BGE Clean-up: New EXP prefix for the BGE Expression module
authorJorge Bernal <jbernalmartinez@gmail.com>
Sun, 12 Jul 2015 14:55:33 +0000 (16:55 +0200)
committerJorge Bernal <jbernalmartinez@gmail.com>
Sun, 12 Jul 2015 14:58:12 +0000 (16:58 +0200)
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

148 files changed:
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ArmatureChannel.h
source/gameengine/Converter/BL_ArmatureConstraint.h
source/gameengine/Converter/BL_BlenderDataConversion.h
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/KX_ConvertControllers.cpp
source/gameengine/Converter/KX_ConvertControllers.h
source/gameengine/Converter/KX_ConvertProperties.cpp
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Converter/KX_LibLoadStatus.h
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/Expressions/EXP_BoolValue.h [moved from source/gameengine/Expressions/BoolValue.h with 92% similarity]
source/gameengine/Expressions/EXP_C-Api.cpp [deleted file]
source/gameengine/Expressions/EXP_C-Api.h [deleted file]
source/gameengine/Expressions/EXP_ConstExpr.h [moved from source/gameengine/Expressions/ConstExpr.h with 87% similarity]
source/gameengine/Expressions/EXP_EmptyValue.h [moved from source/gameengine/Expressions/EmptyValue.h with 90% similarity]
source/gameengine/Expressions/EXP_ErrorValue.h [moved from source/gameengine/Expressions/ErrorValue.h with 88% similarity]
source/gameengine/Expressions/EXP_Expression.h [moved from source/gameengine/Expressions/Expression.h with 96% similarity]
source/gameengine/Expressions/EXP_FloatValue.h [moved from source/gameengine/Expressions/FloatValue.h with 91% similarity]
source/gameengine/Expressions/EXP_HashedPtr.h [moved from source/gameengine/Expressions/KX_HashedPtr.h with 90% similarity]
source/gameengine/Expressions/EXP_IdentifierExpr.h [moved from source/gameengine/Expressions/IdentifierExpr.h with 90% similarity]
source/gameengine/Expressions/EXP_IfExpr.h [moved from source/gameengine/Expressions/IfExpr.h with 91% similarity]
source/gameengine/Expressions/EXP_InputParser.h [moved from source/gameengine/Expressions/InputParser.h with 94% similarity]
source/gameengine/Expressions/EXP_IntValue.h [moved from source/gameengine/Expressions/IntValue.h with 92% similarity]
source/gameengine/Expressions/EXP_ListValue.h [moved from source/gameengine/Expressions/ListValue.h with 94% similarity]
source/gameengine/Expressions/EXP_Operator1Expr.h [moved from source/gameengine/Expressions/Operator1Expr.h with 90% similarity]
source/gameengine/Expressions/EXP_Operator2Expr.h [moved from source/gameengine/Expressions/Operator2Expr.h with 89% similarity]
source/gameengine/Expressions/EXP_PyObjectPlus.h [moved from source/gameengine/Expressions/PyObjectPlus.h with 99% similarity]
source/gameengine/Expressions/EXP_Python.h [moved from source/gameengine/Expressions/KX_Python.h with 94% similarity]
source/gameengine/Expressions/EXP_PythonCallBack.h [moved from source/gameengine/Expressions/KX_PythonCallBack.h with 89% similarity]
source/gameengine/Expressions/EXP_StringValue.h [moved from source/gameengine/Expressions/StringValue.h with 91% similarity]
source/gameengine/Expressions/EXP_Value.h [moved from source/gameengine/Expressions/Value.h with 99% similarity]
source/gameengine/Expressions/EXP_VectorValue.h [moved from source/gameengine/Expressions/VectorValue.h with 94% similarity]
source/gameengine/Expressions/EXP_VoidValue.h [moved from source/gameengine/Expressions/VoidValue.h with 94% similarity]
source/gameengine/Expressions/SConscript
source/gameengine/Expressions/intern/BoolValue.cpp [moved from source/gameengine/Expressions/BoolValue.cpp with 97% similarity]
source/gameengine/Expressions/intern/ConstExpr.cpp [moved from source/gameengine/Expressions/ConstExpr.cpp with 95% similarity]
source/gameengine/Expressions/intern/EmptyValue.cpp [moved from source/gameengine/Expressions/EmptyValue.cpp with 92% similarity]
source/gameengine/Expressions/intern/ErrorValue.cpp [moved from source/gameengine/Expressions/ErrorValue.cpp with 98% similarity]
source/gameengine/Expressions/intern/Expression.cpp [moved from source/gameengine/Expressions/Expression.cpp with 96% similarity]
source/gameengine/Expressions/intern/FloatValue.cpp [moved from source/gameengine/Expressions/FloatValue.cpp with 97% similarity]
source/gameengine/Expressions/intern/HashedPtr.cpp [moved from source/gameengine/Expressions/KX_HashedPtr.cpp with 85% similarity]
source/gameengine/Expressions/intern/IdentifierExpr.cpp [moved from source/gameengine/Expressions/IdentifierExpr.cpp with 98% similarity]
source/gameengine/Expressions/intern/IfExpr.cpp [moved from source/gameengine/Expressions/IfExpr.cpp with 95% similarity]
source/gameengine/Expressions/intern/InputParser.cpp [moved from source/gameengine/Expressions/InputParser.cpp with 97% similarity]
source/gameengine/Expressions/intern/IntValue.cpp [moved from source/gameengine/Expressions/IntValue.cpp with 97% similarity]
source/gameengine/Expressions/intern/ListValue.cpp [moved from source/gameengine/Expressions/ListValue.cpp with 99% similarity]
source/gameengine/Expressions/intern/Operator1Expr.cpp [moved from source/gameengine/Expressions/Operator1Expr.cpp with 97% similarity]
source/gameengine/Expressions/intern/Operator2Expr.cpp [moved from source/gameengine/Expressions/Operator2Expr.cpp with 98% similarity]
source/gameengine/Expressions/intern/PyObjectPlus.cpp [moved from source/gameengine/Expressions/PyObjectPlus.cpp with 99% similarity]
source/gameengine/Expressions/intern/PythonCallBack.cpp [moved from source/gameengine/Expressions/KX_PythonCallBack.cpp with 97% similarity]
source/gameengine/Expressions/intern/StringValue.cpp [moved from source/gameengine/Expressions/StringValue.cpp with 96% similarity]
source/gameengine/Expressions/intern/Value.cpp [moved from source/gameengine/Expressions/Value.cpp with 98% similarity]
source/gameengine/Expressions/intern/VectorValue.cpp [moved from source/gameengine/Expressions/VectorValue.cpp with 97% similarity]
source/gameengine/GameLogic/SCA_ANDController.cpp
source/gameengine/GameLogic/SCA_ExpressionController.cpp
source/gameengine/GameLogic/SCA_IController.cpp
source/gameengine/GameLogic/SCA_IController.h
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
source/gameengine/GameLogic/SCA_ILogicBrick.h
source/gameengine/GameLogic/SCA_IObject.cpp
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/GameLogic/SCA_IScene.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardManager.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.h
source/gameengine/GameLogic/SCA_LogicManager.cpp
source/gameengine/GameLogic/SCA_LogicManager.h
source/gameengine/GameLogic/SCA_MouseManager.cpp
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.h
source/gameengine/GameLogic/SCA_NANDController.cpp
source/gameengine/GameLogic/SCA_NORController.cpp
source/gameengine/GameLogic/SCA_ORController.cpp
source/gameengine/GameLogic/SCA_PropertyActuator.cpp
source/gameengine/GameLogic/SCA_PropertySensor.cpp
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_PythonController.h
source/gameengine/GameLogic/SCA_PythonJoystick.h
source/gameengine/GameLogic/SCA_PythonKeyboard.h
source/gameengine/GameLogic/SCA_PythonMouse.h
source/gameengine/GameLogic/SCA_RandomActuator.cpp
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/GameLogic/SCA_RandomSensor.h
source/gameengine/GameLogic/SCA_TimeEventManager.cpp
source/gameengine/GameLogic/SCA_TimeEventManager.h
source/gameengine/GameLogic/SCA_XNORController.cpp
source/gameengine/GameLogic/SCA_XORController.cpp
source/gameengine/Ketsji/BL_Shader.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_Camera.h
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_CharacterWrapper.h
source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
source/gameengine/Ketsji/KX_ConstraintWrapper.h
source/gameengine/Ketsji/KX_FontObject.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_ISceneConverter.h
source/gameengine/Ketsji/KX_IpoActuator.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_NavMeshObject.cpp
source/gameengine/Ketsji/KX_NavMeshObject.h
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
source/gameengine/Ketsji/KX_PyMath.cpp
source/gameengine/Ketsji/KX_PyMath.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_PythonInit.h
source/gameengine/Ketsji/KX_PythonSeq.h
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_TouchSensor.h
source/gameengine/Ketsji/KX_TrackToActuator.cpp
source/gameengine/Ketsji/KX_VehicleWrapper.cpp
source/gameengine/Ketsji/KX_VehicleWrapper.h
source/gameengine/Ketsji/KX_WorldInfo.h
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/VideoTexture/Exception.cpp
source/gameengine/VideoTexture/FilterBase.cpp
source/gameengine/VideoTexture/FilterBase.h
source/gameengine/VideoTexture/FilterBlueScreen.cpp
source/gameengine/VideoTexture/FilterColor.cpp
source/gameengine/VideoTexture/FilterNormal.cpp
source/gameengine/VideoTexture/FilterSource.cpp
source/gameengine/VideoTexture/ImageBase.cpp
source/gameengine/VideoTexture/ImageBase.h
source/gameengine/VideoTexture/ImageBuff.cpp
source/gameengine/VideoTexture/ImageMix.cpp
source/gameengine/VideoTexture/ImageRender.cpp
source/gameengine/VideoTexture/ImageViewport.cpp
source/gameengine/VideoTexture/PyTypeList.cpp
source/gameengine/VideoTexture/PyTypeList.h
source/gameengine/VideoTexture/Texture.cpp
source/gameengine/VideoTexture/Texture.h
source/gameengine/VideoTexture/VideoBase.h
source/gameengine/VideoTexture/blendVideoTex.cpp

index 1a198920919009df9a0486f9dd93185af4405ebe..9b99574b790586464fbb11f393d62740a3f4e062 100644 (file)
@@ -63,7 +63,7 @@
 #include "BL_System.h"
 
 #include "GPU_extensions.h"
