[Opal-commits] opal/src Matrix44r.h,1.31,1.32 Portability.h,1.5,1.6 Simulator.cpp,1.61,1.62

[tylerstreeter <tyl...@us...>]

Update of /cvsroot/opal/opal/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10352/src

Modified Files:
	Matrix44r.h Portability.h Simulator.cpp 
Log Message:
changed Simulator::instantiateBlueprint to apply scaling (of Shape dimensions and Solid transforms) before applying the additional Blueprint transform; made the playpen sample app cool

Index: Simulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Simulator.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Simulator.cpp	14 Apr 2005 09:15:06 -0000	1.61
--- Simulator.cpp	15 Apr 2005 08:50:42 -0000	1.62
***************
*** 260,269 ****
  			SolidData sd = *bp.getSolidData(i);
  
- 			if (useOffset)
- 			{
- 				// Offset the Solid's transform.
- 				sd.transform = offset * sd.transform;
- 			}
- 
  			if (useScale)
  			{
--- 260,263 ----
***************
*** 339,342 ****
--- 333,342 ----
  			}
  
+ 			if (useOffset)
+ 			{
+ 				// Offset the Solid's transform.
+ 				sd.transform = offset * sd.transform;
+ 			}
+ 
  			s->init(sd);
  			solidList.push_back(s);
***************
*** 358,361 ****
--- 358,367 ----
  			jd.solid1 = solidList.at(jd.internal_solid1Index);
  
+ 			if (useScale)
+ 			{
+ 				// Scale the Joint's anchor.
+ 				jd.anchor = scale * jd.anchor;
+ 			}
+ 
  			if (useOffset)
  			{
***************
*** 367,376 ****
  			}
  
- 			if (useScale)
- 			{
- 				// Scale the Joint's anchor.
- 				jd.anchor = scale * jd.anchor;
- 			}
- 
  			j->init(jd);
  			jointList.push_back(j);
--- 373,376 ----
***************
*** 481,490 ****
  			}
  
- 			if (useOffset)
- 			{
- 				// Offset the Sensor's transform.
- 				transform = offset * transform;
- 			}
- 
  			if (useScale)
  			{
--- 481,484 ----
***************
*** 495,498 ****
--- 489,498 ----
  			}
  
+ 			if (useOffset)
+ 			{
+ 				// Offset the Sensor's transform.
+ 				transform = offset * transform;
+ 			}
+ 
  			// Allocate the right type of Sensor.
  			switch(sensorData->getType())

Index: Matrix44r.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Matrix44r.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Matrix44r.h	12 Apr 2005 06:46:43 -0000	1.31
--- Matrix44r.h	15 Apr 2005 08:50:42 -0000	1.32
***************
*** 621,629 ****
  			m(1,0) * p[0] + m(1,1) * p[1] + m(1,2) * p[2] + m(1,3),
  			m(2,0) * p[0] + m(2,1) * p[1] + m(2,2) * p[2] + m(2,3));
- 			/* wtf mate?
- 			m(0,0) * p[0] + m(0,1) * p[1] + m(0,2) * p[2] + m(3,0),
- 			m(1,0) * p[0] + m(1,1) * p[1] + m(1,2) * p[2] + m(3,1),
- 			m(2,0) * p[0] + m(2,1) * p[1] + m(2,2) * p[2] + m(3,2));
- 			*/
  	}
  
--- 621,624 ----

Index: Portability.h
===================================================================
RCS file: /cvsroot/opal/opal/src/Portability.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Portability.h	18 Feb 2005 23:59:37 -0000	1.5
--- Portability.h	15 Apr 2005 08:50:42 -0000	1.6
***************
*** 52,55 ****
--- 52,56 ----
  
  // Macro for keeping function names from being mangled.
+ // TODO: change all OPAL_DECL to use OPAL_EXPORT to prevent name mangling.
  //#define OPAL_EXPORT(rtype) extern "C" OPAL_DECL rtype OPAL_CALL
  #define OPAL_EXPORT extern "C" OPAL_DECL