mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use C++11 std::chrono library to deal with time instead of old code

Browse Source
This commit is contained in:
Daniel Chappuis 2021-02-22 21:08:55 +01:00
parent 8ca63572f4
commit 4c0e629e9b
15 changed files with 71 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -105,7 +105,6 @@ set (REACTPHYSICS3D_HEADERS
"include/reactphysics3d/engine/Island.h" "include/reactphysics3d/engine/Island.h"
"include/reactphysics3d/engine/Islands.h" "include/reactphysics3d/engine/Islands.h"
"include/reactphysics3d/engine/Material.h" "include/reactphysics3d/engine/Material.h"
"include/reactphysics3d/engine/Timer.h"
"include/reactphysics3d/engine/OverlappingPairs.h" "include/reactphysics3d/engine/OverlappingPairs.h"
"include/reactphysics3d/systems/BroadPhaseSystem.h" "include/reactphysics3d/systems/BroadPhaseSystem.h"
"include/reactphysics3d/components/Components.h" "include/reactphysics3d/components/Components.h"
@ -204,7 +203,6 @@ set (REACTPHYSICS3D_SOURCES
"src/engine/PhysicsWorld.cpp" "src/engine/PhysicsWorld.cpp"
"src/engine/Island.cpp" "src/engine/Island.cpp"
"src/engine/Material.cpp" "src/engine/Material.cpp"
"src/engine/Timer.cpp"
"src/engine/OverlappingPairs.cpp" "src/engine/OverlappingPairs.cpp"
"src/engine/Entity.cpp" "src/engine/Entity.cpp"
"src/engine/EntityManager.cpp" "src/engine/EntityManager.cpp"

9
include/reactphysics3d/configuration.h
View File

@ -35,15 +35,6 @@
#include <reactphysics3d/decimal.h> #include <reactphysics3d/decimal.h>
#include <reactphysics3d/containers/Pair.h> #include <reactphysics3d/containers/Pair.h>
// Platforms
#if defined(WIN32) ||defined(_WIN32) || defined(_WIN64) ||defined(__WIN32__) || defined(__WINDOWS__)
#define WINDOWS_OS
#elif defined(__APPLE__)
#define APPLE_OS
#elif defined(__linux__) || defined(linux) || defined(__linux) // Linux platform
#define LINUX_OS
#endif
// Compilers // Compilers
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define RP3D_COMPILER_VISUAL_STUDIO #define RP3D_COMPILER_VISUAL_STUDIO

196
include/reactphysics3d/engine/Timer.h
View File

@ -1,196 +0,0 @@
/********************************************************************************
* ReactPhysics3D physics library, http://www.reactphysics3d.com *
* Copyright (c) 2010-2020 Daniel Chappuis *
*********************************************************************************
* *
* This software is provided 'as-is', without any express or implied warranty. *
* In no event will the authors be held liable for any damages arising from the *
* use of this software. *
* *
* Permission is granted to anyone to use this software for any purpose, *
* including commercial applications, and to alter it and redistribute it *
* freely, subject to the following restrictions: *
* *
* 1. The origin of this software must not be misrepresented; you must not claim *
* that you wrote the original software. If you use this software in a *
* product, an acknowledgment in the product documentation would be *
* appreciated but is not required. *
* *
* 2. Altered source versions must be plainly marked as such, and must not be *
* misrepresented as being the original software. *
* *
* 3. This notice may not be removed or altered from any source distribution. *
* *
********************************************************************************/
#ifndef REACTPHYSICS3D_TIMER_H
#define REACTPHYSICS3D_TIMER_H
// Libraries
#include <ctime>
#include <cassert>
#include <reactphysics3d/configuration.h>
#if defined(WINDOWS_OS) // For Windows platform
#define NOMINMAX // This is used to avoid definition of max() and min() macros
#include <windows.h>
#else // For Mac OS or Linux platform
#include <sys/time.h>
#endif
/// Namespace ReactPhysics3D
namespace reactphysics3d {
// Class Timer
/**
* This class will take care of the time in the physics engine. It
* uses functions that depend on the current platform to get the
* current time.
*/
class Timer {
private :
// -------------------- Attributes -------------------- //
/// Timestep dt of the physics engine (timestep > 0.0)
double mTimeStep;
/// Last time the timer has been updated
long double mLastUpdateTime;
/// Time difference between the two last timer update() calls
long double mDeltaTime;
/// Used to fix the time step and avoid strange time effects
double mAccumulator;
/// True if the timer is running
bool mIsRunning;
public :
// -------------------- Methods -------------------- //
/// Constructor
Timer(double timeStep);
/// Destructor
~Timer() = default;
/// Deleted copy-constructor
Timer(const Timer& timer) = delete;
/// Deleted assignment operator
Timer& operator=(const Timer& timer) = delete;
/// Return the timestep of the physics engine
double getTimeStep() const;
/// Set the timestep of the physics engine
void setTimeStep(double timeStep);
/// Return the current time of the physics engine
long double getPhysicsTime() const;
/// Start the timer
void start();
/// Stop the timer
void stop();
/// Return true if the timer is running
bool getIsRunning() const;
/// True if it's possible to take a new step
bool isPossibleToTakeStep() const;
/// Compute the time since the last update() call and add it to the accumulator
void update();
/// Take a new step => update the timer by adding the timeStep value to the current time
void nextStep();
/// Compute the interpolation factor
decimal computeInterpolationFactor();
/// Return the current time of the system in seconds
static long double getCurrentSystemTime();
};
// Return the timestep of the physics engine
RP3D_FORCE_INLINE double Timer::getTimeStep() const {
return mTimeStep;
}
// Set the timestep of the physics engine
RP3D_FORCE_INLINE void Timer::setTimeStep(double timeStep) {
assert(timeStep > 0.0f);
mTimeStep = timeStep;
}
// Return the current time
RP3D_FORCE_INLINE long double Timer::getPhysicsTime() const {
return mLastUpdateTime;
}
// Return if the timer is running
RP3D_FORCE_INLINE bool Timer::getIsRunning() const {
return mIsRunning;
}
// Start the timer
RP3D_FORCE_INLINE void Timer::start() {
if (!mIsRunning) {
// Get the current system time
mLastUpdateTime = getCurrentSystemTime();
mAccumulator = 0.0;
mIsRunning = true;
}
}
// Stop the timer
RP3D_FORCE_INLINE void Timer::stop() {
mIsRunning = false;
}
// True if it's possible to take a new step
RP3D_FORCE_INLINE bool Timer::isPossibleToTakeStep() const {
return (mAccumulator >= mTimeStep);
}
// Take a new step => update the timer by adding the timeStep value to the current time
RP3D_FORCE_INLINE void Timer::nextStep() {
assert(mIsRunning);
// Update the accumulator value
mAccumulator -= mTimeStep;
}
// Compute the interpolation factor
RP3D_FORCE_INLINE decimal Timer::computeInterpolationFactor() {
return (decimal(mAccumulator / mTimeStep));
}
// Compute the time since the last update() call and add it to the accumulator
RP3D_FORCE_INLINE void Timer::update() {
// Get the current system time
long double currentTime = getCurrentSystemTime();
// Compute the delta display time between two display frames
mDeltaTime = currentTime - mLastUpdateTime;
// Update the current display time
mLastUpdateTime = currentTime;
// Update the accumulator value
mAccumulator += mDeltaTime;
}
}
#endif

30
include/reactphysics3d/utils/Profiler.h
View File

@ -29,16 +29,17 @@
// If profiling is enabled // If profiling is enabled
#ifdef IS_RP3D_PROFILING_ENABLED #ifdef IS_RP3D_PROFILING_ENABLED
// Libraries // Libraries
#include <reactphysics3d/configuration.h> #include <reactphysics3d/configuration.h>
#include <reactphysics3d/engine/Timer.h>
#include <fstream> #include <fstream>
#include <chrono>
#include <reactphysics3d/containers/Array.h> #include <reactphysics3d/containers/Array.h>
/// ReactPhysics3D namespace /// ReactPhysics3D namespace
namespace reactphysics3d { namespace reactphysics3d {
using clock = std::chrono::high_resolution_clock;
// Class ProfileNode // Class ProfileNode
/** /**
* It represents a profile sample in the profiler tree. * It represents a profile sample in the profiler tree.
@ -56,10 +57,10 @@ class ProfileNode {
uint mNbTotalCalls; uint mNbTotalCalls;
/// Starting time of the sampling of corresponding block of code /// Starting time of the sampling of corresponding block of code
long double mStartingTime; std::chrono::time_point<clock> mStartingTime;
/// Total time spent in the block of code /// Total time spent in the block of code
long double mTotalTime; std::chrono::duration<double, std::milli> mTotalTime;
/// Recursion counter /// Recursion counter
int mRecursionCounter; int mRecursionCounter;
@ -102,7 +103,7 @@ class ProfileNode {
uint getNbTotalCalls() const; uint getNbTotalCalls() const;
/// Return the total time spent in the block of code /// Return the total time spent in the block of code
long double getTotalTime() const; std::chrono::duration<double, std::milli> getTotalTime() const;
/// Called when we enter the block of code corresponding to this profile node /// Called when we enter the block of code corresponding to this profile node
void enterBlockOfCode(); void enterBlockOfCode();
@ -162,7 +163,7 @@ class ProfileNodeIterator {
const char* getCurrentName(); const char* getCurrentName();
/// Return the total time of the current node /// Return the total time of the current node
long double getCurrentTotalTime(); std::chrono::duration<double, std::milli> getCurrentTotalTime();
/// Return the total number of calls of the current node /// Return the total number of calls of the current node
uint getCurrentNbTotalCalls(); uint getCurrentNbTotalCalls();
@ -171,7 +172,7 @@ class ProfileNodeIterator {
const char* getCurrentParentName(); const char* getCurrentParentName();
/// Return the total time of the current parent node /// Return the total time of the current parent node
long double getCurrentParentTotalTime(); std::chrono::duration<double, std::milli> getCurrentParentTotalTime();
/// Return the total number of calls of the current parent node /// Return the total number of calls of the current parent node
uint getCurrentParentNbTotalCalls(); uint getCurrentParentNbTotalCalls();
@ -290,7 +291,7 @@ class Profiler {
uint mFrameCounter; uint mFrameCounter;
/// Starting profiling time /// Starting profiling time
long double mProfilingStartTime; std::chrono::time_point<clock> mProfilingStartTime;
/// Number of allocated destinations /// Number of allocated destinations
uint mNbAllocatedDestinations; uint mNbAllocatedDestinations;
@ -336,7 +337,7 @@ class Profiler {
uint getNbFrames(); uint getNbFrames();
/// Return the elasped time since the start/reset of the profiling /// Return the elasped time since the start/reset of the profiling
long double getElapsedTimeSinceStart(); std::chrono::duration<double, std::milli> getElapsedTimeSinceStart();
/// Increment the frame counter /// Increment the frame counter
void incrementFrameCounter(); void incrementFrameCounter();
@ -416,7 +417,7 @@ RP3D_FORCE_INLINE const char* ProfileNodeIterator::getCurrentName() {
} }
// Return the total time of the current node // Return the total time of the current node
RP3D_FORCE_INLINE long double ProfileNodeIterator::getCurrentTotalTime() { RP3D_FORCE_INLINE std::chrono::duration<double, std::milli> ProfileNodeIterator::getCurrentTotalTime() {
return mCurrentChildNode->getTotalTime(); return mCurrentChildNode->getTotalTime();
} }
@ -431,7 +432,7 @@ RP3D_FORCE_INLINE const char* ProfileNodeIterator::getCurrentParentName() {
} }
// Return the total time of the current parent node // Return the total time of the current parent node
RP3D_FORCE_INLINE long double ProfileNodeIterator::getCurrentParentTotalTime() { RP3D_FORCE_INLINE std::chrono::duration<double, std::milli> ProfileNodeIterator::getCurrentParentTotalTime() {
return mCurrentParentNode->getTotalTime(); return mCurrentParentNode->getTotalTime();
} }
@ -476,7 +477,7 @@ RP3D_FORCE_INLINE uint ProfileNode::getNbTotalCalls() const {
} }
// Return the total time spent in the block of code // Return the total time spent in the block of code
RP3D_FORCE_INLINE long double ProfileNode::getTotalTime() const { RP3D_FORCE_INLINE std::chrono::duration<double, std::milli> ProfileNode::getTotalTime() const {
return mTotalTime; return mTotalTime;
} }
@ -486,9 +487,8 @@ RP3D_FORCE_INLINE uint Profiler::getNbFrames() {
} }
// Return the elasped time since the start/reset of the profiling // Return the elasped time since the start/reset of the profiling
RP3D_FORCE_INLINE long double Profiler::getElapsedTimeSinceStart() { RP3D_FORCE_INLINE std::chrono::duration<double, std::milli> Profiler::getElapsedTimeSinceStart() {
long double currentTime = Timer::getCurrentSystemTime() * 1000.0L; return (clock::now() - mProfilingStartTime);
return currentTime - mProfilingStartTime;
} }
// Increment the frame counter // Increment the frame counter

61
src/engine/Timer.cpp
View File

@ -1,61 +0,0 @@
/********************************************************************************
* ReactPhysics3D physics library, http://www.reactphysics3d.com *
* Copyright (c) 2010-2020 Daniel Chappuis *
*********************************************************************************
* *
* This software is provided 'as-is', without any express or implied warranty. *
* In no event will the authors be held liable for any damages arising from the *
* use of this software. *
* *
* Permission is granted to anyone to use this software for any purpose, *
* including commercial applications, and to alter it and redistribute it *
* freely, subject to the following restrictions: *
* *
* 1. The origin of this software must not be misrepresented; you must not claim *
* that you wrote the original software. If you use this software in a *
* product, an acknowledgment in the product documentation would be *
* appreciated but is not required. *
* *
* 2. Altered source versions must be plainly marked as such, and must not be *
* misrepresented as being the original software. *
* *
* 3. This notice may not be removed or altered from any source distribution. *
* *
********************************************************************************/
// Libraries
#include <reactphysics3d/engine/Timer.h>
// We want to use the ReactPhysics3D namespace
using namespace reactphysics3d;
// Constructor
Timer::Timer(double timeStep) : mTimeStep(timeStep), mLastUpdateTime(0), mDeltaTime(0), mIsRunning(false) {
assert(timeStep > 0.0);
}
// Return the current time of the system in seconds
long double Timer::getCurrentSystemTime() {
#if defined(WINDOWS_OS)
LARGE_INTEGER ticksPerSecond;
LARGE_INTEGER ticks;
QueryPerformanceFrequency(&ticksPerSecond);
QueryPerformanceCounter(&ticks);
return ((long double)(ticks.QuadPart) / (long double)(ticksPerSecond.QuadPart));
#else
// Initialize the lastUpdateTime with the current time in seconds
timeval timeValue;
gettimeofday(&timeValue, nullptr);
return (timeValue.tv_sec + (timeValue.tv_usec / 1000000.0));
#endif
}

32
src/utils/Profiler.cpp
View File

@ -36,7 +36,7 @@ using namespace reactphysics3d;
// Constructor // Constructor
ProfileNode::ProfileNode(const char* name, ProfileNode* parentNode) ProfileNode::ProfileNode(const char* name, ProfileNode* parentNode)
:mName(name), mNbTotalCalls(0), mStartingTime(0), mTotalTime(0), :mName(name), mNbTotalCalls(0), mStartingTime(), mTotalTime(0),
mRecursionCounter(0), mParentNode(parentNode), mChildNode(nullptr), mRecursionCounter(0), mParentNode(parentNode), mChildNode(nullptr),
mSiblingNode(nullptr) { mSiblingNode(nullptr) {
reset(); reset();
@ -79,7 +79,7 @@ void ProfileNode::enterBlockOfCode() {
// Get the current system time to initialize the starting time of // Get the current system time to initialize the starting time of
// the profiling of the current block of code // the profiling of the current block of code
mStartingTime = Timer::getCurrentSystemTime() * 1000.0L; mStartingTime = clock::now();
} }
mRecursionCounter++; mRecursionCounter++;
@ -92,7 +92,7 @@ bool ProfileNode::exitBlockOfCode() {
if (mRecursionCounter == 0 && mNbTotalCalls != 0) { if (mRecursionCounter == 0 && mNbTotalCalls != 0) {
// Get the current system time // Get the current system time
long double currentTime = Timer::getCurrentSystemTime() * 1000.0L; std::chrono::time_point<std::chrono::high_resolution_clock> currentTime = std::chrono::high_resolution_clock::now();
// Increase the total elasped time in the current block of code // Increase the total elasped time in the current block of code
mTotalTime += currentTime - mStartingTime; mTotalTime += currentTime - mStartingTime;
@ -105,7 +105,7 @@ bool ProfileNode::exitBlockOfCode() {
// Reset the profiling of the node // Reset the profiling of the node
void ProfileNode::reset() { void ProfileNode::reset() {
mNbTotalCalls = 0; mNbTotalCalls = 0;
mTotalTime = 0.0L; mTotalTime = std::chrono::duration<double, std::milli>::zero();
// Reset the child node // Reset the child node
if (mChildNode != nullptr) { if (mChildNode != nullptr) {
@ -161,7 +161,7 @@ Profiler::Profiler() :mRootNode("Root", nullptr) {
mCurrentNode = &mRootNode; mCurrentNode = &mRootNode;
mNbDestinations = 0; mNbDestinations = 0;
mNbAllocatedDestinations = 0; mNbAllocatedDestinations = 0;
mProfilingStartTime = Timer::getCurrentSystemTime() * 1000.0L; mProfilingStartTime = clock::now();
mFrameCounter = 0; mFrameCounter = 0;
allocatedDestinations(1); allocatedDestinations(1);
@ -215,7 +215,7 @@ void Profiler::reset() {
mRootNode.reset(); mRootNode.reset();
mRootNode.enterBlockOfCode(); mRootNode.enterBlockOfCode();
mFrameCounter = 0; mFrameCounter = 0;
mProfilingStartTime = Timer::getCurrentSystemTime() * 1000.0L; mProfilingStartTime = clock::now();
} }
// Print the report of the profiler in a given output stream // Print the report of the profiler in a given output stream
@ -283,27 +283,27 @@ void Profiler::printRecursiveNodeReport(ProfileNodeIterator* iterator,
return; return;
} }
long double parentTime = iterator->isRoot() ? getElapsedTimeSinceStart() : std::chrono::duration<double, std::milli> parentTime = iterator->isRoot() ? getElapsedTimeSinceStart() :
iterator->getCurrentParentTotalTime(); iterator->getCurrentParentTotalTime();
long double accumulatedTime = 0.0L; std::chrono::duration<double, std::milli> accumulatedTime = std::chrono::duration<double, std::milli>::zero();
uint nbFrames = Profiler::getNbFrames(); uint nbFrames = Profiler::getNbFrames();
for (int i=0; i<spacing; i++) outputStream << " "; for (int i=0; i<spacing; i++) outputStream << " ";
outputStream << "---------------" << std::endl; outputStream << "---------------" << std::endl;
for (int i=0; i<spacing; i++) outputStream << " "; for (int i=0; i<spacing; i++) outputStream << " ";
outputStream << "| Profiling : " << iterator->getCurrentParentName() << outputStream << "| Profiling : " << iterator->getCurrentParentName() <<
" (total running time : " << parentTime << " ms) ---" << std::endl; " (total running time : " << parentTime.count() << " ms) ---" << std::endl;
// Recurse over the children of the current node // Recurse over the children of the current node
int nbChildren = 0; int nbChildren = 0;
for (int i=0; !iterator->isEnd(); i++, iterator->next()) { for (int i=0; !iterator->isEnd(); i++, iterator->next()) {
nbChildren++; nbChildren++;
long double currentTotalTime = iterator->getCurrentTotalTime(); std::chrono::duration<double, std::milli> currentTotalTime = iterator->getCurrentTotalTime();
accumulatedTime += currentTotalTime; accumulatedTime += currentTotalTime;
long double fraction = parentTime > std::numeric_limits<long double>::epsilon() ? long double fraction = parentTime.count() > std::numeric_limits<long double>::epsilon() ?
(currentTotalTime / parentTime) * 100.0L : 0.0L; (currentTotalTime.count() / parentTime.count()) * 100.0L : 0.0L;
for (int j=0; j<spacing; j++) outputStream << " "; for (int j=0; j<spacing; j++) outputStream << " ";
outputStream << "| " << i << " -- " << iterator->getCurrentName() << " : " << outputStream << "| " << i << " -- " << iterator->getCurrentName() << " : " <<
fraction << " % | " << (currentTotalTime / (long double) (nbFrames)) << fraction << " % | " << (currentTotalTime.count() / (long double) (nbFrames)) <<
" ms/frame (" << iterator->getCurrentNbTotalCalls() << " calls)" << " ms/frame (" << iterator->getCurrentNbTotalCalls() << " calls)" <<
std::endl; std::endl;
} }
@ -312,10 +312,10 @@ void Profiler::printRecursiveNodeReport(ProfileNodeIterator* iterator,
outputStream << "Something is wrong !" << std::endl; outputStream << "Something is wrong !" << std::endl;
} }
for (int i=0; i<spacing; i++) outputStream << " "; for (int i=0; i<spacing; i++) outputStream << " ";
long double percentage = parentTime > std::numeric_limits<long double>::epsilon() ? long double percentage = parentTime.count() > std::numeric_limits<long double>::epsilon() ?
((parentTime - accumulatedTime) / parentTime) * 100.0L : 0.0L; ((parentTime - accumulatedTime) / parentTime) * 100.0L : 0.0L;
long double difference = parentTime - accumulatedTime; std::chrono::duration<double, std::milli> difference = parentTime - accumulatedTime;
outputStream << "| Unaccounted : " << difference << " ms (" << percentage << " %)" << std::endl; outputStream << "| Unaccounted : " << difference.count() << " ms (" << percentage << " %)" << std::endl;
for (int i=0; i<nbChildren; i++){ for (int i=0; i<nbChildren; i++){
iterator->enterChild(i); iterator->enterChild(i);

1
testbed/CMakeLists.txt
View File

@ -91,7 +91,6 @@ set(TESTBED_SOURCES
src/SceneDemo.h src/SceneDemo.h
src/SceneDemo.cpp src/SceneDemo.cpp
src/Timer.h src/Timer.h
src/Timer.cpp
) )
# Common source files # Common source files

2
testbed/scenes/bridge/BridgeScene.cpp
View File

@ -183,7 +183,7 @@ void BridgeScene::updatePhysics() {
if (joint != nullptr) { if (joint != nullptr) {
if (joint->getReactionForce(mEngineSettings.timeStep).lengthSquare() > 60000000) { if (joint->getReactionForce(mEngineSettings.timeStep.count()).lengthSquare() > 60000000) {
mPhysicsWorld->destroyJoint(joint); mPhysicsWorld->destroyJoint(joint);
mHingeJoints[jointIndex] = nullptr; mHingeJoints[jointIndex] = nullptr;
} }

2
testbed/scenes/joints/JointsScene.cpp
View File

@ -129,7 +129,7 @@ JointsScene::~JointsScene() {
void JointsScene::updatePhysics() { void JointsScene::updatePhysics() {
// Update the motor speed of the Slider Joint (to move up and down) // Update the motor speed of the Slider Joint (to move up and down)
double motorSpeed = 2.0 * std::cos(static_cast<double>(mEngineSettings.elapsedTime) * 1.5); double motorSpeed = 2.0 * std::cos(mEngineSettings.elapsedTime.count() * 1.5);
mSliderJoint->setMotorSpeed(rp3d::decimal(motorSpeed)); mSliderJoint->setMotorSpeed(rp3d::decimal(motorSpeed));
SceneDemo::updatePhysics(); SceneDemo::updatePhysics();

4
testbed/src/Gui.cpp
View File

@ -201,7 +201,7 @@ void Gui::createSettingsPanel() {
textboxTimeStep->set_fixed_size(Vector2i(70, 25)); textboxTimeStep->set_fixed_size(Vector2i(70, 25));
textboxTimeStep->set_editable(true); textboxTimeStep->set_editable(true);
std::ostringstream out; std::ostringstream out;
out << std::setprecision(1) << std::fixed << (mApp->mEngineSettings.timeStep * 1000); out << std::setprecision(1) << std::fixed << (mApp->mEngineSettings.timeStep.count() * 1000);
textboxTimeStep->set_value(out.str()); textboxTimeStep->set_value(out.str());
textboxTimeStep->set_units("ms"); textboxTimeStep->set_units("ms");
textboxTimeStep->set_callback([&, textboxTimeStep](const std::string &str) { textboxTimeStep->set_callback([&, textboxTimeStep](const std::string &str) {
@ -214,7 +214,7 @@ void Gui::createSettingsPanel() {
if (finalValue < 1 || finalValue > 1000) return false; if (finalValue < 1 || finalValue > 1000) return false;
mApp->mEngineSettings.timeStep = finalValue / 1000.0f; mApp->mEngineSettings.timeStep = std::chrono::duration<double>(finalValue / 1000.0f);
mApp->notifyEngineSetttingsChanged(); mApp->notifyEngineSetttingsChanged();
textboxTimeStep->set_value(out.str()); textboxTimeStep->set_value(out.str());
} }

8
testbed/src/Scene.h
View File

@ -30,6 +30,8 @@
#include "openglframework.h" #include "openglframework.h"
#include <reactphysics3d/reactphysics3d.h> #include <reactphysics3d/reactphysics3d.h>
using namespace std::chrono_literals;
// Structure ContactPoint // Structure ContactPoint
struct SceneContactPoint { struct SceneContactPoint {
@ -51,8 +53,8 @@ struct EngineSettings {
public: public:
long double elapsedTime; // Elapsed time (in seconds) std::chrono::duration<double> elapsedTime; // Elapsed time (in seconds)
float timeStep; // Current time step (in seconds) std::chrono::duration<double> timeStep; // Current time step (in seconds)
unsigned int nbVelocitySolverIterations; // Nb of velocity solver iterations unsigned int nbVelocitySolverIterations; // Nb of velocity solver iterations
unsigned int nbPositionSolverIterations; // Nb of position solver iterations unsigned int nbPositionSolverIterations; // Nb of position solver iterations
bool isSleepingEnabled; // True if sleeping technique is enabled bool isSleepingEnabled; // True if sleeping technique is enabled
@ -73,7 +75,7 @@ struct EngineSettings {
EngineSettings defaultSettings; EngineSettings defaultSettings;
rp3d::PhysicsWorld::WorldSettings worldSettings; rp3d::PhysicsWorld::WorldSettings worldSettings;
defaultSettings.timeStep = 1.0f / 60.0f; defaultSettings.timeStep = std::chrono::duration<double>(1.0f / 60.0f);
defaultSettings.nbVelocitySolverIterations = worldSettings.defaultVelocitySolverNbIterations; defaultSettings.nbVelocitySolverIterations = worldSettings.defaultVelocitySolverNbIterations;
defaultSettings.nbPositionSolverIterations = worldSettings.defaultPositionSolverNbIterations; defaultSettings.nbPositionSolverIterations = worldSettings.defaultPositionSolverNbIterations;
defaultSettings.isSleepingEnabled = worldSettings.isSleepingEnabled; defaultSettings.isSleepingEnabled = worldSettings.isSleepingEnabled;

2
testbed/src/SceneDemo.cpp
View File

@ -155,7 +155,7 @@ void SceneDemo::updatePhysics() {
if (mIsPhysicsWorldSimulated) { if (mIsPhysicsWorldSimulated) {
// Take a simulation step // Take a simulation step
mPhysicsWorld->update(mEngineSettings.timeStep); mPhysicsWorld->update(mEngineSettings.timeStep.count());
} }
} }

2
testbed/src/TestbedApplication.cpp
View File

@ -205,7 +205,7 @@ void TestbedApplication::updateSinglePhysicsStep() {
void TestbedApplication::updatePhysics() { void TestbedApplication::updatePhysics() {
// Update the elapsed time // Update the elapsed time
mEngineSettings.elapsedTime = mTimer.getPhysicsTime(); mEngineSettings.elapsedTime = mTimer.getElapsedPhysicsTime();
if (mTimer.isRunning()) { if (mTimer.isRunning()) {

64
testbed/src/Timer.cpp
View File

@ -1,64 +0,0 @@
/********************************************************************************
* ReactPhysics3D physics library, http://www.reactphysics3d.com *
* Copyright (c) 2010-2016 Daniel Chappuis *
*********************************************************************************
* *
* This software is provided 'as-is', without any express or implied warranty. *
* In no event will the authors be held liable for any damages arising from the *
* use of this software. *
* *
* Permission is granted to anyone to use this software for any purpose, *
* including commercial applications, and to alter it and redistribute it *
* freely, subject to the following restrictions: *
* *
* 1. The origin of this software must not be misrepresented; you must not claim *
* that you wrote the original software. If you use this software in a *
* product, an acknowledgment in the product documentation would be *
* appreciated but is not required. *
* *
* 2. Altered source versions must be plainly marked as such, and must not be *
* misrepresented as being the original software. *
* *
* 3. This notice may not be removed or altered from any source distribution. *
* *
********************************************************************************/
// Libraries
#include "Timer.h"
// Constructor
Timer::Timer() : mLastUpdateTime(0), mDeltaTime(0), mAccumulator(0), mIsRunning(false) {
}
// Destructor
Timer::~Timer() {
}
// Return the current time of the system in seconds
long double Timer::getCurrentSystemTime() {
#if defined(WINDOWS_OS)
LARGE_INTEGER ticksPerSecond;
LARGE_INTEGER ticks;
QueryPerformanceFrequency(&ticksPerSecond);
QueryPerformanceCounter(&ticks);
return (long double(ticks.QuadPart) / long double(ticksPerSecond.QuadPart));
#else
// Initialize the lastUpdateTime with the current time in seconds
timeval timeValue;
gettimeofday(&timeValue, NULL);
return (timeValue.tv_sec + (timeValue.tv_usec / 1000000.0));
#endif
}

63
testbed/src/Timer.h
View File

@ -29,17 +29,10 @@
// Libraries // Libraries
#include <stdexcept> #include <stdexcept>
#include <iostream> #include <iostream>
#include <ctime> #include <chrono>
#include <cassert> #include <cassert>
#include <reactphysics3d/configuration.h> #include <reactphysics3d/configuration.h>
#if defined(WINDOWS_OS) // For Windows platform
#define NOMINMAX // This is used to avoid definition of max() and min() macros
#include <windows.h>
#else // For Mac OS or Linux platform
#include <sys/time.h>
#endif
// Class Timer // Class Timer
/** /**
* This class will take care of the time in the physics engine. It * This class will take care of the time in the physics engine. It
@ -48,18 +41,20 @@
*/ */
class Timer { class Timer {
using clock = std::chrono::high_resolution_clock;
private : private :
// -------------------- Attributes -------------------- // // -------------------- Attributes -------------------- //
/// Last time the timer has been updated /// Start physics time
long double mLastUpdateTime; std::chrono::time_point<clock> mStartTime;
/// Time difference between the two last timer update() calls /// Last time the timer has been updated
long double mDeltaTime; std::chrono::time_point<clock> mLastUpdateTime;
/// Used to fix the time step and avoid strange time effects /// Used to fix the time step and avoid strange time effects
double mAccumulator; std::chrono::duration<double> mAccumulator;
/// True if the timer is running /// True if the timer is running
bool mIsRunning; bool mIsRunning;
@ -77,13 +72,12 @@ class Timer {
// -------------------- Methods -------------------- // // -------------------- Methods -------------------- //
/// Constructor /// Constructor
Timer(); Timer() : mAccumulator(0), mIsRunning(false) {
/// Destructor }
~Timer();
/// Return the current time of the physics engine /// Return the elapsed physics time
long double getPhysicsTime() const; std::chrono::duration<double> getElapsedPhysicsTime() const;
/// Start the timer /// Start the timer
void start(); void start();
@ -95,24 +89,24 @@ class Timer {
bool isRunning() const; bool isRunning() const;
/// True if it's possible to take a new step /// True if it's possible to take a new step
bool isPossibleToTakeStep(float timeStep) const; bool isPossibleToTakeStep(std::chrono::duration<double> timeStep) const;
/// Compute the time since the last update() call and add it to the accumulator /// Compute the time since the last update() call and add it to the accumulator
void update(); void update();
/// Take a new step => update the timer by adding the timeStep value to the current time /// Take a new step => update the timer by adding the timeStep value to the current time
void nextStep(float timeStep); void nextStep(std::chrono::duration<double> timeStep);
/// Compute the interpolation factor /// Compute the interpolation factor
float computeInterpolationFactor(float timeStep); float computeInterpolationFactor(std::chrono::duration<double> timeStep);
/// Return the current time of the system in seconds /// Return the current time of the system in seconds
static long double getCurrentSystemTime(); static std::chrono::time_point<clock> getCurrentSystemTime();
}; };
// Return the current time // Return the elapsed physics time
inline long double Timer::getPhysicsTime() const { inline std::chrono::duration<double> Timer::getElapsedPhysicsTime() const {
return mLastUpdateTime; return mLastUpdateTime - mStartTime;
} }
// Return if the timer is running // Return if the timer is running
@ -122,12 +116,13 @@ inline bool Timer::isRunning() const {
// Start the timer // Start the timer
inline void Timer::start() { inline void Timer::start() {
if (!mIsRunning) { if (!mIsRunning) {
// Get the current system time // Get the current system time
mLastUpdateTime = getCurrentSystemTime(); mLastUpdateTime = clock::now();
mAccumulator = 0.0; mAccumulator = std::chrono::duration<double>::zero();
mIsRunning = true; mIsRunning = true;
} }
} }
@ -138,12 +133,12 @@ inline void Timer::stop() {
} }
// True if it's possible to take a new step // True if it's possible to take a new step
inline bool Timer::isPossibleToTakeStep(float timeStep) const { inline bool Timer::isPossibleToTakeStep(std::chrono::duration<double> timeStep) const {
return (mAccumulator >= timeStep); return (mAccumulator >= timeStep);
} }
// Take a new step => update the timer by adding the timeStep value to the current time // Take a new step => update the timer by adding the timeStep value to the current time
inline void Timer::nextStep(float timeStep) { inline void Timer::nextStep(std::chrono::duration<double> timeStep) {
assert(mIsRunning); assert(mIsRunning);
// Update the accumulator value // Update the accumulator value
@ -151,24 +146,24 @@ inline void Timer::nextStep(float timeStep) {
} }
// Compute the interpolation factor // Compute the interpolation factor
inline float Timer::computeInterpolationFactor(float timeStep) { inline float Timer::computeInterpolationFactor(std::chrono::duration<double> timeStep) {
return (float(mAccumulator) / timeStep); return float(mAccumulator.count() / timeStep.count());
} }
// Compute the time since the last update() call and add it to the accumulator // Compute the time since the last update() call and add it to the accumulator
inline void Timer::update() { inline void Timer::update() {
// Get the current system time // Get the current system time
long double currentTime = getCurrentSystemTime(); std::chrono::time_point<clock> currentTime = clock::now();
// Compute the delta display time between two display frames // Compute the delta display time between two display frames
mDeltaTime = currentTime - mLastUpdateTime; std::chrono::duration<double> deltaTime = currentTime - mLastUpdateTime;
// Update the current display time // Update the current display time
mLastUpdateTime = currentTime; mLastUpdateTime = currentTime;
// Update the accumulator value // Update the accumulator value
mAccumulator += mDeltaTime; mAccumulator += deltaTime;
} }
#endif #endif