[Roreditor-svn] SF.net SVN: roreditor: [155] trunk

[<ror...@us...>]

Revision: 155
          http://roreditor.svn.sourceforge.net/roreditor/?rev=155&view=rev
Author:   rorthomas
Date:     2007-08-03 04:49:20 -0700 (Fri, 03 Aug 2007)

Log Message:
-----------
* re-enabled rotation for trucks
* changed 3d models of arrows and the ground pointer

Modified Paths:
--------------
    trunk/lib/ror/terrainparser.py
    trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py
    trunk/media/models/roundarrow.mesh

Added Paths:
-----------
    trunk/media/models/cylinder.mesh

Removed Paths:
-------------
    trunk/media/models/circlepointer.mesh

Modified: trunk/lib/ror/terrainparser.py
===================================================================
--- trunk/lib/ror/terrainparser.py	2007-08-03 01:07:48 UTC (rev 154)
+++ trunk/lib/ror/terrainparser.py	2007-08-03 11:49:20 UTC (rev 155)
@@ -156,7 +156,7 @@
                 truck.setPosition(x, y, z)
                 truck.setRotation(rx, ry, -rz)
                 truck.additionaloptions = objname[1:]
-                truck.mayRotate=False
+                #truck.mayRotate=False
                 self.trucks.append(truck)
                 continue
             if objname[0][0:4] == "load" and len(objname) > 1:
@@ -168,7 +168,7 @@
                 load.setPosition(x, y, z)
                 load.setRotation(rx, ry, -rz)
                 load.additionaloptions = objname[1:]
-                load.mayRotate=False
+                #load.mayRotate=False
                 self.loads.append(load)
                 continue
             

Modified: trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py
===================================================================
--- trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py	2007-08-03 01:07:48 UTC (rev 154)
+++ trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py	2007-08-03 11:49:20 UTC (rev 155)
@@ -296,6 +296,7 @@
 
         nry = nr.createChildSceneNode("rotatearrowsnodeY")
         ery = self.sceneManager.createEntity("rotatearrowsY", "roundarrow.mesh") 
+        nry.rotate(ogre.Vector3.UNIT_X, ogre.Degree(180).valueRadians(), relativeTo=ogre.Node.TransformSpace.TS_WORLD)
         nry.rotate(ogre.Vector3.UNIT_Y, ogre.Degree(90).valueRadians(), relativeTo=ogre.Node.TransformSpace.TS_WORLD)
         ery.setMaterialName("mysimple/transred")
         nry.setInheritOrientation(True)
@@ -309,10 +310,11 @@
         
         # terrain selection node
         nt = self.sceneManager.getRootSceneNode().createChildSceneNode("terrainselectnode") 
-        et = self.sceneManager.createEntity("circlepointer", "circlepointer.mesh") 
+        et = self.sceneManager.createEntity("circlepointer", "cylinder.mesh") 
         et.setMaterialName("mysimple/terrainselect")
         nt.rotate(ogre.Vector3.UNIT_X, ogre.Degree(90).valueRadians(), relativeTo=ogre.Node.TransformSpace.TS_WORLD)
         nt.attachObject(et)
+        nt.setScale(5,5,5)
        
         self.TerrainSelectNode = nt
         self.TranslateNode = n

Deleted: trunk/media/models/circlepointer.mesh
===================================================================
(Binary files differ)

Added: trunk/media/models/cylinder.mesh
===================================================================
(Binary files differ)


Property changes on: trunk/media/models/cylinder.mesh
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/media/models/roundarrow.mesh
===================================================================
(Binary files differ)


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