libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM: Reverted some of the changes I made to model as they were just wrong

Browse Source
This commit is contained in:
Joel Teichroeb 2012-04-25 17:32:45 -07:00
parent 4b5321b3cf
commit 2b48f5c15d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/grim/model.cpp
View File

@ -115,7 +115,7 @@ void Model::loadBinary(Common::SeekableReadStream *data) {
data->read(_materialNames[i], 32);
_materialsShared[i] = false;
_materials[i] = NULL;
loadMaterial(i);
loadMaterial(i, _cmap);
}
data->seek(32, SEEK_CUR); // skip name
data->seek(4, SEEK_CUR);
@ -153,7 +153,7 @@ void Model::loadText(TextSplitter *ts) {
ts->scanString("%d: %32s", 2, &num, materialName);
strcpy(_materialNames[num], materialName);
loadMaterial(num);
loadMaterial(num, _cmap);
}
ts->expectString("section: geometrydef");
@ -224,32 +224,32 @@ ModelNode *Model::getHierarchy() const {
}
void Model::reload(CMap *cmap) {
_cmap = cmap;
// Load the new colormap
for (int i = 0; i < _numMaterials; i++) {
loadMaterial(i);
loadMaterial(i, cmap);
}
for (int i = 0; i < _numGeosets; i++)
_geosets[i].changeMaterials(_materials);
_cmap = cmap;
}
void Model::loadMaterial(int index) {
void Model::loadMaterial(int index, CMap *cmap) {
Material *mat = NULL;
if (!_materialsShared[index]) {
mat = _materials[index];
}
_materials[index] = NULL;
if (_parent) {
_materials[index] = _parent->findMaterial(_materialNames[index], _cmap);
_materials[index] = _parent->findMaterial(_materialNames[index], cmap);
if (_materials[index]) {
_materialsShared[index] = true;
}
}
if (!_materials[index]) {
if (mat && _cmap->getFilename() == _cmap->getFilename()) {
if (mat && cmap->getFilename() == _cmap->getFilename()) {
_materials[index] = mat;
} else {
_materials[index] = g_resourceloader->loadMaterial(_materialNames[index], _cmap);
_materials[index] = g_resourceloader->loadMaterial(_materialNames[index], cmap);
}
_materialsShared[index] = false;
}

2
engines/grim/model.h
View File

@ -77,7 +77,7 @@ public:
};
//private:
void loadMaterial(int index);
void loadMaterial(int index, CMap *cmap);
void loadBinary(Common::SeekableReadStream *data);
void loadText(TextSplitter *ts);