TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update bullet so it actually works

Browse source 
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:
marauder2k7 2026-06-03 15:08:51 +01:00
parent c7be48130a
commit 13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Engine/lib/bullet/test/GwenOpenGLTest/UnitTest.h
View file

@ -4,7 +4,6 @@
See license in Gwen.h
*/
#pragma once
#ifndef GWEN_UNITTEST_UNITTEST_H
#define GWEN_UNITTEST_UNITTEST_H
@ -18,47 +17,43 @@
class UnitTest;
class GUnit : public Gwen::Controls::Base
{
public:
public:
GWEN_CONTROL_INLINE(GUnit, Gwen::Controls::Base)
{
m_pUnitTest = NULL;
}
GWEN_CONTROL_INLINE( GUnit, Gwen::Controls::Base )
{
m_pUnitTest = NULL;
}
void SetUnitTest(UnitTest* u) { m_pUnitTest = u; }
void SetUnitTest( UnitTest* u ){ m_pUnitTest = u; }
void UnitPrint(const Gwen::UnicodeString& str);
void UnitPrint(const Gwen::String& str);
void UnitPrint( const Gwen::UnicodeString& str );
void UnitPrint( const Gwen::String& str );
UnitTest* m_pUnitTest;
UnitTest* m_pUnitTest;
};
class UnitTest : public Gwen::Controls::WindowControl
{
public:
public:
GWEN_CONTROL(UnitTest, Gwen::Controls::WindowControl);
GWEN_CONTROL( UnitTest, Gwen::Controls::WindowControl );
void PrintText(const Gwen::UnicodeString& str);
void PrintText( const Gwen::UnicodeString& str );
void Render( Gwen::Skin::Base* skin );
private:
Gwen::Controls::TabControl* m_TabControl;
Gwen::Controls::ListBox* m_TextOutput;
unsigned int m_iFrames;
float m_fLastSecond;
void Render(Gwen::Skin::Base* skin);
private:
Gwen::Controls::TabControl* m_TabControl;
Gwen::Controls::ListBox* m_TextOutput;
unsigned int m_iFrames;
float m_fLastSecond;
};
#define DEFINE_UNIT_TEST( name, displayname ) GUnit* RegisterUnitTest_##name( Gwen::Controls::TabControl* tab ){ GUnit* u = new name( tab ); tab->AddPage( displayname, u ); return u; }
#define DEFINE_UNIT_TEST(name, displayname) \
GUnit* RegisterUnitTest_##name(Gwen::Controls::TabControl* tab) \
{ \
GUnit* u = new name(tab); \
tab->AddPage(displayname, u); \
return u; \
}
#endif