diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-27 01:58:06 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-27 01:58:06 +0400 |
commit | 4f3ca854e1e25d855c7c2b8f6458edd6aae385c5 (patch) | |
tree | 60f07ffa26286fcde603977b6482a10f92a0ad11 /intern/elbeem | |
parent | 1927f446868e71c56e8032b4693004225ee5177d (diff) |
Fix various warnings with clang build, and adjust cmake clang warnings flags
to include a few more that gcc is using too.
Diffstat (limited to 'intern/elbeem')
-rw-r--r-- | intern/elbeem/intern/ntl_geometrymodel.cpp | 8 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_geometryobject.cpp | 7 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_geometryobject.h | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_ray.cpp | 1 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_ray.h | 3 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 1 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_util.cpp | 14 |
7 files changed, 12 insertions, 24 deletions
diff --git a/intern/elbeem/intern/ntl_geometrymodel.cpp b/intern/elbeem/intern/ntl_geometrymodel.cpp index 13220736b8e..62e4441bad7 100644 --- a/intern/elbeem/intern/ntl_geometrymodel.cpp +++ b/intern/elbeem/intern/ntl_geometrymodel.cpp @@ -215,7 +215,6 @@ void ntlGeometryObjModel::calcTriangleDivs(vector<ntlVec3Gfx> &verts, vector<ntl errMsg("ntlGeometryObjModel","calcTriangleDivs special!"); mTriangleDivs1.resize( tris.size() ); mTriangleDivs2.resize( tris.size() ); - mTriangleDivs3.resize( tris.size() ); for(size_t i=0; i<tris.size(); i++) { ntlVec3Gfx p0 = verts[ tris[i].getPoints()[0] ]; ntlVec3Gfx p1 = verts[ tris[i].getPoints()[1] ]; @@ -223,10 +222,9 @@ void ntlGeometryObjModel::calcTriangleDivs(vector<ntlVec3Gfx> &verts, vector<ntl ntlVec3Gfx side1 = p1 - p0; ntlVec3Gfx side2 = p2 - p0; ntlVec3Gfx side3 = p1 - p2; - int divs1=0, divs2=0, divs3=0; + int divs1=0, divs2=0; if(normNoSqrt(side1) > fsTri*fsTri) { divs1 = (int)(norm(side1)/fsTri); } if(normNoSqrt(side2) > fsTri*fsTri) { divs2 = (int)(norm(side2)/fsTri); } - //if(normNoSqrt(side3) > fsTri*fsTri) { divs3 = (int)(norm(side3)/fsTri); } // special handling // warning, requires objmodel triangle treatment (no verts dups) @@ -237,17 +235,15 @@ void ntlGeometryObjModel::calcTriangleDivs(vector<ntlVec3Gfx> &verts, vector<ntl p1 = sverts[s].mVerts[ tris[i].getPoints()[1] ]; p2 = sverts[s].mVerts[ tris[i].getPoints()[2] ]; side1 = p1 - p0; side2 = p2 - p0; side3 = p1 - p2; - int tdivs1=0, tdivs2=0, tdivs3=0; + int tdivs1=0, tdivs2=0; if(normNoSqrt(side1) > fsTri*fsTri) { tdivs1 = (int)(norm(side1)/fsTri); } if(normNoSqrt(side2) > fsTri*fsTri) { tdivs2 = (int)(norm(side2)/fsTri); } if(tdivs1>divs1) divs1=tdivs1; if(tdivs2>divs2) divs2=tdivs2; - if(tdivs3>divs3) divs3=tdivs3; } } // */ mTriangleDivs1[i] = divs1; mTriangleDivs2[i] = divs2; - mTriangleDivs3[i] = divs3; } } diff --git a/intern/elbeem/intern/ntl_geometryobject.cpp b/intern/elbeem/intern/ntl_geometryobject.cpp index 1e08cb96a95..9b17b1854f2 100644 --- a/intern/elbeem/intern/ntl_geometryobject.cpp +++ b/intern/elbeem/intern/ntl_geometryobject.cpp @@ -42,7 +42,7 @@ ntlGeometryObject::ntlGeometryObject() : mMovPoints(), mMovNormals(), mHaveCachedMov(false), mCachedMovPoints(), mCachedMovNormals(), - mTriangleDivs1(), mTriangleDivs2(), mTriangleDivs3(), + mTriangleDivs1(), mTriangleDivs2(), mMovPntsInited(-100.0), mMaxMovPnt(-1), mcGeoActive(1.), mCpsTimeStart(0.), mCpsTimeEnd(1.0), mCpsQuality(10.), @@ -434,7 +434,6 @@ void ntlGeometryObject::applyTransformation(double t, vector<ntlVec3Gfx> *verts, void ntlGeometryObject::calcTriangleDivs(vector<ntlVec3Gfx> &verts, vector<ntlTriangle> &tris, gfxReal fsTri) { mTriangleDivs1.resize( tris.size() ); mTriangleDivs2.resize( tris.size() ); - mTriangleDivs3.resize( tris.size() ); //fsTri *= 2.; // DEBUG! , wrong init! @@ -444,14 +443,12 @@ void ntlGeometryObject::calcTriangleDivs(vector<ntlVec3Gfx> &verts, vector<ntlTr const ntlVec3Gfx p2 = verts[ tris[i].getPoints()[2] ]; const ntlVec3Gfx side1 = p1 - p0; const ntlVec3Gfx side2 = p2 - p0; - const ntlVec3Gfx side3 = p1 - p2; - int divs1=0, divs2=0, divs3=0; + int divs1=0, divs2=0; if(normNoSqrt(side1) > fsTri*fsTri) { divs1 = (int)(norm(side1)/fsTri); } if(normNoSqrt(side2) > fsTri*fsTri) { divs2 = (int)(norm(side2)/fsTri); } mTriangleDivs1[i] = divs1; mTriangleDivs2[i] = divs2; - mTriangleDivs3[i] = divs3; } } diff --git a/intern/elbeem/intern/ntl_geometryobject.h b/intern/elbeem/intern/ntl_geometryobject.h index fca539b8402..677f132f4c3 100644 --- a/intern/elbeem/intern/ntl_geometryobject.h +++ b/intern/elbeem/intern/ntl_geometryobject.h @@ -223,7 +223,7 @@ class ntlGeometryObject : public ntlGeometryClass vector<ntlVec3Gfx> mCachedMovPoints; vector<ntlVec3Gfx> mCachedMovNormals; /*! precomputed triangle divisions */ - vector<int> mTriangleDivs1,mTriangleDivs2,mTriangleDivs3; + vector<int> mTriangleDivs1,mTriangleDivs2; /*! inited? */ float mMovPntsInited; /*! point with max. distance from center */ diff --git a/intern/elbeem/intern/ntl_ray.cpp b/intern/elbeem/intern/ntl_ray.cpp index 7f5aedc53c6..1083fcdb68b 100644 --- a/intern/elbeem/intern/ntl_ray.cpp +++ b/intern/elbeem/intern/ntl_ray.cpp @@ -677,7 +677,6 @@ const ntlColor ntlRay::shade() //const ntlScene::ntlScene( ntlRenderGlobals *glob, bool del ) : mpGlob( glob ), mSceneDel(del), mpTree( NULL ), - mDisplayListId( -1 ), mSceneBuilt( false ), mFirstInitDone( false ) { } diff --git a/intern/elbeem/intern/ntl_ray.h b/intern/elbeem/intern/ntl_ray.h index 71fcd5f71c2..5f6d34e3020 100644 --- a/intern/elbeem/intern/ntl_ray.h +++ b/intern/elbeem/intern/ntl_ray.h @@ -404,9 +404,6 @@ private: /*! Tree to store quickly intersect triangles */ ntlTree *mpTree; - /*! id of dislpay list for raytracer stuff */ - int mDisplayListId; - /*! was the scene successfully built? only then getObject(i) requests are valid */ bool mSceneBuilt; diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index b9436e84922..99278657fd9 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -1170,7 +1170,6 @@ LbmFsgrSolver::standingFluidPreinit() LbmFloat lcsmqo; # if OPT3D==1 LbmFloat lcsmqadd, lcsmeq[LBM_DFNUM], lcsmomega; - CellFlagType nbored=0; # endif // OPT3D==true GRID_LOOP_START(); diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp index 935a910e7d5..6eca427c787 100644 --- a/intern/elbeem/intern/solver_util.cpp +++ b/intern/elbeem/intern/solver_util.cpp @@ -731,15 +731,15 @@ void LbmFsgrSolver::advanceParticles() { if(mPartUsePhysModel) { LbmFloat radius = p->getSize() * minDropSize; - LbmVec velPart = vec2L(p->getVel()) *cellsize/timestep; // L2RW, lattice velocity - LbmVec velWater = LbmVec(vx,vy,vz) *cellsize/timestep;// L2RW, fluid velocity - LbmVec velRel = velWater - velPart; + //LbmVec velPart = vec2L(p->getVel()) *cellsize/timestep; // L2RW, lattice velocity + //LbmVec velWater = LbmVec(vx,vy,vz) *cellsize/timestep;// L2RW, fluid velocity + //LbmVec velRel = velWater - velPart; //LbmFloat velRelNorm = norm(velRel); - LbmFloat pvolume = rhoAir * 4.0/3.0 * M_PI* radius*radius*radius; // volume: 4/3 pi r^3 + //LbmFloat pvolume = rhoAir * 4.0/3.0 * M_PI* radius*radius*radius; // volume: 4/3 pi r^3 - LbmVec fb = -rwgrav* pvolume *rhoWater; - LbmVec fd = velRel*6.0*M_PI*radius* (1e-3); //viscWater; - LbmVec change = (fb+fd) *10.0*timestep *(timestep/cellsize); + //LbmVec fb = -rwgrav* pvolume *rhoWater; + //LbmVec fd = velRel*6.0*M_PI*radius* (1e-3); //viscWater; + //LbmVec change = (fb+fd) *10.0*timestep *(timestep/cellsize); /*if(debugOutCounter<0) { errMsg("PIT","BTEST1 vol="<<pvolume<<" radius="<<radius<<" vn="<<velRelNorm<<" velPart="<<velPart<<" velRel"<<velRel); errMsg("PIT","BTEST2 cellsize="<<cellsize<<" timestep="<<timestep<<" viscW="<<viscWater<<" ss/mb="<<(timestep/(pvolume*rhoAir))); |