Browse Source

resolve circular import

David Rose 22 years ago
parent
commit
1b729fb229

+ 8 - 0
direct/src/showbase/InputStateGlobal.py

@@ -0,0 +1,8 @@
+"""instantiate global InputState object"""
+
+# This file had to be separated from MessengerGlobal to resolve a
+# circular include dependency with DirectObject.
+
+import InputState
+
+inputState = InputState.InputState()

+ 0 - 5
direct/src/showbase/MessengerGlobal.py

@@ -1,10 +1,5 @@
 """instantiate global Messenger object"""
 """instantiate global Messenger object"""
 
 
 import Messenger
 import Messenger
-import InputState
 
 
 messenger = Messenger.Messenger()
 messenger = Messenger.Messenger()
-
-# inputState is an optional add-on for the messenger, and
-# that is why it is created here (See Also: InputState.py):
-inputState = InputState.InputState()

+ 1 - 0
direct/src/showbase/ShowBase.py

@@ -13,6 +13,7 @@ from PythonUtil import *
 from ParticleManagerGlobal import *
 from ParticleManagerGlobal import *
 from PhysicsManagerGlobal import *
 from PhysicsManagerGlobal import *
 from IntervalManager import ivalMgr
 from IntervalManager import ivalMgr
+from InputStateGlobal import inputState
 
 
 import Task
 import Task
 import EventManager
 import EventManager