libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WATCHMAKER: Fix some further warnings, and clean out some #if 0-ed code.

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2022-11-07 20:46:55 +01:00 committed by Eugene Sandulenko
parent 6f7a9362e5
commit 5844a03e49
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
engines/watchmaker/3d/material.cpp
View File

@ -137,8 +137,9 @@ MaterialPtr rMergeMaterial(MaterialPtr Mat1, MaterialPtr Mat2) {
void rRemoveMaterials(Common::Array<Common::SharedPtr<gMaterial>> &m) {
for (auto &material : m) {
m.clear();
material->clear();
}
m.clear();
}
Common::SharedPtr<gMaterial> rCopyMaterial(Common::SharedPtr<gMaterial> Mat1, Common::SharedPtr<gMaterial> Mat2) {
@ -222,19 +223,18 @@ void rRemoveMaterial(Common::SharedPtr<gMaterial> &m) {
* Aggiunge un materiale alla MaterialList
* --------------------------------------------------*/
void rAddToMaterialList(gMaterial &mat, signed short int ViewMatrixNum) {
//warning("Stubbed: rAddToMaterialList");
//D3DVERTEXBUFFERDESC VBDesc;
gMaterial *cm;
gBatchBlock *bb;
int j;
#if 0
if (!mat)
return;
#endif
if ((mat.Flags & T3D_MATERIAL_MOVIE))
gBatchBlock *bb = nullptr;
if ((mat.Flags & T3D_MATERIAL_MOVIE)) {
warning("Movie: %s %d", mat.Movie->_name.c_str(), mat.Texture->ID);
mat.Movie->updateMovie();
}
if ((mat.NumFaces() >= 3) && (mat.VBO)) {
if (mat.Texture) {
// if (mat.Texture->name == "./TMaps/bianco.tga")
// return;
}
bb = rNewBatchBlock(mat.Texture->ID, mat.Flags, 0, 0);
bb->ViewMatrixNum = ViewMatrixNum;
bb->FacesList = mat.getFacesList();
@ -248,17 +248,6 @@ void rAddToMaterialList(gMaterial &mat, signed short int ViewMatrixNum) {
}
}
mat.emptyFacesList(); // We may want to keep the reservation to avoid the extra reallocs here.
// if ( bb->VB == g_lpD3DUserVertexBuffer )
// DebugLogFile("User VB %s with %d verts",mat->Texture->Name,bb->NumVerts);
#if 0
if ((bb->NumVerts == 0) && (bb->VBO)) {
if (bb->VB->GetVertexBufferDesc(&VBDesc) != D3D_OK)
DebugLogFile("Can't get VB information for %s", mat->Texture->Name);
else
bb->NumVerts = (unsigned short int) VBDesc.dwNumVertices;
// DebugLogFile("Saving VB %s with %d verts",mat->Texture->Name,bb->NumVerts);
}
#endif
}
for (auto &cm : mat.AddictionalMaterial) {
@ -269,15 +258,6 @@ void rAddToMaterialList(gMaterial &mat, signed short int ViewMatrixNum) {
bb->FacesList = cm->getFacesList();
bb->VBO = cm->VBO;
cm->emptyFacesList();
#if 0
if (bb->NumVerts == 0) {
if (bb->VBO->GetVertexBufferDesc(&VBDesc) != D3D_OK)
DebugLogFile("Can't get VB information for %s", mat->Texture->Name);
else
bb->NumVerts = (unsigned short int) VBDesc.dwNumVertices;
// DebugLogFile("Saving VB %s with %d verts",mat->Texture->Name,bb->NumVerts);
}
#endif
}
}