sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixing compile warnings

Browse Source
This commit is contained in:
Daniel Genrich 2008-09-24 00:23:01 +00:00
parent 005c5e6371
commit 7c94eed4cb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,8 +109,7 @@ int ControlParticles::initFromObject(ntlGeometryObjModel *model) {
ntlVec3Gfx org = start+ntlVec3Gfx(width*0.5); ntlVec3Gfx org = start+ntlVec3Gfx(width*0.5);
gfxReal distance = -1.; gfxReal distance = -1.;
vector<ntlVec3Gfx> inspos; 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); // printf("distance: %f, width: %f\n", distance, width);
while(org[2]<end[2]) { while(org[2]<end[2]) {
@ -146,7 +145,6 @@ int ControlParticles::initFromObject(ntlGeometryObjModel *model) {
ControlParticle p; p.reset(); ControlParticle p; p.reset();
p.pos = vec2L(inspos[i]); p.pos = vec2L(inspos[i]);
double cpdist = norm(inspos[i]-ninspos[i]);
bool usecpv = true; bool usecpv = true;
mPartSets[mPartSets.size()-1].particles.push_back(p); mPartSets[mPartSets.size()-1].particles.push_back(p);
@ -157,7 +155,7 @@ int ControlParticles::initFromObject(ntlGeometryObjModel *model) {
double tsampling = mCPSTimestep; double tsampling = mCPSTimestep;
// printf("tsampling: %f, ninspos.size(): %d, mCPSTimeEnd: %f\n", tsampling, ninspos.size(), mCPSTimeEnd); // 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) { for(double t=mCPSTimeStart+tsampling; ((t<mCPSTimeEnd) && (ninspos.size()>0.)); t+=tsampling) {
ControlParticleSet nextcps; //T ControlParticleSet nextcps; //T
mPartSets.push_back(nextcps); mPartSets.push_back(nextcps);
@ -299,6 +297,7 @@ int ControlParticles::getTotalSize()
#define LINE_LEN 100 #define LINE_LEN 100
int ControlParticles::initFromTextFile(string filename) int ControlParticles::initFromTextFile(string filename)
{ {
/*
const bool debugRead = false; const bool debugRead = false;
char line[LINE_LEN]; char line[LINE_LEN];
line[LINE_LEN-1] = '\0'; line[LINE_LEN-1] = '\0';
@ -341,7 +340,7 @@ int ControlParticles::initFromTextFile(string filename)
//if(debugRead) printf("\nDEBUG%d r '%s'\n",lineCnt, line); //if(debugRead) printf("\nDEBUG%d r '%s'\n",lineCnt, line);
if(!line) continue; if(!line) continue;
int len = (int)strlen(line); size_t len = strlen(line);
// skip empty lines and comments (#,//) // skip empty lines and comments (#,//)
if(len<1) continue; if(len<1) continue;
@ -503,12 +502,14 @@ int ControlParticles::initFromTextFile(string filename)
// done... // done...
fclose(infile); fclose(infile);
applyTrafos(); applyTrafos();
*/
return 1; return 1;
} }
int ControlParticles::initFromTextFileOld(string filename) int ControlParticles::initFromTextFileOld(string filename)
{ {
/*
const bool debugRead = false; const bool debugRead = false;
char line[LINE_LEN]; char line[LINE_LEN];
line[LINE_LEN-1] = '\0'; line[LINE_LEN-1] = '\0';
@ -540,7 +541,7 @@ int ControlParticles::initFromTextFileOld(string filename)
if(debugRead) printf("\nDEBUG%d r '%s'\n",lineCnt, line); if(debugRead) printf("\nDEBUG%d r '%s'\n",lineCnt, line);
if(!line) continue; if(!line) continue;
int len = (int)strlen(line); size_t len = strlen(line);
// skip empty lines and comments (#,//) // skip empty lines and comments (#,//)
if(len<1) continue; if(len<1) continue;
@ -622,6 +623,7 @@ int ControlParticles::initFromTextFileOld(string filename)
// done... // done...
fclose(infile); fclose(infile);
applyTrafos(); applyTrafos();
*/
return 1; return 1;
} }