Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tweak gui description window size

Browse Source 
use system clock for delta time
fix urdf file name
This commit is contained in:
Erwin Coumans
2015-05-04 16:52:43 -07:00
parent 6ea35aa875
commit 633ea613ab
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp
View File

@@ -364,10 +364,10 @@ void GwenUserInterface::init(int width, int height,Gwen::Renderer::Base* rendere
m_data->m_explorerTreeCtrl = ctrl; m_data->m_explorerTreeCtrl = ctrl;
ctrl->SetKeyboardInputEnabled(true); ctrl->SetKeyboardInputEnabled(true);
ctrl->Focus(); ctrl->Focus();
ctrl->SetBounds(2, 10, 236, 400); ctrl->SetBounds(2, 10, 236, 300);
m_data->m_exampleInfoGroupBox = new Gwen::Controls::Label( m_data->m_explorerPage->GetPage() ); m_data->m_exampleInfoGroupBox = new Gwen::Controls::Label( m_data->m_explorerPage->GetPage() );
m_data->m_exampleInfoGroupBox->SetPos(2, 414); m_data->m_exampleInfoGroupBox->SetPos(2, 314);
m_data->m_exampleInfoGroupBox->SetHeight( 15 ); m_data->m_exampleInfoGroupBox->SetHeight( 15 );
m_data->m_exampleInfoGroupBox->SetWidth(234); m_data->m_exampleInfoGroupBox->SetWidth(234);
m_data->m_exampleInfoGroupBox->SetText("Example Description"); m_data->m_exampleInfoGroupBox->SetText("Example Description");
@@ -376,7 +376,7 @@ void GwenUserInterface::init(int width, int height,Gwen::Renderer::Base* rendere
//m_data->m_exampleInfoTextOutput->Dock( Gwen::Pos::Bottom ); //m_data->m_exampleInfoTextOutput->Dock( Gwen::Pos::Bottom );
m_data->m_exampleInfoTextOutput->SetPos(2, 432); m_data->m_exampleInfoTextOutput->SetPos(2, 332);
m_data->m_exampleInfoTextOutput->SetHeight( 150 ); m_data->m_exampleInfoTextOutput->SetHeight( 150 );
m_data->m_exampleInfoTextOutput->SetWidth(233); m_data->m_exampleInfoTextOutput->SetWidth(233);

5
examples/ExampleBrowser/main.cpp
View File

@@ -17,7 +17,8 @@ int main(int argc, char* argv[])
{ {
b3CommandLineArgs args(argc,argv); b3CommandLineArgs args(argc,argv);
b3Clock clock; b3Clock clock;
ExampleEntries examples; ExampleEntries examples;
examples.initExampleEntries(); examples.initExampleEntries();
@@ -27,7 +28,7 @@ int main(int argc, char* argv[])
{ {
do do
{ {
float deltaTimeInSeconds = 1./120.f; float deltaTimeInSeconds = clock.getTimeMicroseconds()/1000000.f;
exampleBrowser->update(deltaTimeInSeconds); exampleBrowser->update(deltaTimeInSeconds);
} while (!exampleBrowser->requestedExit()); } while (!exampleBrowser->requestedExit());

4
examples/Importers/ImportURDFDemo/ImportURDFSetup.cpp
View File

@@ -91,7 +91,7 @@ ImportUrdfSetup::ImportUrdfSetup(struct GUIHelperInterface* helper, int option,
} else } else
{ {
gFileNameArray.clear(); gFileNameArray.clear();
gFileNameArray.push_back("husky/model.urdf"); gFileNameArray.push_back("r2d2.urdf");
@@ -291,4 +291,4 @@ class CommonExampleInterface* ImportURDFCreateFunc(struct CommonExampleOption
{ {
return new ImportUrdfSetup(options.m_guiHelper, options.m_option,options.m_fileName); return new ImportUrdfSetup(options.m_guiHelper, options.m_option,options.m_fileName);
} }