From: <ma...@us...> - 2012-02-26 12:06:39
|
Revision: 8096 http://planeshift.svn.sourceforge.net/planeshift/?rev=8096&view=rev Author: magodra Date: 2012-02-26 12:06:32 +0000 (Sun, 26 Feb 2012) Log Message: ----------- Update scales for all indexes. KA_POS was not updated. Modified Paths: -------------- trunk/src/common/effects/pseffectobj.cpp Modified: trunk/src/common/effects/pseffectobj.cpp =================================================================== --- trunk/src/common/effects/pseffectobj.cpp 2012-02-26 11:06:13 UTC (rev 8095) +++ trunk/src/common/effects/pseffectobj.cpp 2012-02-26 12:06:32 UTC (rev 8096) @@ -296,7 +296,7 @@ { actions[i] = actions[i]*scale[useScale[i]-1]; } - if (i > KA_COUNT) + if (i >= KA_COUNT) { vecActions[i-KA_COUNT] = vecActions[i-KA_COUNT]*scale[useScale[i]-1]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2012-12-22 13:07:12
|
Revision: 8517 http://planeshift.svn.sourceforge.net/planeshift/?rev=8517&view=rev Author: weltall2 Date: 2012-12-22 13:07:01 +0000 (Sat, 22 Dec 2012) Log Message: ----------- fixed scaling issues with pseffects Modified Paths: -------------- trunk/src/common/effects/pseffectobj.cpp Modified: trunk/src/common/effects/pseffectobj.cpp =================================================================== --- trunk/src/common/effects/pseffectobj.cpp 2012-12-20 20:47:07 UTC (rev 8516) +++ trunk/src/common/effects/pseffectobj.cpp 2012-12-22 13:07:01 UTC (rev 8517) @@ -600,7 +600,7 @@ } baseScale = scale; - matTransform = matBase / baseScale; + matTransform = matBase * baseScale; } else { @@ -649,7 +649,7 @@ // SCALE baseScale = LERP_KEY(KA_SCALE,lerpfactor) * scale; - matTransform /= baseScale; + matTransform *= baseScale; // adjust position meshMovable->SetPosition(anchorPosition+newPos); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |