diff --git a/direct/src/showbase/InputStateGlobal.py b/direct/src/showbase/InputStateGlobal.py new file mode 100644 index 0000000000..d124244c7a --- /dev/null +++ b/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() diff --git a/direct/src/showbase/MessengerGlobal.py b/direct/src/showbase/MessengerGlobal.py index 8aab6ac0d0..588d38254c 100644 --- a/direct/src/showbase/MessengerGlobal.py +++ b/direct/src/showbase/MessengerGlobal.py @@ -1,10 +1,5 @@ """instantiate global Messenger object""" import Messenger -import InputState 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() diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 02604403cc..c168665698 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -13,6 +13,7 @@ from PythonUtil import * from ParticleManagerGlobal import * from PhysicsManagerGlobal import * from IntervalManager import ivalMgr +from InputStateGlobal import inputState import Task import EventManager