sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Removed the termporary defines added to make the Game Engine compile. Hopefully this fixes all of the cases which broke.

Browse Source
This commit is contained in:
Joshua Leung 2009-09-29 01:52:54 +00:00
parent be3000773b
commit 52b28fddec
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/makesdna/DNA_action_types.h
View File

@ -553,13 +553,4 @@ typedef enum ACHAN_FLAG {
ACHAN_MOVED = (1<<31), ACHAN_MOVED = (1<<31),
} ACHAN_FLAG; } ACHAN_FLAG;
// XXX Incorrect, Temp for building
#define PCHAN_ROT_QUAT -1
#define PCHAN_ROT_XYZ -1
#define PCHAN_ROT_XZY -1
#define PCHAN_ROT_YXZ -1
#define PCHAN_ROT_YZX -1
#define PCHAN_ROT_ZXY -1
#define PCHAN_ROT_ZYX -1
#endif #endif

2
source/gameengine/Converter/BL_ArmatureObject.cpp
View File

@ -152,7 +152,7 @@ void game_blend_poses(bPose *dst, bPose *src, float srcweight/*, short mode*/)
for (dchan = (bPoseChannel*)dst->chanbase.first; dchan; dchan=(bPoseChannel*)dchan->next, schan= (bPoseChannel*)schan->next){ for (dchan = (bPoseChannel*)dst->chanbase.first; dchan; dchan=(bPoseChannel*)dchan->next, schan= (bPoseChannel*)schan->next){
// always blend on all channels since we don't know which one has been set // always blend on all channels since we don't know which one has been set
/* quat interpolation done separate */ /* quat interpolation done separate */
if (schan->rotmode == PCHAN_ROT_QUAT) { if (schan->rotmode == ROT_MODE_QUAT) {
float dquat[4], squat[4]; float dquat[4], squat[4];
QUATCOPY(dquat, dchan->quat); QUATCOPY(dquat, dchan->quat);

14
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -1259,13 +1259,13 @@ PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack
KX_MACRO_addTypesToDict(d, KX_ACT_ARMATURE_SETWEIGHT, ACT_ARM_SETWEIGHT); KX_MACRO_addTypesToDict(d, KX_ACT_ARMATURE_SETWEIGHT, ACT_ARM_SETWEIGHT);
/* BL_Armature Channel rotation_mode */ /* BL_Armature Channel rotation_mode */
KX_MACRO_addTypesToDict(d, PCHAN_ROT_QUAT, PCHAN_ROT_QUAT); KX_MACRO_addTypesToDict(d, ROT_MODE_QUAT, ROT_MODE_QUAT);
KX_MACRO_addTypesToDict(d, PCHAN_ROT_XYZ, PCHAN_ROT_XYZ); KX_MACRO_addTypesToDict(d, ROT_MODE_XYZ, ROT_MODE_XYZ);
KX_MACRO_addTypesToDict(d, PCHAN_ROT_XZY, PCHAN_ROT_XZY); KX_MACRO_addTypesToDict(d, ROT_MODE_XZY, ROT_MODE_XZY);
KX_MACRO_addTypesToDict(d, PCHAN_ROT_YXZ, PCHAN_ROT_YXZ); KX_MACRO_addTypesToDict(d, ROT_MODE_YXZ, ROT_MODE_YXZ);
KX_MACRO_addTypesToDict(d, PCHAN_ROT_YZX, PCHAN_ROT_YZX); KX_MACRO_addTypesToDict(d, ROT_MODE_YZX, ROT_MODE_YZX);
KX_MACRO_addTypesToDict(d, PCHAN_ROT_ZXY, PCHAN_ROT_ZXY); KX_MACRO_addTypesToDict(d, ROT_MODE_ZXY, ROT_MODE_ZXY);
KX_MACRO_addTypesToDict(d, PCHAN_ROT_ZYX, PCHAN_ROT_ZYX); KX_MACRO_addTypesToDict(d, ROT_MODE_ZYX, ROT_MODE_ZYX);
// Check for errors // Check for errors
if (PyErr_Occurred()) if (PyErr_Occurred())