Skip to content

Y
YGOMobile
Commit 7a29b16e authored by fallenstardust's avatar fallenstardust
Browse files
Options

太吃配置，待定

parent 9dbf9968
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 13 deletions
Classes/gframe/image_manager.cpp
View file @ 7a29b16e
...@@ -82,7 +82,7 @@ void ImageManager::RemoveTexture(int code) { ...@@ -82,7 +82,7 @@ void ImageManager::RemoveTexture(int code) {
driver->removeTexture(tit->second); driver->removeTexture(tit->second);
tMap.erase(tit); tMap.erase(tit);
} }
} }/*
// function by Warr1024, from https://github.com/minetest/minetest/issues/2419 , modified // function by Warr1024, from https://github.com/minetest/minetest/issues/2419 , modified
void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) { void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) {
double sx, sy, minsx, maxsx, minsy, maxsy, area, ra, ga, ba, aa, pw, ph, pa; double sx, sy, minsx, maxsx, minsy, maxsy, area, ra, ga, ba, aa, pw, ph, pa;
...@@ -175,23 +175,24 @@ irr::video::ITexture* ImageManager::GetTextureFromFile(char* file, s32 width, s3 ...@@ -175,23 +175,24 @@ irr::video::ITexture* ImageManager::GetTextureFromFile(char* file, s32 width, s3
//} else { //} else {
// return driver->getTexture(file); // return driver->getTexture(file);
//} //}
} }*/
irr::video::ITexture* ImageManager::GetTexture(int code) { irr::video::ITexture* ImageManager::GetTexture(int code) {
if(code == 0) if(code == 0)
return tUnknown; return tUnknown;
int width = CARD_IMG_WIDTH; // int width = CARD_IMG_WIDTH;
int height = CARD_IMG_HEIGHT; // int height = CARD_IMG_HEIGHT;
auto tit = tMap.find(code); auto tit = tMap.find(code);
if(tit == tMap.end()) { if(tit == tMap.end()) {
char file[256]; char file[256];
char file_img[256]; // char file_img[256];
sprintf(file, "expansions/pics/%d.jpg", code); sprintf(file, "expansions/pics/%d.jpg", code);
irr::video::ITexture* img = NULL; irr::video::ITexture* img = NULL;
std::list<std::string>::iterator iter; std::list<std::string>::iterator iter;
for (iter = support_types.begin(); iter != support_types.end(); ++iter) { for (iter = support_types.begin(); iter != support_types.end(); ++iter) {
sprintf(file, "/expansions/pics/%d.%s", code, iter->c_str()); sprintf(file, "/expansions/pics/%d.%s", code, iter->c_str());
sprintf(file_img, "%s", (image_work_path + path(file)).c_str()); img = driver->getTexture(image_work_path + path(file));
img = GetTextureFromFile(file_img, width, height); // sprintf(file_img, "%s", (image_work_path + path(file)).c_str());
// img = GetTextureFromFile(file_img, width, height);
if (img != NULL) { if (img != NULL) {
break; break;
} }
...@@ -199,7 +200,8 @@ irr::video::ITexture* ImageManager::GetTexture(int code) { ...@@ -199,7 +200,8 @@ irr::video::ITexture* ImageManager::GetTexture(int code) {
if(img == NULL) { if(img == NULL) {
for (iter = support_types.begin(); iter != support_types.end(); ++iter) { for (iter = support_types.begin(); iter != support_types.end(); ++iter) {
sprintf(file, "%s/%d.%s", irr::android::getCardImagePath(mainGame->appMain).c_str(), code, iter->c_str()); sprintf(file, "%s/%d.%s", irr::android::getCardImagePath(mainGame->appMain).c_str(), code, iter->c_str());
img = GetTextureFromFile(file, width, height); img = driver->getTexture(file);
// img = GetTextureFromFile(file, width, height);
if (img != NULL) { if (img != NULL) {
break; break;
} }
...@@ -262,18 +264,22 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) { ...@@ -262,18 +264,22 @@ irr::video::ITexture* ImageManager::GetTextureField(int code) {
if(tit == tFields.end()) { if(tit == tFields.end()) {
char file[256]; char file[256];
sprintf(file, "field/%s/%d.jpg", irr::android::getCardImagePath(mainGame->appMain).c_str(), code); sprintf(file, "field/%s/%d.jpg", irr::android::getCardImagePath(mainGame->appMain).c_str(), code);
irr::video::ITexture* img = GetTextureFromFile(file, 512, 512); irr::video::ITexture* img = driver->getTexture(file);
// irr::video::ITexture* img = GetTextureFromFile(file, 512, 512);
if(img == NULL) { if(img == NULL) {
sprintf(file, "field/%s/%d.jpg", irr::android::getCardImagePath(mainGame->appMain).c_str(), code); sprintf(file, "field/%s/%d.jpg", irr::android::getCardImagePath(mainGame->appMain).c_str(), code);
img = GetTextureFromFile(file, 512, 512); img = driver->getTexture(file);
// img = GetTextureFromFile(file, 512, 512);
} }
if(img == NULL) { if(img == NULL) {
sprintf(file, "field/%s/%d.png", irr::android::getCardImagePath(mainGame->appMain).c_str(), code); sprintf(file, "field/%s/%d.png", irr::android::getCardImagePath(mainGame->appMain).c_str(), code);
img = GetTextureFromFile(file, 512, 512); img = driver->getTexture(file);
// img = GetTextureFromFile(file, 512, 512);
} }
if(img == NULL) { if(img == NULL) {
sprintf(file, "pics/field/%d.jpg", code); sprintf(file, "pics/field/%d.jpg", code);
img = GetTextureFromFile(file, 512, 512); img = driver->getTexture(file);
// img = GetTextureFromFile(file, 512, 512);
if(img == NULL) { if(img == NULL) {
tFields[code] = NULL; tFields[code] = NULL;
return NULL; return NULL;
......
Classes/gframe/image_manager.h
View file @ 7a29b16e
...@@ -15,7 +15,7 @@ public: ...@@ -15,7 +15,7 @@ public:
void SetDevice(irr::IrrlichtDevice* dev); void SetDevice(irr::IrrlichtDevice* dev);
void ClearTexture(); void ClearTexture();
void RemoveTexture(int code); void RemoveTexture(int code);
irr::video::ITexture* GetTextureFromFile(char* file, s32 width, s32 height); // irr::video::ITexture* GetTextureFromFile(char* file, s32 width, s32 height);
irr::video::ITexture* GetTexture(int code); irr::video::ITexture* GetTexture(int code);
irr::video::ITexture* GetTextureThumb(int code); irr::video::ITexture* GetTextureThumb(int code);
irr::video::ITexture* GetTextureField(int code); irr::video::ITexture* GetTextureField(int code);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment