Supporting changes in movement of models.

direct/src/gui/DirectGuiTest.py

@@ -3,7 +3,7 @@ from whrandom import *
 
 # EXAMPLE CODE
 # Load a model
-smiley = loader.loadModel('models/directmodels/smiley')
+smiley = loader.loadModel('models/misc/smiley')
 
 # Here we specify the button's command
 def dummyCmd(index):

direct/src/interval/IntervalTest.py

@@ -5,7 +5,7 @@ from Actor import *
 
 import Mopath
 
-boat = loader.loadModel('models/directmodels/smiley')
+boat = loader.loadModel('models/misc/smiley')
 boat.reparentTo(render)
 
 donald = Actor()
@@ -13,7 +13,7 @@ donald.loadModel("phase_6/models/char/donald-wheel-mod")
 donald.loadAnims({"steer":"phase_6/models/char/donald-wheel-chan"})
 donald.reparentTo(boat)
 
-dock = loader.loadModel('models/directmodels/smiley')
+dock = loader.loadModel('models/misc/smiley')
 dock.reparentTo(render)
 
 sound = loader.loadSound('phase_6/audio/sfx/SZ_DD_waterlap.mp3')

direct/src/tkpanels/DirectSessionPanel.py

@@ -747,32 +747,32 @@ class DirectSessionPanel(AppShell):
         dr = self.activeDisplayRegion
         if dr:
             if self.lockedFov.get():
-                sf = hFov/dr.camNode.getHfov()
-                vFov = min(dr.camNode.getVfov() * sf, 170.0)
-                dr.camNode.setFov(hFov, vFov)
+                sf = hFov/dr.getHfov()
+                vFov = min(dr.getVfov() * sf, 170.0)
+                dr.setFov(hFov, vFov)
                 # Update scale
                 self.vFov.set(vFov, 0)
             else:
                 # Just set horizontal
-                dr.camNode.setHfov(hFov)
+                dr.setHfov(hFov)
 
     def setVFov(self, vFov):
         dr = self.activeDisplayRegion
         if dr:
             if self.lockedFov.get():
-                sf = vFov/dr.camNode.getVfov()
-                hFov = min(dr.camNode.getHfov() * sf, 170.0)
-                dr.camNode.setFov(hFov, vFov)
+                sf = vFov/dr.getVfov()
+                hFov = min(dr.getHfov() * sf, 170.0)
+                dr.setFov(hFov, vFov)
                 # Update scale
                 self.hFov.set(hFov, 0)
             else:
                 # Just set horizontal
-                dr.camNode.setVfov(vFov)
+                dr.setVfov(vFov)
 
     def resetFov(self):
         dr = self.activeDisplayRegion
         if dr:
-            dr.camNode.setFov(45.0, 33.75)
+            dr.setFov(45.0, 33.75)
             self.hFov.set(45.0, 0)
             self.vFov.set(33.75, 0)
             

direct/src/tkpanels/MopathRecorder.py

@@ -68,14 +68,14 @@ class MopathRecorder(AppShell, PandaObject):
         self.tempCS = self.recorderNodePath.attachNewNode(
             'mopathRecorderTempCS')
         # Marker for use in playback
-        self.playbackMarker = loader.loadModel('models/directmodels/smiley')
+        self.playbackMarker = loader.loadModel('models/misc/smiley')
         self.playbackMarker.setName('Playback Marker')
         self.playbackMarker.reparentTo(self.recorderNodePath)
         self.playbackMarker.hide()
         # Tangent marker
         self.tangentGroup = self.playbackMarker.attachNewNode('Tangent Group')
         self.tangentGroup.hide()
-        self.tangentMarker = loader.loadModel('models/directmodels/sphere')
+        self.tangentMarker = loader.loadModel('models/misc/sphere')
         self.tangentMarker.reparentTo(self.tangentGroup)
         self.tangentMarker.setScale(0.5)
         self.tangentMarker.setColor(1,0,1,1)