TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-06-12 00:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update bullet so it actually works

Browse source 
Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.
This commit is contained in:
marauder2k7 2026-06-03 15:08:51 +01:00
parent c7be48130a
commit 13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Engine/lib/bullet/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());
}