[cgkit-commits] cgkit2/cgkit worldobject.py,1.1.1.1,1.2

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

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

Modified Files:
	worldobject.py 
Log Message:
The material parameter can now also contain a sequence of materials

Index: worldobject.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/cgkit/worldobject.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** worldobject.py	12 Dec 2004 14:31:30 -0000	1.1.1.1
--- worldobject.py	27 Feb 2005 20:06:27 -0000	1.2
***************
*** 83,87 ****
          \param parent (\c WorldObject or \c str) Parent object or None
          \param mass (\c float) Total mass
!         \param material (\c Material) Material class
          \param visible (\c Bool) Visibility flag
          \param linearvel (\c vec3) Linear velocity
--- 83,87 ----
          \param parent (\c WorldObject or \c str) Parent object or None
          \param mass (\c float) Total mass
!         \param material (\c Material) Material class (or a sequence of materials)
          \param visible (\c Bool) Visibility flag
          \param linearvel (\c vec3) Linear velocity
***************
*** 180,184 ****
          self.mass = mass
      if material!=None:
!         self.setMaterial(material)
      if linearvel!=None:
          self.linearvel = vec3(linearvel)
--- 180,192 ----
          self.mass = mass
      if material!=None:
!         try:
!             # Check if material is a sequence or not. If it is not a
!             # sequence the following line will raise an exception.
!             len(material)
!         except:
!             material = [material]
!         self.setNumMaterials(len(material))
!         for i,mat in enumerate(material):
!             self.setMaterial(mat, i)
      if linearvel!=None:
          self.linearvel = vec3(linearvel)