OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

PhysX conversion code validation at compile-time

Browse Source 
Seriously? Offsetof has been around for a long time, and eap added a
compiler_assert for his crazy netcode. There's no excuse for that to be
happening at runtime.
This commit is contained in:
Adam Johnson
2013-05-23 00:07:37 -04:00
parent 12c53b85c5
commit 9634f9b050
3 changed files with 12 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.cpp
View File

@ -39,44 +39,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021 Mead, WA 99021
*==LICENSE==*/ *==LICENSE==*/
#include "plPXConvert.h" #include "plPXConvert.h"
bool plPXConvert::Validate() #define CHECK_OFFSET(NxCls, NxMem, hsCls, hsMem) \
{ static_assert(offsetof(NxCls, NxMem) == offsetof(hsCls, hsMem), \
NxVec3 nxVec; "PhysX Conversion Failure: "#NxCls " and " #hsCls " offsets do not match for " #NxMem "!");
hsVector3 plVec;
int nxVecXOffset = ((char*)&nxVec.x) - ((char*)&nxVec); CHECK_OFFSET(NxVec3, x, hsScalarTriple, fX);
int nxVecYOffset = ((char*)&nxVec.y) - ((char*)&nxVec); CHECK_OFFSET(NxVec3, y, hsScalarTriple, fY);
int nxVecZOffset = ((char*)&nxVec.z) - ((char*)&nxVec); CHECK_OFFSET(NxVec3, z, hsScalarTriple, fZ);
int plVecXOffset = ((char*)&plVec.fX) - ((char*)&plVec); CHECK_OFFSET(NxQuat, x, hsQuat, fX);
int plVecYOffset = ((char*)&plVec.fY) - ((char*)&plVec); CHECK_OFFSET(NxQuat, y, hsQuat, fY);
int plVecZOffset = ((char*)&plVec.fZ) - ((char*)&plVec); CHECK_OFFSET(NxQuat, z, hsQuat, fZ);
CHECK_OFFSET(NxQuat, w, hsQuat, fW);
#undef CHECK_OFFSET
NxQuat nxQuat;
hsQuat plQuat;
int nxQuatXOffset = ((char*)&nxQuat.x) - ((char*)&nxQuat);
int nxQuatYOffset = ((char*)&nxQuat.y) - ((char*)&nxQuat);
int nxQuatZOffset = ((char*)&nxQuat.z) - ((char*)&nxQuat);
int nxQuatWOffset = ((char*)&nxQuat.w) - ((char*)&nxQuat);
int plQuatXOffset = ((char*)&plQuat.fX) - ((char*)&plQuat);
int plQuatYOffset = ((char*)&plQuat.fY) - ((char*)&plQuat);
int plQuatZOffset = ((char*)&plQuat.fZ) - ((char*)&plQuat);
int plQuatWOffset = ((char*)&plQuat.fW) - ((char*)&plQuat);
bool offsetsOK =
nxVecXOffset == plVecXOffset &&
nxVecYOffset == plVecYOffset &&
nxVecZOffset == plVecZOffset &&
nxQuatXOffset == plQuatXOffset &&
nxQuatYOffset == plQuatYOffset &&
nxQuatZOffset == plQuatZOffset &&
nxQuatWOffset == plQuatWOffset;
hsAssert(offsetsOK, "PhysX or Plasma offsets have changed, need to rewrite conversion code");
return offsetsOK;
}

1
Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h
View File

@ -73,7 +73,6 @@ namespace plPXConvert
inline void Matrix(const hsMatrix44& fromMat, NxMat34& toMat) { toMat.setRowMajor44(&fromMat.fMap[0][0]); } inline void Matrix(const hsMatrix44& fromMat, NxMat34& toMat) { toMat.setRowMajor44(&fromMat.fMap[0][0]); }
inline void Matrix(const NxMat34& fromMat, hsMatrix44& toMat) { toMat.NotIdentity(); fromMat.getRowMajor44(&toMat.fMap[0][0]); } inline void Matrix(const NxMat34& fromMat, hsMatrix44& toMat) { toMat.NotIdentity(); fromMat.getRowMajor44(&toMat.fMap[0][0]); }
bool Validate();
}; };
#endif // plPXConvert_h_inc #endif // plPXConvert_h_inc

8
Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
View File

@ -301,14 +301,6 @@ bool plSimulationMgr::InitSimulation()
fSDK->getFoundationSDK().getRemoteDebugger()->connect("localhost", 5425); fSDK->getFoundationSDK().getRemoteDebugger()->connect("localhost", 5425);
#endif #endif
if ( !plPXConvert::Validate() )
{
#ifndef PLASMA_EXTERNAL_RELEASE
hsMessageBox("Ageia's PhysX or Plasma offsets have changed, need to rewrite conversion code.","PhysX Error",hsMBoxOk);
#endif
return false; // client will handle this and ask user to install
}
return true; return true;
} }