[simspark-cvs] simspark/simulations/parts/rsg/boxspheres box.rsg, 1.1, 1.2 ccylinder.rsg, 1.1, 1.2 sphere.rsg, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/simulations/parts/rsg/boxspheres

Modified Files:
	box.rsg ccylinder.rsg sphere.rsg 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: box.rsg
===================================================================
RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres/box.rsg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** box.rsg	24 Feb 2006 12:04:14 -0000	1.1
--- box.rsg	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 27,34 ****
  
  	     (setContactSoftERPMode true)
! 	     (setContactSoftERP 0.5)
  
  	     (setContactSoftCFM true)
! 	     (setContactSoftCFM 0.3)
  
  	     )
--- 27,34 ----
  
  	     (setContactSoftERPMode true)
! 	     (setContactSoftERP 0.2)
  
  	     (setContactSoftCFM true)
! 	     (setContactSoftCFM 0.01)
  
  	     )

Index: sphere.rsg
===================================================================
RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres/sphere.rsg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sphere.rsg	24 Feb 2006 12:04:14 -0000	1.1
--- sphere.rsg	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 14,20 ****
         (setSphere $density $radius)
         (node DragController
! 	     (setAngularDrag 0.01)
  	     (setLinearDrag 0.01)
! 	     )
  )
         
--- 14,20 ----
         (setSphere $density $radius)
         (node DragController
!              (setAngularDrag 0.01)
  	     (setLinearDrag 0.01)
! 	)
  )
         
***************
*** 29,36 ****
  
  	     (setContactSoftERPMode true)
! 	     (setContactSoftERP 0.5)
  
  	     (setContactSoftCFM true)
! 	     (setContactSoftCFM 0.3)
  	     )
         )
--- 29,36 ----
  
  	     (setContactSoftERPMode true)
! 	     (setContactSoftERP 0.2)
  
  	     (setContactSoftCFM true)
! 	     (setContactSoftCFM 0.01)
  	     )
         )

Index: ccylinder.rsg
===================================================================
RCS file: /cvsroot/simspark/simspark/simulations/parts/rsg/boxspheres/ccylinder.rsg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ccylinder.rsg	24 Feb 2006 12:04:14 -0000	1.1
--- ccylinder.rsg	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
         
   (node Body
+        (setName ccylinderBody)
         (setCappedCylinder $density $radius $length)
         )