[brlcad-commits] SF.net SVN: brlcad:[47012] brlcad/trunk/src/libged/simulate/ simcollisionalgo.cpp

[<abh...@us...>]

Revision: 47012
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47012&view=rev
Author:   abhi2011
Date:     2011-10-01 20:55:22 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
fixed order of arguments in the VMOVE() which retrieve the collision points

Modified Paths:
--------------
    brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp

Modified: brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp
===================================================================
--- brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp	2011-10-01 20:48:21 UTC (rev 47011)
+++ brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp	2011-10-01 20:55:22 UTC (rev 47012)
@@ -106,7 +106,7 @@
 
 		btPersistentManifold* contactManifold = resultOut->getPersistentManifold();
 
-/*		struct sim_manifold *current_manifold =
+		struct sim_manifold *current_manifold =
 			(struct sim_manifold *)bu_malloc(sizeof(struct sim_manifold), "sim_manifold: current_manifold");
 		current_manifold->next = NULL;
 
@@ -125,12 +125,12 @@
 			//print_manifold_list(rb->first_manifold);
 		}
 		rbB->num_manifolds++;
-*/
+
 		bu_log("processCollision(box/box): %s & %s \n", rbA->rb_namep, rbB->rb_namep);
 
 		//Get the number of points in this manifold
 		int num_contacts = contactManifold->getNumContacts();
-/*		current_manifold->num_contacts = num_contacts;*/
+		current_manifold->num_contacts = num_contacts;
 		int i;
 
 		bu_log("processCollision : Manifold contacts : %d\n", num_contacts);
@@ -142,9 +142,9 @@
 			btVector3 ptA = pt.getPositionWorldOnA();
 			btVector3 ptB = pt.getPositionWorldOnB();
 
-/*			VMOVE(ptA, current_manifold->rb_contacts[i].ptA);
-			VMOVE(ptB, current_manifold->rb_contacts[i].ptB);
-			VMOVE(pt.m_normalWorldOnB, current_manifold->rb_contacts[i].normalWorldOnB);*/
+			VMOVE(current_manifold->rb_contacts[i].ptA, ptA);
+			VMOVE(current_manifold->rb_contacts[i].ptB, ptB);
+			VMOVE(current_manifold->rb_contacts[i].normalWorldOnB, pt.m_normalWorldOnB);
 
 			bu_log("contact %d of %d, %s(%f, %f, %f) , %s(%f, %f, %f), n(%f, %f, %f)\n",
 					i+1, num_contacts,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.