Revision: 1562
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1562&view=rev
Author: aperion
Date: 2010-12-19 18:32:42 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
reverting the | to a || in collisions, for some reason this change caused the
ground textures to be off
Modified Paths:
--------------
trunk/source/main/BeamForcesEuler.cpp
Modified: trunk/source/main/BeamForcesEuler.cpp
===================================================================
--- trunk/source/main/BeamForcesEuler.cpp 2010-12-19 17:08:02 UTC (rev
1561)
+++ trunk/source/main/BeamForcesEuler.cpp 2010-12-19 18:32:42 UTC (rev
1562)
@@ -757,8 +757,8 @@
int contacted =
collisions->groundCollision(&nodes[i], nodes[i].colltesttimer, &gm, &ns);
int handlernum = -1;
- //TODO is this supposed to be a binary
operator, or a logical operator?
- if ( contacted ||
+ //Tlooks like this needs to remain a binary
operator otherwise the terrain material appears to be wrong
+ if ( contacted |
collisions->nodeCollision(&nodes[i],
i==cinecameranodepos[currentcamera], contacted, nodes[i].colltesttimer, &ns,
&gm, &handlernum))
{
//FX
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
