diff --git a/direct/src/directtools/DirectCameraControl.py b/direct/src/directtools/DirectCameraControl.py index f4a5292877..5d551fbc4a 100644 --- a/direct/src/directtools/DirectCameraControl.py +++ b/direct/src/directtools/DirectCameraControl.py @@ -254,12 +254,12 @@ class DirectCameraControl(PandaObject): t.coaCenter = getScreenXY(self.coaMarker) t.lastAngle = getCrankAngle(t.coaCenter) # Get a copy of the camera/manipRef offset matrix - t.wrtMat = Mat4() - t.wrtMat.assign(direct.camera.getMat( self.camManipRef )) + t.wrtMat = Mat4(direct.camera.getMat( self.camManipRef )) taskMgr.add(t, 'manipulateCamera') def mouseRollTask(self, state): wrtMat = state.wrtMat + print wrtMat angle = getCrankAngle(state.coaCenter) deltaAngle = angle - state.lastAngle state.lastAngle = angle diff --git a/direct/src/directutil/Mopath.py b/direct/src/directutil/Mopath.py index eacfd783d8..fb8fb0cf77 100644 --- a/direct/src/directutil/Mopath.py +++ b/direct/src/directutil/Mopath.py @@ -20,8 +20,9 @@ class Mopath(PandaObject): def getMaxT(self): return self.maxT - def loadFile(self, filename): - self.reset() + def loadFile(self, filename, fReset = 1): + if fReset: + self.reset() nodePath = loader.loadModel(filename) if nodePath: self.__extractCurves(nodePath)