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

71
examples/RenderingExamples/TimeSeriesExample.cpp
View File

@@ -10,13 +10,10 @@
#include "btBulletCollisionCommon.h"
#include "../CommonInterfaces/CommonGUIHelperInterface.h"
#include "TimeSeriesCanvas.h"
struct TimeSeriesExample : public CommonExampleInterface
{
struct CommonGraphicsApp* m_app;
struct TimeSeriesExampleInternalData* m_internalData;
@@ -30,17 +27,17 @@ struct TimeSeriesExample : public CommonExampleInterface
virtual void stepSimulation(float deltaTime);
virtual void physicsDebugDraw(int debugFlags);
virtual void physicsDebugDraw(int debugFlags);
virtual void syncPhysicsToGraphics(struct GraphicsPhysicsBridge& gfxBridge);
virtual bool mouseMoveCallback(float x,float y);
virtual bool mouseMoveCallback(float x, float y);
virtual bool mouseButtonCallback(int button, int state, float x, float y);
virtual bool mouseButtonCallback(int button, int state, float x, float y);
virtual bool keyboardCallback(int key, int state);
virtual bool keyboardCallback(int key, int state);
virtual void renderScene()
virtual void renderScene()
{
}
};
@@ -49,9 +46,8 @@ struct TimeSeriesExampleInternalData
{
TimeSeriesCanvas* m_timeSeriesCanvas;
TimeSeriesExampleInternalData()
:m_timeSeriesCanvas(0)
: m_timeSeriesCanvas(0)
{
}
};
@@ -71,72 +67,59 @@ TimeSeriesExample::~TimeSeriesExample()
void TimeSeriesExample::initPhysics()
{
//request a visual bitma/texture we can render to
m_internalData->m_timeSeriesCanvas = new TimeSeriesCanvas(m_app->m_2dCanvasInterface,512,512, "Test");
m_internalData->m_timeSeriesCanvas ->setupTimeSeries(3,100, 0);
m_internalData->m_timeSeriesCanvas->addDataSource("Some sine wave", 255,0,0);
m_internalData->m_timeSeriesCanvas->addDataSource("Some cosine wave", 0,255,0);
m_internalData->m_timeSeriesCanvas->addDataSource("Delta Time (*10)", 0,0,255);
m_internalData->m_timeSeriesCanvas->addDataSource("Tan", 255,0,255);
m_internalData->m_timeSeriesCanvas->addDataSource("Some cosine wave2", 255,255,0);
m_internalData->m_timeSeriesCanvas->addDataSource("Empty source2", 255,0,255);
}
m_internalData->m_timeSeriesCanvas = new TimeSeriesCanvas(m_app->m_2dCanvasInterface, 512, 512, "Test");
m_internalData->m_timeSeriesCanvas->setupTimeSeries(3, 100, 0);
m_internalData->m_timeSeriesCanvas->addDataSource("Some sine wave", 255, 0, 0);
m_internalData->m_timeSeriesCanvas->addDataSource("Some cosine wave", 0, 255, 0);
m_internalData->m_timeSeriesCanvas->addDataSource("Delta Time (*10)", 0, 0, 255);
m_internalData->m_timeSeriesCanvas->addDataSource("Tan", 255, 0, 255);
m_internalData->m_timeSeriesCanvas->addDataSource("Some cosine wave2", 255, 255, 0);
m_internalData->m_timeSeriesCanvas->addDataSource("Empty source2", 255, 0, 255);
}
void TimeSeriesExample::exitPhysics()
{
}
void TimeSeriesExample::stepSimulation(float deltaTime)
{
float time = m_internalData->m_timeSeriesCanvas->getCurrentTime();
float v = sinf(time);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(v,0,true);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(v, 0, true);
v = cosf(time);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(v,1,true);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(v, 1, true);
v = tanf(time);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(v,3,true);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(deltaTime*10,2,true);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(v, 3, true);
m_internalData->m_timeSeriesCanvas->insertDataAtCurrentTime(deltaTime * 10, 2, true);
m_internalData->m_timeSeriesCanvas->nextTick();
}
void TimeSeriesExample::physicsDebugDraw(int debugDrawFlags)
void TimeSeriesExample::physicsDebugDraw(int debugDrawFlags)
{
}
bool TimeSeriesExample::mouseMoveCallback(float x,float y)
bool TimeSeriesExample::mouseMoveCallback(float x, float y)
{
return false;
}
bool TimeSeriesExample::mouseButtonCallback(int button, int state, float x, float y)
bool TimeSeriesExample::mouseButtonCallback(int button, int state, float x, float y)
{
return false;
}
bool TimeSeriesExample::keyboardCallback(int key, int state)
bool TimeSeriesExample::keyboardCallback(int key, int state)
{
return false;
}
void TimeSeriesExample::syncPhysicsToGraphics(GraphicsPhysicsBridge& gfxBridge)
{
}
CommonExampleInterface* TimeSeriesCreateFunc(struct CommonExampleOptions& options)
{
return new TimeSeriesExample(options.m_guiHelper->getAppInterface());
}
CommonExampleInterface* TimeSeriesCreateFunc(struct CommonExampleOptions& options)
{
return new TimeSeriesExample(options.m_guiHelper->getAppInterface());
}