Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix various warnings with clang build, and adjust cmake clang warnings flags

Browse Source 
to include a few more that gcc is using too.
This commit is contained in:
Brecht Van Lommel
2013-02-26 21:58:06 +00:00
parent 1927f44686
commit 4f3ca854e1
37 changed files with 121 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/elbeem/intern/ntl_geometrymodel.cpp
View File

@@ -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;
}
}

7
intern/elbeem/intern/ntl_geometryobject.cpp
View File

@@ -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;
}
}

2
intern/elbeem/intern/ntl_geometryobject.h
View File

@@ -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 */

1
intern/elbeem/intern/ntl_ray.cpp
View File

@@ -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 )
{
}

3
intern/elbeem/intern/ntl_ray.h
View File

@@ -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;

1
intern/elbeem/intern/solver_main.cpp
View File

@@ -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();

14
intern/elbeem/intern/solver_util.cpp
View File

@@ -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)));