[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16709] trunk/blender/intern/elbeem/intern /controlparticles.cpp: Fixing compile warnings
Daniel Genrich
daniel.genrich at gmx.net
Wed Sep 24 02:23:01 CEST 2008
Revision: 16709
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16709
Author: genscher
Date: 2008-09-24 02:23:01 +0200 (Wed, 24 Sep 2008)
Log Message:
-----------
Fixing compile warnings
Modified Paths:
--------------
trunk/blender/intern/elbeem/intern/controlparticles.cpp
Modified: trunk/blender/intern/elbeem/intern/controlparticles.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/controlparticles.cpp 2008-09-23 22:33:22 UTC (rev 16708)
+++ trunk/blender/intern/elbeem/intern/controlparticles.cpp 2008-09-24 00:23:01 UTC (rev 16709)
@@ -109,8 +109,7 @@
ntlVec3Gfx org = start+ntlVec3Gfx(width*0.5);
gfxReal distance = -1.;
vector<ntlVec3Gfx> inspos;
- int approxmax = (int)( ((end[0]-start[0])/width)*((end[1]-start[1])/width)*((end[2]-start[2])/width) );
-
+
// printf("distance: %f, width: %f\n", distance, width);
while(org[2]<end[2]) {
@@ -146,7 +145,6 @@
ControlParticle p; p.reset();
p.pos = vec2L(inspos[i]);
- double cpdist = norm(inspos[i]-ninspos[i]);
bool usecpv = true;
mPartSets[mPartSets.size()-1].particles.push_back(p);
@@ -157,7 +155,7 @@
double tsampling = mCPSTimestep;
// printf("tsampling: %f, ninspos.size(): %d, mCPSTimeEnd: %f\n", tsampling, ninspos.size(), mCPSTimeEnd);
- int totcnt = (int)( (mCPSTimeEnd-mCPSTimeStart)/tsampling ), tcnt=0;
+ int tcnt=0;
for(double t=mCPSTimeStart+tsampling; ((t<mCPSTimeEnd) && (ninspos.size()>0.)); t+=tsampling) {
ControlParticleSet nextcps; //T
mPartSets.push_back(nextcps);
@@ -299,6 +297,7 @@
#define LINE_LEN 100
int ControlParticles::initFromTextFile(string filename)
{
+ /*
const bool debugRead = false;
char line[LINE_LEN];
line[LINE_LEN-1] = '\0';
@@ -341,7 +340,7 @@
//if(debugRead) printf("\nDEBUG%d r '%s'\n",lineCnt, line);
if(!line) continue;
- int len = (int)strlen(line);
+ size_t len = strlen(line);
// skip empty lines and comments (#,//)
if(len<1) continue;
@@ -503,12 +502,14 @@
// done...
fclose(infile);
applyTrafos();
+ */
return 1;
}
int ControlParticles::initFromTextFileOld(string filename)
{
+ /*
const bool debugRead = false;
char line[LINE_LEN];
line[LINE_LEN-1] = '\0';
@@ -540,7 +541,7 @@
if(debugRead) printf("\nDEBUG%d r '%s'\n",lineCnt, line);
if(!line) continue;
- int len = (int)strlen(line);
+ size_t len = strlen(line);
// skip empty lines and comments (#,//)
if(len<1) continue;
@@ -622,6 +623,7 @@
// done...
fclose(infile);
applyTrafos();
+ */
return 1;
}
More information about the Bf-blender-cvs
mailing list