diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-04-20 13:57:28 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-04-20 13:57:28 +0400 |
| commit | b43f24a9445faa5775057dab441877fc4627dfde (patch) | |
| tree | 64f95db8140eeccebc866c891efc861919a2136a /intern/elbeem | |
| parent | f265eeed8a3a690215e3bc69ea48053d38fddc6f (diff) | |
Reverting new epsilons since they had bad global impact - instead just remove the problematic normalize() call
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/ntl_vector3dim.h | 4 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_util.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h index 35a3ad59ec9..6f17f9f5e7b 100644 --- a/intern/elbeem/intern/ntl_vector3dim.h +++ b/intern/elbeem/intern/ntl_vector3dim.h @@ -833,7 +833,7 @@ typedef float gfxReal; //#define vecGfx2F(x) (x) //#define vecD2Gfx(x) vecD2F(x) //#define vecGfx2D(x) vecF2D(x) -#define VECTOR_EPSILON (1.192092896e-07F) +#define VECTOR_EPSILON (1e-5f) #else typedef double gfxReal; #define GFX_REAL_MAX __DBL_MAX__ @@ -841,7 +841,7 @@ typedef double gfxReal; //#define vecGfx2F(x) vecF2D(x) //#define vecD2Gfx(x) (x) //#define vecGfx2D(x) (x) -#define VECTOR_EPSILON (2.2204460492503131e-016) +#define VECTOR_EPSILON (1e-10) #endif /* fixed double prec. type, for epxlicitly double values */ diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp index e74875a0dbf..25b8b98b3c6 100644 --- a/intern/elbeem/intern/solver_util.cpp +++ b/intern/elbeem/intern/solver_util.cpp @@ -40,7 +40,7 @@ void LbmFsgrSolver::prepareVisualization( void ) { int mainGravDir=6; // if normalizing fails, we asume z-direction gravity LbmFloat mainGravLen = 0.; FORDF1{ - LbmFloat thisGravLen = dot(LbmVec(dfVecX[l],dfVecY[l],dfVecZ[l]), getNormalized(mLevel[mMaxRefine].gravity) ); + LbmFloat thisGravLen = dot(LbmVec(dfVecX[l],dfVecY[l],dfVecZ[l]), mLevel[mMaxRefine].gravity ); if(thisGravLen>mainGravLen) { mainGravLen = thisGravLen; mainGravDir = l; |