[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14485] trunk/blender/intern/elbeem/intern : Reverting new epsilons since they had bad global impact - instead just remove the problematic normalize () call
Daniel Genrich
daniel.genrich at gmx.net
Sun Apr 20 11:57:28 CEST 2008
Revision: 14485
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14485
Author: genscher
Date: 2008-04-20 11:57:28 +0200 (Sun, 20 Apr 2008)
Log Message:
-----------
Reverting new epsilons since they had bad global impact - instead just remove the problematic normalize() call
Modified Paths:
--------------
trunk/blender/intern/elbeem/intern/ntl_vector3dim.h
trunk/blender/intern/elbeem/intern/solver_util.cpp
Modified: trunk/blender/intern/elbeem/intern/ntl_vector3dim.h
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_vector3dim.h 2008-04-19 21:59:15 UTC (rev 14484)
+++ trunk/blender/intern/elbeem/intern/ntl_vector3dim.h 2008-04-20 09:57:28 UTC (rev 14485)
@@ -833,7 +833,7 @@
//#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 @@
//#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 */
Modified: trunk/blender/intern/elbeem/intern/solver_util.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_util.cpp 2008-04-19 21:59:15 UTC (rev 14484)
+++ trunk/blender/intern/elbeem/intern/solver_util.cpp 2008-04-20 09:57:28 UTC (rev 14485)
@@ -40,7 +40,7 @@
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;
More information about the Bf-blender-cvs
mailing list