Revision: 47296
http://brlcad.svn.sourceforge.net/brlcad/?rev=47296&view=rev
Author: abhi2011
Date: 2011-10-18 21:05:52 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Corrected some indexing errors which arose while removing the linked lists
Modified Paths:
--------------
brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp
brlcad/trunk/src/libged/simulate/simutils.c
Modified: brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp
===================================================================
--- brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp 2011-10-18
21:04:55 UTC (rev 47295)
+++ brlcad/trunk/src/libged/simulate/simcollisionalgo.cpp 2011-10-18
21:05:52 UTC (rev 47296)
@@ -39,7 +39,7 @@
#define USE_PERSISTENT_CONTACTS 1
-//#define DEBUG_MF 1
+#define DEBUG_MF 1
btRTCollisionAlgorithm::btRTCollisionAlgorithm(btPersistentManifold* mf,
Modified: brlcad/trunk/src/libged/simulate/simutils.c
===================================================================
--- brlcad/trunk/src/libged/simulate/simutils.c 2011-10-18 21:04:55 UTC (rev
47295)
+++ brlcad/trunk/src/libged/simulate/simutils.c 2011-10-18 21:05:52 UTC (rev
47296)
@@ -642,7 +642,7 @@
{
char* cmd_args[28];
char buffer[20];
- int i, rv, argc;
+ int i, j, rv, argc;
char *prefix = "mf_";
char *prefix_reg = "mf_reg_";
char *prefix_normal = "normal_";
@@ -739,20 +739,20 @@
case 4:
cmd_args[2] = bu_strdup("arb8");
- for (i=0; i<4; i++) {
- sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[i].ptA[0]);
- cmd_args[3+i*3] = bu_strdup(buffer);
- sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[i].ptA[1]);
- cmd_args[4+i*3] = bu_strdup(buffer);
- sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[i].ptA[2]);
- cmd_args[5+i*3] = bu_strdup(buffer);
+ for (j=0; j<4; j++) {
+ sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[j].ptA[0]);
+ cmd_args[3+j*3] = bu_strdup(buffer);
+ sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[j].ptA[1]);
+ cmd_args[4+j*3] = bu_strdup(buffer);
+ sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[j].ptA[2]);
+ cmd_args[5+j*3] = bu_strdup(buffer);
- sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[i].ptB[0]);
- cmd_args[15+i*3] = bu_strdup(buffer);
- sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[i].ptB[1]);
- cmd_args[16+i*3] = bu_strdup(buffer);
- sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[i].ptB[2]);
- cmd_args[17+i*3] = bu_strdup(buffer);
+ sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[j].ptB[0]);
+ cmd_args[15+j*3] = bu_strdup(buffer);
+ sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[j].ptB[1]);
+ cmd_args[16+j*3] = bu_strdup(buffer);
+ sprintf(buffer, "%f",
rb->bt_manifold[i].contacts[j].ptB[2]);
+ cmd_args[17+j*3] = bu_strdup(buffer);
}
cmd_args[27] = (char *)0;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
