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

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

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

Log Message:
-----------
* re-added ror start button to starter.py
* fixed truck rotations on save (http://forum.rigsofrods.com/index.php/topic,682.msg10240.html#msg10240)

Modified Paths:
--------------
    trunk/lib/ror/starter.py
    trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py

Modified: trunk/lib/ror/starter.py
===================================================================
--- trunk/lib/ror/starter.py	2007-06-30 00:59:28 UTC (rev 68)
+++ trunk/lib/ror/starter.py	2007-06-30 01:19:50 UTC (rev 69)
@@ -26,8 +26,8 @@
         self.btnSelectRoRDir = wx.Button(self.panel, wx.ID_ANY, "Select RoR Directory")
         self.Bind(wx.EVT_BUTTON, self.OnSelectRoRDir, self.btnSelectRoRDir)
 
-        #self.btnStartRoR = wx.Button(self.panel, wx.ID_ANY, "Start RoR")
-        #self.Bind(wx.EVT_BUTTON, self.OnStartRoR, self.btnStartRoR)
+        self.btnStartRoR = wx.Button(self.panel, wx.ID_ANY, "Start RoR")
+        self.Bind(wx.EVT_BUTTON, self.OnStartRoR, self.btnStartRoR)
 
         self.cbbRenderEngine = wx.ComboBox(self.panel, wx.ID_ANY, RENDERSYSTEMS[0], style=wx.CB_READONLY, choices=RENDERSYSTEMS)
         self.Bind(wx.EVT_COMBOBOX, self.OnSelectRenderer, self.cbbRenderEngine)
@@ -51,19 +51,19 @@
         #print self.rordir
         if not self.rordir is None:
             if self.checkRoRDir(self.rordir):
-                #self.btnStartRoR.Enable(True)
+                self.btnStartRoR.Enable(True)
                 self.btnStartTruckEditor.Enable(True)
                 self.btnStartTerrainEditor.Enable(True)
                 self.lblRoRDir.SetLabel(self.rordir)
             else:
                 self.rordir = ""
-                #self.btnStartRoR.Enable(False)
+                self.btnStartRoR.Enable(False)
                 self.btnStartTruckEditor.Enable(False)
                 self.btnStartTerrainEditor.Enable(False)
                 self.lblRoRDir.SetLabel("Please select Rigs of Rods Directory!")
 
         else:
-            #self.btnStartRoR.Enable(False)
+            self.btnStartRoR.Enable(False)
             self.btnStartTruckEditor.Enable(False)
             self.btnStartTerrainEditor.Enable(False)
         self.__set_properties() 
@@ -168,7 +168,7 @@
             self.rordir = newpath
             self.lblRoRDir.SetLabel(newpath)
             getSettingsManager().setSetting("RigsOfRods", "BasePath", newpath)
-            #self.btnStartRoR.Enable(True)
+            self.btnStartRoR.Enable(True)
             self.btnStartTruckEditor.Enable(True)
             self.btnStartTerrainEditor.Enable(True)
             
@@ -187,8 +187,8 @@
         sizer_panel = wx.BoxSizer(wx.VERTICAL)
         sizer_panel.Add(self.lblRoRDir, 0, wx.EXPAND, 0)
         sizer_panel.Add(self.btnSelectRoRDir, 0, wx.EXPAND, 0)
-        #sizer_panel.Add(self.btnStartRoR, 0, wx.EXPAND, 0) 
         sizer_panel.Add(self.cbbRenderEngine, 0, wx.EXPAND, 0)
+        sizer_panel.Add(self.btnStartRoR, 0, wx.EXPAND, 0) 
         sizer_panel.Add(self.btnStartTerrainEditor, 0, wx.EXPAND, 0)
         sizer_panel.Add(self.btnStartTruckEditor, 0, wx.EXPAND, 0)
         sizer_panel.Add(self.btnBugReport, 0, wx.EXPAND, 0)

Modified: trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py
===================================================================
--- trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py	2007-06-30 00:59:28 UTC (rev 68)
+++ trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py	2007-06-30 01:19:50 UTC (rev 69)
@@ -393,12 +393,8 @@
                 
                 posx, posy, posz, rotx, roty, rotz = self.getPositionRotation(self.trucks[k])
 
-                if rotx != 0:
-                    rotx -= 180
-                if roty != 0:
-                    roty -= 180
-                if rotz != 0:
-                    rotz -= 180
+                rotx -= 90
+
                 truckstring = k.split(".")[-1] + "\t " + k
                 ar = [self.formatFloat(posx), 
                       self.formatFloat(posy), 


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