From 8cab401d08f8e25aa9b2dc710204785858ff3dbb Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 15 Sep 2014 11:33:30 -0300 Subject: 3D Physics Rework, Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-=- 3D Physics: -Fixed "Bounce" parameter in 3D -Fixed bug affecting Area (sometims it would not detect properly) -Vehicle Body has seen heavy work -Added Query API for doing space queries in 3D. Needs some docs though. -Added JOINTS! Adapted Bullet Joints: and created easy gizmos for setting them up: -PinJoint -HingeJoint (with motor) -SliderJoint -ConeTwistJoint -Generic6DOFJoint -Added OBJECT PICKING! based on the new query API. Any physics object now (Area or Body) has the following signals and virtual functions: -input_event (mouse or multitouch input over the body) -mouse_enter (mouse entered the body area) -mouse_exit (mouse exited body area) For Area it needs to be activated manually, as it isn't by default (ray goes thru). Other: -Begun working on Windows 8 (RT) port. Compiles but does not work yet. -Added TheoraPlayer library for improved to-texture and portable video support. -Fixed a few bugs in the renderer, collada importer, collada exporter, etc. --- drivers/theoraplayer/src/TheoraTimer.cpp | 70 ++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 drivers/theoraplayer/src/TheoraTimer.cpp (limited to 'drivers/theoraplayer/src/TheoraTimer.cpp') diff --git a/drivers/theoraplayer/src/TheoraTimer.cpp b/drivers/theoraplayer/src/TheoraTimer.cpp new file mode 100644 index 0000000000..644d1c2ab7 --- /dev/null +++ b/drivers/theoraplayer/src/TheoraTimer.cpp @@ -0,0 +1,70 @@ +/************************************************************************************ +This source file is part of the Theora Video Playback Library +For latest info, see http://libtheoraplayer.googlecode.com +************************************************************************************* +Copyright (c) 2008-2014 Kresimir Spes (kspes@cateia.com) +This program is free software; you can redistribute it and/or modify it under +the terms of the BSD license: http://opensource.org/licenses/BSD-3-Clause +*************************************************************************************/ +#include "TheoraTimer.h" + +TheoraTimer::TheoraTimer() +{ + mTime = 0; + mPaused = 0; + mSpeed = 1.0f; +} + +TheoraTimer::~TheoraTimer() +{ + +} + +void TheoraTimer::update(float timeDelta) +{ + if (!isPaused()) + { + mTime += timeDelta * mSpeed; + } +} + +float TheoraTimer::getTime() +{ + return mTime; +} + +void TheoraTimer::pause() +{ + mPaused = true; +} + +void TheoraTimer::play() +{ + mPaused = false; +} + + +bool TheoraTimer::isPaused() +{ + return mPaused; +} + +void TheoraTimer::stop() +{ + +} + +void TheoraTimer::seek(float time) +{ + mTime = time; +} + +void TheoraTimer::setSpeed(float speed) +{ + mSpeed = speed; +} + +float TheoraTimer::getSpeed() +{ + return mSpeed; +} -- cgit v1.2.3