mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 14:44:36 +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
|
|
@ -7,78 +7,74 @@ using namespace Gwen;
|
|||
|
||||
class CrossSplitter : public GUnit
|
||||
{
|
||||
public:
|
||||
|
||||
GWEN_CONTROL_INLINE( CrossSplitter, GUnit )
|
||||
public:
|
||||
GWEN_CONTROL_INLINE(CrossSplitter, GUnit)
|
||||
{
|
||||
|
||||
m_bSplittersVisible = false;
|
||||
m_iCurZoom = 0;
|
||||
|
||||
m_Splitter = new Gwen::Controls::CrossSplitter( this );
|
||||
m_Splitter = new Gwen::Controls::CrossSplitter(this);
|
||||
m_Splitter->SetPos(0, 0);
|
||||
m_Splitter->Dock( Pos::Fill );
|
||||
m_Splitter->Dock(Pos::Fill);
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button( m_Splitter );
|
||||
testButton->SetText( "TOPLEFT");
|
||||
m_Splitter->SetPanel( 0, testButton );
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button(m_Splitter);
|
||||
testButton->SetText("TOPLEFT");
|
||||
m_Splitter->SetPanel(0, testButton);
|
||||
}
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button( m_Splitter );
|
||||
testButton->SetText( "TOPRIGHT");
|
||||
m_Splitter->SetPanel( 1, testButton );
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button(m_Splitter);
|
||||
testButton->SetText("TOPRIGHT");
|
||||
m_Splitter->SetPanel(1, testButton);
|
||||
}
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button( m_Splitter );
|
||||
testButton->SetText( "BOTTOMRIGHT");
|
||||
m_Splitter->SetPanel( 2, testButton );
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button(m_Splitter);
|
||||
testButton->SetText("BOTTOMRIGHT");
|
||||
m_Splitter->SetPanel(2, testButton);
|
||||
}
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button( m_Splitter );
|
||||
testButton->SetText( "BOTTOMLEFT");
|
||||
m_Splitter->SetPanel( 3, testButton );
|
||||
Gwen::Controls::Button* testButton = new Gwen::Controls::Button(m_Splitter);
|
||||
testButton->SetText("BOTTOMLEFT");
|
||||
m_Splitter->SetPanel(3, testButton);
|
||||
}
|
||||
|
||||
|
||||
//Status bar to hold unit testing buttons
|
||||
Gwen::Controls::StatusBar* pStatus = new Gwen::Controls::StatusBar( this );
|
||||
pStatus->Dock( Pos::Bottom );
|
||||
|
||||
Gwen::Controls::StatusBar* pStatus = new Gwen::Controls::StatusBar(this);
|
||||
pStatus->Dock(Pos::Bottom);
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button( pStatus );
|
||||
pButton->SetText( "Zoom" );
|
||||
pButton->onPress.Add( this, &CrossSplitter::ZoomTest );
|
||||
pStatus->AddControl( pButton, false );
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button(pStatus);
|
||||
pButton->SetText("Zoom");
|
||||
pButton->onPress.Add(this, &CrossSplitter::ZoomTest);
|
||||
pStatus->AddControl(pButton, false);
|
||||
}
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button( pStatus );
|
||||
pButton->SetText( "UnZoom" );
|
||||
pButton->onPress.Add( this, &CrossSplitter::UnZoomTest );
|
||||
pStatus->AddControl( pButton, false );
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button(pStatus);
|
||||
pButton->SetText("UnZoom");
|
||||
pButton->onPress.Add(this, &CrossSplitter::UnZoomTest);
|
||||
pStatus->AddControl(pButton, false);
|
||||
}
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button( pStatus );
|
||||
pButton->SetText( "CenterPanels" );
|
||||
pButton->onPress.Add( this, &CrossSplitter::CenterPanels );
|
||||
pStatus->AddControl( pButton, true );
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button(pStatus);
|
||||
pButton->SetText("CenterPanels");
|
||||
pButton->onPress.Add(this, &CrossSplitter::CenterPanels);
|
||||
pStatus->AddControl(pButton, true);
|
||||
}
|
||||
|
||||
{
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button( pStatus );
|
||||
pButton->SetText( "Splitters" );
|
||||
pButton->onPress.Add( this, &CrossSplitter::ToggleSplitters );
|
||||
pStatus->AddControl( pButton, true );
|
||||
Gwen::Controls::Button* pButton = new Gwen::Controls::Button(pStatus);
|
||||
pButton->SetText("Splitters");
|
||||
pButton->onPress.Add(this, &CrossSplitter::ToggleSplitters);
|
||||
pStatus->AddControl(pButton, true);
|
||||
}
|
||||
}
|
||||
|
||||
void ZoomTest( Gwen::Controls::Base* pFromPanel )
|
||||
void ZoomTest(Gwen::Controls::Base* pFromPanel)
|
||||
{
|
||||
m_Splitter->Zoom(m_iCurZoom);
|
||||
m_iCurZoom++;
|
||||
|
|
@ -86,30 +82,26 @@ class CrossSplitter : public GUnit
|
|||
m_iCurZoom = 0;
|
||||
}
|
||||
|
||||
void UnZoomTest( Gwen::Controls::Base* pFromPanel )
|
||||
void UnZoomTest(Gwen::Controls::Base* pFromPanel)
|
||||
{
|
||||
m_Splitter->UnZoom();
|
||||
}
|
||||
|
||||
void CenterPanels( Gwen::Controls::Base* pFromPanel )
|
||||
void CenterPanels(Gwen::Controls::Base* pFromPanel)
|
||||
{
|
||||
m_Splitter->CenterPanels();
|
||||
m_Splitter->UnZoom();
|
||||
}
|
||||
|
||||
void ToggleSplitters( Gwen::Controls::Base* pFromPanel )
|
||||
void ToggleSplitters(Gwen::Controls::Base* pFromPanel)
|
||||
{
|
||||
m_Splitter->SetSplittersVisible( !m_bSplittersVisible );
|
||||
m_Splitter->SetSplittersVisible(!m_bSplittersVisible);
|
||||
m_bSplittersVisible = !m_bSplittersVisible;
|
||||
}
|
||||
|
||||
|
||||
bool m_bSplittersVisible;
|
||||
int m_iCurZoom;
|
||||
int m_iCurZoom;
|
||||
Controls::CrossSplitter* m_Splitter;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
DEFINE_UNIT_TEST( CrossSplitter, L"CrossSplitter" );
|
||||
DEFINE_UNIT_TEST(CrossSplitter, L"CrossSplitter");
|
||||
Loading…
Add table
Add a link
Reference in a new issue