-#include "Value.h"
+#include "EXP_Value.h"
 
 
 extern "C" {
index c756d8695e6923d421ad0606a3fe48e1ca7a7c42..d40ba8d11c2784987c57025b9cb739755507377a 100644 (file)
@@ -49,8 +49,8 @@
 #include "MT_Matrix4x4.h"
 
 #include "BKE_action.h"
-#include "FloatValue.h"
-#include "PyObjectPlus.h"
+#include "EXP_FloatValue.h"
+#include "EXP_PyObjectPlus.h"
 #include "KX_PyMath.h"
 
 extern "C" {
index 51114c5df3047ba0cab5f9c95342d54fc3da918e..d349e6e9dae835ba77b6b9975c133e3420e245d1 100644 (file)
@@ -35,7 +35,7 @@
 #include "DNA_action_types.h"
 #include "CTR_HashedPtr.h"
 #include "CTR_Map.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_IObject;
 class KX_GameObject;
index 98c2954baf4155fe9ad0a28b846aa2193fa59737..1d9f7f0d5481a937386554c1e8c6b9c3c2bdb2bb 100644 (file)
@@ -35,7 +35,7 @@
 #include "DNA_constraint_types.h"
 #include "CTR_HashedPtr.h"
 #include "CTR_Map.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_IObject;
 class KX_GameObject;
index 6bd77954b88795f0e8e244996ee20cdd5afac9eb..22210cc6035c22bcf5ef1770a764a34c4d27f192 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "CTR_HashedPtr.h"
 #include "STR_String.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "KX_PhysicsEngineEnums.h"
 #include "SCA_IInputDevice.h"
 
index 67712c683f96f5b110ff5cf593dc73745caf461f..e8f451213f5ee44904347a5e5b032d97123c9965 100644 (file)
@@ -48,8 +48,8 @@
 #include "BLI_math.h"
 #include "MT_Matrix4x4.h"
 
-#include "FloatValue.h"
-#include "PyObjectPlus.h"
+#include "EXP_FloatValue.h"
+#include "EXP_PyObjectPlus.h"
 
 extern "C" {
        #include "BKE_animsys.h"
index 3ae90301553c5986ea640563480b644a05f84276..a40188d197da2c074730a6601e27be154ff7801f 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef __KX_BLENDERSCENECONVERTER_H__
 #define __KX_BLENDERSCENECONVERTER_H__
 
-#include "KX_HashedPtr.h"
+#include "EXP_HashedPtr.h"
 #include "CTR_Map.h"
 #include <stdio.h>
 
index ff4b5a61d129ed67db1c21f370ed43cbabb339f8..10ee228b33fbbbe0df32dbb886d9820ae3b47425 100644 (file)
@@ -75,7 +75,7 @@
 #include "KX_Scene.h"
 #include "KX_KetsjiEngine.h"
 
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "KX_GameObject.h"
 
 /* This little block needed for linking to Blender... */
index 0215b604fdd51dc21b0c090391658534583b7168..e3697087ea9ab8101b88d58f624c2e414f2134b9 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "KX_BlenderSceneConverter.h"
 #include "KX_ConvertControllers.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 
 // Controller
 #include "SCA_ANDController.h"
@@ -48,7 +48,7 @@
 
 #include "SCA_LogicManager.h"
 #include "KX_GameObject.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 
 /* This little block needed for linking to Blender... */
 #ifdef WIN32
index babe3e2e73f4183bc227d91f620859bfe6602543..0ec1c3c09b315e7548ab7d3f9eb2e18722f8e9e8 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef __KX_CONVERTCONTROLLERS_H__
 #define __KX_CONVERTCONTROLLERS_H__
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 
 void BL_ConvertControllers(
        struct Object* blenderobject,
index 3b4ba6886cb6ff887af99789769088ba441c26e0..2cb61207fb5eef863a5a3f749d47721dd86110e7 100644 (file)
 /* end of blender include block */
 
 
-#include "Value.h"
-#include "VectorValue.h"
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "FloatValue.h"
+#include "EXP_Value.h"
+#include "EXP_VectorValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_FloatValue.h"
 #include "KX_GameObject.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "SCA_TimeEventManager.h"
 #include "SCA_IScene.h"
 
index 854ae5b28dc7a36a69acd5355218c96209674225..79fd9cb925497d5608d873afbc765757e4ee4a67 100644 (file)
@@ -79,7 +79,7 @@
 #include "SCA_LogicManager.h"
 #include "KX_BlenderInputDevice.h"
 #include "KX_Scene.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "KX_BlenderKeyboardDevice.h"
 #include "RAS_ICanvas.h"
 #include "PHY_IPhysicsEnvironment.h"
index 3da7329213ba7579fc3f67d79030512d32814b43..bedf4498c9668ee7c6282fcf9107ed180ce75d27 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef __KX_LIBLOADSTATUS_H__
 #define __KX_LIBLOADSTATUS_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class KX_LibLoadStatus : public PyObjectPlus
 {
index f827a9528b4de9e23cb79bf71dfb60bbf98f456a..6ab4d3fdaccb58612743b3a7d3943924c454cd16 100644 (file)
@@ -36,54 +36,52 @@ set(INC_SYS
 )
 
 set(SRC
-       BoolValue.cpp
-       ConstExpr.cpp
-       EXP_C-Api.cpp
-       EmptyValue.cpp
-       ErrorValue.cpp
-       Expression.cpp
-       FloatValue.cpp
-       IdentifierExpr.cpp
-       IfExpr.cpp
-       InputParser.cpp
-       IntValue.cpp
-       KX_HashedPtr.cpp
-       ListValue.cpp
-       Operator1Expr.cpp
-       Operator2Expr.cpp
-       PyObjectPlus.cpp
-       StringValue.cpp
-       Value.cpp
-       VectorValue.cpp
+       intern/BoolValue.cpp
+       intern/ConstExpr.cpp
+       intern/EmptyValue.cpp
+       intern/ErrorValue.cpp
+       intern/Expression.cpp
+       intern/FloatValue.cpp
+       intern/IdentifierExpr.cpp
+       intern/IfExpr.cpp
+       intern/InputParser.cpp
+       intern/IntValue.cpp
+       intern/HashedPtr.cpp
+       intern/ListValue.cpp
+       intern/Operator1Expr.cpp
+       intern/Operator2Expr.cpp
+       intern/PyObjectPlus.cpp
+       intern/StringValue.cpp
+       intern/Value.cpp
+       intern/VectorValue.cpp
 
-       BoolValue.h
-       ConstExpr.h
-       EXP_C-Api.h
-       EmptyValue.h
-       ErrorValue.h
-       Expression.h
-       FloatValue.h
-       IdentifierExpr.h
-       IfExpr.h
-       InputParser.h
-       IntValue.h
-       KX_HashedPtr.h
-       KX_Python.h
-       ListValue.h
-       Operator1Expr.h
-       Operator2Expr.h
-       PyObjectPlus.h
-       StringValue.h
-       Value.h
-       VectorValue.h
-       VoidValue.h
+       EXP_BoolValue.h
+       EXP_ConstExpr.h
+       EXP_EmptyValue.h
+       EXP_ErrorValue.h
+       EXP_Expression.h
+       EXP_FloatValue.h
+       EXP_HashedPtr.h
+       EXP_IdentifierExpr.h
+       EXP_IfExpr.h
+       EXP_InputParser.h
+       EXP_IntValue.h
+       EXP_ListValue.h
+       EXP_Operator1Expr.h
+       EXP_Operator2Expr.h
+       EXP_PyObjectPlus.h
+       EXP_Python.h
+       EXP_StringValue.h
+       EXP_Value.h
+       EXP_VectorValue.h
+       EXP_VoidValue.h
 )
 
 if(WITH_PYTHON)
        list(APPEND SRC
-               KX_PythonCallBack.cpp
+               intern/PythonCallBack.cpp
 
-               KX_PythonCallBack.h
+               EXP_PythonCallBack.h
        )
 endif()
 
similarity index 92%
rename from source/gameengine/Expressions/BoolValue.h
rename to source/gameengine/Expressions/EXP_BoolValue.h
index 161d6112f684cdc94ce2325919b9f31c33aac8e9..98ba1d75e520a0b7ff67a8966bb122e14b47c84b 100644 (file)
  *
  */
 
-/** \file BoolValue.h
+/** \file EXP_BoolValue.h
  *  \ingroup expressions
  */
 
-#ifndef __BOOLVALUE_H__
-#define __BOOLVALUE_H__
+#ifndef __EXP_BOOLVALUE_H__
+#define __EXP_BOOLVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 /**
  *     Smart Boolean Value class.
@@ -62,4 +62,4 @@ private:
 #endif
 };
 
-#endif  /* __BOOLVALUE_H__ */
+#endif  /* __EXP_BOOLVALUE_H__ */
diff --git a/source/gameengine/Expressions/EXP_C-Api.cpp b/source/gameengine/Expressions/EXP_C-Api.cpp
deleted file mode 100644 (file)
index 2822fd8..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file gameengine/Expressions/EXP_C-Api.cpp
- *  \ingroup expressions
- */
-
-#include "EXP_C-Api.h"
-#include "IntValue.h"
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "InputParser.h"
-
-EXP_ValueHandle EXP_CreateInt(int innie)
-{
-       return (EXP_ValueHandle) new CIntValue(innie);
-}
-
-
-
-EXP_ValueHandle EXP_CreateBool(int innie)
-{
-       return (EXP_ValueHandle) new CBoolValue(innie!=0);
-}
-
-
-
-EXP_ValueHandle EXP_CreateString(const char* str)
-{
-       
-       return (EXP_ValueHandle) new CStringValue(str,"");
-}
-
-
-
-void EXP_SetName(EXP_ValueHandle inval,const char* newname)
-{
-       ((CValue*) inval)->SetName(newname);
-}
-
-
-
-/* calculate expression from inputtext */
-EXP_ValueHandle EXP_ParseInput(const char* inputtext)
-{
-       CValue* resultval=NULL;
-       CParser parser;
-       CExpression* expr = parser.ProcessText(inputtext);
-       if (expr)
-       {
-               resultval = expr->Calculate();
-               expr->Release();
-       }
-       else
-       {
-               resultval = new CErrorValue("couldn't parsetext");
-       }
-
-       return (EXP_ValueHandle) resultval;
-}
-
-
-
-void EXP_ReleaseValue(EXP_ValueHandle inval)
-{
-       ((CValue*) inval)->Release();
-}
-
-
-
-int EXP_IsValid(EXP_ValueHandle inval)
-{
-       return !((CValue*) inval)->IsError();
-}
-
-
-
-/* assign property 'propval' to 'destinationval' */
-void EXP_SetProperty(EXP_ValueHandle destinationval,
-                     const char *propname,
-                     EXP_ValueHandle propval)
-{
-       ((CValue*) destinationval)->SetProperty(propname,(CValue*)propval);
-}
-
-
-
-const char* EXP_GetText(EXP_ValueHandle inval)
-{
-       return ((CValue*) inval)->GetText();
-}
-
-
-
-EXP_ValueHandle EXP_GetProperty(EXP_ValueHandle inval,const char* propname)
-{
-       return (EXP_ValueHandle) ((CValue*)inval)->GetProperty(propname);
-}
diff --git a/source/gameengine/Expressions/EXP_C-Api.h b/source/gameengine/Expressions/EXP_C-Api.h
deleted file mode 100644 (file)
index d73b0a2..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file EXP_C-Api.h
- *  \ingroup expressions
- */
-
-#ifndef __EXP_C_API_H__
-#define __EXP_C_API_H__
-
-#define EXP_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
-
-EXP_DECLARE_HANDLE(EXP_ValueHandle);
-EXP_DECLARE_HANDLE(EXP_ExpressionHandle);
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern EXP_ValueHandle         EXP_CreateInt(int innie);
-extern EXP_ValueHandle         EXP_CreateBool(int innie);
-extern EXP_ValueHandle         EXP_CreateString(const char* str);
-extern void                                    EXP_SetName(EXP_ValueHandle,const char* newname);
-
-/* calculate expression from inputtext */
-extern EXP_ValueHandle         EXP_ParseInput(const char* inputtext);
-extern void                                    EXP_ReleaseValue(EXP_ValueHandle);
-extern int                                     EXP_IsValid(EXP_ValueHandle);
-
-/* assign property 'propval' to 'destinationval' */
-extern void                                    EXP_SetProperty(EXP_ValueHandle destinationval, const char *propname, EXP_ValueHandle propval);
-
-/* returns NULL if property doesn't exist */
-extern EXP_ValueHandle         EXP_GetProperty(EXP_ValueHandle inval,const char* propname);
-
-const char*                                    EXP_GetText(EXP_ValueHandle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __EXP_C_API_H__ */
similarity index 87%
rename from source/gameengine/Expressions/ConstExpr.h
rename to source/gameengine/Expressions/EXP_ConstExpr.h
index 768f2bbd10ea4d204912c0bc322fb25cdd79f549..b4456dacdf3abc2a775022d6fa9f390300888c39 100644 (file)
  *
  */
 
-/** \file ConstExpr.h
+/** \file EXP_ConstExpr.h
  *  \ingroup expressions
  */
 
-#ifndef __CONSTEXPR_H__
-#define __CONSTEXPR_H__
+#ifndef __EXP_CONSTEXPR_H__
+#define __EXP_CONSTEXPR_H__
 
-#include "Expression.h"
-#include "Value.h"     // Added by ClassView
+#include "EXP_Expression.h"
+#include "EXP_Value.h" // Added by ClassView
 
 class CConstExpr : public CExpression  
 {
@@ -51,4 +51,4 @@ private:
 #endif
 };
 
-#endif  /* __CONSTEXPR_H__ */
+#endif  /* __EXP_CONSTEXPR_H__ */
similarity index 90%
rename from source/gameengine/Expressions/EmptyValue.h
rename to source/gameengine/Expressions/EXP_EmptyValue.h
index 88ef206f0f0b007a5135ee37e4e804fca2905d67..d23addb9f9fb869e6f06fbc41969907622f36abd 100644 (file)
  *
  */
 
-/** \file EmptyValue.h
+/** \file EXP_EmptyValue.h
  *  \ingroup expressions
  */
 
-#ifndef __EMPTYVALUE_H__
-#define __EMPTYVALUE_H__
+#ifndef __EXP_EMPTYVALUE_H__
+#define __EXP_EMPTYVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CListValue;
 
@@ -46,4 +46,4 @@ public:
 #endif
 };
 
-#endif  /* __EMPTYVALUE_H__ */
+#endif  /* __EXP_EMPTYVALUE_H__ */
similarity index 88%
rename from source/gameengine/Expressions/ErrorValue.h
rename to source/gameengine/Expressions/EXP_ErrorValue.h
index 61c72151f40fef50b595100a253baa917223dfa7..a6f91ca200a579d1adbf24c053f593121aefa4b3 100644 (file)
  *
  */
 
-/** \file ErrorValue.h
+/** \file EXP_ErrorValue.h
  *  \ingroup expressions
  */
 
-#ifndef __ERRORVALUE_H__
-#define __ERRORVALUE_H__
+#ifndef __EXP_ERRORVALUE_H__
+#define __EXP_ERRORVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CErrorValue : public CPropValue  
 {
@@ -44,4 +44,4 @@ private:
 #endif
 };
 
-#endif  /* __ERRORVALUE_H__ */
+#endif  /* __EXP_ERRORVALUE_H__ */
similarity index 96%
rename from source/gameengine/Expressions/Expression.h
rename to source/gameengine/Expressions/EXP_Expression.h
index 9a4f1f932840a171dbe7b339923ec615a7296cc9..66a6e9476ff2405aec80a35ec9b700f152682636 100644 (file)
  *
  */
 
-/** \file Expression.h
+/** \file EXP_Expression.h
  *  \ingroup expressions
  */
 
-#ifndef __EXPRESSION_H__
-#define __EXPRESSION_H__
+#ifndef __EXP_EXPRESSION_H__
+#define __EXP_EXPRESSION_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 //extern int gRefCountExpr; // only for debugging purposes (detect mem.leaks)
 
@@ -146,4 +146,4 @@ protected:
 #endif
 };
 
-#endif  /* __EXPRESSION_H__ */
+#endif  /* __EXP_EXPRESSION_H__ */
similarity index 91%
rename from source/gameengine/Expressions/FloatValue.h
rename to source/gameengine/Expressions/EXP_FloatValue.h
index 379c3e951bc14c0b07c63b5090176a6c822034bd..3c16c57d16dd9706ed12f59c03eaea96218a1ead 100644 (file)
  *
  */
 
-/** \file FloatValue.h
+/** \file EXP_FloatValue.h
  *  \ingroup expressions
  */
 
-#ifndef __FLOATVALUE_H__
-#define __FLOATVALUE_H__
+#ifndef __EXP_FLOATVALUE_H__
+#define __EXP_FLOATVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CFloatValue : public CPropValue 
 {
@@ -55,4 +55,4 @@ protected:
 #endif
 };
 
-#endif  /* __FLOATVALUE_H__ */
+#endif  /* __EXP_FLOATVALUE_H__ */
similarity index 90%
rename from source/gameengine/Expressions/KX_HashedPtr.h
rename to source/gameengine/Expressions/EXP_HashedPtr.h
index acd9d4daafab1ed436e9376fdff6e9bbe075a024..7c7c5f6e5ec8a68f2f8750e966e854a705205f50 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file KX_HashedPtr.h
+/** \file EXP_HashedPtr.h
  *  \ingroup expressions
  */
 
-#ifndef __KX_HASHEDPTR_H__
-#define __KX_HASHEDPTR_H__
+#ifndef __EXP_HASHEDPTR_H__
+#define __EXP_HASHEDPTR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
 #endif
 
-unsigned int                   KX_Hash(void *inDWord);
-
 class CHashedPtr
 {
        void* m_valptr;
@@ -58,4 +56,4 @@ public:
 #endif
 };
 
-#endif  /* __KX_HASHEDPTR_H__ */
+#endif  /* __EXP_HASHEDPTR_H__ */
similarity index 90%
rename from source/gameengine/Expressions/IdentifierExpr.h
rename to source/gameengine/Expressions/EXP_IdentifierExpr.h
index 26eb3691378d97e2c7e03715ec541e0192f792d2..96ef3677cf36425a727a7f8a42e71c19c90eca05 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file IdentifierExpr.h
+/** \file EXP_IdentifierExpr.h
  *  \ingroup expressions
  */
 
-#ifndef __IDENTIFIEREXPR_H__
-#define __IDENTIFIEREXPR_H__
+#ifndef __EXP_IDENTIFIEREXPR_H__
+#define __EXP_IDENTIFIEREXPR_H__
 
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 class CIdentifierExpr : public CExpression
 {
@@ -56,4 +56,4 @@ public:
 #endif
 };
 
-#endif  /* __IDENTIFIEREXPR_H__ */
+#endif  /* __EXP_IDENTIFIEREXPR_H__ */
similarity index 91%
rename from source/gameengine/Expressions/IfExpr.h
rename to source/gameengine/Expressions/EXP_IfExpr.h
index 80e35471d82a7564d13b2ce1afa43c1cab12b9d6..43b4b8faf5339fe8fb7a29a9931c251304161bf8 100644 (file)
  *
  */
 
-/** \file IfExpr.h
+/** \file EXP_IfExpr.h
  *  \ingroup expressions
  */
 
-#ifndef __IFEXPR_H__
-#define __IFEXPR_H__
+#ifndef __EXP_IFEXPR_H__
+#define __EXP_IFEXPR_H__
 
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 class CIfExpr : public CExpression  
 {
@@ -51,4 +51,4 @@ public:
 #endif
 };
 
-#endif  /* __IFEXPR_H__ */
+#endif  /* __EXP_IFEXPR_H__ */
similarity index 94%
rename from source/gameengine/Expressions/InputParser.h
rename to source/gameengine/Expressions/EXP_InputParser.h
index 50bb1ae2f6e318aa0732adebff20fa0ba175a3b4..80471009a16351e9e20b2dafb2271488b7f5abd9 100644 (file)
  *
  */
 
-/** \file InputParser.h
+/** \file EXP_InputParser.h
  *  \ingroup expressions
  */
 
-#ifndef __INPUTPARSER_H__
-#define __INPUTPARSER_H__
+#ifndef __EXP_INPUTPARSER_H__
+#define __EXP_INPUTPARSER_H__
 
 class CParser;
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 
 class CParser
@@ -114,5 +114,5 @@ private:
 #endif
 };
 
-#endif
+#endif /* __EXP_INPUTPARSER_H__ */
 
similarity index 92%
rename from source/gameengine/Expressions/IntValue.h
rename to source/gameengine/Expressions/EXP_IntValue.h
index 6da975f4f7faccca8ab68485696322f821ac4e6e..a1cd96a888e29d5bc85ab0bede4287079fca8465 100644 (file)
  *
  */
 
-/** \file IntValue.h
+/** \file EXP_IntValue.h
  *  \ingroup expressions
  */
 
-#ifndef __INTVALUE_H__
-#define __INTVALUE_H__
+#ifndef __EXP_INTVALUE_H__
+#define __EXP_INTVALUE_H__
 
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 typedef long long cInt; 
 
@@ -70,4 +70,4 @@ private:
 #endif
 };
 
-#endif  /* __INTVALUE_H__ */
+#endif  /* __EXP_INTVALUE_H__ */
similarity index 94%
rename from source/gameengine/Expressions/ListValue.h
rename to source/gameengine/Expressions/EXP_ListValue.h
index bb188179836d62de07aa412179c1f7daa1dee298..f5421066f628e997f2578e61b5fbb0e2a9694774 100644 (file)
  *
  */
 
-/** \file ListValue.h
+/** \file EXP_ListValue.h
  *  \ingroup expressions
  */
 
-#ifndef __LISTVALUE_H__
-#define __LISTVALUE_H__
+#ifndef __EXP_LISTVALUE_H__
+#define __EXP_LISTVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CListValue : public CPropValue  
 {
@@ -88,5 +88,5 @@ private:
        bool    m_bReleaseContents;
 };
 
-#endif  /* __LISTVALUE_H__ */
+#endif  /* __EXP_LISTVALUE_H__ */
 
similarity index 90%
rename from source/gameengine/Expressions/Operator1Expr.h
rename to source/gameengine/Expressions/EXP_Operator1Expr.h
index 3dd76f773f272344ebce97939adaeebd1299b745..9a05ce9c0c4250dab756426b5b30b759c8452f87 100644 (file)
  *
  */
 
-/** \file Operator1Expr.h
+/** \file EXP_Operator1Expr.h
  *  \ingroup expressions
  */
 
-#ifndef __OPERATOR1EXPR_H__
-#define __OPERATOR1EXPR_H__
+#ifndef __EXP_OPERATOR1EXPR_H__
+#define __EXP_OPERATOR1EXPR_H__
 
-#include "Expression.h"
+#include "EXP_Expression.h"
 
 class COperator1Expr : public CExpression  
 {
@@ -56,4 +56,4 @@ private:
 #endif
 };
 
-#endif  /* __OPERATOR1EXPR_H__ */
+#endif  /* __EXP_OPERATOR1EXPR_H__ */
similarity index 89%
rename from source/gameengine/Expressions/Operator2Expr.h
rename to source/gameengine/Expressions/EXP_Operator2Expr.h
index 8c30b7cd634b02664080908f3d0890bd78b2275a..cd7a492fde073f031b15f452c6249e20098e718d 100644 (file)
  *
  */
 
-/** \file Operator2Expr.h
+/** \file EXP_Operator2Expr.h
  *  \ingroup expressions
  */
 
-#ifndef __OPERATOR2EXPR_H__
-#define __OPERATOR2EXPR_H__
+#ifndef __EXP_OPERATOR2EXPR_H__
+#define __EXP_OPERATOR2EXPR_H__
 
 
-#include "Expression.h"
-#include "Value.h"     // Added by ClassView
+#include "EXP_Expression.h"
+#include "EXP_Value.h" // Added by ClassView
 
 class COperator2Expr : public CExpression  
 {
@@ -62,5 +62,5 @@ private:
 #endif
 };
 
-#endif  /* __OPERATOR2EXPR_H__ */
+#endif  /* __EXP_OPERATOR2EXPR_H__ */
 
similarity index 99%
rename from source/gameengine/Expressions/PyObjectPlus.h
rename to source/gameengine/Expressions/EXP_PyObjectPlus.h
index c3ce98ed27a584bfcbed4ef200104fbe42d70381..dd612a08494f95f19a964d4e64c1e6d23267f7b7 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file PyObjectPlus.h
+/** \file EXP_PyObjectPlus.h
  *  \ingroup expressions
  */
 
-#ifndef __PYOBJECTPLUS_H__
-#define __PYOBJECTPLUS_H__
+#ifndef __EXP_PYOBJECTPLUS_H__
+#define __EXP_PYOBJECTPLUS_H__
 
 /* for now keep weakrefs optional */
 #define USE_WEAKREFS
@@ -40,7 +40,7 @@
 #error Must be compiled with C++
 #endif
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "STR_String.h"
 #include "MT_Vector3.h"
 #include "SG_QList.h"
@@ -645,5 +645,4 @@ inline PyObject *_bge_proxy_from_ref_borrow(void *self_v)
 
 #endif
 
-
-#endif  /* __PYOBJECTPLUS_H__ */
+#endif  /* __EXP_PYOBJECTPLUS_H__ */
similarity index 94%
rename from source/gameengine/Expressions/KX_Python.h
rename to source/gameengine/Expressions/EXP_Python.h
index 62dd9a13dd48f1fa612bad9f2aa3bb70a950962d..f904151085ea3661645c14d459fe06cd12b39b79 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file KX_Python.h
+/** \file EXP_Python.h
  *  \ingroup expressions
  */
 
-#ifndef __KX_PYTHON_H__
-#define __KX_PYTHON_H__
+#ifndef __EXP_PYTHON_H__
+#define __EXP_PYTHON_H__
 
 //#define USE_DL_EXPORT
 
@@ -79,4 +79,4 @@
 #undef toupper
 #endif
 
-#endif  /* __KX_PYTHON_H__ */
+#endif  /* __EXP_PYTHON_H__ */
similarity index 89%
rename from source/gameengine/Expressions/KX_PythonCallBack.h
rename to source/gameengine/Expressions/EXP_PythonCallBack.h
index 2ff6e305d673558438e3febdd905718c89587ace..f0cbcac0c6fa169f7792388dfae96fc1983bebdc 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file KX_PythonCallBack.h
+/** \file EXP_PythonCallBack.h
  *  \ingroup expressions
  */
 
-#ifndef __KX_PYTHON_CALLBACK_H__
-#define __KX_PYTHON_CALLBACK_H__
+#ifndef __EXP_PYTHON_CALLBACK_H__
+#define __EXP_PYTHON_CALLBACK_H__
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 
 /** Execute each functions with at least one argument
  * \param functionlist The python list which contains callbacks.
@@ -37,4 +37,4 @@
  */
 void RunPythonCallBackList(PyObject *functionlist, PyObject **arglist, unsigned int minargcount, unsigned int maxargcount);
 
-#endif // __KX_PYTHON_CALLBACK_H__
+#endif // __EXP_PYTHON_CALLBACK_H__
similarity index 91%
rename from source/gameengine/Expressions/StringValue.h
rename to source/gameengine/Expressions/EXP_StringValue.h
index cb60600ad88cb1d34c921f9ecac4324cb705c60c..ca59ebf1f8221ddbaac6d4d5def9e5b5af51194f 100644 (file)
  *
  */
 
-/** \file StringValue.h
+/** \file EXP_StringValue.h
  *  \ingroup expressions
  */
 
-#ifndef __STRINGVALUE_H__
-#define __STRINGVALUE_H__
+#ifndef __EXP_STRINGVALUE_H__
+#define __EXP_STRINGVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 class CStringValue : public CPropValue  
 {
@@ -58,4 +58,4 @@ private:
 #endif
 };
 
-#endif  /* __STRINGVALUE_H__ */
+#endif  /* __EXP_STRINGVALUE_H__ */
similarity index 99%
rename from source/gameengine/Expressions/Value.h
rename to source/gameengine/Expressions/EXP_Value.h
index c7e9a40a05949097175b4f589e937d69168c03c3..014fc59405f192c03fd2be53f19ed9fe0b6d2cc4 100644 (file)
  *
  */
 
-/** \file Value.h
+/** \file EXP_Value.h
  *  \ingroup expressions
  */
 
-#ifndef __VALUE_H__
-#define __VALUE_H__
+#ifndef __EXP_VALUE_H__
+#define __EXP_VALUE_H__
 
 #ifdef _MSC_VER
 #  pragma warning (disable:4786)
@@ -159,7 +159,7 @@ public:
 };
 
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #ifdef WITH_PYTHON
 #include "object.h"
 #endif
