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

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

Revision: 101
          http://roreditor.svn.sourceforge.net/roreditor/?rev=101&view=rev
Author:   rorthomas
Date:     2007-07-15 12:03:22 -0700 (Sun, 15 Jul 2007)

Log Message:
-----------
* added camera land collision checkbox

Modified Paths:
--------------
    trunk/lib/rorterraineditor/MainFrame.py
    trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py

Modified: trunk/lib/rorterraineditor/MainFrame.py
===================================================================
--- trunk/lib/rorterraineditor/MainFrame.py	2007-07-08 20:27:33 UTC (rev 100)
+++ trunk/lib/rorterraineditor/MainFrame.py	2007-07-15 19:03:22 UTC (rev 101)
@@ -20,6 +20,7 @@
 ID_ADDMESH  = 108
 ID_CHECKUPDATE = 109
 ID_SAVEFILEAS = 110
+ID_TERRAINCOLLISION = 111
 ID_EXIT     = 199
 
 DATADIR     = "data"
@@ -133,10 +134,13 @@
         menuBar.Append(file_menu, "&File");
         
         view_menu = wx.Menu()
+        self.mnuterraincollision = view_menu.AppendCheckItem(ID_TERRAINCOLLISION, "Camera collides with Terrain", "")
+        self.mnuterraincollision.Check(True)
+        view_menu.AppendSeparator()
         self.viewObjectDetails = view_menu.AppendCheckItem(ID_VIEWOBJ, "&View Objects", "Display object details")
+        self.viewObjectDetails.Check(False)
         view_menu.AppendSeparator()
         view_menu.Append(ID_OGRESET, "&Ogre Settings", "Change Ogre Display Settings")
-        self.viewObjectDetails.Check(False)
         menuBar.Append(view_menu, "&View");
         
         add_menu = wx.Menu()
@@ -163,7 +167,7 @@
         self.Bind(wx.EVT_MENU, self.OnAbout, id=ID_ABOUT)
         self.Bind(wx.EVT_MENU, self.onViewObjectDetails, id=ID_VIEWOBJ)
         self.Bind(wx.EVT_MENU, self.OnChangeOgreSettings, id=ID_OGRESET)
-        self.Bind(wx.EVT_MENU, self.OnHelp, id=ID_SHOWHELP)
+        self.Bind(wx.EVT_MENU, self.OnCameraTerrainCollision, id=ID_TERRAINCOLLISION)
 
     def OnAbout(self, event=None):
         ShowOnAbout()
@@ -171,6 +175,9 @@
     def OnCheckUpdate(self, event=None):
         pass
         
+    def OnCameraTerrainCollision(self, event=None):
+        self.terrainOgreWin.CameraLandCollision(self.mnuterraincollision.IsChecked())
+        
     def OnHelp(self, event=None):
         import HelpFrame
         HelpFrame.showHelpFrame()

Modified: trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py
===================================================================
--- trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py	2007-07-08 20:27:33 UTC (rev 100)
+++ trunk/lib/rorterraineditor/RoRTerrainOgreWindow.py	2007-07-15 19:03:22 UTC (rev 101)
@@ -34,6 +34,7 @@
         self.myODefs = {}
         self.trucks = {}
         self.comments = {}
+        self.cameralandcollisionenabled = True
         self.meshes = {}
         self.keyPress = ogre.Vector3(0,0,0)
         self.moveVector = ogre.Vector3(0,0,0)
@@ -41,6 +42,8 @@
         self.selectionMaterialAnimState = 0
         wxOgreWindow.__init__(self, self.parent, self.ID, size = self.size, **self.kwargs) 
 
+    def CameraLandCollision(self, value):
+        self.cameralandcollisionenabled = value
         
     def animateSelection(self):
         if not self.selectionMaterial is None:
@@ -52,8 +55,9 @@
             self.selectionMaterial.setDiffuse(1, 0.3, 0, val)
             self.selectionMaterial.setSpecular(1, 0.3, 0, val)
 
-    def OnFrameStarted(self): 
-        self.cameraLandCollision()
+    def OnFrameStarted(self):
+        if self.cameralandcollisionenabled:
+            self.cameraLandCollision()
         self.animateSelection()
         if not self.TranslateNode is None:
             if self.mSelected:


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