[Roreditor-svn] SF.net SVN: roreditor: [66] trunk/lib

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

Revision: 66
          http://roreditor.svn.sourceforge.net/roreditor/?rev=66&view=rev
Author:   rorthomas
Date:     2007-06-29 06:18:42 -0700 (Fri, 29 Jun 2007)

Log Message:
-----------
* added newton.chm - newton help
* fixed UVFrame.py and RoRUVOgreWindow.py
* beams are now updated, but the bad way :(

Modified Paths:
--------------
    trunk/lib/ror/editor.ini
    trunk/lib/rortruckeditor/RoRTruckOgreWindow.py
    trunk/lib/rortruckeditor/RoRUVOgreWindow.py
    trunk/lib/rortruckeditor/UVFrame.py

Added Paths:
-----------
    trunk/lib/ogre/newton.chm

Added: trunk/lib/ogre/newton.chm
===================================================================
(Binary files differ)


Property changes on: trunk/lib/ogre/newton.chm
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/lib/ror/editor.ini
===================================================================
--- trunk/lib/ror/editor.ini	2007-06-29 09:37:09 UTC (rev 65)
+++ trunk/lib/ror/editor.ini	2007-06-29 13:18:42 UTC (rev 66)
@@ -1,7 +1,6 @@
 [RigsOfRods]
 basepath = C:\games\RoR-0.31a
-
-# this is a comment
+
 [gui]
 usegui = yes
 

Modified: trunk/lib/rortruckeditor/RoRTruckOgreWindow.py
===================================================================
--- trunk/lib/rortruckeditor/RoRTruckOgreWindow.py	2007-06-29 09:37:09 UTC (rev 65)
+++ trunk/lib/rortruckeditor/RoRTruckOgreWindow.py	2007-06-29 13:18:42 UTC (rev 66)
@@ -73,6 +73,7 @@
     def OnFrameStarted(self):
         if self.enablephysics:
             self.World.update(TIMER)
+            self.updateBeams()
         pass
             
     def OnFrameEnded(self): 
@@ -267,12 +268,32 @@
             line.position(pos2)
             line.end()
             line.setCastShadows(False)
+            line.setDynamic(True)
             linenode = self.sceneManager.getRootSceneNode().createChildSceneNode()
             linenode.attachObject(line)
             self.beams[id0] = [linenode, id1, id2, options, line]
+            print id0
         except:
             pass
 
+    def updateBeams(self):
+        for bk in self.beams.keys():
+            beam = self.beams[bk]
+            line = beam[4]
+            id1 = beam[1]
+            id2 = beam[2]
+            try:
+                pos1 = self.nodes[id1][0].getPosition()
+                pos2 = self.nodes[id2][0].getPosition()
+                line.beginUpdate(0)
+                line.position(pos1)
+                line.position(pos2)
+                line.end()
+            except Exception, e:
+                print str(e)
+                continue
+            
+            
     def createShock(self, id0, id1, id2, options):
         try:
             pos1 = self.nodes[id1][0].getPosition()
@@ -344,7 +365,7 @@
             smnode = self.sceneManager.getRootSceneNode().createChildSceneNode()
             smnode.attachObject(sm)
 
-            self.submeshs[smgid] = [smnode, smgid, smg]
+            self.submeshs[smgid] = [smnode, smgid, smg, sm]
         except:
             pass
                 
@@ -514,9 +535,9 @@
                 #print beam
                 try:
                     self.createBeam(beamcounter, int(beam[0]),int(beam[1]), option)
+                    beamcounter += 1
                 except:
                     pass
-                beamcounter += 1
 
 
             if 'shocks' in tree.keys():            

Modified: trunk/lib/rortruckeditor/RoRUVOgreWindow.py
===================================================================
--- trunk/lib/rortruckeditor/RoRUVOgreWindow.py	2007-06-29 09:37:09 UTC (rev 65)
+++ trunk/lib/rortruckeditor/RoRUVOgreWindow.py	2007-06-29 13:18:42 UTC (rev 66)
@@ -2,7 +2,10 @@
 import wx, os, os.path
 import ogre.renderer.OGRE as ogre 
 from ror.truckparser import *
-from ror.rorsettings import *
+
+from ror.logger import log
+from ror.settingsManager import getSettingsManager
+
 from ror.rorcommon import *
 from wxogre.OgreManager import *
 from wxogre.wxOgreWindow import *
@@ -16,7 +19,7 @@
 class RoRUVOgreWindow(wxOgreWindow):
     def __init__(self, parent, ID, size = wx.Size(200,200), **kwargs): 
         self.parent = parent
-        self.rordir = getSettings().getRoRDir()
+        self.rordir = getSettingsManager().getSetting("RigsOfRods", "BasePath")
         self.World = OgreNewt.World()
         self.sceneManager = None
         self.trucktree = None

Modified: trunk/lib/rortruckeditor/UVFrame.py
===================================================================
--- trunk/lib/rortruckeditor/UVFrame.py	2007-06-29 09:37:09 UTC (rev 65)
+++ trunk/lib/rortruckeditor/UVFrame.py	2007-06-29 13:18:42 UTC (rev 66)
@@ -1,7 +1,10 @@
 #Thomas Fischer 31/05/2007, th...@th...
 from wxogre.OgreManager import *
 from ror.RoROgreWindow import *
-from ror.rorsettings import *
+
+from ror.logger import log
+from ror.settingsManager import getSettingsManager
+
 from ror.rorcommon import *
 from RoRUVOgreWindow import *
 
@@ -23,7 +26,7 @@
         self.splitter.SetSashPosition(100)
         self.splitter.SetMinimumPaneSize(200)
       
-        self.rordir = getSettings().getRoRDir()
+        self.rordir = getSettingsManager().getSetting("RigsOfRods", "BasePath")
 
         #ogre windows
         self.uvOgreWin = RoRUVOgreWindow(self.splitterleft, wx.ID_ANY)


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