Merge of itasc branch. Project files, scons and cmake should be working. Makefile...
[blender.git] / source / gameengine / Ketsji / KX_Scene.cpp
index 3483496..140be3f 100644 (file)
 #include "ListValue.h"
 #include "SCA_LogicManager.h"
 #include "SCA_TimeEventManager.h"
-#include "SCA_AlwaysEventManager.h"
-#include "SCA_RandomEventManager.h"
-#include "KX_RayEventManager.h"
+//#include "SCA_AlwaysEventManager.h"
+//#include "SCA_RandomEventManager.h"
+//#include "KX_RayEventManager.h"
 #include "KX_TouchEventManager.h"
 #include "SCA_KeyboardManager.h"
 #include "SCA_MouseManager.h"
-#include "SCA_PropertyEventManager.h"
+//#include "SCA_PropertyEventManager.h"
 #include "SCA_ActuatorEventManager.h"
+#include "SCA_BasicEventManager.h"
 #include "KX_Camera.h"
 #include "SCA_JoystickManager.h"
 
@@ -168,25 +169,27 @@ KX_Scene::KX_Scene(class SCA_IInputDevice* keyboarddevice,
        m_keyboardmgr = new SCA_KeyboardManager(m_logicmgr,keyboarddevice);
        m_mousemgr = new SCA_MouseManager(m_logicmgr,mousedevice);
        
-       SCA_AlwaysEventManager* alwaysmgr = new SCA_AlwaysEventManager(m_logicmgr);
-       SCA_PropertyEventManager* propmgr = new SCA_PropertyEventManager(m_logicmgr);
+       //SCA_AlwaysEventManager* alwaysmgr = new SCA_AlwaysEventManager(m_logicmgr);
+       //SCA_PropertyEventManager* propmgr = new SCA_PropertyEventManager(m_logicmgr);
        SCA_ActuatorEventManager* actmgr = new SCA_ActuatorEventManager(m_logicmgr);
-       SCA_RandomEventManager* rndmgr = new SCA_RandomEventManager(m_logicmgr);
-       KX_RayEventManager* raymgr = new KX_RayEventManager(m_logicmgr);
+       //SCA_RandomEventManager* rndmgr = new SCA_RandomEventManager(m_logicmgr);
+       SCA_BasicEventManager* basicmgr = new SCA_BasicEventManager(m_logicmgr);
+       //KX_RayEventManager* raymgr = new KX_RayEventManager(m_logicmgr);
 
        KX_NetworkEventManager* netmgr = new KX_NetworkEventManager(m_logicmgr, ndi);
        
        
 
-       m_logicmgr->RegisterEventManager(alwaysmgr);
-       m_logicmgr->RegisterEventManager(propmgr);
+       //m_logicmgr->RegisterEventManager(alwaysmgr);
+       //m_logicmgr->RegisterEventManager(propmgr);
        m_logicmgr->RegisterEventManager(actmgr);
        m_logicmgr->RegisterEventManager(m_keyboardmgr);
        m_logicmgr->RegisterEventManager(m_mousemgr);
        m_logicmgr->RegisterEventManager(m_timemgr);
-       m_logicmgr->RegisterEventManager(rndmgr);
-       m_logicmgr->RegisterEventManager(raymgr);
+       //m_logicmgr->RegisterEventManager(rndmgr);
+       //m_logicmgr->RegisterEventManager(raymgr);
        m_logicmgr->RegisterEventManager(netmgr);
+       m_logicmgr->RegisterEventManager(basicmgr);
 
 
        SYS_SystemHandle hSystem = SYS_GetSystem();