Revision: 23490
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23490
Author: campbellbarton
Date: 2009-09-25 18:30:15 +0200 (Fri, 25 Sep 2009)
Log Message:
-----------
almost all event managers stored a pointer back to the logic manager, easier if
this pointer is in the base class - SCA_EventManager
Modified Paths:
--------------
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_EventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.h
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -36,8 +36,7 @@
SCA_ActuatorEventManager::SCA_ActuatorEventManager(class SCA_LogicManager*
logicmgr)
- : SCA_EventManager(ACTUATOR_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, ACTUATOR_EVENTMGR)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -37,8 +37,6 @@
class SCA_ActuatorEventManager : public SCA_EventManager
{
- class SCA_LogicManager* m_logicmgr;
-
public:
SCA_ActuatorEventManager(class SCA_LogicManager* logicmgr);
virtual ~SCA_ActuatorEventManager();
Modified: trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -42,8 +42,7 @@
using namespace std;
SCA_AlwaysEventManager::SCA_AlwaysEventManager(class SCA_LogicManager*
logicmgr)
- : SCA_EventManager(ALWAYS_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, ALWAYS_EVENTMGR)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -34,8 +34,6 @@
using namespace std;
class SCA_AlwaysEventManager : public SCA_EventManager
{
-
- class SCA_LogicManager* m_logicmgr;
public:
SCA_AlwaysEventManager(class SCA_LogicManager* logicmgr);
virtual void NextFrame();
Modified: trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -42,8 +42,7 @@
using namespace std;
SCA_BasicEventManager::SCA_BasicEventManager(class SCA_LogicManager* logicmgr)
- : SCA_EventManager(BASIC_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, BASIC_EVENTMGR)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_EventManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_EventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_EventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -35,8 +35,9 @@
#endif
-SCA_EventManager::SCA_EventManager(EVENT_MANAGER_TYPE mgrtype)
- :m_mgrtype(mgrtype)
+SCA_EventManager::SCA_EventManager(SCA_LogicManager* logicmgr,
EVENT_MANAGER_TYPE mgrtype)
+ :m_logicmgr(logicmgr),
+ m_mgrtype(mgrtype)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -38,6 +38,8 @@
class SCA_EventManager
{
protected:
+ class SCA_LogicManager* m_logicmgr; /* all event manager subclasses use
this (other then TimeEventManager) */
+
// use a set to speed-up insertion/removal
//std::set <class SCA_ISensor*> m_sensors;
SG_DList m_sensors;
@@ -58,7 +60,7 @@
BASIC_EVENTMGR
};
- SCA_EventManager(EVENT_MANAGER_TYPE mgrtype);
+ SCA_EventManager(SCA_LogicManager* logicmgr, EVENT_MANAGER_TYPE
mgrtype);
virtual ~SCA_EventManager();
virtual void RemoveSensor(class SCA_ISensor* sensor);
Modified: trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -37,8 +37,7 @@
SCA_JoystickManager::SCA_JoystickManager(class SCA_LogicManager* logicmgr)
- : SCA_EventManager(JOY_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, JOY_EVENTMGR)
{
int i;
for (i=0; i<JOYINDEX_MAX; i++) {
Modified: trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -35,8 +35,6 @@
using namespace std;
class SCA_JoystickManager : public SCA_EventManager
{
-
- class SCA_LogicManager* m_logicmgr;
/**
* SDL Joystick Class Instance
*/
Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -37,9 +37,8 @@
SCA_KeyboardManager::SCA_KeyboardManager(SCA_LogicManager* logicmgr,
SCA_IInputDevice* inputdev)
- : SCA_EventManager(KEYBOARD_EVENTMGR),
- m_inputDevice(inputdev),
- m_logicmanager(logicmgr)
+ : SCA_EventManager(logicmgr, KEYBOARD_EVENTMGR),
+ m_inputDevice(inputdev)
{
}
@@ -65,7 +64,7 @@
SG_DList::iterator<SCA_ISensor> it(m_sensors);
for (it.begin();!it.end();++it)
{
- (*it)->Activate(m_logicmanager);
+ (*it)->Activate(m_logicmgr);
}
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -45,8 +45,6 @@
class SCA_KeyboardManager : public SCA_EventManager
{
class SCA_IInputDevice* m_inputDevice;
- class SCA_LogicManager* m_logicmanager;
-
public:
SCA_KeyboardManager(class SCA_LogicManager* logicmgr,class
SCA_IInputDevice* inputdev);
Modified: trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -48,9 +48,8 @@
SCA_MouseManager::SCA_MouseManager(SCA_LogicManager* logicmgr,
SCA_IInputDevice* mousedev)
- : SCA_EventManager(MOUSE_EVENTMGR),
- m_mousedevice (mousedev),
- m_logicmanager(logicmgr)
+ : SCA_EventManager(logicmgr, MOUSE_EVENTMGR),
+ m_mousedevice (mousedev)
{
m_xpos = 0;
m_ypos = 0;
@@ -93,7 +92,7 @@
mousesensor->setX(mx);
mousesensor->setY(my);
- mousesensor->Activate(m_logicmanager);
+ mousesensor->Activate(m_logicmgr);
}
}
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -47,7 +47,6 @@
{
class SCA_IInputDevice* m_mousedevice;
- class SCA_LogicManager* m_logicmanager;
unsigned short m_xpos; // Cached location of the mouse pointer
unsigned short m_ypos;
Modified: trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -35,8 +35,7 @@
SCA_PropertyEventManager::SCA_PropertyEventManager(class SCA_LogicManager*
logicmgr)
- : SCA_EventManager(PROPERTY_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, PROPERTY_EVENTMGR)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -37,8 +37,6 @@
class SCA_PropertyEventManager : public SCA_EventManager
{
- class SCA_LogicManager* m_logicmgr;
-
public:
SCA_PropertyEventManager(class SCA_LogicManager* logicmgr);
virtual ~SCA_PropertyEventManager();
Modified: trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -42,8 +42,7 @@
#endif
SCA_RandomEventManager::SCA_RandomEventManager(class SCA_LogicManager*
logicmgr)
- : SCA_EventManager(RANDOM_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, RANDOM_EVENTMGR)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
