Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5: patch to comment out some more bad level calls in the game engine,

Browse Source 
apparently msvc is more strict here, provided by Jean-Michel Soler.
This commit is contained in:
Brecht Van Lommel
2008-11-16 21:13:53 +00:00
parent 369bdcc702
commit 6ea6edfa32
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@@ -179,7 +179,7 @@ extern "C" {
extern "C" { extern "C" {
#endif #endif
//XXX #include "BSE_headerbuttons.h" //XXX #include "BSE_headerbuttons.h"
void update_for_newframe(); //XXX void update_for_newframe();
//void scene_update_for_newframe(struct Scene *sce, unsigned int lay); //void scene_update_for_newframe(struct Scene *sce, unsigned int lay);
//#include "BKE_ipo.h" //#include "BKE_ipo.h"
//void do_all_data_ipos(void); //void do_all_data_ipos(void);
@@ -1929,7 +1929,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
if (converter->addInitFromFrame){//rcruiz if (converter->addInitFromFrame){//rcruiz
float eulxyzPrev[3]; float eulxyzPrev[3];
blenderscene->r.cfra=blenderscene->r.sfra-1; blenderscene->r.cfra=blenderscene->r.sfra-1;
update_for_newframe(); //XXX update_for_newframe();
MT_Vector3 tmp=pos-MT_Point3(blenderobject->loc[0]+blenderobject->dloc[0], MT_Vector3 tmp=pos-MT_Point3(blenderobject->loc[0]+blenderobject->dloc[0],
blenderobject->loc[1]+blenderobject->dloc[1], blenderobject->loc[1]+blenderobject->dloc[1],
blenderobject->loc[2]+blenderobject->dloc[2] blenderobject->loc[2]+blenderobject->dloc[2]
@@ -1947,7 +1947,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
tmp.scale(fps, fps, fps); tmp.scale(fps, fps, fps);
iniang.push_back(tmp); iniang.push_back(tmp);
blenderscene->r.cfra=blenderscene->r.sfra; blenderscene->r.cfra=blenderscene->r.sfra;
update_for_newframe(); //XXX update_for_newframe();
} }
gameobj->NodeSetLocalPosition(pos); gameobj->NodeSetLocalPosition(pos);
@@ -2131,7 +2131,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
if (converter->addInitFromFrame){//rcruiz if (converter->addInitFromFrame){//rcruiz
float eulxyzPrev[3]; float eulxyzPrev[3];
blenderscene->r.cfra=blenderscene->r.sfra-1; blenderscene->r.cfra=blenderscene->r.sfra-1;
update_for_newframe(); //XXX update_for_newframe();
MT_Vector3 tmp=pos-MT_Point3(blenderobject->loc[0]+blenderobject->dloc[0], MT_Vector3 tmp=pos-MT_Point3(blenderobject->loc[0]+blenderobject->dloc[0],
blenderobject->loc[1]+blenderobject->dloc[1], blenderobject->loc[1]+blenderobject->dloc[1],
blenderobject->loc[2]+blenderobject->dloc[2] blenderobject->loc[2]+blenderobject->dloc[2]
@@ -2149,7 +2149,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
tmp.scale(fps, fps, fps); tmp.scale(fps, fps, fps);
iniang.push_back(tmp); iniang.push_back(tmp);
blenderscene->r.cfra=blenderscene->r.sfra; blenderscene->r.cfra=blenderscene->r.sfra;
update_for_newframe(); //XXX update_for_newframe();
} }
gameobj->NodeSetLocalPosition(pos); gameobj->NodeSetLocalPosition(pos);

56
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@@ -661,8 +661,8 @@ void KX_BlenderSceneConverter::localDel_ipoCurve ( IpoCurve * icu ,struct SpaceI
extern "C" extern "C"
{ {
Ipo *add_ipo( char *name, int idcode ); Ipo *add_ipo( char *name, int idcode );
char *getIpoCurveName( IpoCurve * icu ); //XXX char *getIpoCurveName( IpoCurve * icu );
struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, char *, int, short); //XXX struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, char *, int);
void testhandles_ipocurve(struct IpoCurve *icu); void testhandles_ipocurve(struct IpoCurve *icu);
void insert_vert_icu(struct IpoCurve *, float, float, short); void insert_vert_icu(struct IpoCurve *, float, float, short);
void Mat3ToEul(float tmat[][3], float *eul); void Mat3ToEul(float tmat[][3], float *eul);
@@ -673,11 +673,11 @@ IpoCurve* findIpoCurve(IpoCurve* first, const char* searchName)
IpoCurve* icu1; IpoCurve* icu1;
for( icu1 = first; icu1; icu1 = icu1->next ) for( icu1 = first; icu1; icu1 = icu1->next )
{ {
char* curveName = getIpoCurveName( icu1 ); /*XXX char* curveName = getIpoCurveName( icu1 );
if( !strcmp( curveName, searchName) ) if( !strcmp( curveName, searchName) )
{ {
return icu1; return icu1;
} }*/
} }
return 0; return 0;
} }
@@ -874,28 +874,28 @@ void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
//create the curves, if not existing //create the curves, if not existing
IpoCurve *icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX"); IpoCurve *icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_X, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_X);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Y, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Y);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Z, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Z);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_X, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_X);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Y, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Y);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Z, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Z);
@@ -1030,28 +1030,28 @@ void KX_BlenderSceneConverter::TestHandlesPhysicsObjectToAnimationIpo()
//create the curves, if not existing //create the curves, if not existing
IpoCurve *icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX"); IpoCurve *icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_X, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_X);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Y, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Y);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Z, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Z);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_X, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_X);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Y, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Y);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ"); icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
if (!icu1) //XXX if (!icu1)
icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Z, 1); //XXX icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Z);