[cgkit-commits] cgkit2/demos demo3.py,1.1,1.2

[Matthias B. <mb...@us...>]

Update of /cvsroot/cgkit/cgkit2/demos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8675

Modified Files:
	demo3.py 
Log Message:
Changed the order of rotation to accommodate to the modified meaning of the fromEuler..() methods

Index: demo3.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/demos/demo3.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** demo3.py	19 Dec 2004 21:36:05 -0000	1.1
--- demo3.py	14 Feb 2005 16:56:00 -0000	1.2
***************
*** 25,29 ****
  
  # Animate the center sphere (all other objects will move with it)
! e = Expression("mat3().fromEulerXYZ(pi*sin(0.2*t), 0, -1.4*t)")
  e.output_slot.connect(hub.rot_slot)
  
--- 25,29 ----
  
  # Animate the center sphere (all other objects will move with it)
! e = Expression("mat3().fromEulerZYX(pi*sin(0.2*t), 0, -1.4*t)")
  e.output_slot.connect(hub.rot_slot)
  
***************
*** 54,58 ****
      # Animate the rotation of the cylinder
      # (the z angle will "position" the cylinder at the correct angle around the hub)
!     e = Expression("mat3().fromEulerXYZ(0, 0.3*sin(%f+2*t)+pi/2, %f)"%(4*a*pi, 2*a*pi))
      e.output_slot.connect(c.rot_slot)
  
--- 54,58 ----
      # Animate the rotation of the cylinder
      # (the z angle will "position" the cylinder at the correct angle around the hub)
!     e = Expression("mat3().fromEulerZYX(0, 0.3*sin(%f+2*t)+pi/2, %f)"%(4*a*pi, 2*a*pi))
      e.output_slot.connect(c.rot_slot)