zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- silence some warnings.

This commit is contained in:
Christoph Oelckers 2018-05-18 00:12:58 +02:00
parent b197bfc964
commit 2962fe9f08
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/r_data/models/models_ue1.cpp
View File

@ -115,8 +115,8 @@ void FUE1Model::LoadGeometry()
// unpack coords // unpack coords
for ( int j=0; j<3; j++ ) for ( int j=0; j<3; j++ )
{ {
Poly.C[j].S = dpolys[i].uv[j][0]/255.; Poly.C[j].S = dpolys[i].uv[j][0]/255.f;
Poly.C[j].T = dpolys[i].uv[j][1]/255.; Poly.C[j].T = dpolys[i].uv[j][1]/255.f;
} }
Poly.texNum = dpolys[i].texnum; Poly.texNum = dpolys[i].texnum;
// push // push
@ -130,7 +130,7 @@ void FUE1Model::LoadGeometry()
for ( int j=0; j<numVerts; j++ ) for ( int j=0; j<numVerts; j++ )
{ {
UE1Vector nsum = {0,0,0}; UE1Vector nsum = {0,0,0};
double total = 0.; float total = 0.;
for ( int k=0; k<numPolys; k++ ) for ( int k=0; k<numPolys; k++ )
{ {
if ( (polys[k].V[0] != j) && (polys[k].V[1] != j) && (polys[k].V[2] != j) ) continue; if ( (polys[k].V[0] != j) && (polys[k].V[1] != j) && (polys[k].V[2] != j) ) continue;
@ -147,8 +147,8 @@ void FUE1Model::LoadGeometry()
norm.X = dir[0].Y*dir[1].Z-dir[0].Z*dir[1].Y; norm.X = dir[0].Y*dir[1].Z-dir[0].Z*dir[1].Y;
norm.Y = dir[0].Z*dir[1].X-dir[0].X*dir[1].Z; norm.Y = dir[0].Z*dir[1].X-dir[0].X*dir[1].Z;
norm.Z = dir[0].X*dir[1].Y-dir[0].Y*dir[1].X; norm.Z = dir[0].X*dir[1].Y-dir[0].Y*dir[1].X;
double s = sqrt(norm.X*norm.X+norm.Y*norm.Y+norm.Z*norm.Z); float s = (float)sqrt(norm.X*norm.X+norm.Y*norm.Y+norm.Z*norm.Z);
if ( s != 0. ) if ( s != 0.f )
{ {
norm.X /= s; norm.X /= s;
norm.Y /= s; norm.Y /= s;
@ -157,7 +157,7 @@ void FUE1Model::LoadGeometry()
nsum.X += norm.X; nsum.X += norm.X;
nsum.Y += norm.Y; nsum.Y += norm.Y;
nsum.Z += norm.Z; nsum.Z += norm.Z;
total+=1.; total+=1.f;
} }
verts[j+numVerts*i].Normal.X = nsum.X/total; verts[j+numVerts*i].Normal.X = nsum.X/total;
verts[j+numVerts*i].Normal.Y = nsum.Y/total; verts[j+numVerts*i].Normal.Y = nsum.Y/total;

2
src/vectors.h
View File

@ -1362,7 +1362,7 @@ struct TAngle
vec_t Radians() const vec_t Radians() const
{ {
return Degrees * (pi::pi() / 180.0); return vec_t(Degrees * (pi::pi() / 180.0));
} }
unsigned BAMs() const unsigned BAMs() const