diff --git a/examples/Evolution/NN3DWalkers.h b/examples/Evolution/NN3DWalkers.h index 7d7f22536..4f2f4b769 100755 --- a/examples/Evolution/NN3DWalkers.h +++ b/examples/Evolution/NN3DWalkers.h @@ -17,7 +17,7 @@ subject to the following restrictions: #ifndef NN_3D_WALKERS_H #define NN_3D_WALKERS_H -class CommonExampleInterface* NN3DWalkersCreateFunc(struct CommonExampleOptions& options); +class CommonExampleInterface* ET_NN3DWalkersCreateFunc(struct CommonExampleOptions& options); #endif diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt index 49ccf0594..0b698742b 100644 --- a/examples/ExampleBrowser/CMakeLists.txt +++ b/examples/ExampleBrowser/CMakeLists.txt @@ -107,18 +107,18 @@ ELSE(WIN32) ENDIF(WIN32) -SET(ExtendedTutorialsSources - ../ExtendedTutorials/SimpleBox.cpp - ../ExtendedTutorials/MultipleBoxes.cpp - ../ExtendedTutorials/SimpleJoint.cpp - ../ExtendedTutorials/SimpleCloth.cpp - ../ExtendedTutorials/Chain.cpp - ../ExtendedTutorials/Bridge.cpp - ../ExtendedTutorials/RigidBodyFromObj.cpp - ../ExtendedTutorials/InclinedPlane.cpp - ../ExtendedTutorials/InclinedPlane.h - ../ExtendedTutorials/NewtonsCradle.cpp -) +#SET(ExtendedTutorialsSources +# ../ExtendedTutorials/SimpleBox.cpp +# ../ExtendedTutorials/MultipleBoxes.cpp +# ../ExtendedTutorials/SimpleJoint.cpp +# ../ExtendedTutorials/SimpleCloth.cpp +# ../ExtendedTutorials/Chain.cpp +# ../ExtendedTutorials/Bridge.cpp +# ../ExtendedTutorials/RigidBodyFromObj.cpp +# ../ExtendedTutorials/InclinedPlane.cpp +# ../ExtendedTutorials/InclinedPlane.h +# ../ExtendedTutorials/NewtonsCradle.cpp +#) SET(BulletExampleBrowser_SRCS @@ -175,8 +175,8 @@ SET(BulletExampleBrowser_SRCS ../ExtendedTutorials/InclinedPlane.h ../ExtendedTutorials/MultiPendulum.cpp ../ExtendedTutorials/MultiPendulum.h - ../ExtendedTutorials/NN3DWalkers.cpp - ../ExtendedTutorials/NN3DWalkers.h + ../Evolution/NN3DWalkers.cpp + ../Evolution/NN3DWalkers.h ../Collision/CollisionSdkC_Api.cpp ../Collision/CollisionSdkC_Api.h ../Collision/CollisionTutorialBullet2.cpp diff --git a/examples/ExampleBrowser/ExampleEntries.cpp b/examples/ExampleBrowser/ExampleEntries.cpp index e32d14648..fed2d4690 100644 --- a/examples/ExampleBrowser/ExampleEntries.cpp +++ b/examples/ExampleBrowser/ExampleEntries.cpp @@ -67,7 +67,7 @@ #include "../ExtendedTutorials/InclinedPlane.h" #include "../ExtendedTutorials/NewtonsCradle.h" #include "../ExtendedTutorials/MultiPendulum.h" -#include "../ExtendedTutorials/NN3DWalkers.h" +#include "../Evolution/NN3DWalkers.h" struct ExampleEntry { @@ -281,7 +281,9 @@ static ExampleEntry gDefaultExamples[]= ExampleEntry(1,"Inclined Plane", "Create an inclined plane to show restitution and different types of friction. Use the sliders to vary restitution and friction and press space to reset the scene.", ET_InclinedPlaneCreateFunc), ExampleEntry(1,"Newton's Cradle", "Create a Newton's Cradle using a pair of point2point/slider constraints. Press 1/2 to lengthen/shorten the pendula, press 3 to displace pendula. Use the sliders to select the number of pendula in total (reset simulation), the number of displaced pendula and other options.", ET_NewtonsCradleCreateFunc), ExampleEntry(1,"Multi-Pendulum", "Create a Multi-Pendulum using point2point/slider constraints. Press 1/2 to lengthen/shorten the pendula, press 3 to displace pendula. Use the sliders to select the number of pendula in total (reset simulation), the number of displaced pendula and other options.",ET_MultiPendulumCreateFunc), - ExampleEntry(1,"Neural Network 3D Walkers","A simple example of using evolution to make a creature walk.",NN3DWalkersCreateFunc) + + ExampleEntry(9,"Evolution"), + ExampleEntry(1,"Neural Network 3D Walkers","A simple example of using evolution to make a creature walk.",ET_NN3DWalkersCreateFunc), //todo: create a category/tutorial about advanced topics, such as optimizations, using different collision detection algorithm, different constraint solvers etc. //ExampleEntry(0,"Advanced"), diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua index c872caa4c..c5299244a 100644 --- a/examples/ExampleBrowser/premake4.lua +++ b/examples/ExampleBrowser/premake4.lua @@ -93,8 +93,8 @@ project "App_BulletExampleBrowser" "../ExtendedTutorials/Chain.cpp", "../ExtendedTutorials/Bridge.cpp", "../ExtendedTutorials/RigidBodyFromObj.cpp", - "../ExtendedTutorials/NN3DWalkers.cpp", - "../ExtendedTutorials/NN3DWalkers.h", + "../Evolution/NN3DWalkers.cpp", + "../Evolution/NN3DWalkers.h", "../Collision/*", "../Collision/Internal/*", "../Benchmarks/*",