zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 14:51:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to fix warnings from VS2017 Win64 compiler

Browse source
This commit is contained in:
Kevin Caccamo 2018-09-22 12:49:54 -04:00
parent 7d4895d9df
commit 525ab8eda3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/r_data/models/models_obj.cpp
View file

@ -379,9 +379,9 @@ void FOBJModel::BuildVertexBuffer(FModelRenderer *renderer)
FModelVertex *vertptr = vbuf->LockVertexBuffer(vbufsize); FModelVertex *vertptr = vbuf->LockVertexBuffer(vbufsize);
for (size_t i = 0; i < surfaces.Size(); i++) for (unsigned int i = 0; i < surfaces.Size(); i++)
{ {
for (size_t j = 0; j < surfaces[i].numTris; j++) for (unsigned int j = 0; j < surfaces[i].numTris; j++)
{ {
for (size_t side = 0; side < 3; side++) for (size_t side = 0; side < 3; side++)
{ {
@ -506,9 +506,9 @@ void FOBJModel::TriangulateQuad(const OBJFace &quad, OBJFace *tris)
void FOBJModel::AddVertFaces() { void FOBJModel::AddVertFaces() {
// Initialize and populate vertFaces - this array stores references to triangles per vertex // Initialize and populate vertFaces - this array stores references to triangles per vertex
vertFaces = new TArray<OBJTriRef>[verts.Size()]; vertFaces = new TArray<OBJTriRef>[verts.Size()];
for (size_t i = 0; i < surfaces.Size(); i++) for (unsigned int i = 0; i < surfaces.Size(); i++)
{ {
for (size_t j = 0; j < surfaces[i].numTris; j++) for (unsigned int j = 0; j < surfaces[i].numTris; j++)
{ {
OBJTriRef otr = OBJTriRef(i, j); OBJTriRef otr = OBJTriRef(i, j);
for (size_t k = 0; k < surfaces[i].tris[j].sideCount; k++) for (size_t k = 0; k < surfaces[i].tris[j].sideCount; k++)
@ -599,7 +599,7 @@ FVector3 FOBJModel::CalculateNormalSmooth(unsigned int vidx, unsigned int smooth
vNormal += fNormal; vNormal += fNormal;
} }
} }
vNormal /= connectedFaces; vNormal /= (float)connectedFaces;
return vNormal; return vNormal;
} }