Polished multiview camera control

direct/src/leveleditor/ActionMgr.py

@@ -19,7 +19,6 @@ class ActionMgr:
         self.undoList.append(action)
         if len(self.redoList) > 0:
             self.redoList.pop()
-        print 'current undoList', self.undoList
 
     def undo(self):
         if len(self.undoList) < 1:
@@ -28,7 +27,6 @@ class ActionMgr:
             action = self.undoList.pop()
             self.redoList.append(action)
             action.undo()
-            print 'current redoList', self.redoList
 
     def redo(self):
         if len(self.redoList) < 1:
@@ -37,7 +35,6 @@ class ActionMgr:
             action = self.redoList.pop()
             self.undoList.append(action)
             action.redo()
-            print 'current undoList', self.undoList
 
 class ActionBase(Functor):
     """ Base class for user actions """

direct/src/leveleditor/LevelEditorBase.py

@@ -37,6 +37,7 @@ class LevelEditorBase(DirectObject):
         fTk = 0
         fWx = 0
         base.startDirect(fWantTk = fTk, fWantWx = fWx)
+
         base.closeWindow(base.win)
         base.win = base.winList[3]
 
@@ -101,6 +102,7 @@ class LevelEditorBase(DirectObject):
         base.direct.ignore('DIRECT-delete')
         base.direct.ignore('DIRECT-select')
         base.direct.ignore('DIRECT-preDeselectAll')
+        base.direct.fIgnoreDirectOnlyKeyMap = 1
         
         # [gjeon] do not use the old way of finding current DR
         base.direct.drList.tryToGetCurrentDr = False
@@ -221,7 +223,20 @@ class LevelEditorBase(DirectObject):
         base.direct.deselectAll()
         self.objectMgr.reset()
         self.actionMgr.reset()
-
+        self.ui.perspView.camera.setPos(-19, -19, 19)
+        self.ui.leftView.camera.setPos(600, 0, 0)
+        self.ui.frontView.camera.setPos(0, -600, 0)
+        self.ui.topView.camera.setPos(0, 0, 600)
+        self.resetOrthoCam(self.ui.topView)
+        self.resetOrthoCam(self.ui.frontView)
+        self.resetOrthoCam(self.ui.leftView)
+        
+    def resetOrthoCam(self, view):
+        base.direct.drList[base.camList.index(NodePath(view.camNode))].orthoFactor = 0.1
+        x = view.ClientSize.GetWidth() * 0.1
+        y = view.ClientSize.GetHeight() * 0.1
+        view.camLens.setFilmSize(x, y)
+        
     def save(self):
         if self.currentFile:
             self.fileMgr.saveToFile(self.currentFile)

direct/src/leveleditor/LevelEditorUI.py

@@ -34,25 +34,27 @@ class PandaTextDropTarget(wx.TextDropTarget):
         # create ray from the camera to detect 3d position
         iRay = SelectionRay(self.view.camera)
         iRay.collider.setFromLens(self.view.camNode, mx, my)
-        iRay.collideWithGeom()
+        iRay.collideWithBitMask(1)
-        iRay.ct.traverse(self.view.grid)
+        iRay.ct.traverse(self.view.collPlane)
-        entry = iRay.getEntry(0)
-        hitPt = entry.getSurfacePoint(entry.getFromNodePath())
 
-        # create a temp nodePath to get the position
+        if iRay.getNumEntries() > 0:
-        np = hidden.attachNewNode('temp')
+            entry = iRay.getEntry(0)
-        np.setPos(self.view.camera, hitPt)
+            hitPt = entry.getSurfacePoint(entry.getFromNodePath())
 
-        # update temp nodePath's HPR and scale with newobj's
+            # create a temp nodePath to get the position
-        np.setHpr(newobj.getHpr())
+            np = NodePath('temp')
-        np.setScale(newobj.getScale())
+            np.setPos(self.view.camera, hitPt)
 
-        # transform newobj to cursor position
+            # update temp nodePath's HPR and scale with newobj's
-        obj = self.editor.objectMgr.findObjectByNodePath(newobj)
+            np.setHpr(newobj.getHpr())
-        action = ActionTransformObj(self.editor, obj[OG.OBJ_UID], Mat4(np.getMat()))
+            np.setScale(newobj.getScale())
-        self.editor.actionMgr.push(action)
+
-        np.remove()
+            # transform newobj to cursor position
-        action()
+            obj = self.editor.objectMgr.findObjectByNodePath(newobj)
+            action = ActionTransformObj(self.editor, obj[OG.OBJ_UID], Mat4(np.getMat()))
+            self.editor.actionMgr.push(action)
+            np.remove()
+            action()
         del iRay
 
 class LevelEditorUI(WxAppShell):
