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 | |
| 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')
148 files changed, 374 insertions, 575 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 1a198920919..9b99574b790 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -63,7 +63,7 @@ #include "BL_System.h" #include "GPU_extensions.h" -#include "Value.h" +#include "EXP_Value.h" extern "C" { diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index c756d8695e6..d40ba8d11c2 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -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" { diff --git a/source/gameengine/Converter/BL_ArmatureChannel.h b/source/gameengine/Converter/BL_ArmatureChannel.h index 51114c5df30..d349e6e9dae 100644 --- a/source/gameengine/Converter/BL_ArmatureChannel.h +++ b/source/gameengine/Converter/BL_ArmatureChannel.h @@ -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; diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h index 98c2954baf4..1d9f7f0d548 100644 --- a/source/gameengine/Converter/BL_ArmatureConstraint.h +++ b/source/gameengine/Converter/BL_ArmatureConstraint.h @@ -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; diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h index 6bd77954b88..22210cc6035 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.h +++ b/source/gameengine/Converter/BL_BlenderDataConversion.h @@ -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" diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp index 67712c683f9..e8f451213f5 100644 --- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp +++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp @@ -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" diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index 3ae90301553..a40188d197d 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -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> diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index ff4b5a61d12..10ee228b33f 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -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... */ diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp index 0215b604fdd..e3697087ea9 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.cpp +++ b/source/gameengine/Converter/KX_ConvertControllers.cpp @@ -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 diff --git a/source/gameengine/Converter/KX_ConvertControllers.h b/source/gameengine/Converter/KX_ConvertControllers.h index babe3e2e73f..0ec1c3c09b3 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.h +++ b/source/gameengine/Converter/KX_ConvertControllers.h @@ -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, diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp index 3b4ba6886cb..2cb61207fb5 100644 --- a/source/gameengine/Converter/KX_ConvertProperties.cpp +++ b/source/gameengine/Converter/KX_ConvertProperties.cpp @@ -38,13 +38,13 @@ /* 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" diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp index 854ae5b28dc..79fd9cb9254 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.cpp +++ b/source/gameengine/Converter/KX_ConvertSensors.cpp @@ -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" diff --git a/source/gameengine/Converter/KX_LibLoadStatus.h b/source/gameengine/Converter/KX_LibLoadStatus.h index 3da7329213b..bedf4498c96 100644 --- a/source/gameengine/Converter/KX_LibLoadStatus.h +++ b/source/gameengine/Converter/KX_LibLoadStatus.h @@ -27,7 +27,7 @@ #ifndef __KX_LIBLOADSTATUS_H__ #define __KX_LIBLOADSTATUS_H__ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" class KX_LibLoadStatus : public PyObjectPlus { diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt index f827a9528b4..6ab4d3fdacc 100644 --- a/source/gameengine/Expressions/CMakeLists.txt +++ b/source/gameengine/Expressions/CMakeLists.txt @@ -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() diff --git a/source/gameengine/Expressions/BoolValue.h b/source/gameengine/Expressions/EXP_BoolValue.h index 161d6112f68..98ba1d75e52 100644 --- a/source/gameengine/Expressions/BoolValue.h +++ b/source/gameengine/Expressions/EXP_BoolValue.h @@ -12,14 +12,14 @@ * */ -/** \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 index 2822fd8f6de..00000000000 --- a/source/gameengine/Expressions/EXP_C-Api.cpp +++ /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 index d73b0a209d4..00000000000 --- a/source/gameengine/Expressions/EXP_C-Api.h +++ /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__ */ diff --git a/source/gameengine/Expressions/ConstExpr.h b/source/gameengine/Expressions/EXP_ConstExpr.h index 768f2bbd10e..b4456dacdf3 100644 --- a/source/gameengine/Expressions/ConstExpr.h +++ b/source/gameengine/Expressions/EXP_ConstExpr.h @@ -12,15 +12,15 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/EmptyValue.h b/source/gameengine/Expressions/EXP_EmptyValue.h index 88ef206f0f0..d23addb9f9f 100644 --- a/source/gameengine/Expressions/EmptyValue.h +++ b/source/gameengine/Expressions/EXP_EmptyValue.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/ErrorValue.h b/source/gameengine/Expressions/EXP_ErrorValue.h index 61c72151f40..a6f91ca200a 100644 --- a/source/gameengine/Expressions/ErrorValue.h +++ b/source/gameengine/Expressions/EXP_ErrorValue.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/Expression.h b/source/gameengine/Expressions/EXP_Expression.h index 9a4f1f93284..66a6e9476ff 100644 --- a/source/gameengine/Expressions/Expression.h +++ b/source/gameengine/Expressions/EXP_Expression.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/FloatValue.h b/source/gameengine/Expressions/EXP_FloatValue.h index 379c3e951bc..3c16c57d16d 100644 --- a/source/gameengine/Expressions/FloatValue.h +++ b/source/gameengine/Expressions/EXP_FloatValue.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/EXP_HashedPtr.h index acd9d4daafa..7c7c5f6e5ec 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.h +++ b/source/gameengine/Expressions/EXP_HashedPtr.h @@ -25,19 +25,17 @@ * ***** 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__ */ diff --git a/source/gameengine/Expressions/IdentifierExpr.h b/source/gameengine/Expressions/EXP_IdentifierExpr.h index 26eb3691378..96ef3677cf3 100644 --- a/source/gameengine/Expressions/IdentifierExpr.h +++ b/source/gameengine/Expressions/EXP_IdentifierExpr.h @@ -25,14 +25,14 @@ * ***** 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__ */ diff --git a/source/gameengine/Expressions/IfExpr.h b/source/gameengine/Expressions/EXP_IfExpr.h index 80e35471d82..43b4b8faf53 100644 --- a/source/gameengine/Expressions/IfExpr.h +++ b/source/gameengine/Expressions/EXP_IfExpr.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/InputParser.h b/source/gameengine/Expressions/EXP_InputParser.h index 50bb1ae2f6e..80471009a16 100644 --- a/source/gameengine/Expressions/InputParser.h +++ b/source/gameengine/Expressions/EXP_InputParser.h @@ -14,15 +14,15 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/IntValue.h b/source/gameengine/Expressions/EXP_IntValue.h index 6da975f4f7f..a1cd96a888e 100644 --- a/source/gameengine/Expressions/IntValue.h +++ b/source/gameengine/Expressions/EXP_IntValue.h @@ -12,15 +12,15 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/EXP_ListValue.h index bb188179836..f5421066f62 100644 --- a/source/gameengine/Expressions/ListValue.h +++ b/source/gameengine/Expressions/EXP_ListValue.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/EXP_Operator1Expr.h index 3dd76f773f2..9a05ce9c0c4 100644 --- a/source/gameengine/Expressions/Operator1Expr.h +++ b/source/gameengine/Expressions/EXP_Operator1Expr.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/Operator2Expr.h b/source/gameengine/Expressions/EXP_Operator2Expr.h index 8c30b7cd634..cd7a492fde0 100644 --- a/source/gameengine/Expressions/Operator2Expr.h +++ b/source/gameengine/Expressions/EXP_Operator2Expr.h @@ -12,16 +12,16 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/EXP_PyObjectPlus.h index c3ce98ed27a..dd612a08494 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/EXP_PyObjectPlus.h @@ -25,12 +25,12 @@ * ***** 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__ */ diff --git a/source/gameengine/Expressions/KX_Python.h b/source/gameengine/Expressions/EXP_Python.h index 62dd9a13dd4..f904151085e 100644 --- a/source/gameengine/Expressions/KX_Python.h +++ b/source/gameengine/Expressions/EXP_Python.h @@ -25,12 +25,12 @@ * ***** 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__ */ diff --git a/source/gameengine/Expressions/KX_PythonCallBack.h b/source/gameengine/Expressions/EXP_PythonCallBack.h index 2ff6e305d67..f0cbcac0c6f 100644 --- a/source/gameengine/Expressions/KX_PythonCallBack.h +++ b/source/gameengine/Expressions/EXP_PythonCallBack.h @@ -20,14 +20,14 @@ * ***** 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__ diff --git a/source/gameengine/Expressions/StringValue.h b/source/gameengine/Expressions/EXP_StringValue.h index cb60600ad88..ca59ebf1f82 100644 --- a/source/gameengine/Expressions/StringValue.h +++ b/source/gameengine/Expressions/EXP_StringValue.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/EXP_Value.h index c7e9a40a059..014fc59405f 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/EXP_Value.h @@ -12,12 +12,12 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/EXP_VectorValue.h index 717fa68f6dc..d87d5097156 100644 --- a/source/gameengine/Expressions/VectorValue.h +++ b/source/gameengine/Expressions/EXP_VectorValue.h @@ -12,14 +12,14 @@ * */ -/** \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__ */ diff --git a/source/gameengine/Expressions/VoidValue.h b/source/gameengine/Expressions/EXP_VoidValue.h index 4f74910dd8a..8b2c29488d7 100644 --- a/source/gameengine/Expressions/VoidValue.h +++ b/source/gameengine/Expressions/EXP_VoidValue.h @@ -27,14 +27,14 @@ * ***** 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__ */ diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index 48102e5ba3c..b66d36c2080 100644 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -27,7 +27,7 @@ Import ('env') -sources = env.Glob('*.cpp') +sources = env.Glob('intern/*.cpp') incs = [ '.', diff --git a/source/gameengine/Expressions/BoolValue.cpp b/source/gameengine/Expressions/intern/BoolValue.cpp index 9ff53395056..1523a9212ba 100644 --- a/source/gameengine/Expressions/BoolValue.cpp +++ b/source/gameengine/Expressions/intern/BoolValue.cpp @@ -16,10 +16,10 @@ * */ -#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 diff --git a/source/gameengine/Expressions/ConstExpr.cpp b/source/gameengine/Expressions/intern/ConstExpr.cpp index c41cf5a54f5..597427ecfe5 100644 --- a/source/gameengine/Expressions/ConstExpr.cpp +++ b/source/gameengine/Expressions/intern/ConstExpr.cpp @@ -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 diff --git a/source/gameengine/Expressions/EmptyValue.cpp b/source/gameengine/Expressions/intern/EmptyValue.cpp index f8e72181ed7..9227626777d 100644 --- a/source/gameengine/Expressions/EmptyValue.cpp +++ b/source/gameengine/Expressions/intern/EmptyValue.cpp @@ -16,13 +16,13 @@ * */ -#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 diff --git a/source/gameengine/Expressions/ErrorValue.cpp b/source/gameengine/Expressions/intern/ErrorValue.cpp index 46e09b9073f..c03ceb88073 100644 --- a/source/gameengine/Expressions/ErrorValue.cpp +++ b/source/gameengine/Expressions/intern/ErrorValue.cpp @@ -15,7 +15,7 @@ * */ -#include "ErrorValue.h" +#include "EXP_ErrorValue.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/source/gameengine/Expressions/Expression.cpp b/source/gameengine/Expressions/intern/Expression.cpp index 2428df977d3..6a98a15aa12 100644 --- a/source/gameengine/Expressions/Expression.cpp +++ b/source/gameengine/Expressions/intern/Expression.cpp @@ -15,8 +15,8 @@ * */ -#include "Expression.h" -#include "ErrorValue.h" +#include "EXP_Expression.h" +#include "EXP_ErrorValue.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/source/gameengine/Expressions/FloatValue.cpp b/source/gameengine/Expressions/intern/FloatValue.cpp index 4d6f3f467eb..0f86a429d81 100644 --- a/source/gameengine/Expressions/FloatValue.cpp +++ b/source/gameengine/Expressions/intern/FloatValue.cpp @@ -15,12 +15,12 @@ * */ -#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 diff --git a/source/gameengine/Expressions/KX_HashedPtr.cpp b/source/gameengine/Expressions/intern/HashedPtr.cpp index bd42892cc8d..005ac16b231 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.cpp +++ b/source/gameengine/Expressions/intern/HashedPtr.cpp @@ -30,16 +30,22 @@ */ -#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); -} diff --git a/source/gameengine/Expressions/IdentifierExpr.cpp b/source/gameengine/Expressions/intern/IdentifierExpr.cpp index c9e053574cd..8fbbf41cd63 100644 --- a/source/gameengine/Expressions/IdentifierExpr.cpp +++ b/source/gameengine/Expressions/intern/IdentifierExpr.cpp @@ -30,7 +30,7 @@ */ -#include "IdentifierExpr.h" +#include "EXP_IdentifierExpr.h" CIdentifierExpr::CIdentifierExpr(const STR_String& identifier,CValue* id_context) :m_identifier(identifier) diff --git a/source/gameengine/Expressions/IfExpr.cpp b/source/gameengine/Expressions/intern/IfExpr.cpp index 152ca8704ce..b4e2fe7315b 100644 --- a/source/gameengine/Expressions/IfExpr.cpp +++ b/source/gameengine/Expressions/intern/IfExpr.cpp @@ -15,10 +15,10 @@ * */ -#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 diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/intern/InputParser.cpp index 4ba3585455b..e8cc7fba284 100644 --- a/source/gameengine/Expressions/InputParser.cpp +++ b/source/gameengine/Expressions/intern/InputParser.cpp @@ -19,23 +19,23 @@ #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 diff --git a/source/gameengine/Expressions/IntValue.cpp b/source/gameengine/Expressions/intern/IntValue.cpp index 82d2e94dbb0..25aff5b32ab 100644 --- a/source/gameengine/Expressions/IntValue.cpp +++ b/source/gameengine/Expressions/intern/IntValue.cpp @@ -17,12 +17,12 @@ #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 diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/intern/ListValue.cpp index 58e571042d8..557ce7be300 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/intern/ListValue.cpp @@ -19,11 +19,11 @@ #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 */ diff --git a/source/gameengine/Expressions/Operator1Expr.cpp b/source/gameengine/Expressions/intern/Operator1Expr.cpp index b985f76825d..add0376f487 100644 --- a/source/gameengine/Expressions/Operator1Expr.cpp +++ b/source/gameengine/Expressions/intern/Operator1Expr.cpp @@ -15,8 +15,8 @@ * */ -#include "Operator1Expr.h" -#include "EmptyValue.h" +#include "EXP_Operator1Expr.h" +#include "EXP_EmptyValue.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/source/gameengine/Expressions/Operator2Expr.cpp b/source/gameengine/Expressions/intern/Operator2Expr.cpp index b03d00e7f77..0a7f30b8cc8 100644 --- a/source/gameengine/Expressions/Operator2Expr.cpp +++ b/source/gameengine/Expressions/intern/Operator2Expr.cpp @@ -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 diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/intern/PyObjectPlus.cpp index 31a17bd0cbf..3df175668ad 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/intern/PyObjectPlus.cpp @@ -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" diff --git a/source/gameengine/Expressions/KX_PythonCallBack.cpp b/source/gameengine/Expressions/intern/PythonCallBack.cpp index fbc250a1b3d..3fb84569eca 100644 --- a/source/gameengine/Expressions/KX_PythonCallBack.cpp +++ b/source/gameengine/Expressions/intern/PythonCallBack.cpp @@ -20,11 +20,11 @@ * ***** 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> diff --git a/source/gameengine/Expressions/StringValue.cpp b/source/gameengine/Expressions/intern/StringValue.cpp index 098949c9d7b..ddf61dc441c 100644 --- a/source/gameengine/Expressions/StringValue.cpp +++ b/source/gameengine/Expressions/intern/StringValue.cpp @@ -15,10 +15,10 @@ * */ -#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 diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/intern/Value.cpp index 286db016476..f8796a76e76 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/intern/Value.cpp @@ -17,15 +17,15 @@ * 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 diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/intern/VectorValue.cpp index 6931ba2aa76..a3d44116317 100644 --- a/source/gameengine/Expressions/VectorValue.cpp +++ b/source/gameengine/Expressions/intern/VectorValue.cpp @@ -19,12 +19,12 @@ # 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" 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 */ diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h index 4c671d0c9a3..e3dc4b19773 100644 --- a/source/gameengine/Ketsji/BL_Shader.h +++ b/source/gameengine/Ketsji/BL_Shader.h @@ -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" // -- diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp index 6260596159d..1fadd9382e0 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp @@ -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> diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 0448236b10c..9364abb8eed 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -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" diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp index 3b69d4005cd..644c71a68e4 100644 --- a/source/gameengine/Ketsji/KX_Camera.cpp +++ b/source/gameengine/Ketsji/KX_Camera.cpp @@ -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" diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h index 991d8813a00..8addf0b7aed 100644 --- a/source/gameengine/Ketsji/KX_Camera.h +++ b/source/gameengine/Ketsji/KX_Camera.h @@ -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 diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index 3d1802bb2a6..f065e3f0001 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -40,7 +40,7 @@ #include <float.h> #include "KX_GameObject.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/Ketsji/KX_CharacterWrapper.h b/source/gameengine/Ketsji/KX_CharacterWrapper.h index d4d8f195102..dd7ba680ec7 100644 --- a/source/gameengine/Ketsji/KX_CharacterWrapper.h +++ b/source/gameengine/Ketsji/KX_CharacterWrapper.h @@ -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; diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp index 29d92762285..2f32b5e3216 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp @@ -30,7 +30,7 @@ */ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "KX_ConstraintWrapper.h" #include "PHY_IPhysicsEnvironment.h" diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h index b7124c76439..5e20b7a9aca 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h @@ -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 diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index f3b098f407a..420f1f7eb98 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -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 */ diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index eabe0765d3b..536670dde1a 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -69,11 +69,11 @@ #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 diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 3639d73d1e5..99c8a6d718b 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -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" diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h index b6647cdf3dc..2e1c16c6e32 100644 --- a/source/gameengine/Ketsji/KX_ISceneConverter.h +++ b/source/gameengine/Ketsji/KX_ISceneConverter.h @@ -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" diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp index 1597d7f8809..ec7a4146b7d 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.cpp +++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp @@ -36,7 +36,7 @@ #include "KX_IpoActuator.h" #include "KX_GameObject.h" -#include "FloatValue.h" +#include "EXP_FloatValue.h" #include "KX_KetsjiEngine.h" diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index 91963713dad..423e41e4e7f 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -41,11 +41,11 @@ #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" diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h index cd473451111..b4bd8a64f78 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.h +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h @@ -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> diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index a6f2f728674..c98766c9c81 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -43,7 +43,7 @@ #include "KX_PyMath.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" PyTypeObject KX_MeshProxy::Type = { PyVarObject_HEAD_INIT(NULL, 0) diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index 8360681759a..891eb00cae6 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -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" diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.h b/source/gameengine/Ketsji/KX_NavMeshObject.h index 1599361b334..af178f9aaee 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.h +++ b/source/gameengine/Ketsji/KX_NavMeshObject.h @@ -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; diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp index 6926fdb1d4c..6ffa2593792 100644 --- a/source/gameengine/Ketsji/KX_ParentActuator.cpp +++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp @@ -37,7 +37,7 @@ #include "KX_GameObject.h" #include "KX_PythonInit.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp index bfac9a87512..5877df5f289 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp @@ -41,7 +41,7 @@ #include "KX_GameObject.h" // ConvertPythonToGameObject() -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #ifdef WITH_BULLET # include "LinearMath/btIDebugDraw.h" diff --git a/source/gameengine/Ketsji/KX_PyMath.cpp b/source/gameengine/Ketsji/KX_PyMath.cpp index 798e93a12e9..ee05fd442ab 100644 --- a/source/gameengine/Ketsji/KX_PyMath.cpp +++ b/source/gameengine/Ketsji/KX_PyMath.cpp @@ -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) diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h index 63a37806fb6..917fd0fcda6 100644 --- a/source/gameengine/Ketsji/KX_PyMath.h +++ b/source/gameengine/Ketsji/KX_PyMath.h @@ -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 diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index a5fb2dede72..b7ca6248079 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -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 diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h index 06aeb5a4fca..6550934a916 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.h +++ b/source/gameengine/Ketsji/KX_PythonInit.h @@ -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" diff --git a/source/gameengine/Ketsji/KX_PythonSeq.h b/source/gameengine/Ketsji/KX_PythonSeq.h index 568d59119c0..33b5335ddf4 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.h +++ b/source/gameengine/Ketsji/KX_PythonSeq.h @@ -35,7 +35,7 @@ #ifdef WITH_PYTHON -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" // ------------------------- enum KX_PYGENSEQ_TYPE { diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp index f8f79269eaa..fdcfd22270b 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp @@ -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 */ diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp index b105256836b..6b6b090c1c4 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp @@ -43,7 +43,7 @@ #include "KX_SCA_ReplaceMeshActuator.h" #include "KX_MeshProxy.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #ifdef WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index d33cbb9e2ae..1959b3d8b0a 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -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" @@ -100,7 +100,7 @@ #endif #ifdef WITH_PYTHON -# include "KX_PythonCallBack.h" +# include "EXP_PythonCallBack.h" #endif #include "KX_Light.h" diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index a5645ea6448..4f7ad98f30d 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -49,7 +49,7 @@ #include "RAS_Rect.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "RAS_2DFilterManager.h" /** diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index 0edca44296a..e1b5725a32b 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -34,7 +34,7 @@ #define __KX_TOUCHSENSOR_H__ #include "SCA_ISensor.h" -#include "ListValue.h" +#include "EXP_ListValue.h" struct PHY_CollData; diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp index 75baf5fac1d..3ed8eba759f 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp +++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp @@ -44,7 +44,7 @@ #include <iostream> #include "KX_GameObject.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" /* ------------------------------------------------------------------------- */ /* Native functions */ diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp index b42200783e4..ee791a44782 100644 --- a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp +++ b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp @@ -22,7 +22,7 @@ * \ingroup ketsji */ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "KX_VehicleWrapper.h" #include "PHY_IPhysicsEnvironment.h" diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.h b/source/gameengine/Ketsji/KX_VehicleWrapper.h index c38f57d8b9f..22b9591f48b 100644 --- a/source/gameengine/Ketsji/KX_VehicleWrapper.h +++ b/source/gameengine/Ketsji/KX_VehicleWrapper.h @@ -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; diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h index 22851d3e269..f2b37ec5587 100644 --- a/source/gameengine/Ketsji/KX_WorldInfo.h +++ b/source/gameengine/Ketsji/KX_WorldInfo.h @@ -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" diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp index 4133f2b1461..f1ce8356e20 100644 --- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp +++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp @@ -47,7 +47,7 @@ #include <stdio.h> -#include "Value.h" +#include "EXP_Value.h" RAS_2DFilterManager::RAS_2DFilterManager(): texturewidth(-1), textureheight(-1), diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 95c153a7e2a..4904fdd0eb0 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -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" diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp index 804834af4cd..08616e0c41c 100644 --- a/source/gameengine/VideoTexture/Exception.cpp +++ b/source/gameengine/VideoTexture/Exception.cpp @@ -31,7 +31,7 @@ #include <sstream> #include <fstream> -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "Exception.h" diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp index 97abe36bb81..5717a1edbcb 100644 --- a/source/gameengine/VideoTexture/FilterBase.cpp +++ b/source/gameengine/VideoTexture/FilterBase.cpp @@ -31,7 +31,7 @@ #include "FilterBase.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> diff --git a/source/gameengine/VideoTexture/FilterBase.h b/source/gameengine/VideoTexture/FilterBase.h index a1d199b1851..25a6d5ff31c 100644 --- a/source/gameengine/VideoTexture/FilterBase.h +++ b/source/gameengine/VideoTexture/FilterBase.h @@ -33,7 +33,7 @@ #include "Common.h" -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "PyTypeList.h" diff --git a/source/gameengine/VideoTexture/FilterBlueScreen.cpp b/source/gameengine/VideoTexture/FilterBlueScreen.cpp index 857da12c28d..a25d09e1eee 100644 --- a/source/gameengine/VideoTexture/FilterBlueScreen.cpp +++ b/source/gameengine/VideoTexture/FilterBlueScreen.cpp @@ -28,7 +28,7 @@ * \ingroup bgevideotex */ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "FilterBlueScreen.h" diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp index 26b5303e365..eed84a8580c 100644 --- a/source/gameengine/VideoTexture/FilterColor.cpp +++ b/source/gameengine/VideoTexture/FilterColor.cpp @@ -28,7 +28,7 @@ * \ingroup bgevideotex */ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "FilterColor.h" diff --git a/source/gameengine/VideoTexture/FilterNormal.cpp b/source/gameengine/VideoTexture/FilterNormal.cpp index 78a09f8afac..3a5333710fd 100644 --- a/source/gameengine/VideoTexture/FilterNormal.cpp +++ b/source/gameengine/VideoTexture/FilterNormal.cpp @@ -28,7 +28,7 @@ * \ingroup bgevideotex */ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "FilterNormal.h" diff --git a/source/gameengine/VideoTexture/FilterSource.cpp b/source/gameengine/VideoTexture/FilterSource.cpp index 1fac87f2b04..c8faa1f9f07 100644 --- a/source/gameengine/VideoTexture/FilterSource.cpp +++ b/source/gameengine/VideoTexture/FilterSource.cpp @@ -30,7 +30,7 @@ // implementation -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "FilterSource.h" diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp index 23da528009d..8be152c7b8e 100644 --- a/source/gameengine/VideoTexture/ImageBase.cpp +++ b/source/gameengine/VideoTexture/ImageBase.cpp @@ -37,7 +37,7 @@ extern "C" { #include <vector> #include <string.h> -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "FilterBase.h" diff --git a/source/gameengine/VideoTexture/ImageBase.h b/source/gameengine/VideoTexture/ImageBase.h index 50dc8c10ec6..f646d145365 100644 --- a/source/gameengine/VideoTexture/ImageBase.h +++ b/source/gameengine/VideoTexture/ImageBase.h @@ -34,7 +34,7 @@ #include "Common.h" #include <vector> -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "PyTypeList.h" diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp index 705d9136cbe..77270865b17 100644 --- a/source/gameengine/VideoTexture/ImageBuff.cpp +++ b/source/gameengine/VideoTexture/ImageBuff.cpp @@ -30,7 +30,7 @@ // implementation -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "ImageBuff.h" diff --git a/source/gameengine/VideoTexture/ImageMix.cpp b/source/gameengine/VideoTexture/ImageMix.cpp index dc93bf03423..973be52e0fc 100644 --- a/source/gameengine/VideoTexture/ImageMix.cpp +++ b/source/gameengine/VideoTexture/ImageMix.cpp @@ -31,7 +31,7 @@ // implementation -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "ImageMix.h" diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 797313366cd..9086b042537 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -30,7 +30,7 @@ // implementation -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include <float.h> #include <math.h> diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp index 421f0df814b..820a019832e 100644 --- a/source/gameengine/VideoTexture/ImageViewport.cpp +++ b/source/gameengine/VideoTexture/ImageViewport.cpp @@ -30,7 +30,7 @@ // implementation -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "glew-mx.h" diff --git a/source/gameengine/VideoTexture/PyTypeList.cpp b/source/gameengine/VideoTexture/PyTypeList.cpp index 588a1257d6a..18f477f6178 100644 --- a/source/gameengine/VideoTexture/PyTypeList.cpp +++ b/source/gameengine/VideoTexture/PyTypeList.cpp @@ -33,7 +33,7 @@ #include <memory> #include <vector> -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" /// destructor PyTypeList::~PyTypeList() diff --git a/source/gameengine/VideoTexture/PyTypeList.h b/source/gameengine/VideoTexture/PyTypeList.h index b36f11ed75a..a8716e72e14 100644 --- a/source/gameengine/VideoTexture/PyTypeList.h +++ b/source/gameengine/VideoTexture/PyTypeList.h @@ -36,7 +36,7 @@ #include <memory> #include <vector> -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" // forward declaration class PyTypeListItem; diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp index c31faf5a463..cc010f08b17 100644 --- a/source/gameengine/VideoTexture/Texture.cpp +++ b/source/gameengine/VideoTexture/Texture.cpp @@ -30,7 +30,7 @@ // implementation -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include <structmember.h> #include "KX_GameObject.h" diff --git a/source/gameengine/VideoTexture/Texture.h b/source/gameengine/VideoTexture/Texture.h index ae778bae704..dc38b4181bb 100644 --- a/source/gameengine/VideoTexture/Texture.h +++ b/source/gameengine/VideoTexture/Texture.h @@ -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" diff --git a/source/gameengine/VideoTexture/VideoBase.h b/source/gameengine/VideoTexture/VideoBase.h index 51f025909fd..6f35c474300 100644 --- a/source/gameengine/VideoTexture/VideoBase.h +++ b/source/gameengine/VideoTexture/VideoBase.h @@ -32,7 +32,7 @@ #define __VIDEOBASE_H__ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "ImageBase.h" diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp index 710eebc1c47..30a8107b558 100644 --- a/source/gameengine/VideoTexture/blendVideoTex.cpp +++ b/source/gameengine/VideoTexture/blendVideoTex.cpp @@ -28,7 +28,7 @@ * \ingroup bgevideotex */ -#include "PyObjectPlus.h" +#include "EXP_PyObjectPlus.h" #include "KX_PythonInit.h" |