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

Correct the build files and fix the name of the create method in header

Browse Source 
file.
This commit is contained in:
Benjamin Ellenberger
2016-07-04 19:17:50 +02:00
parent 277e103b7b
commit 74aba8b8fd
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Evolution/NN3DWalkers.h
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#ifndef NN_3D_WALKERS_H #ifndef NN_3D_WALKERS_H
#define NN_3D_WALKERS_H #define NN_3D_WALKERS_H
class CommonExampleInterface* NN3DWalkersCreateFunc(struct CommonExampleOptions& options); class CommonExampleInterface* ET_NN3DWalkersCreateFunc(struct CommonExampleOptions& options);
#endif #endif

28
examples/ExampleBrowser/CMakeLists.txt
View File

@@ -107,18 +107,18 @@ ELSE(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
SET(ExtendedTutorialsSources #SET(ExtendedTutorialsSources
../ExtendedTutorials/SimpleBox.cpp # ../ExtendedTutorials/SimpleBox.cpp
../ExtendedTutorials/MultipleBoxes.cpp # ../ExtendedTutorials/MultipleBoxes.cpp
../ExtendedTutorials/SimpleJoint.cpp # ../ExtendedTutorials/SimpleJoint.cpp
../ExtendedTutorials/SimpleCloth.cpp # ../ExtendedTutorials/SimpleCloth.cpp
../ExtendedTutorials/Chain.cpp # ../ExtendedTutorials/Chain.cpp
../ExtendedTutorials/Bridge.cpp # ../ExtendedTutorials/Bridge.cpp
../ExtendedTutorials/RigidBodyFromObj.cpp # ../ExtendedTutorials/RigidBodyFromObj.cpp
../ExtendedTutorials/InclinedPlane.cpp # ../ExtendedTutorials/InclinedPlane.cpp
../ExtendedTutorials/InclinedPlane.h # ../ExtendedTutorials/InclinedPlane.h
../ExtendedTutorials/NewtonsCradle.cpp # ../ExtendedTutorials/NewtonsCradle.cpp
) #)
SET(BulletExampleBrowser_SRCS SET(BulletExampleBrowser_SRCS
@@ -175,8 +175,8 @@ SET(BulletExampleBrowser_SRCS
../ExtendedTutorials/InclinedPlane.h ../ExtendedTutorials/InclinedPlane.h
../ExtendedTutorials/MultiPendulum.cpp ../ExtendedTutorials/MultiPendulum.cpp
../ExtendedTutorials/MultiPendulum.h ../ExtendedTutorials/MultiPendulum.h
../ExtendedTutorials/NN3DWalkers.cpp ../Evolution/NN3DWalkers.cpp
../ExtendedTutorials/NN3DWalkers.h ../Evolution/NN3DWalkers.h
../Collision/CollisionSdkC_Api.cpp ../Collision/CollisionSdkC_Api.cpp
../Collision/CollisionSdkC_Api.h ../Collision/CollisionSdkC_Api.h
../Collision/CollisionTutorialBullet2.cpp ../Collision/CollisionTutorialBullet2.cpp

6
examples/ExampleBrowser/ExampleEntries.cpp
View File

@@ -67,7 +67,7 @@
#include "../ExtendedTutorials/InclinedPlane.h" #include "../ExtendedTutorials/InclinedPlane.h"
#include "../ExtendedTutorials/NewtonsCradle.h" #include "../ExtendedTutorials/NewtonsCradle.h"
#include "../ExtendedTutorials/MultiPendulum.h" #include "../ExtendedTutorials/MultiPendulum.h"
#include "../ExtendedTutorials/NN3DWalkers.h" #include "../Evolution/NN3DWalkers.h"
struct ExampleEntry 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,"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,"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,"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. //todo: create a category/tutorial about advanced topics, such as optimizations, using different collision detection algorithm, different constraint solvers etc.
//ExampleEntry(0,"Advanced"), //ExampleEntry(0,"Advanced"),

4
examples/ExampleBrowser/premake4.lua
View File

@@ -93,8 +93,8 @@ project "App_BulletExampleBrowser"
"../ExtendedTutorials/Chain.cpp", "../ExtendedTutorials/Chain.cpp",
"../ExtendedTutorials/Bridge.cpp", "../ExtendedTutorials/Bridge.cpp",
"../ExtendedTutorials/RigidBodyFromObj.cpp", "../ExtendedTutorials/RigidBodyFromObj.cpp",
"../ExtendedTutorials/NN3DWalkers.cpp", "../Evolution/NN3DWalkers.cpp",
"../ExtendedTutorials/NN3DWalkers.h", "../Evolution/NN3DWalkers.h",
"../Collision/*", "../Collision/*",
"../Collision/Internal/*", "../Collision/Internal/*",
"../Benchmarks/*", "../Benchmarks/*",