@@ -292,14 +294,14 @@ class GridSizeUI(wx.Dialog):
 
         wx.StaticBox(panel, -1, 'Grid Size', (5, 5), (235, 80))
 
-        self.gridSizeSlider = WxSlider(panel, -1, float(gridSize), 10.0, 1000.0,
+        self.gridSizeSlider = WxSlider(panel, -1, float(gridSize), 10.0, 100000.0,
                            pos = (10, 25), size=(220, -1),
-                           style=wx.SL_HORIZONTAL | wx.SL_LABELS)
+                           style=wx.SL_HORIZONTAL | wx.SL_LABELS, textSize=(80,20))
         self.gridSizeSlider.Enable()
 
         wx.StaticBox(panel, -1, 'Grid Space', (5, 90), (235, 80))
 
-        self.gridSpacingSlider = WxSlider(panel, -1, float(gridSpacing), 0.01, 20.0,
+        self.gridSpacingSlider = WxSlider(panel, -1, float(gridSpacing), 0.01, 2000.0,
                            pos = (10, 115), size=(220, -1),
                            style=wx.SL_HORIZONTAL | wx.SL_LABELS)
         self.gridSpacingSlider.Enable()

direct/src/leveleditor/MayaConverter.py

@@ -90,13 +90,13 @@ class MayaConverter(wx.Dialog):
 
         if self.isAnim:
             if self.obj:
-                command = 'maya2egg -a chan %s -o %s.anim.egg'%(mayaFile, mayaFile)
+                command = 'maya2egg -uo ft -a chan %s -o %s.anim.egg'%(mayaFile, mayaFile)
                 self.process = Process(self, command, lambda p0=None, p1=mayaFile: self.onProcessEnded(p0, p1))
             else:
-                command = 'maya2egg -a model %s -o %s.model.egg'%(mayaFile, mayaFile)
+                command = 'maya2egg -uo ft -a model %s -o %s.model.egg'%(mayaFile, mayaFile)
                 self.process = Process(self, command, lambda p0=None, p1=mayaFile: self.onModelProcessEnded(p0, p1))
         else:
-            command = 'maya2egg %s -o %s.egg'%(mayaFile, mayaFile)
+            command = 'maya2egg -uo ft %s -o %s.egg'%(mayaFile, mayaFile)
             self.process = Process(self, command, lambda p0=None, p1=mayaFile: self.onProcessEnded(p0, p1))
 
         self.timer = wx.Timer(self, -1)
@@ -113,7 +113,7 @@ class MayaConverter(wx.Dialog):
         for i in self.process.Poll():
             self.output.AppendText(i)        
         self.process = None
-        command = 'maya2egg -a chan %s -o %s.anim.egg'%(mayaFile, mayaFile)
+        command = 'maya2egg -uo ft -a chan %s -o %s.anim.egg'%(mayaFile, mayaFile)
         self.process = Process(self, command, lambda p0 = None, p1=mayaFile: self.onProcessEnded(p0, p1))
 
     def onProcessEnded(self, evt, mayaFile):

direct/src/leveleditor/ObjectMgr.py

@@ -292,7 +292,6 @@ class ObjectMgr:
     def setObjectTransform(self, uid, xformMat):
         obj = self.findObjectById(uid)
         if obj:
-            print obj[OG.OBJ_NP], xformMat
             obj[OG.OBJ_NP].setMat(xformMat)
         
     def updateObjectColor(self, r, g, b, a, np=None):
@@ -601,6 +600,5 @@ class ObjectMgr:
                 duplicatedNPs.append(newObjNP)
 
         base.direct.deselectAllCB()
-        print duplicatedNPs
         for newNodePath in duplicatedNPs:
             base.direct.select(newNodePath, fMultiSelect = 1, fUndo=0)

direct/src/leveleditor/ViewPort.py

@@ -11,7 +11,7 @@ from direct.showbase.DirectObject import DirectObject
 from direct.directtools.DirectGrid import DirectGrid
 from direct.showbase.ShowBase import WindowControls
 from direct.directtools.DirectGlobals import *
-from pandac.PandaModules import WindowProperties, OrthographicLens, Point3
+from pandac.PandaModules import WindowProperties, OrthographicLens, Point3, Plane, CollisionPlane, CollisionNode, NodePath
 import wx
 
 HORIZONTAL = wx.SPLIT_HORIZONTAL
@@ -65,6 +65,7 @@ class Viewport(wx.Panel, DirectObject):
     self.camLookAt = None
     self.initialized = False
     self.grid = None
+    self.collPlane = None
     #self.Bind(wx.EVT_RIGHT_DOWN, self.onRightDown)
 
   def initialize(self):
@@ -104,7 +105,8 @@ class Viewport(wx.Panel, DirectObject):
                 cam=self.camera,
                 camNode = self.camNode,
                 cam2d=None,
-                mouseKeyboard =mk)
+                mouseKeyboard =mk,
+                grid = self.grid)
     base.setupWindowControls(winCtrl)
 
     self.initialized = True
