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

Fix material regression introduced in r1499

Browse Source
This commit is contained in:
Ori Avtalion 2009-08-27 19:01:09 +00:00
parent 148ce2f6cd
commit d5aaee5057
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
engines/grim/model.cpp
View File

@ -49,7 +49,7 @@ Model::Model(const char *filename, const char *data, int len, const CMap *cmap)
void Model::reload(const CMap *cmap) {
// Load the new colormap
for (int i = 0; i < _numMaterials; i++)
_materials[i] = g_resourceloader->loadMaterial(_materialNames[i], cmap)[0];
_materials[i] = g_resourceloader->loadMaterial(_materialNames[i], cmap);
for (int i = 0; i < _numGeosets; i++)
_geosets[i].changeMaterials(_materials);
}
@ -57,11 +57,11 @@ void Model::reload(const CMap *cmap) {
void Model::loadBinary(const char *&data, const CMap *cmap) {
_numMaterials = READ_LE_UINT32(data + 4);
data += 8;
_materials = new Material[_numMaterials];
_materials = new Material*[_numMaterials];
_materialNames = new char[_numMaterials][32];
for (int i = 0; i < _numMaterials; i++) {
strcpy(_materialNames[i], data);
_materials[i] = g_resourceloader->loadMaterial(_materialNames[i], cmap)[0];
_materials[i] = g_resourceloader->loadMaterial(_materialNames[i], cmap);
data += 32;
}
data += 32; // skip name
@ -86,7 +86,7 @@ Model::~Model() {
delete[] _rootHierNode;
}
void Model::Geoset::loadBinary(const char *&data, Material *materials) {
void Model::Geoset::loadBinary(const char *&data, Material *materials[]) {
_numMeshes = READ_LE_UINT32(data);
data += 4;
_meshes = new Mesh[_numMeshes];
@ -98,7 +98,7 @@ Model::Geoset::~Geoset() {
delete[] _meshes;
}
void Model::Mesh::loadBinary(const char *&data, Material *materials) {
void Model::Mesh::loadBinary(const char *&data, Material *materials[]) {
memcpy(_name, data, 32);
_geometryMode = READ_LE_UINT32(data + 36);
_lightingMode = READ_LE_UINT32(data + 40);
@ -153,7 +153,7 @@ void Model::Face::changeMaterial(Material *material) {
_material = material;
}
int Model::Face::loadBinary(const char *&data, Material *materials) {
int Model::Face::loadBinary(const char *&data, Material *materials[]) {
_type = READ_LE_UINT32(data + 4);
_geo = READ_LE_UINT32(data + 8);
_light = READ_LE_UINT32(data + 12);
@ -182,7 +182,7 @@ int Model::Face::loadBinary(const char *&data, Material *materials) {
if (materialPtr == 0)
_material = 0;
else {
_material = &materials[READ_LE_UINT32(data)];
_material = materials[READ_LE_UINT32(data)];
materialPtr = READ_LE_UINT32(data);
data += 4;
}
@ -268,14 +268,14 @@ void Model::loadText(TextSplitter *ts, const CMap *cmap) {
ts->scanString("3do %d.%d", 2, &major, &minor);
ts->expectString("section: modelresource");
ts->scanString("materials %d", 1, &_numMaterials);
_materials = new Material[_numMaterials];
_materials = new Material*[_numMaterials];
_materialNames = new char[_numMaterials][32];
for (int i = 0; i < _numMaterials; i++) {
char materialName[32];
int num;
ts->scanString("%d: %32s", 2, &num, materialName);
_materials[num] = g_resourceloader->loadMaterial(materialName, cmap)[0];
_materials[num] = g_resourceloader->loadMaterial(materialName, cmap);
strcpy(_materialNames[num], materialName);
}
@ -338,12 +338,12 @@ void Model::loadText(TextSplitter *ts, const CMap *cmap) {
warning("Unexpected junk at end of model text");
}
void Model::Geoset::changeMaterials(Material *materials) {
void Model::Geoset::changeMaterials(Material *materials[]) {
for (int i = 0; i < _numMeshes; i++)
_meshes[i].changeMaterials(materials);
}
void Model::Geoset::loadText(TextSplitter *ts, Material *materials) {
void Model::Geoset::loadText(TextSplitter *ts, Material *materials[]) {
ts->scanString("meshes %d", 1, &_numMeshes);
_meshes = new Mesh[_numMeshes];
for (int i = 0; i < _numMeshes; i++) {
@ -353,12 +353,12 @@ void Model::Geoset::loadText(TextSplitter *ts, Material *materials) {
}
}
void Model::Mesh::changeMaterials(Material *materials) {
void Model::Mesh::changeMaterials(Material *materials[]) {
for (int i = 0; i < _numFaces; i++)
_faces[i].changeMaterial(&materials[_materialid[i]]);
_faces[i].changeMaterial(materials[_materialid[i]]);
}
void Model::Mesh::loadText(TextSplitter *ts, Material *materials) {
void Model::Mesh::loadText(TextSplitter *ts, Material *materials[]) {
ts->scanString("name %32s", 1, _name);
ts->scanString("radius %f", 1, &_radius);
@ -423,7 +423,7 @@ void Model::Mesh::loadText(TextSplitter *ts, Material *materials) {
assert(materialid != -1);
_materialid[num] = materialid;
_faces[num]._material = &materials[materialid];
_faces[num]._material = materials[materialid];
_faces[num]._type = (int)type;
_faces[num]._geo = geo;
_faces[num]._light = light;

16
engines/grim/model.h
View File

@ -79,7 +79,7 @@ public:
//private:
struct Face {
int loadBinary(const char *&data, Material *materials);
int loadBinary(const char *&data, Material *materials[]);
void draw(float *vertices, float *vertNormals, float *textureVerts) const;
void changeMaterial(Material *material);
~Face();
@ -93,9 +93,9 @@ public:
};
struct Mesh {
void loadBinary(const char *&data, Material *materials);
void loadText(TextSplitter *ts, Material *materials);
void changeMaterials(Material *materials);
void loadBinary(const char *&data, Material *materials[]);
void loadText(TextSplitter *ts, Material *materials[]);
void changeMaterials(Material *materials[]);
void draw() const;
void update();
Mesh() : _numFaces(0) { }
@ -120,9 +120,9 @@ public:
};
struct Geoset {
void loadBinary(const char *&data, Material *materials);
void loadText(TextSplitter *ts, Material *materials);
void changeMaterials(Material *materials);
void loadBinary(const char *&data, Material *materials[]);
void loadText(TextSplitter *ts, Material *materials[]);
void changeMaterials(Material *materials[]);
Geoset() : _numMeshes(0) { }
~Geoset();
@ -132,7 +132,7 @@ public:
int _numMaterials;
char (*_materialNames)[32];
Material *_materials;
Material **_materials;
Graphics::Vector3d _insertOffset;
int _numGeosets;
Geoset *_geosets;