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

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
examples/RenderingExamples/DynamicTexturedCubeDemo.cpp
View File

@@ -19,10 +19,9 @@
class DynamicTexturedCubeDemo : public CommonExampleInterface
{
CommonGraphicsApp* m_app;
b3AlignedObjectArray<int> m_movingInstances;
CommonGraphicsApp* m_app;
b3AlignedObjectArray<int> m_movingInstances;
TinyVRGui* m_tinyVrGUI;
enum
@@ -30,116 +29,102 @@ class DynamicTexturedCubeDemo : public CommonExampleInterface
numCubesX = 1,
numCubesY = 1
};
public:
DynamicTexturedCubeDemo(CommonGraphicsApp* app)
:m_app(app),
m_tinyVrGUI(0)
{
DynamicTexturedCubeDemo(CommonGraphicsApp* app)
: m_app(app),
m_tinyVrGUI(0)
{
m_app->setUpAxis(2);
{
b3Vector3 extents=b3MakeVector3(100,100,100);
extents[m_app->getUpAxis()]=1;
int xres = 20;
int yres = 20;
b3Vector4 color0=b3MakeVector4(0.1, 0.1, 0.5,1);
b3Vector4 color1=b3MakeVector4(0.6, 0.6, 0.6,1);
m_app->registerGrid(xres, yres, color0, color1);
}
{
b3Vector3 extents = b3MakeVector3(100, 100, 100);
extents[m_app->getUpAxis()] = 1;
int xres = 20;
int yres = 20;
b3Vector4 color0 = b3MakeVector4(0.1, 0.1, 0.5, 1);
b3Vector4 color1 = b3MakeVector4(0.6, 0.6, 0.6, 1);
m_app->registerGrid(xres, yres, color0, color1);
}
ComboBoxParams comboParams;
comboParams.m_comboboxId = 0;
comboParams.m_numItems = 0;
comboParams.m_startItem = 0;
comboParams.m_callback = 0;//MyComboBoxCallback;
comboParams.m_userPointer = 0;//this;
m_tinyVrGUI = new TinyVRGui(comboParams,m_app->m_renderer);
comboParams.m_comboboxId = 0;
comboParams.m_numItems = 0;
comboParams.m_startItem = 0;
comboParams.m_callback = 0; //MyComboBoxCallback;
comboParams.m_userPointer = 0; //this;
m_tinyVrGUI = new TinyVRGui(comboParams, m_app->m_renderer);
m_tinyVrGUI->init();
m_app->m_renderer->writeTransforms();
}
virtual ~DynamicTexturedCubeDemo()
{
m_app->m_renderer->writeTransforms();
}
virtual ~DynamicTexturedCubeDemo()
{
delete m_tinyVrGUI;
}
}
virtual void physicsDebugDraw(int debugDrawMode)
{
}
virtual void initPhysics()
{
}
virtual void exitPhysics()
{
}
virtual void physicsDebugDraw(int debugDrawMode)
{
}
virtual void initPhysics()
{
}
virtual void exitPhysics()
{
}
virtual void stepSimulation(float deltaTime)
{
static b3Transform tr = b3Transform::getIdentity();
virtual void stepSimulation(float deltaTime)
{
static b3Transform tr = b3Transform::getIdentity();
static b3Scalar t = 0.f;
t+=deltaTime;
tr.setOrigin(b3MakeVector3(0.,0.,2.)+b3MakeVector3(0.,0.,0.02*b3Sin(t)));
t += deltaTime;
tr.setOrigin(b3MakeVector3(0., 0., 2.) + b3MakeVector3(0., 0., 0.02 * b3Sin(t)));
m_tinyVrGUI->tick(deltaTime,tr);
m_tinyVrGUI->tick(deltaTime, tr);
m_app->m_renderer->writeTransforms();
}
virtual void renderScene()
{
m_app->m_renderer->writeTransforms();
}
virtual void renderScene()
{
m_app->m_renderer->renderScene();
}
}
virtual void physicsDebugDraw()
{
}
virtual bool mouseMoveCallback(float x, float y)
{
return false;
}
virtual bool mouseButtonCallback(int button, int state, float x, float y)
{
return false;
}
virtual bool keyboardCallback(int key, int state)
{
return false;
}
virtual void physicsDebugDraw()
{
}
virtual bool mouseMoveCallback(float x,float y)
{
return false;
}
virtual bool mouseButtonCallback(int button, int state, float x, float y)
{
return false;
}
virtual bool keyboardCallback(int key, int state)
{
return false;
}
virtual void resetCamera()
{
float dist = 1.15;
float pitch = -33.7;
float yaw = 396;
float targetPos[3]={-0.5,0.7,1.45};
if (m_app->m_renderer && m_app->m_renderer->getActiveCamera())
float targetPos[3] = {-0.5, 0.7, 1.45};
if (m_app->m_renderer && m_app->m_renderer->getActiveCamera())
{
m_app->m_renderer->getActiveCamera()->setCameraDistance(dist);
m_app->m_renderer->getActiveCamera()->setCameraPitch(pitch);
m_app->m_renderer->getActiveCamera()->setCameraYaw(yaw);
m_app->m_renderer->getActiveCamera()->setCameraTargetPosition(targetPos[0],targetPos[1],targetPos[2]);
m_app->m_renderer->getActiveCamera()->setCameraTargetPosition(targetPos[0], targetPos[1], targetPos[2]);
}
}
};
class CommonExampleInterface* DynamicTexturedCubeDemoCreateFunc(struct CommonExampleOptions& options)
class CommonExampleInterface* DynamicTexturedCubeDemoCreateFunc(struct CommonExampleOptions& options)
{
return new DynamicTexturedCubeDemo(options.m_guiHelper->getAppInterface());
}