mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 08:04:40 +00:00
update bullet so it actually works
Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.
This commit is contained in:
parent
c7be48130a
commit
13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
|
|
@ -4,49 +4,47 @@
|
|||
See license in Gwen.h
|
||||
*/
|
||||
|
||||
|
||||
#include "Gwen/Gwen.h"
|
||||
|
||||
|
||||
namespace Gwen
|
||||
{
|
||||
// Globals
|
||||
GWEN_EXPORT Controls::Base* HoveredControl = NULL;
|
||||
GWEN_EXPORT Controls::Base* KeyboardFocus = NULL;
|
||||
GWEN_EXPORT Controls::Base* MouseFocus = NULL;
|
||||
|
||||
namespace Debug
|
||||
{
|
||||
void Msg( const char* str, ... )
|
||||
{
|
||||
char strOut[1024];
|
||||
va_list s;
|
||||
va_start( s, str );
|
||||
GwenUtil_VSNPrintFSafe( strOut, sizeof(strOut), _TRUNCATE, str, s );
|
||||
va_end(s);
|
||||
GwenUtil_OutputDebugCharString( strOut );
|
||||
}
|
||||
#ifdef UNICODE
|
||||
void Msg( const wchar_t* str, ... )
|
||||
{
|
||||
wchar_t strOut[1024];
|
||||
va_list s;
|
||||
va_start( s, str );
|
||||
GwenUtil_VSWPrintFSafeSized( strOut, str, s );
|
||||
va_end(s);
|
||||
GwenUtil_OutputDebugWideString( strOut );
|
||||
}
|
||||
#endif
|
||||
void AssertCheck( bool b, const char* strMsg )
|
||||
{
|
||||
if ( b ) return;
|
||||
#ifdef WINDOWS
|
||||
MessageBoxA( NULL, strMsg, "Assert", MB_ICONEXCLAMATION | MB_OK );
|
||||
_asm { int 3 }
|
||||
#else
|
||||
(void)strMsg; // unused param
|
||||
#endif
|
||||
}
|
||||
}
|
||||
// Globals
|
||||
GWEN_EXPORT Controls::Base* HoveredControl = NULL;
|
||||
GWEN_EXPORT Controls::Base* KeyboardFocus = NULL;
|
||||
GWEN_EXPORT Controls::Base* MouseFocus = NULL;
|
||||
|
||||
namespace Debug
|
||||
{
|
||||
void Msg(const char* str, ...)
|
||||
{
|
||||
char strOut[1024];
|
||||
va_list s;
|
||||
va_start(s, str);
|
||||
GwenUtil_VSNPrintFSafe(strOut, sizeof(strOut), _TRUNCATE, str, s);
|
||||
va_end(s);
|
||||
GwenUtil_OutputDebugCharString(strOut);
|
||||
}
|
||||
#ifdef UNICODE
|
||||
void Msg(const wchar_t* str, ...)
|
||||
{
|
||||
wchar_t strOut[1024];
|
||||
va_list s;
|
||||
va_start(s, str);
|
||||
GwenUtil_VSWPrintFSafeSized(strOut, str, s);
|
||||
va_end(s);
|
||||
GwenUtil_OutputDebugWideString(strOut);
|
||||
}
|
||||
#endif
|
||||
void AssertCheck(bool b, const char* strMsg)
|
||||
{
|
||||
if (b) return;
|
||||
#ifdef WINDOWS
|
||||
MessageBoxA(NULL, strMsg, "Assert", MB_ICONEXCLAMATION | MB_OK);
|
||||
_asm { int 3 }
|
||||
#else
|
||||
(void)strMsg; // unused param
|
||||
#endif
|
||||
}
|
||||
} // namespace Debug
|
||||
|
||||
} // namespace Gwen
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue