diff --git a/direct/src/leveleditor/LevelEditorBase.py b/direct/src/leveleditor/LevelEditorBase.py index c7b748aa56..4dd7a191a3 100755 --- a/direct/src/leveleditor/LevelEditorBase.py +++ b/direct/src/leveleditor/LevelEditorBase.py @@ -41,7 +41,7 @@ class LevelEditorBase(DirectObject): self.fMoveCamera = False - self.NPParent = render + self.NPParent = base.render # define your own config file in inherited class self.settingsFile = None diff --git a/direct/src/leveleditor/LevelEditorStart.py b/direct/src/leveleditor/LevelEditorStart.py index bcb8800c94..27a8da1c40 100644 --- a/direct/src/leveleditor/LevelEditorStart.py +++ b/direct/src/leveleditor/LevelEditorStart.py @@ -1,6 +1,9 @@ from direct.leveleditor import LevelEditor if __name__ == '__main__': + from direct.showbase.ShowBase import ShowBase + base = ShowBase() + base.le = LevelEditor.LevelEditor() # You should define LevelEditor instance as # base.le so it can be reached in global scope diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 22e1ff7864..d657442895 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -3237,7 +3237,7 @@ class ShowBase(DirectObject.DirectObject): # Set a timer to run the Panda frame 60 times per second. wxFrameRate = ConfigVariableDouble('wx-frame-rate', 60.0) self.wxTimer = wx.Timer(self.wxApp) - self.wxTimer.Start(1000.0 / wxFrameRate.value) + self.wxTimer.Start(int(round(1000.0 / wxFrameRate.value))) self.wxApp.Bind(wx.EVT_TIMER, self.__wxTimerCallback) # wx is now the main loop, not us any more. diff --git a/direct/src/wxwidgets/WxPandaShell.py b/direct/src/wxwidgets/WxPandaShell.py index ff8ec51981..44790bd653 100755 --- a/direct/src/wxwidgets/WxPandaShell.py +++ b/direct/src/wxwidgets/WxPandaShell.py @@ -119,7 +119,7 @@ class WxPandaShell(WxAppShell): base.trackball.node().setHpr(0, 15, 0) # to make persp view as default - self.perspViewMenuItem.Toggle() + self.perspViewMenuItem.Check() self.onViewChange(None, 3) # initializing direct