[Opende-svn] SF.net SVN: opende: [1109] trunk/ode/test/test_moving_trimesh.cpp

[<hid...@us...>]

Revision: 1109
          http://svn.sourceforge.net/opende/?rev=1109&view=rev
Author:   hidden_asbestos
Date:     2006-10-30 07:39:08 -0800 (Mon, 30 Oct 2006)

Log Message:
-----------
Added cylinder support now that it's almost fully implemented.

Modified Paths:
--------------
    trunk/ode/test/test_moving_trimesh.cpp

Modified: trunk/ode/test/test_moving_trimesh.cpp
===================================================================
--- trunk/ode/test/test_moving_trimesh.cpp	2006-10-30 14:01:48 UTC (rev 1108)
+++ trunk/ode/test/test_moving_trimesh.cpp	2006-10-30 15:39:08 UTC (rev 1109)
@@ -1487,9 +1487,10 @@
   printf ("To drop another object, press:\n");
   printf ("   b for box.\n");
   printf ("   s for sphere.\n");
+  printf ("   y for cylinder.\n");
   printf ("   c for capsule.\n");
   printf ("   x for a composite object.\n");
-  printf ("   m for a trimesh (EXPERIMENTAL).\n");
+  printf ("   m for a trimesh.\n");
   printf ("To select an object, press space.\n");
   printf ("To disable the selected object, press d.\n");
   printf ("To enable the selected object, press e.\n");
@@ -1515,8 +1516,7 @@
   dMass m;
 
   cmd = locase (cmd);
-  if (cmd == 'b' || cmd == 's' || cmd == 'c' || cmd == 'x' || cmd == 'm'
-      /* || cmd == 'l' */) {
+  if (cmd == 'b' || cmd == 's' || cmd == 'c' || cmd == 'x' || cmd == 'm' || cmd == 'y' ) {
     if (num < NUM) {
       i = num;
       num++;
@@ -1565,15 +1565,12 @@
       dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
       obj[i].geom[0] = dCreateCapsule (space,sides[0],sides[1]);
     }
-/*
-    // cylinder option not yet implemented
-    else if (cmd == 'l') {
+    else if (cmd == 'y') {
       sides[1] *= 0.5;
-      dMassSetCapsule (&m,DENSITY,3,sides[0],sides[1]);
+      dMassSetCylinder (&m,DENSITY,3,sides[0],sides[1]);
       obj[i].geom[0] = dCreateCylinder (space,sides[0],sides[1]);
     }
-*/
-    else if (cmd == 's') {
+	else if (cmd == 's') {
       sides[0] *= 0.5;
       dMassSetSphere (&m,DENSITY,sides[0]);
       obj[i].geom[0] = dCreateSphere (space,sides[0]);
@@ -1698,14 +1695,12 @@
     dGeomCapsuleGetParams (g,&radius,&length);
     dsDrawCapsule (pos,R,length,radius);
   }
-/*
-  // cylinder option not yet implemented
   else if (type == dCylinderClass) {
     dReal radius,length;
     dGeomCylinderGetParams (g,&radius,&length);
     dsDrawCylinder (pos,R,length,radius);
   }
-*/
+
   else if (type == dGeomTransformClass) {
     dGeomID g2 = dGeomTransformGetGeom (g);
     const dReal *pos2 = dGeomGetPosition (g2);


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