Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: GCC warnings

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-12-26 13:26:51 +01:00
parent 2d0d87a05e
commit 2006f1a866
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/nel/src/3d/quad_effect.cpp
View file

@ -56,19 +56,17 @@ void CQuadEffect::makeRasters(const TPoint2DVect &poly
{ {
dest.clear(); dest.clear();
const float epsilon = 10E-5f; startY = 0.f;
sint size = (sint)poly.size(); sint size = (sint)poly.size();
if (!size) return;
const float epsilon = 10E-5f;
uint aelSize = 0; // size of active edge list uint aelSize = 0; // size of active edge list
sint k; // loop counter sint k; // loop counter
dest.clear();
if (!size) return;
static TEdgeList lel, ael; // the left edge list, and the active edge list static TEdgeList lel, ael; // the left edge list, and the active edge list
float highest = poly[0].y; float highest = poly[0].y;
lel.clear(); lel.clear();
@ -217,7 +215,8 @@ void CQuadEffect::makeRasters(const TPoint2DVect &poly
currY += quadHeight; currY += quadHeight;
} while (size || aelSize); }
while (size || aelSize);
} }
//** //**

3
code/nel/src/3d/water_model.cpp
View file

@ -1640,6 +1640,9 @@ void CWaterModel::traverseRender()
for(sint k = 0; k < (sint) poly.Vertices.size() - 2; ++k) for(sint k = 0; k < (sint) poly.Vertices.size() - 2; ++k)
{ {
NLMISC::CTriangleUV truv; NLMISC::CTriangleUV truv;
truv.Uv0.set(0.f, 0.f);
truv.Uv1.set(0.f, 0.f);
truv.Uv2.set(0.f, 0.f);
truv.V0.set(poly.Vertices[0].x, poly.Vertices[0].y, 0.f); truv.V0.set(poly.Vertices[0].x, poly.Vertices[0].y, 0.f);
truv.V1.set(poly.Vertices[k + 1].x, poly.Vertices[k + 1].y, 0.f); truv.V1.set(poly.Vertices[k + 1].x, poly.Vertices[k + 1].y, 0.f);
truv.V2.set(poly.Vertices[k + 2].x, poly.Vertices[k + 2].y, 0.f); truv.V2.set(poly.Vertices[k + 2].x, poly.Vertices[k + 2].y, 0.f);