@@ -429,4 +429,4 @@ protected:
 #endif
 };
 
-#endif  /* __VALUE_H__ */
+#endif  /* __EXP_VALUE_H__ */
similarity index 94%
rename from source/gameengine/Expressions/VectorValue.h
rename to source/gameengine/Expressions/EXP_VectorValue.h
index 717fa68f6dc92dab43f8f61452e1dae5d0085c9d..d87d5097156c5c34a7f54d37f880236e9a041c2a 100644 (file)
  *
  */
 
-/** \file VectorValue.h
+/** \file EXP_VectorValue.h
  *  \ingroup expressions
  */
 
-#ifndef __VECTORVALUE_H__
-#define __VECTORVALUE_H__
+#ifndef __EXP_VECTORVALUE_H__
+#define __EXP_VECTORVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 #define KX_X 0
 #define KX_Y 1
@@ -91,4 +91,4 @@ protected:
 #endif
 };
 
-#endif  /* __VECTORVALUE_H__ */
+#endif  /* __EXP_VECTORVALUE_H__ */
similarity index 94%
rename from source/gameengine/Expressions/VoidValue.h
rename to source/gameengine/Expressions/EXP_VoidValue.h
index 4f74910dd8a88eef50d675be1f7433d6d03d3874..8b2c29488d79a1f6f14023f18213653b23d96e48 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file VoidValue.h
+/** \file EXP_VoidValue.h
  *  \ingroup expressions
  */
 