@@ -114,7 +116,13 @@ class Viewport(wx.Panel, DirectObject):
 
     self.camLens = self.camNode.getLens()
 
+    if self.name in ['top', 'front', 'left']:
+      x = self.ClientSize.GetWidth() * 0.1
+      y = self.ClientSize.GetHeight() * 0.1
+      self.camLens.setFilmSize(x, y)
+
     self.Bind(wx.EVT_SIZE, self.onSize)
+
 ##     self.accept("wheel_down", self.zoomOut)
 ##     self.accept("wheel_up", self.zoomIn)
 ##     self.accept("page_down", self.zoomOut)
@@ -186,13 +194,25 @@ class Viewport(wx.Panel, DirectObject):
     v.grid = DirectGrid(parent=render)
     if name == 'left':
       v.grid.setHpr(0, 0, 90)
+      collPlane = CollisionNode('LeftGridCol')
+      collPlane.addSolid(CollisionPlane(Plane(1, 0, 0, 0)))
+      v.collPlane = NodePath(collPlane)
+      v.collPlane.wrtReparentTo(v.grid)
       #v.grid.gridBack.findAllMatches("**/+GeomNode")[0].setName("_leftViewGridBack")
       LE_showInOneCam(v.grid, name)
     elif name == 'front':
       v.grid.setHpr(90, 0, 90)
+      collPlane = CollisionNode('FrontGridCol')
+      collPlane.addSolid(CollisionPlane(Plane(0, -1, 0, 0)))
+      v.collPlane = NodePath(collPlane)      
+      v.collPlane.wrtReparentTo(v.grid)
       #v.grid.gridBack.findAllMatches("**/+GeomNode")[0].setName("_frontViewGridBack")
       LE_showInOneCam(v.grid, name)
     else:
+      collPlane = CollisionNode('TopGridCol')
+      collPlane.addSolid(CollisionPlane(Plane(0, 0, 1, 0)))
+      v.collPlane = NodePath(collPlane)
+      v.collPlane.reparentTo(v.grid)
       #v.grid.gridBack.findAllMatches("**/+GeomNode")[0].setName("_topViewGridBack")
       LE_showInOneCam(v.grid, name)
     return v
@@ -200,20 +220,24 @@ class Viewport(wx.Panel, DirectObject):
   @staticmethod
   def makePerspective(parent):
     v = Viewport('persp', parent)
-    v.camPos = Point3(-30, -30, 30)
+    v.camPos = Point3(-19, -19, 19)
     v.camLookAt = Point3(0, 0, 0)
 
     v.grid = DirectGrid(parent=render)
+    collPlane = CollisionNode('PerspGridCol')
+    collPlane.addSolid(CollisionPlane(Plane(0, 0, 1, 0)))
+    v.collPlane = NodePath(collPlane)
+    v.collPlane.reparentTo(v.grid)
     #v.grid.gridBack.findAllMatches("**/+GeomNode")[0].setName("_perspViewGridBack")
     LE_showInOneCam(v.grid, 'persp')
     return v
   
   @staticmethod
-  def makeLeft(parent): return Viewport.makeOrthographic(parent, 'left', Point3(100, 0, 0))
+  def makeLeft(parent): return Viewport.makeOrthographic(parent, 'left', Point3(600, 0, 0))
   @staticmethod
-  def makeFront(parent): return Viewport.makeOrthographic(parent, 'front', Point3(0, -100, 0))
+  def makeFront(parent): return Viewport.makeOrthographic(parent, 'front', Point3(0, -600, 0))
   @staticmethod
-  def makeTop(parent): return Viewport.makeOrthographic(parent, 'top', Point3(0, 0, 100))
+  def makeTop(parent): return Viewport.makeOrthographic(parent, 'top', Point3(0, 0, 600))
 
 class ViewportMenu(wx.Menu):
   """Represents a menu that appears when right-clicking a viewport."""