forked from bartvdbraak/blender
- fixed MSVC problem in fluidsim.c
- removed some more debug output in the solver
This commit is contained in:
parent
0497ea57cb
commit
74fc4fa254
@ -234,8 +234,8 @@ int ntlGeometryObjModel::loadBobjModel(string filename)
|
||||
vector<ntlSetVec3f> aninorms;
|
||||
vector<double> anitimes;
|
||||
|
||||
const bool debugPrint=true;
|
||||
const bool debugPrintFull=true;
|
||||
const bool debugPrint=false;
|
||||
const bool debugPrintFull=false;
|
||||
gzFile gzf;
|
||||
gzf = gzopen(filename.c_str(), "rb");
|
||||
if (!gzf) {
|
||||
|
@ -900,8 +900,8 @@ LbmFsgrSolver::mainLoop(int lev)
|
||||
((rl>RWVEL_WINDTHRESH) && (lcsmqo<P_LCSMQO)) )// normal checks
|
||||
||(k>this->mSizez-SLOWDOWNREGION) ) {
|
||||
LbmFloat nuz = uz;
|
||||
LbmFloat jdf; // = 0.05 * (rand()/(RAND_MAX+1.0));
|
||||
if(rl>RWVEL_WINDTHRESH) jdf *= (rl-RWVEL_WINDTHRESH);
|
||||
//? LbmFloat jdf; // = 0.05 * (rand()/(RAND_MAX+1.0));
|
||||
//? if(rl>RWVEL_WINDTHRESH) jdf *= (rl-RWVEL_WINDTHRESH);
|
||||
if(k>this->mSizez-SLOWDOWNREGION) {
|
||||
// special case
|
||||
LbmFloat zfac = (LbmFloat)( k-(this->mSizez-SLOWDOWNREGION) );
|
||||
@ -910,11 +910,11 @@ LbmFsgrSolver::mainLoop(int lev)
|
||||
//errMsg("TOPT"," at "<<PRINT_IJK<<" zfac"<<zfac);
|
||||
} else {
|
||||
// normal probability
|
||||
LbmFloat fac = P_LCSMQO-lcsmqo;
|
||||
jdf *= fac;
|
||||
//? LbmFloat fac = P_LCSMQO-lcsmqo;
|
||||
//? jdf *= fac;
|
||||
}
|
||||
FORDF1 {
|
||||
jdf = 0.05 * (rand()/(RAND_MAX+1.0));
|
||||
const LbmFloat jdf = 0.05 * (rand()/(RAND_MAX+1.0));
|
||||
// TODO use wind velocity?
|
||||
if(jdf>0.025) {
|
||||
const LbmFloat add = this->dfLength[l]*(-ux*this->dfDvecX[l]-uy*this->dfDvecY[l]-nuz*this->dfDvecZ[l])*jdf;
|
||||
|
@ -71,8 +71,7 @@
|
||||
#include "BKE_DerivedMesh.h"
|
||||
#include "BKE_ipo.h"
|
||||
#include "LBM_fluidsim.h"
|
||||
// FIXME move?
|
||||
// TODO FIXME DOUBLE elbeem.h! in intern/extern...
|
||||
// TODO FIXME double elbeem.h in intern/extern...
|
||||
#include "elbeem.h"
|
||||
|
||||
#include "BLI_editVert.h"
|
||||
@ -925,9 +924,7 @@ void fluidsimBake(struct Object *ob)
|
||||
int *tris=NULL;
|
||||
int numVerts=0, numTris=0;
|
||||
int o = channelObjCount;
|
||||
//Key *shapekey= ob_get_key(obit);
|
||||
int deform; // = (shapekey && BLI_countlist(&shapekey->block) >0)||(obit->parent && obit->partype==PARSKEL);
|
||||
deform = (obit->fluidsimSettings->domainNovecgen);
|
||||
int deform = (obit->fluidsimSettings->domainNovecgen);
|
||||
elbeemMesh fsmesh;
|
||||
elbeemResetMesh( &fsmesh );
|
||||
fsmesh.type = obit->fluidsimSettings->type;;
|
||||
@ -1250,10 +1247,7 @@ void fluidsimBake(struct Object *ob)
|
||||
(obit->fluidsimSettings->type != OB_FLUIDSIM_DOMAIN) &&
|
||||
(obit->fluidsimSettings->type != OB_FLUIDSIM_PARTICLE)
|
||||
) {
|
||||
//Key *shapekey= ob_get_key(obit);
|
||||
// armature check from effect.c
|
||||
int deform; //= (shapekey && BLI_countlist(&shapekey->block) >0)||(obit->parent && obit->partype==PARSKEL);
|
||||
deform = (obit->fluidsimSettings->domainNovecgen);
|
||||
int deform = (obit->fluidsimSettings->domainNovecgen);
|
||||
|
||||
fluidsimGetGeometryObjFilename(obit, fnameObjdat);
|
||||
strcpy(targetFile, targetDir);
|
||||
|
Loading…
Reference in New Issue
Block a user