-#ifndef __VOIDVALUE_H__
-#define __VOIDVALUE_H__
+#ifndef __EXP_VOIDVALUE_H__
+#define __EXP_VOIDVALUE_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 //
 // Void value, used to transport *any* type of data
@@ -78,4 +78,4 @@ public:
 #endif
 };
 
-#endif  /* __VOIDVALUE_H__ */
+#endif  /* __EXP_VOIDVALUE_H__ */
index 48102e5ba3c3761c9f6463c70044b14e81561b86..b66d36c20800859059536f3d95d538558599e1fc 100644 (file)
@@ -27,7 +27,7 @@
 
 Import ('env')
 
-sources = env.Glob('*.cpp')
+sources = env.Glob('intern/*.cpp')
 
 incs = [
     '.',
similarity index 97%
rename from source/gameengine/Expressions/BoolValue.cpp
rename to source/gameengine/Expressions/intern/BoolValue.cpp
index 9ff53395056e3b2a6629a140d067d90672e2bcfb..1523a9212ba457a7243d44d2c1aa5414742a24f2 100644 (file)
  *
  */
 
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "VoidValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 95%
rename from source/gameengine/Expressions/ConstExpr.cpp
rename to source/gameengine/Expressions/intern/ConstExpr.cpp
index c41cf5a54f5f5758a9786b6a10e0b1b4ecad9dee..597427ecfe5fdb3c7e27bb5ff91b8deae0b87721 100644 (file)
@@ -16,9 +16,9 @@
  *
  */
 
-#include "Value.h" // for precompiled header
-#include "ConstExpr.h"
-#include "VectorValue.h"
+#include "EXP_Value.h" // for precompiled header
+#include "EXP_ConstExpr.h"
+#include "EXP_VectorValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 92%
rename from source/gameengine/Expressions/EmptyValue.cpp
rename to source/gameengine/Expressions/intern/EmptyValue.cpp
index f8e72181ed723a87ee104854311204c85fac5794..9227626777dc6775c23a479740c247bde5791f9d 100644 (file)
  *
  */
 
-#include "EmptyValue.h"
-#include "IntValue.h"
-#include "FloatValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "ListValue.h"
-#include "VoidValue.h"
+#include "EXP_EmptyValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_ListValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 98%
rename from source/gameengine/Expressions/ErrorValue.cpp
rename to source/gameengine/Expressions/intern/ErrorValue.cpp
index 46e09b9073f2b04e44d91d3b589fb9d0c6c8a6bd..c03ceb88073e3a2e4fa0c4b90bb009138653c05f 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-#include "ErrorValue.h"
+#include "EXP_ErrorValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 96%
rename from source/gameengine/Expressions/Expression.cpp
rename to source/gameengine/Expressions/intern/Expression.cpp
index 2428df977d36fe243359afb16971b5c59853e31d..6a98a15aa12a70d88f310e79748c173401959ae2 100644 (file)
@@ -15,8 +15,8 @@
  *
  */
 
-#include "Expression.h"
-#include "ErrorValue.h"
+#include "EXP_Expression.h"
+#include "EXP_ErrorValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 97%
rename from source/gameengine/Expressions/FloatValue.cpp
rename to source/gameengine/Expressions/intern/FloatValue.cpp
index 4d6f3f467eb382f33665b52776bf2f6b256d0496..0f86a429d8105a46724fc9f8692c68712b03f607 100644 (file)
  *
  */
 
-#include "FloatValue.h"
-#include "IntValue.h"
-#include "StringValue.h"
-#include "BoolValue.h"
-#include "ErrorValue.h"
-#include "VoidValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 85%
rename from source/gameengine/Expressions/KX_HashedPtr.cpp
rename to source/gameengine/Expressions/intern/HashedPtr.cpp
index bd42892cc8d90226ace304e0a30a35034aff240e..005ac16b231f9034cb5e33247a60c08fe229197d 100644 (file)
  */
 
 
-#include "KX_HashedPtr.h"
+#include "EXP_HashedPtr.h"
 
-unsigned int KX_Hash(void *inDWord)
+
+CHashedPtr::CHashedPtr(void* val) : m_valptr(val)
+{
+}
+
+
+unsigned int CHashedPtr::hash() const
 {
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
-       unsigned __int64 key = (unsigned __int64)inDWord;
+       unsigned __int64 key = (unsigned __int64)m_valptr;
 #elif defined(FREE_WINDOWS64)
-       unsigned long long key = (unsigned long long)inDWord;
+       unsigned long long key = (unsigned long long)m_valptr;
 #else
-       unsigned long key = (unsigned long)inDWord;
+       unsigned long key = (unsigned long)m_valptr;
 #endif
 
        key += ~(key << 16);
@@ -51,15 +57,3 @@ unsigned int KX_Hash(void *inDWord)
 
        return (unsigned int)(key & 0xffffffff);
 }
-
-
-CHashedPtr::CHashedPtr(void* val) : m_valptr(val)
-{
-}
-
-
-
-unsigned int CHashedPtr::hash() const
-{
-       return KX_Hash(m_valptr);
-}
similarity index 98%
rename from source/gameengine/Expressions/IdentifierExpr.cpp
rename to source/gameengine/Expressions/intern/IdentifierExpr.cpp
index c9e053574cd977887647983b2e8909519189d58a..8fbbf41cd63e3fdf0eb69ea686f29e5a92dd4718 100644 (file)
@@ -30,7 +30,7 @@
  */
 
 
-#include "IdentifierExpr.h"
+#include "EXP_IdentifierExpr.h"
 
 CIdentifierExpr::CIdentifierExpr(const STR_String& identifier,CValue* id_context)
 :m_identifier(identifier)
similarity index 95%
rename from source/gameengine/Expressions/IfExpr.cpp
rename to source/gameengine/Expressions/intern/IfExpr.cpp
index 152ca8704ce7b11d814cf759f4376686b8d098fc..b4e2fe7315bbac1fd57b534e14c311ea155d3394 100644 (file)
  *
  */
 
-#include "IfExpr.h"
-#include "EmptyValue.h"
-#include "ErrorValue.h"
-#include "BoolValue.h"
+#include "EXP_IfExpr.h"
+#include "EXP_EmptyValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_BoolValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 97%
rename from source/gameengine/Expressions/InputParser.cpp
rename to source/gameengine/Expressions/intern/InputParser.cpp
index 4ba3585455b16957bb9084da2d4aa33c6644529b..e8cc7fba284e7f2b180794a75beb18ae93802a99 100644 (file)
 
 #include "MT_assert.h"
 
-#include "Value.h"
-#include "InputParser.h"
-#include "ErrorValue.h"
-#include "IntValue.h"
-#include "StringValue.h"
-#include "FloatValue.h"
-#include "BoolValue.h"
-#include "EmptyValue.h"
-#include "ConstExpr.h"
-#include "Operator2Expr.h"
-#include "Operator1Expr.h"
-#include "IdentifierExpr.h"
+#include "EXP_Value.h"
+#include "EXP_InputParser.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_EmptyValue.h"
+#include "EXP_ConstExpr.h"
+#include "EXP_Operator2Expr.h"
+#include "EXP_Operator1Expr.h"
+#include "EXP_IdentifierExpr.h"
 
 // this is disable at the moment, I expected a memleak from it, but the error-cleanup was the reason
 // well, looks we don't need it anyway, until maybe the Curved Surfaces are integrated into CSG 
 // cool things like (IF(LOD==1,CCurvedValue,IF(LOD==2,CCurvedValue2)) etc...
-#include "IfExpr.h" 
+#include "EXP_IfExpr.h"
 
 #if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS)
 #define strcasecmp     _stricmp
similarity index 97%
rename from source/gameengine/Expressions/IntValue.cpp
rename to source/gameengine/Expressions/intern/IntValue.cpp
index 82d2e94dbb07e4debad277af3e84cc4a7e1ecfe8..25aff5b32abd32bb077b8a27d9a8a7a49c1851fe 100644 (file)
 
 #include <stdio.h>
 
-#include "IntValue.h"
-#include "ErrorValue.h"
-#include "FloatValue.h"
-#include "BoolValue.h"
-#include "StringValue.h"
-#include "VoidValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 99%
rename from source/gameengine/Expressions/ListValue.cpp
rename to source/gameengine/Expressions/intern/ListValue.cpp
index 58e571042d803a0302de0b5545c68b1011f6f862..557ce7be3000362d70d89f930f5b8deb55f54a3d 100644 (file)
 
 #include <stdio.h>
 
-#include "ListValue.h"
-#include "StringValue.h"
-#include "VoidValue.h"
+#include "EXP_ListValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_VoidValue.h"
 #include <algorithm>
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 
similarity index 97%
rename from source/gameengine/Expressions/Operator1Expr.cpp
rename to source/gameengine/Expressions/intern/Operator1Expr.cpp
index b985f76825dd9f3464272826c107caf9fc1de974..add0376f4879ae1ae60925d089f8917ecf03e2c1 100644 (file)
@@ -15,8 +15,8 @@
  *
  */
 
-#include "Operator1Expr.h"
-#include "EmptyValue.h"
+#include "EXP_Operator1Expr.h"
+#include "EXP_EmptyValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 98%
rename from source/gameengine/Expressions/Operator2Expr.cpp
rename to source/gameengine/Expressions/intern/Operator2Expr.cpp
index b03d00e7f777492146ff7e59e1315fea34d4000d..0a7f30b8cc81d09d04e607dd7837c44b5ec30e11 100644 (file)
@@ -19,9 +19,9 @@
 // have to do the trick
 // when expression is cached, there will be a call to UpdateCalc() instead of Calc()
 
-#include "Operator2Expr.h"
-#include "StringValue.h"
-#include "VoidValue.h"
+#include "EXP_Operator2Expr.h"
+#include "EXP_StringValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 99%
rename from source/gameengine/Expressions/PyObjectPlus.cpp
rename to source/gameengine/Expressions/intern/PyObjectPlus.cpp
index 31a17bd0cbf348b7c1228fe8b2ab71191262fdbf..3df175668ada1750072d5fc60253b8b61966f090 100644 (file)
@@ -47,7 +47,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "STR_String.h"
 #include "MT_Vector3.h"
 #include "MEM_guardedalloc.h"
similarity index 97%
rename from source/gameengine/Expressions/KX_PythonCallBack.cpp
rename to source/gameengine/Expressions/intern/PythonCallBack.cpp
index fbc250a1b3d35e27084740b7d7887303e6fee508..3fb84569eca1e3691efb1b7ea05011409a435d1c 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file gameengine/Expressions/KX_PythonCallBack.cpp
+/** \file gameengine/Expressions/intern/PythonCallBack.cpp
  *  \ingroup expressions
  */
 
-#include "KX_PythonCallBack.h"
+#include "EXP_PythonCallBack.h"
 #include <iostream>
 #include <stdarg.h>
 
similarity index 96%
rename from source/gameengine/Expressions/StringValue.cpp
rename to source/gameengine/Expressions/intern/StringValue.cpp
index 098949c9d7b8a05c115d297f4aa8cb34103f7f55..ddf61dc441c59432a3cf2e9fcc65e36f7bf82bab 100644 (file)
  *
  */
 
-#include "StringValue.h"
-#include "BoolValue.h"
-#include "ErrorValue.h"
-#include "VoidValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_VoidValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 98%
rename from source/gameengine/Expressions/Value.cpp
rename to source/gameengine/Expressions/intern/Value.cpp
index 286db016476305dc002a845c6d1a7f077c2132f5..f8796a76e76df0daad002cf732dab10f003788f3 100644 (file)
  * purpose.  It is provided "as is" without express or implied warranty.
  *
  */
-#include "Value.h"
-#include "BoolValue.h"
-#include "FloatValue.h"
-#include "IntValue.h"
-#include "VectorValue.h"
-#include "VoidValue.h"
-#include "StringValue.h"
-#include "ErrorValue.h"
-#include "ListValue.h"
+#include "EXP_Value.h"
+#include "EXP_BoolValue.h"
+#include "EXP_FloatValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_VectorValue.h"
+#include "EXP_VoidValue.h"
+#include "EXP_StringValue.h"
+#include "EXP_ErrorValue.h"
+#include "EXP_ListValue.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
similarity index 97%
rename from source/gameengine/Expressions/VectorValue.cpp
rename to source/gameengine/Expressions/intern/VectorValue.cpp
index 6931ba2aa76497322da68e04a948c03b429c264f..a3d441163173bb5ca6acf7c78706b7e8155fdb34 100644 (file)
 #  pragma warning (disable:4786)
 #endif
 
-#include "Value.h"
-#include "VectorValue.h"
-#include "ErrorValue.h"
+#include "EXP_Value.h"
+#include "EXP_VectorValue.h"
+#include "EXP_ErrorValue.h"
 //#include "MatrixValue.h"
-#include "VoidValue.h"
-#include "StringValue.h"
+#include "EXP_VoidValue.h"
+#include "EXP_StringValue.h"
 //#include "FactoryManager.h"
 
 
index 3c60f2b88475732a42952494fc99a9d7b4d006d5..2cb7406779cd120c1def57a914a441d631b9d5de 100644 (file)
@@ -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                                                          */
index d1c7b58a52c469d8c609669b651976dddda87c21..ef058e215d633095879e2d0621a9965da09c307a 100644 (file)
@@ -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>
index f922e617367af3ee1ad77caee5b2297fa8578ac2..2bb04fe7be00024d509e3eb057efcaf4fd6b8520 100644 (file)
@@ -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>
index 1bc6b60bf1e653963a3712e1958ace94a908229a..4ec872c23166f3f8deb73d68b27d35243d7bde6e 100644 (file)
@@ -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
index 34fa1c98a73106439a14f1a3ec81184a2580d11c..72a0b392447f159f103f2f6967459fa4ec6aeb17 100644 (file)
@@ -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;
 
index dc0aa4ce33126c3d76a40f51f55cdad2d08e70dd..a37257892276654caf286d88aaa2873620a0fbff 100644 (file)
@@ -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"
 
index ab9e27810018b6816ffd9d04173b941d0ae4c198..526e695e79227b24b130be4c438441a2afbf317f 100644 (file)
@@ -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;
index 21e2c1cbcfc32160c4b86cf39c0cf054bed224ad..29a21fd87080d8bfe46fa5b1ce4ec5ce1a2a7407 100644 (file)
@@ -34,7 +34,7 @@
 #ifndef __SCA_IOBJECT_H__
 #define __SCA_IOBJECT_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 #include <vector>
 
 class SCA_IObject;
index b6ce1d86ba72c6a66c957c439df0cae2908e5818..a4c905096d7352e02b076c27e1c704ce85db925c 100644 (file)
@@ -31,7 +31,7 @@
 
 
 #include "SCA_IScene.h"
-#include "Value.h"
+#include "EXP_Value.h"
 
 SCA_DebugProp::SCA_DebugProp(): m_obj(NULL)
 {
index e20dd8bcd742493fc26e4c6ecd0f4c967f6c735f..56df9692e72e12a4226aa2bfdfb0a8666237e3b7 100644 (file)
@@ -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>
index edf1f300fba709e4891bc1022c259da7ba3dbac3..778ba9e9a2c5f174b0f4e7f9a8947ce773b5db7b 100644 (file)
  */
 
 
-#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,
index e5d717e0140f7db73e7a46daea20ac60226e6a0a..414a685d358b828be02722eb8b6bf793d97fc094 100644 (file)
@@ -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" {
index c9d55280fb76bba74c735934f77cd2ae717f7f40..51d7756bd1f81c22fae144894e0b216046f141f8 100644 (file)
@@ -34,7 +34,7 @@
 #define __SCA_KEYBOARDSENSOR_H__
 
 #include "SCA_ISensor.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 #include <list>
 
 /**
index adf57dec278c7744ecc143f95a90adc77d47c3e0..978f6d6b8365dc8b2036eae9aae01f7bcf088153 100644 (file)
@@ -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"
index 1275a7c5085c362663932bd949b8d1875ab2d01b..7319bb537dde850a9c7691938ccfcc1bafcba8c3 100644 (file)
 
 #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;
index 6d05b862c2d913f18807401ae2ef281a3ac148a9..51c03d1e350a084d8896cdbdeaaf55381fb380b9 100644 (file)
 #  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"
 
 
index a7cf4963f04dc61ff1a9ab93d1267b5684490695..2479e859dea5853ea2f83226f33616e43058db3d 100644 (file)
@@ -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>
 
 /* ------------------------------------------------------------------------- */
index 8d05a54868106862a43bd07a3007ccb9c5a00662..2660aaeacb5198710c4b5f0cc6496b1409cc60c0 100644 (file)
@@ -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
index c78ce77f9fb8c362de805cb5eb7f8003c686b26b..6a00c110e2b9c936bec14a4184db8e17a8480eb4 100644 (file)
@@ -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                                                          */
index e7fb6437febdbd201a95a17106227cadb49aa05c..fb09617e060938ec57eaa262b7fa4ba8594dae1e 100644 (file)
@@ -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                                                          */
index b147f8e6bf61ee435bf013ceb2df41fb0c605464..8a59bdf1b89dbde3f21238f0c0580c6fcbe8b7c7 100644 (file)
@@ -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                                                          */
index ea1b2a2bce323ac81a5c746b3298b89a31bc9dba..f2907ca6361a03df330e99cb9c7107368afb5cc4 100644 (file)
@@ -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                                                          */
index 6841d2a8ea1e51a940599f567d1a6fcbe5a1dfbc..82f3bee86b2ab85929242cd103a543f276d954cf 100644 (file)
 
 #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,
index 8c3ce38276ebc11eb41e58127317421f2c1ce642..0c7bc9fa93e63026434466612dc73d4b0d45e136 100644 (file)
@@ -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"
index d2549318c2eec1b430d2a034a4fb783e34c59571..11241da9117cf4246bf3de990d47b483a97634ca 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "SCA_IController.h"
 #include "SCA_LogicManager.h"
-#include "BoolValue.h"
+#include "EXP_BoolValue.h"
 
 #include <vector>
 
index 15c6285aed5323dc29a5f0b97b8c6760cbdeec22..ecde00d28b901e089a61d63b1242b695c6e3e82a 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef __SCA_PYTHONJOYSTICK_H__
 #define __SCA_PYTHONJOYSTICK_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_PythonJoystick : public PyObjectPlus
 {
index 53068f38e6aa351d6cfa8bc8d8470a1552b38358..3cbe250378c88bb9aaac0d26e3a69c8909ea3a88 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef __SCA_PYTHONKEYBOARD_H__
 #define __SCA_PYTHONKEYBOARD_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_PythonKeyboard : public PyObjectPlus
 {
index bc6e65f07a8a9398d77959eba3bebbdb90be5947..6dde90b3482061da4492a935bbabe20dc28a020c 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef __SCA_PYTHONMOUSE_H__
 #define __SCA_PYTHONMOUSE_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 class SCA_PythonMouse : public PyObjectPlus
 {
index db6b4a634238d960351ebbcc0e974263fb72d627..8d75be9089d19f9c92bac607b46726e12e5d8d80 100644 (file)
@@ -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"
index 2fe4d18a7fc04e041647792af8b5d572eae2e858..8f2dc8d80f5d6ed2d6054df9a69196ff4bf2789a 100644 (file)
@@ -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>
 
 /* ------------------------------------------------------------------------- */
index 628562b77e6c4fca7b948f96e852914bd99341db..66107b7b74b0b8afb4010a7fed3211bffe788273 100644 (file)
@@ -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
index 5aa6fdc8625399fdc4cc5f3feffaefac44cdd665..c56a14968230e2b20c465513f0428a7902e84734 100644 (file)
@@ -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)
index 4c929dca23c2b43ad6104f885796b0e2ba7d59a7..38d7e3fc4d4fc6b95c70e030d0924e5285c9d8c3 100644 (file)
@@ -33,7 +33,7 @@
 #define __SCA_TIMEEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
-#include "Value.h"
+#include "EXP_Value.h"
 #include <vector>
 
 using namespace std;
index 2cfc32a6d40f8514ed07e709bd1409697d785525..f97d11cabf32574d609ce39a07f34baae9c9c980 100644 (file)
@@ -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                                                          */
index eaa1825e5b673b08a4282098346cc954eaf5dda4..bb1ea822bd8dbb37fbc56dbf6f576b58a75aeead 100644 (file)
@@ -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                                                          */
index 4c671d0c9a3540694890a6bca9924400351b9b37..e3dc4b19773856117e8ebe416b057e9bdaa8805b 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __BL_SHADER_H__
 #define __BL_SHADER_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "BL_Material.h"
 #include "BL_Texture.h"
 // --
index 6260596159d64124b4e36cb9ad14664f706de8ae..1fadd9382e00612f1262b69158aa179c345f4ad4 100644 (file)
@@ -39,9 +39,9 @@
 #include "NG_NetworkScene.h"
 #include "NG_NetworkObject.h"
 #include "SCA_IObject.h"
-#include "InputParser.h"
-#include "ListValue.h"
-#include "StringValue.h"
+#include "EXP_InputParser.h"
+#include "EXP_ListValue.h"
+#include "EXP_StringValue.h"
 
 #ifdef NAN_NET_DEBUG
   #include <iostream>
index 0448236b10c4ce9f75656e41a9c7b81bd38aac65..9364abb8eed659631bc60632eb2a73acefa2fccd 100644 (file)
@@ -15,7 +15,7 @@
 #include "BL_Shader.h"
 #include "BL_BlenderShader.h"
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "MT_Vector3.h"
 #include "MT_Vector4.h"
index 3b69d4005cdc62633e8b444f4984d5b760433421..644c71a68e4e0498a7a94cabd12160b50a8d642f 100644 (file)
@@ -35,7 +35,7 @@
 #include "KX_Camera.h"
 #include "KX_Scene.h"
 #include "KX_PythonInit.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "KX_PyMath.h"
 
 #include "RAS_ICanvas.h"
index 991d8813a002357f5da030b8040f8ecb13c28414..8addf0b7aedee148cdbdc4732cf8633c7cbd93cc 100644 (file)
@@ -40,7 +40,7 @@
 #include "MT_Vector3.h"
 #include "MT_Point3.h"
 #include "KX_GameObject.h"
-#include "IntValue.h"
+#include "EXP_IntValue.h"
 #include "RAS_CameraData.h"
 
 #ifdef WITH_PYTHON
index 3d1802bb2a6f5376c2af378684f46db0847fb5ba..f065e3f0001c7ad8a064b8d64846938ffa2fd0fc 100644 (file)
@@ -40,7 +40,7 @@
 #include <float.h>
 #include "KX_GameObject.h"
 
-#include "PyObjectPlus.h" 
+#include "EXP_PyObjectPlus.h" 
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
index d4d8f195102f3c0f8a16129540a174790819b80f..dd7ba680ec7ed899065521e635abb1f1e2f11a75 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __KX_CHARACTERWRAPPER_H__
 #define __KX_CHARACTERWRAPPER_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 #include "PHY_DynamicTypes.h"
 class PHY_ICharacter;
 
index 29d92762285fcf354412d64a3e2e420b89229119..2f32b5e32166c9d1e530e03fe4d1dd8b73eff1d0 100644 (file)
@@ -30,7 +30,7 @@
  */
 
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "KX_ConstraintWrapper.h"
 #include "PHY_IPhysicsEnvironment.h"
 
index b7124c76439f5af8f77d7742ef749d80589b7566..5e20b7a9aca665299f388a9c5e51176c76d2b522 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef __KX_CONSTRAINTWRAPPER_H__
 #define __KX_CONSTRAINTWRAPPER_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 #include "PHY_DynamicTypes.h"
 
 class  KX_ConstraintWrapper : public PyObjectPlus
index f3b098f407add21a68173d8f894989aa1b836675..420f1f7eb98332c364bd2174b9673e7756d17ca9 100644 (file)
@@ -35,7 +35,7 @@
 #include "KX_Scene.h"
 #include "KX_PythonInit.h"
 #include "BLI_math.h"
-#include "StringValue.h"
+#include "EXP_StringValue.h"
 #include "RAS_IRasterizer.h"
 
 /* paths needed for font load */
index eabe0765d3b2cd5485f3164f2e436c4a3fb28b91..536670dde1a5c45720f657ca8d92d5089359d6dd 100644 (file)
 #include "BL_ActionManager.h"
 #include "BL_Action.h"
 
-#include "PyObjectPlus.h" /* python stuff */
+#include "EXP_PyObjectPlus.h" /* python stuff */
 #include "BLI_utildefines.h"
 
 #ifdef WITH_PYTHON
-#  include "KX_PythonCallBack.h"
+#  include "EXP_PythonCallBack.h"
 #  include "python_utildefines.h"
 #endif
 
index 3639d73d1e5794de8ea858ea5d8e401b42ca9d2e..99c8a6d718bc162e23d8b2c46794a77839b76ce6 100644 (file)
@@ -40,7 +40,7 @@
 
 #include <stddef.h>
 
-#include "ListValue.h"
+#include "EXP_ListValue.h"
 #include "SCA_IObject.h"
 #include "SG_Node.h"
 #include "MT_Transform.h"
index b6647cdf3dc3ff32b76ba1a085183405e368e885..2e1c16c6e32dc5956e2ba0cad7597fada3fd2b6b 100644 (file)
@@ -33,7 +33,7 @@
 #define __KX_ISCENECONVERTER_H__
 
 #include "STR_String.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
index 1597d7f8809d4c8f6b6b4be4dd37a7ecfe53d296..ec7a4146b7d69ea3723a7f262fcad45ca6feec6f 100644 (file)
@@ -36,7 +36,7 @@
  
 #include "KX_IpoActuator.h"
 #include "KX_GameObject.h"
-#include "FloatValue.h"
+#include "EXP_FloatValue.h"
 
 #include "KX_KetsjiEngine.h"
 
index 91963713dad375dfa84e95ddc70c9268623f9dc5..423e41e4e7f482933b8d133e0d1c65d0edf5be0a 100644 (file)
 
 #include "KX_KetsjiEngine.h"
 
-#include "ListValue.h"
-#include "IntValue.h"
-#include "VectorValue.h"
-#include "BoolValue.h"
-#include "FloatValue.h"
+#include "EXP_ListValue.h"
+#include "EXP_IntValue.h"
+#include "EXP_VectorValue.h"
+#include "EXP_BoolValue.h"
+#include "EXP_FloatValue.h"
 
 #include "RAS_BucketManager.h"
 #include "RAS_Rect.h"
index cd473451111eb8966625e0375072d098b6ced8d4..b4bd8a64f78b16525c8423f177988b7028cd6945 100644 (file)
@@ -38,7 +38,7 @@
 #include "STR_String.h"
 #include "KX_ISystem.h"
 #include "KX_Scene.h"
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "KX_WorldInfo.h"
 #include <vector>
 
index a6f2f728674247822321e38603bad7368be60c7c..c98766c9c81db2d68b631037d15129d1fa21dd76 100644 (file)
@@ -43,7 +43,7 @@
 
 #include "KX_PyMath.h"
 
-#include "PyObjectPlus.h" 
+#include "EXP_PyObjectPlus.h" 
 
 PyTypeObject KX_MeshProxy::Type = {
        PyVarObject_HEAD_INIT(NULL, 0)
index 8360681759a58e8807a77896aa0e75b56f08b792..891eb00cae63c3b727b12bcba3d869f7a74d2e62 100644 (file)
@@ -45,7 +45,7 @@ extern "C" {
 
 #include "KX_PythonInit.h"
 #include "KX_PyMath.h"
-#include "Value.h"
+#include "EXP_Value.h"
 #include "Recast.h"
 #include "DetourStatNavMeshBuilder.h"
 #include "KX_ObstacleSimulation.h"
index 1599361b3340d6fe75fa9b1a64f466e660d62b0c..af178f9aaee47dd0bf5ba2de24e55670205b107e 100644 (file)
@@ -28,7 +28,7 @@
 #define __KX_NAVMESHOBJECT_H__
 #include "DetourStatNavMesh.h"
 #include "KX_GameObject.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <vector>
 
 class RAS_MeshObject;
index 6926fdb1d4cac863cda54e6f379995b6f30a4942..6ffa2593792b1440197900ca9ea861cf1bcc2acc 100644 (file)
@@ -37,7 +37,7 @@
 #include "KX_GameObject.h"
 #include "KX_PythonInit.h"
 
-#include "PyObjectPlus.h" 
+#include "EXP_PyObjectPlus.h" 
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
index bfac9a875123c3fc85b914a631ed7a03bb8752fd..5877df5f289e5acc49d19e63eeb0c00a58f96f14 100644 (file)
@@ -41,7 +41,7 @@
 
 #include "KX_GameObject.h" // ConvertPythonToGameObject()
 
-#include "PyObjectPlus.h" 
+#include "EXP_PyObjectPlus.h" 
 
 #ifdef WITH_BULLET
 #  include "LinearMath/btIDebugDraw.h"
index 798e93a12e9fe20a1d9e713d086c6f8a582746ac..ee05fd442abf58801f4990f7652b2c9855675f80 100644 (file)
@@ -42,9 +42,9 @@
 #include "MT_Matrix4x4.h"
 #include "MT_Point2.h"
 
-#include "ListValue.h"
+#include "EXP_ListValue.h"
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "KX_PyMath.h"
 
 bool PyOrientationTo(PyObject *pyval, MT_Matrix3x3 &rot, const char *error_prefix)
index 63a37806fb67ed74ebb36faa7e56da1f6ac37a0f..917fd0fcda662856a9c1a37599bf9884f7719ed9 100644 (file)
@@ -41,8 +41,8 @@
 #include "MT_Matrix3x3.h"
 #include "MT_Matrix4x4.h"
 
-#include "KX_Python.h"
-#include "PyObjectPlus.h"
+#include "EXP_Python.h"
+#include "EXP_PyObjectPlus.h"
 
 #ifdef WITH_PYTHON
 #ifdef USE_MATHUTILS
index a5fb2dede72ecbdbd52dac5651790a11e37387d7..b7ca6248079fc1bbfd24ecc100397d51c0ca7f65 100644 (file)
@@ -112,8 +112,8 @@ extern "C" {
 #include "RAS_2DFilterManager.h"
 #include "MT_Vector3.h"
 #include "MT_Point3.h"
-#include "ListValue.h"
-#include "InputParser.h"
+#include "EXP_ListValue.h"
+#include "EXP_InputParser.h"
 #include "KX_Scene.h"
 
 #include "NG_NetworkScene.h" //Needed for sendMessage()
@@ -123,7 +123,7 @@ extern "C" {
 
 #include "KX_PyMath.h"
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "KX_PythonInitTypes.h" 
 
@@ -221,7 +221,7 @@ static void KX_MACRO_addTypesToDict_fn(PyObject *dict, const char *name, long va
 
 
 // temporarily python stuff, will be put in another place later !
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "SCA_PythonController.h"
 // List of methods defined in the module
 
index 06aeb5a4fcac60540bb0d24557f691624d3fec48..6550934a916674acfd83a34bf9a964ee33d5d1cd 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef __KX_PYTHONINIT_H__
 #define __KX_PYTHONINIT_H__
 
-#include "KX_Python.h"
+#include "EXP_Python.h"
 #include "STR_String.h"
 #include "MT_Vector3.h"
 
index 568d59119c0761c4a11619171b90822d3045237c..33b5335ddf4bda4c1b416479fb78e6b217c05f3f 100644 (file)
@@ -35,7 +35,7 @@
 
 #ifdef WITH_PYTHON
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 // -------------------------
 enum KX_PYGENSEQ_TYPE {
index f8f79269eaa080d34cfcb13466060df69539b10e..fdcfd22270bf7911bbd44d3ed032cbd559d6b849 100644 (file)
@@ -38,7 +38,7 @@
 #include "KX_SCA_AddObjectActuator.h"
 #include "SCA_IScene.h"
 #include "KX_GameObject.h"
-#include "PyObjectPlus.h" 
+#include "EXP_PyObjectPlus.h" 
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
index b105256836b56dca5b2c7cb42365e0ce5031b7f4..6b6b090c1c487d80ee4e5eea2d1ef44d615ad55e 100644 (file)
@@ -43,7 +43,7 @@
 #include "KX_SCA_ReplaceMeshActuator.h"
 #include "KX_MeshProxy.h"
 
-#include "PyObjectPlus.h" 
+#include "EXP_PyObjectPlus.h" 
 
 #ifdef WITH_PYTHON
 
index d33cbb9e2ae163f2d8f267207dfd85721a46f074..1959b3d8b0af3566fbd40ea56d2104ea1c7f3426 100644 (file)
@@ -44,7 +44,7 @@
 #include "KX_BlenderMaterial.h"
 #include "KX_FontObject.h"
 #include "RAS_IPolygonMaterial.h"
-#include "ListValue.h"
+#include "EXP_ListValue.h"
 #include "SCA_LogicManager.h"
 #include "SCA_TimeEventManager.h"
 //#include "SCA_AlwaysEventManager.h"
@@ -68,7 +68,7 @@
 #include "RAS_ICanvas.h"
 #include "RAS_BucketManager.h"
 
-#include "FloatValue.h"
+#include "EXP_FloatValue.h"
 #include "SCA_IController.h"
 #include "SCA_IActuator.h"
 #include "SG_Node.h"
 #endif
 
 #ifdef WITH_PYTHON
-#  include "KX_PythonCallBack.h"
+#  include "EXP_PythonCallBack.h"
 #endif
 
 #include "KX_Light.h"
index a5645ea6448b4845099abbeddaf1c7e7c636002b..4f7ad98f30d0390338ba18f663abbd7913269f4a 100644 (file)
@@ -49,7 +49,7 @@
 #include "RAS_Rect.h"
 
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include "RAS_2DFilterManager.h"
 
 /**
index 0edca44296a25124cff6b4c9be24e15a98b0db54..e1b5725a32bae87c188426be9af03346e234df00 100644 (file)
@@ -34,7 +34,7 @@
 #define __KX_TOUCHSENSOR_H__
 
 #include "SCA_ISensor.h"
-#include "ListValue.h"
+#include "EXP_ListValue.h"
 
 struct PHY_CollData;
 
index 75baf5fac1d6957f0ab630fee810dc93172180ef..3ed8eba759f1a01ddd45d1e04bb766e75b84ec44 100644 (file)
@@ -44,7 +44,7 @@
 #include <iostream>
 #include "KX_GameObject.h"
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
index b42200783e48e081221855c95b3d8d71849b4922..ee791a44782275c181022a6f4feeca674004b3ab 100644 (file)
@@ -22,7 +22,7 @@
  *  \ingroup ketsji
  */
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "KX_VehicleWrapper.h"
 #include "PHY_IPhysicsEnvironment.h"
index c38f57d8b9ff454cda940374a1d855f13b323629..22b9591f48b6b39851e52a2bb1a475d648f5c31a 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __KX_VEHICLEWRAPPER_H__
 #define __KX_VEHICLEWRAPPER_H__
 
-#include "Value.h"
+#include "EXP_Value.h"
 class PHY_IVehicle;
 class PHY_IMotionState;
 
index 22851d3e269d33143ed13bf6718bac892e3f2856..f2b37ec5587ae9440a50f994c011bf75ac2e459a 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "MT_Scalar.h"
 #include "KX_KetsjiEngine.h"
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
index 4133f2b1461898957128f6bd3773e494f5468ec7..f1ce8356e20e354db109fb262557fab8039545f8 100644 (file)
@@ -47,7 +47,7 @@
 
 #include <stdio.h>
 
-#include "Value.h"
+#include "EXP_Value.h"
 
 RAS_2DFilterManager::RAS_2DFilterManager():
 texturewidth(-1), textureheight(-1),
index 95c153a7e2adc0bd336c82c516ddde68aacaeb0a..4904fdd0eb0cdae468bc65cf09d2ff820af00e3d 100644 (file)
@@ -60,7 +60,7 @@ extern "C"{
 
 
 // XXX Clean these up <<<
-#include "Value.h"
+#include "EXP_Value.h"
 #include "KX_Scene.h"
 #include "KX_RayCast.h"
 #include "KX_GameObject.h"
index 804834af4cd764c7a0fc7e8b25f79d21a7a3ae11..08616e0c41c5f1163781f3de8eece8bbec60ba95 100644 (file)
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <fstream>
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "Exception.h"
 
index 97abe36bb8128c5e1345bf4956e6be8d6477f93e..5717a1edbcbda6ab79977c98e338c4cc5397f4fc 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "FilterBase.h"
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 
index a1d199b1851c84d2ce50f420b6dd9ea1cfeacc10..25a6d5ff31cef526693c02ab76d7f98280969cf1 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "Common.h"
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "PyTypeList.h"
 
index 857da12c28de1869641029a3984cb9f9d756e0be..a25d09e1eeec68334b84d28fe8f7a45023b9c69e 100644 (file)
@@ -28,7 +28,7 @@
  *  \ingroup bgevideotex
  */
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterBlueScreen.h"
index 26b5303e365eadafb5b33be989ad700c871217c0..eed84a8580c7e1ce100afd8716dbe78ad1700558 100644 (file)
@@ -28,7 +28,7 @@
  *  \ingroup bgevideotex
  */
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterColor.h"
index 78a09f8afac09715e6c772cd2c6afe5f9e5fd2f9..3a5333710fd170fc0a21e23d2b0e29c20fbe6d91 100644 (file)
@@ -28,7 +28,7 @@
  *  \ingroup bgevideotex
  */
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterNormal.h"
index 1fac87f2b04b3ee71282d6b8c5ca4395d42dbcb3..c8faa1f9f0713a0288b02eafced7fdec8ffc7631 100644 (file)
@@ -30,7 +30,7 @@
 
 // implementation
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterSource.h"
index 23da528009d5e9fc6031b8860c916f4986b3d4ea..8be152c7b8e4ccb08a13b851310af88794cffc51 100644 (file)
@@ -37,7 +37,7 @@ extern "C" {
 #include <vector>
 #include <string.h>
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterBase.h"
index 50dc8c10ec62f44940a4ab9ff33733e4288f76c7..f646d145365c5f816235bf8c35a2d472b51e82c6 100644 (file)
@@ -34,7 +34,7 @@
 #include "Common.h"
 
 #include <vector>
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "PyTypeList.h"
 
index 705d9136cbef77ba60c4741ffb1ff7d02c8e8789..77270865b1723dc0b7cf10523a8fdccd7f846d63 100644 (file)
@@ -30,7 +30,7 @@
 
 // implementation
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "ImageBuff.h"
index dc93bf03423af7361eb57325fab68ea2d274757f..973be52e0fc44a7207f2bf866c4c3a845f755741 100644 (file)
@@ -31,7 +31,7 @@
 
 // implementation
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "ImageMix.h"
index 797313366cd81a9a8bdfba8acd0e8184004ca7b2..9086b042537b5ba3d11ed90c0593a432c0367fb1 100644 (file)
@@ -30,7 +30,7 @@
 
 // implementation
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 #include <float.h>
 #include <math.h>
index 421f0df814befb7f638f1e7fc33db2a79c6d651d..820a019832e90f176fb7d858fdbfc257eb909542 100644 (file)
@@ -30,7 +30,7 @@
 
 // implementation
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "glew-mx.h"
index 588a1257d6a462d477e5b0f0371590b99c2ceb5e..18f477f61785560a11033b1fcff24149b16c49c1 100644 (file)
@@ -33,7 +33,7 @@
 #include <memory>
 #include <vector>
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 /// destructor
 PyTypeList::~PyTypeList()
index b36f11ed75a8d015ca15b1657aaba82d8dd1d52f..a8716e72e147641bcc845d8653f0e4235fe9cbef 100644 (file)
@@ -36,7 +36,7 @@
 #include <memory>
 #include <vector>
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 // forward declaration
 class PyTypeListItem;
index c31faf5a46363f21be29f6d288000d0d81b3b975..cc010f08b17bd5864f68103dadf6576f99f16949 100644 (file)
@@ -30,7 +30,7 @@
 
 // implementation
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "KX_GameObject.h"
index ae778bae70467eee3e0f1f95f47d3bbd947d709e..dc38b4181bb587d0692d9f25c819fc9b986af255 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef __TEXTURE_H__
 #define __TEXTURE_H__
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 #include <structmember.h>
 
 #include "DNA_image_types.h"
index 51f025909fd49cd515a6f066b7ba1fe9aecf15cb..6f35c47430097b33feacd921fec0d93a71538afe 100644 (file)
@@ -32,7 +32,7 @@
 #define __VIDEOBASE_H__
 
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "ImageBase.h"
 
index 710eebc1c47388e80a0b432d02e2de7f1afd2469..30a8107b5581704a5d2f1a96a0d722b5fa48f136 100644 (file)
@@ -28,7 +28,7 @@
  *  \ingroup bgevideotex
  */
 
-#include "PyObjectPlus.h"
+#include "EXP_PyObjectPlus.h"
 
 #include "KX_PythonInit.h"