diff options
author | Chris Burt <desoto@exenex.com> | 2005-03-25 17:57:25 +0300 |
---|---|---|
committer | Chris Burt <desoto@exenex.com> | 2005-03-25 17:57:25 +0300 |
commit | 94839880d731449d6dd31dfdd2586fd10592b641 (patch) | |
tree | 01c158f8400914f3d6a1d28bac0978831f24abac /source/gameengine/Physics/Sumo | |
parent | 57f72f4081953f0297404d128abb23065ae8489c (diff) |
Quickly hacked together a fix for game engine compiling. There were two
missing files in Kester's new commits. This commit adds these two files so
that compiling can continue as it is intended to. Emilie M. found a
home for the files rather quickly, Ton recieived the files from Erwin via
email, and we all tested. Works great! Thanks to everyone that helped!
Diffstat (limited to 'source/gameengine/Physics/Sumo')
-rwxr-xr-x | source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp | 66 | ||||
-rwxr-xr-x | source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h | 27 |
2 files changed, 93 insertions, 0 deletions
diff --git a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp new file mode 100755 index 00000000000..52d3888f58c --- /dev/null +++ b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp @@ -0,0 +1,66 @@ +#include "SumoPHYCallbackBridge.h" +#include "PHY_IPhysicsController.h" +#include "SM_Object.h" + + +SumoPHYCallbackBridge::SumoPHYCallbackBridge(void* clientData,PHY_ResponseCallback phyCallback) +:m_orgClientData(clientData), +m_phyCallback(phyCallback) +{ + +} +DT_Bool SumoPHYCallbackBridge::StaticSolidToPHYCallback(void *client_data, + void *client_object1, + void *client_object2, + const DT_CollData *coll_data) +{ + SumoPHYCallbackBridge* bridge = static_cast<SumoPHYCallbackBridge*>(client_data); + bridge->SolidToPHY(client_object1,client_object2,coll_data); + return false; +} + +DT_Bool SumoPHYCallbackBridge::SolidToPHY(void *client_object1, + void *client_object2, + const DT_CollData *coll_data) +{ + + SM_Object* smObject1 = static_cast<SM_Object*>(client_object1); + SM_Object* smObject2 = static_cast<SM_Object*>(client_object2); + + PHY_IPhysicsController* ctrl1 = static_cast<PHY_IPhysicsController*>(smObject1->getPhysicsClientObject()); + PHY_IPhysicsController* ctrl2 = static_cast<PHY_IPhysicsController*>(smObject2->getPhysicsClientObject()); + + if (!ctrl1 || !ctrl2) + { + //todo: check which objects are not linked up properly + return false; + } + if (coll_data) + { + PHY_CollData phyCollData; + + phyCollData.m_point1[0] = coll_data->point1[0]; + phyCollData.m_point1[1] = coll_data->point1[1]; + phyCollData.m_point1[2] = coll_data->point1[2]; + phyCollData.m_point1[3] = 0.f; + + phyCollData.m_point2[0] = coll_data->point2[0]; + phyCollData.m_point2[1] = coll_data->point2[1]; + phyCollData.m_point2[2] = coll_data->point2[2]; + phyCollData.m_point2[3] = 0.f; + + phyCollData.m_normal[0] = coll_data->normal[0]; + phyCollData.m_normal[1] = coll_data->normal[1]; + phyCollData.m_normal[2] = coll_data->normal[2]; + phyCollData.m_normal[3] = 0.f; + + + return m_phyCallback(m_orgClientData, + ctrl1,ctrl2,&phyCollData); + } + + return m_phyCallback(m_orgClientData, + ctrl1,ctrl2,0); + + +}
\ No newline at end of file diff --git a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h new file mode 100755 index 00000000000..343fd7ce938 --- /dev/null +++ b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h @@ -0,0 +1,27 @@ +#ifndef SUMO_PHY_CALLBACK_BRIDGE_H +#define SUMO_PHY_CALLBACK_BRIDGE_H + +#include <SOLID/SOLID.h> +#include "PHY_DynamicTypes.h" + +class SumoPHYCallbackBridge +{ + void* m_orgClientData; + PHY_ResponseCallback m_phyCallback; + +public: + + SumoPHYCallbackBridge::SumoPHYCallbackBridge(void* clientData,PHY_ResponseCallback phyCallback); + + static DT_Bool StaticSolidToPHYCallback(void *client_data, + void *client_object1, + void *client_object2, + const DT_CollData *coll_data); + + DT_Bool SolidToPHY(void *client_object1, + void *client_object2, + const DT_CollData *coll_data); + + +}; +#endif //SUMO_PHY_CALLBACK_BRIDGE_H
\ No newline at end of file |