diff options
author | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-07-12 17:55:33 +0300 |
---|---|---|
committer | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-07-12 17:58:12 +0300 |
commit | 6ffc988ae3aa57822be89e9580146908c938e0a0 (patch) | |
tree | 6c9299a519b8d4b1da0780cf0cd2bc4bba108fb8 /source/gameengine/GameLogic | |
parent | 5b0f674e0948d079332718e165b4a42369517ed6 (diff) |
BGE Clean-up: New EXP prefix for the BGE Expression module
The expression module now uses an EXP prefix and it follows a
distribution similar to blender.
Additionally the hash function in EXP_HashedPtr.h was simplified and the
files EXP_C-Api.h &.EXP_C-Api.cpp were deleted because were unused.
Reviewers: campbellbarton, moguri, sybren, hg1
Projects: #game_engine
Differential Revision: https://developer.blender.org/D1221
Diffstat (limited to 'source/gameengine/GameLogic')
35 files changed, 49 insertions, 49 deletions
diff --git a/source/gameengine/GameLogic/SCA_ANDController.cpp b/source/gameengine/GameLogic/SCA_ANDController.cpp index 3c60f2b8847..2cb7406779c 100644 --- a/source/gameengine/GameLogic/SCA_ANDController.cpp +++ b/source/gameengine/GameLogic/SCA_ANDController.cpp @@ -36,7 +36,7 @@ #include "SCA_ANDController.h" #include "SCA_ISensor.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.cpp b/source/gameengine/GameLogic/SCA_ExpressionController.cpp index d1c7b58a52c..ef058e215d6 100644 --- a/source/gameengine/GameLogic/SCA_ExpressionController.cpp +++ b/source/gameengine/GameLogic/SCA_ExpressionController.cpp @@ -36,8 +36,8 @@ #include "SCA_ExpressionController.h" #include "SCA_ISensor.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" -#include "InputParser.h" +#include "EXP_BoolValue.h" +#include "EXP_InputParser.h" #include "MT_Transform.h" // for fuzzyZero #include <stdio.h> diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp index f922e617367..2bb04fe7be0 100644 --- a/source/gameengine/GameLogic/SCA_IController.cpp +++ b/source/gameengine/GameLogic/SCA_IController.cpp @@ -36,7 +36,7 @@ #include "SCA_LogicManager.h" #include "SCA_IActuator.h" #include "SCA_ISensor.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "../Ketsji/KX_PythonSeq.h" /* not nice, only need for KX_PythonSeq_CreatePyObject */ #include <stdio.h> diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h index 1bc6b60bf1e..4ec872c2316 100644 --- a/source/gameengine/GameLogic/SCA_IController.h +++ b/source/gameengine/GameLogic/SCA_IController.h @@ -33,7 +33,7 @@ #define __SCA_ICONTROLLER_H__ #include "SCA_ILogicBrick.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" /** * Use of SG_DList element: none diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp index 34fa1c98a73..72a0b392447 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp @@ -33,7 +33,7 @@ #include <stddef.h> #include "SCA_ILogicBrick.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" SCA_LogicManager* SCA_ILogicBrick::m_sCurrentLogicManager = NULL; diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h index dc0aa4ce331..a3725789227 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.h +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h @@ -32,9 +32,9 @@ #ifndef __SCA_ILOGICBRICK_H__ #define __SCA_ILOGICBRICK_H__ -#include "Value.h" +#include "EXP_Value.h" #include "SCA_IObject.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" #include "CTR_Map.h" #include "CTR_HashedPtr.h" diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp index ab9e2781001..526e695e792 100644 --- a/source/gameengine/GameLogic/SCA_IObject.cpp +++ b/source/gameengine/GameLogic/SCA_IObject.cpp @@ -37,7 +37,7 @@ #include "SCA_IController.h" #include "SCA_IActuator.h" #include "MT_Point3.h" -#include "ListValue.h" +#include "EXP_ListValue.h" MT_Point3 SCA_IObject::m_sDummy=MT_Point3(0,0,0); SG_QList SCA_IObject::m_activeBookmarkedControllers; diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index 21e2c1cbcfc..29a21fd8708 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -34,7 +34,7 @@ #ifndef __SCA_IOBJECT_H__ #define __SCA_IOBJECT_H__ -#include "Value.h" +#include "EXP_Value.h" #include <vector> class SCA_IObject; diff --git a/source/gameengine/GameLogic/SCA_IScene.cpp b/source/gameengine/GameLogic/SCA_IScene.cpp index b6ce1d86ba7..a4c905096d7 100644 --- a/source/gameengine/GameLogic/SCA_IScene.cpp +++ b/source/gameengine/GameLogic/SCA_IScene.cpp @@ -31,7 +31,7 @@ #include "SCA_IScene.h" -#include "Value.h" +#include "EXP_Value.h" SCA_DebugProp::SCA_DebugProp(): m_obj(NULL) { diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp index e20dd8bcd74..56df9692e72 100644 --- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp +++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp @@ -35,7 +35,7 @@ #include "SCA_EventManager.h" #include "SCA_LogicManager.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <stdio.h> #include <stddef.h> diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.cpp b/source/gameengine/GameLogic/SCA_KeyboardManager.cpp index edf1f300fba..778ba9e9a2c 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardManager.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardManager.cpp @@ -33,10 +33,10 @@ */ -#include "BoolValue.h" +#include "EXP_BoolValue.h" #include "SCA_KeyboardManager.h" #include "SCA_KeyboardSensor.h" -#include "IntValue.h" +#include "EXP_IntValue.h" #include <vector> SCA_KeyboardManager::SCA_KeyboardManager(SCA_LogicManager* logicmgr, diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp index e5d717e0140..414a685d358 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp @@ -36,7 +36,7 @@ #include "SCA_KeyboardSensor.h" #include "SCA_KeyboardManager.h" #include "SCA_LogicManager.h" -#include "StringValue.h" +#include "EXP_StringValue.h" #include "SCA_IInputDevice.h" extern "C" { diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h index c9d55280fb7..51d7756bd1f 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h @@ -34,7 +34,7 @@ #define __SCA_KEYBOARDSENSOR_H__ #include "SCA_ISensor.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" #include <list> /** diff --git a/source/gameengine/GameLogic/SCA_LogicManager.cpp b/source/gameengine/GameLogic/SCA_LogicManager.cpp index adf57dec278..978f6d6b836 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.cpp +++ b/source/gameengine/GameLogic/SCA_LogicManager.cpp @@ -30,7 +30,7 @@ * \ingroup gamelogic */ -#include "Value.h" +#include "EXP_Value.h" #include "SCA_LogicManager.h" #include "SCA_ISensor.h" #include "SCA_IController.h" diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h index 1275a7c5085..7319bb537dd 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.h +++ b/source/gameengine/GameLogic/SCA_LogicManager.h @@ -43,10 +43,10 @@ #include "CTR_Map.h" #include "STR_HashedString.h" -#include "Value.h" +#include "EXP_Value.h" #include "SG_QList.h" -#include "KX_HashedPtr.h" +#include "EXP_HashedPtr.h" using namespace std; typedef std::list<class SCA_IController*> controllerlist; diff --git a/source/gameengine/GameLogic/SCA_MouseManager.cpp b/source/gameengine/GameLogic/SCA_MouseManager.cpp index 6d05b862c2d..51c03d1e350 100644 --- a/source/gameengine/GameLogic/SCA_MouseManager.cpp +++ b/source/gameengine/GameLogic/SCA_MouseManager.cpp @@ -40,10 +40,10 @@ # pragma warning( disable:4786 ) #endif -#include "BoolValue.h" +#include "EXP_BoolValue.h" #include "SCA_MouseManager.h" #include "SCA_MouseSensor.h" -#include "IntValue.h" +#include "EXP_IntValue.h" #include "RAS_ICanvas.h" diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp index a7cf4963f04..2479e859dea 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp +++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp @@ -41,7 +41,7 @@ #include "SCA_MouseManager.h" #include "SCA_LogicManager.h" #include "SCA_IInputDevice.h" -#include "ConstExpr.h" +#include "EXP_ConstExpr.h" #include <iostream> /* ------------------------------------------------------------------------- */ diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h index 8d05a548681..2660aaeacb5 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.h +++ b/source/gameengine/GameLogic/SCA_MouseSensor.h @@ -34,7 +34,7 @@ #define __SCA_MOUSESENSOR_H__ #include "SCA_ISensor.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" #include "SCA_IInputDevice.h" class SCA_MouseSensor : public SCA_ISensor diff --git a/source/gameengine/GameLogic/SCA_NANDController.cpp b/source/gameengine/GameLogic/SCA_NANDController.cpp index c78ce77f9fb..6a00c110e2b 100644 --- a/source/gameengine/GameLogic/SCA_NANDController.cpp +++ b/source/gameengine/GameLogic/SCA_NANDController.cpp @@ -36,7 +36,7 @@ #include "SCA_NANDController.h" #include "SCA_ISensor.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/GameLogic/SCA_NORController.cpp b/source/gameengine/GameLogic/SCA_NORController.cpp index e7fb6437feb..fb09617e060 100644 --- a/source/gameengine/GameLogic/SCA_NORController.cpp +++ b/source/gameengine/GameLogic/SCA_NORController.cpp @@ -36,7 +36,7 @@ #include "SCA_NORController.h" #include "SCA_ISensor.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/GameLogic/SCA_ORController.cpp b/source/gameengine/GameLogic/SCA_ORController.cpp index b147f8e6bf6..8a59bdf1b89 100644 --- a/source/gameengine/GameLogic/SCA_ORController.cpp +++ b/source/gameengine/GameLogic/SCA_ORController.cpp @@ -36,7 +36,7 @@ #include "SCA_ORController.h" #include "SCA_ISensor.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp index ea1b2a2bce3..f2907ca6361 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp @@ -36,9 +36,9 @@ #include <stddef.h> #include "SCA_PropertyActuator.h" -#include "InputParser.h" -#include "Operator2Expr.h" -#include "ConstExpr.h" +#include "EXP_InputParser.h" +#include "EXP_Operator2Expr.h" +#include "EXP_ConstExpr.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp index 6841d2a8ea1..82f3bee86b2 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp +++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp @@ -37,14 +37,14 @@ #include <iostream> #include "SCA_PropertySensor.h" -#include "Operator2Expr.h" -#include "ConstExpr.h" -#include "InputParser.h" -#include "StringValue.h" +#include "EXP_Operator2Expr.h" +#include "EXP_ConstExpr.h" +#include "EXP_InputParser.h" +#include "EXP_StringValue.h" #include "SCA_EventManager.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" -#include "FloatValue.h" +#include "EXP_BoolValue.h" +#include "EXP_FloatValue.h" #include <stdio.h> SCA_PropertySensor::SCA_PropertySensor(SCA_EventManager* eventmgr, diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index 8c3ce38276e..0c7bc9fa93e 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -39,7 +39,7 @@ #include "SCA_LogicManager.h" #include "SCA_ISensor.h" #include "SCA_IActuator.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #ifdef WITH_PYTHON #include "compile.h" diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h index d2549318c2e..11241da9117 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.h +++ b/source/gameengine/GameLogic/SCA_PythonController.h @@ -35,7 +35,7 @@ #include "SCA_IController.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" #include <vector> diff --git a/source/gameengine/GameLogic/SCA_PythonJoystick.h b/source/gameengine/GameLogic/SCA_PythonJoystick.h index 15c6285aed5..ecde00d28b9 100644 --- a/source/gameengine/GameLogic/SCA_PythonJoystick.h +++ b/source/gameengine/GameLogic/SCA_PythonJoystick.h @@ -27,7 +27,7 @@ #ifndef __SCA_PYTHONJOYSTICK_H__ #define __SCA_PYTHONJOYSTICK_H__ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" class SCA_PythonJoystick : public PyObjectPlus { diff --git a/source/gameengine/GameLogic/SCA_PythonKeyboard.h b/source/gameengine/GameLogic/SCA_PythonKeyboard.h index 53068f38e6a..3cbe250378c 100644 --- a/source/gameengine/GameLogic/SCA_PythonKeyboard.h +++ b/source/gameengine/GameLogic/SCA_PythonKeyboard.h @@ -27,7 +27,7 @@ #ifndef __SCA_PYTHONKEYBOARD_H__ #define __SCA_PYTHONKEYBOARD_H__ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" class SCA_PythonKeyboard : public PyObjectPlus { diff --git a/source/gameengine/GameLogic/SCA_PythonMouse.h b/source/gameengine/GameLogic/SCA_PythonMouse.h index bc6e65f07a8..6dde90b3482 100644 --- a/source/gameengine/GameLogic/SCA_PythonMouse.h +++ b/source/gameengine/GameLogic/SCA_PythonMouse.h @@ -27,7 +27,7 @@ #ifndef __SCA_PYTHONMOUSE_H__ #define __SCA_PYTHONMOUSE_H__ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" class SCA_PythonMouse : public PyObjectPlus { diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp index db6b4a63423..8d75be9089d 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp +++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp @@ -36,9 +36,9 @@ #include <stddef.h> #include <math.h> -#include "BoolValue.h" -#include "IntValue.h" -#include "FloatValue.h" +#include "EXP_BoolValue.h" +#include "EXP_IntValue.h" +#include "EXP_FloatValue.h" #include "SCA_IActuator.h" #include "SCA_RandomActuator.h" #include "MT_Transform.h" diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.cpp b/source/gameengine/GameLogic/SCA_RandomSensor.cpp index 2fe4d18a7fc..8f2dc8d80f5 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.cpp +++ b/source/gameengine/GameLogic/SCA_RandomSensor.cpp @@ -39,7 +39,7 @@ #include "SCA_EventManager.h" #include "SCA_RandomEventManager.h" #include "SCA_LogicManager.h" -#include "ConstExpr.h" +#include "EXP_ConstExpr.h" #include <iostream> /* ------------------------------------------------------------------------- */ diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h index 628562b77e6..66107b7b74b 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.h +++ b/source/gameengine/GameLogic/SCA_RandomSensor.h @@ -34,7 +34,7 @@ #define __SCA_RANDOMSENSOR_H__ #include "SCA_ISensor.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" #include "SCA_RandomNumberGenerator.h" class SCA_RandomSensor : public SCA_ISensor diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.cpp b/source/gameengine/GameLogic/SCA_TimeEventManager.cpp index 5aa6fdc8625..c56a1496823 100644 --- a/source/gameengine/GameLogic/SCA_TimeEventManager.cpp +++ b/source/gameengine/GameLogic/SCA_TimeEventManager.cpp @@ -38,7 +38,7 @@ #include "SCA_TimeEventManager.h" #include "SCA_LogicManager.h" -#include "FloatValue.h" +#include "EXP_FloatValue.h" SCA_TimeEventManager::SCA_TimeEventManager(SCA_LogicManager* logicmgr) : SCA_EventManager(NULL, TIME_EVENTMGR) diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.h b/source/gameengine/GameLogic/SCA_TimeEventManager.h index 4c929dca23c..38d7e3fc4d4 100644 --- a/source/gameengine/GameLogic/SCA_TimeEventManager.h +++ b/source/gameengine/GameLogic/SCA_TimeEventManager.h @@ -33,7 +33,7 @@ #define __SCA_TIMEEVENTMANAGER_H__ #include "SCA_EventManager.h" -#include "Value.h" +#include "EXP_Value.h" #include <vector> using namespace std; diff --git a/source/gameengine/GameLogic/SCA_XNORController.cpp b/source/gameengine/GameLogic/SCA_XNORController.cpp index 2cfc32a6d40..f97d11cabf3 100644 --- a/source/gameengine/GameLogic/SCA_XNORController.cpp +++ b/source/gameengine/GameLogic/SCA_XNORController.cpp @@ -36,7 +36,7 @@ #include "SCA_XNORController.h" #include "SCA_ISensor.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/GameLogic/SCA_XORController.cpp b/source/gameengine/GameLogic/SCA_XORController.cpp index eaa1825e5b6..bb1ea822bd8 100644 --- a/source/gameengine/GameLogic/SCA_XORController.cpp +++ b/source/gameengine/GameLogic/SCA_XORController.cpp @@ -36,7 +36,7 @@ #include "SCA_XORController.h" #include "SCA_ISensor.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" +#include "EXP_BoolValue.h" /* ------------------------------------------------------------------------- */ /* Native functions */ |