Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Bernal <jbernalmartinez@gmail.com>2015-07-12 17:55:33 +0300
committerJorge Bernal <jbernalmartinez@gmail.com>2015-07-12 17:58:12 +0300
commit6ffc988ae3aa57822be89e9580146908c938e0a0 (patch)
tree6c9299a519b8d4b1da0780cf0cd2bc4bba108fb8 /source/gameengine/Converter
parent5b0f674e0948d079332718e165b4a42369517ed6 (diff)
BGE Clean-up: New EXP prefix for the BGE Expression module
The expression module now uses an EXP prefix and it follows a distribution similar to blender. Additionally the hash function in EXP_HashedPtr.h was simplified and the files EXP_C-Api.h &.EXP_C-Api.cpp were deleted because were unused. Reviewers: campbellbarton, moguri, sybren, hg1 Projects: #game_engine Differential Revision: https://developer.blender.org/D1221
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_ActionActuator.cpp4
-rw-r--r--source/gameengine/Converter/BL_ArmatureChannel.h2
-rw-r--r--source/gameengine/Converter/BL_ArmatureConstraint.h2
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.h2
-rw-r--r--source/gameengine/Converter/BL_ShapeActionActuator.cpp4
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.h2
-rw-r--r--source/gameengine/Converter/KX_ConvertActuators.cpp2
-rw-r--r--source/gameengine/Converter/KX_ConvertControllers.cpp4
-rw-r--r--source/gameengine/Converter/KX_ConvertControllers.h2
-rw-r--r--source/gameengine/Converter/KX_ConvertProperties.cpp12
-rw-r--r--source/gameengine/Converter/KX_ConvertSensors.cpp2
-rw-r--r--source/gameengine/Converter/KX_LibLoadStatus.h2
12 files changed, 20 insertions, 20 deletions
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
{