From eefd32b42b173392150c560b01ece0d57ca6ac6f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 23 Jan 2015 11:04:02 -0800 Subject: [PATCH] remove KinematicController classes --- libraries/physics/src/KinematicController.cpp | 22 ----------- libraries/physics/src/KinematicController.h | 36 ------------------ .../src/SimpleEntityKinematicController.cpp | 21 ---------- .../src/SimpleEntityKinematicController.h | 38 ------------------- 4 files changed, 117 deletions(-) delete mode 100644 libraries/physics/src/KinematicController.cpp delete mode 100644 libraries/physics/src/KinematicController.h delete mode 100644 libraries/physics/src/SimpleEntityKinematicController.cpp delete mode 100644 libraries/physics/src/SimpleEntityKinematicController.h diff --git a/libraries/physics/src/KinematicController.cpp b/libraries/physics/src/KinematicController.cpp deleted file mode 100644 index 354b285bc1..0000000000 --- a/libraries/physics/src/KinematicController.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// -// KinematicController.cpp -// libraries/physcis/src -// -// Created by Andrew Meadows 2015.01.13 -// Copyright 2015 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#include "KinematicController.h" -#include "PhysicsEngine.h" - -KinematicController::KinematicController() { - _lastSubstep = PhysicsEngine::getNumSubsteps(); -} - -void KinematicController::start() { - _enabled = true; - _lastSubstep = PhysicsEngine::getNumSubsteps(); -} diff --git a/libraries/physics/src/KinematicController.h b/libraries/physics/src/KinematicController.h deleted file mode 100644 index 60b8548607..0000000000 --- a/libraries/physics/src/KinematicController.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// KinematicController.h -// libraries/physcis/src -// -// Created by Andrew Meadows 2015.01.13 -// Copyright 2015 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#ifndef hifi_KinematicController_h -#define hifi_KinematicController_h - -#include - -/// KinematicController defines an API for derived classes. - -class KinematicController { -public: - KinematicController(); - - virtual ~KinematicController() {} - - virtual void stepForward() = 0; - - void start(); - void stop() { _enabled = false; } - bool isRunning() const { return _enabled; } - -protected: - bool _enabled = false; - uint32_t _lastSubstep; -}; - -#endif // hifi_KinematicController_h diff --git a/libraries/physics/src/SimpleEntityKinematicController.cpp b/libraries/physics/src/SimpleEntityKinematicController.cpp deleted file mode 100644 index e834d4e91b..0000000000 --- a/libraries/physics/src/SimpleEntityKinematicController.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// -// SimpleEntityKinematicController.cpp -// libraries/physcis/src -// -// Created by Andrew Meadows 2015.01.13 -// Copyright 2015 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#include "PhysicsEngine.h" -#include "SimpleEntityKinematicController.h" - -void SimpleEntityKinematicController:: stepForward() { - uint32_t substep = PhysicsEngine::getNumSubsteps(); - float dt = (substep - _lastSubstep) * PHYSICS_ENGINE_FIXED_SUBSTEP; - _entity->simulateSimpleKinematicMotion(dt); - _lastSubstep = substep; -} - diff --git a/libraries/physics/src/SimpleEntityKinematicController.h b/libraries/physics/src/SimpleEntityKinematicController.h deleted file mode 100644 index 1edfaf8d2c..0000000000 --- a/libraries/physics/src/SimpleEntityKinematicController.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// SimpleEntityKinematicController.h -// libraries/physcis/src -// -// Created by Andrew Meadows 2015.01.13 -// Copyright 2015 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#ifndef hifi_SimpleEntityKinematicController_h -#define hifi_SimpleEntityKinematicController_h - -/// SimpleKinematicConstroller performs simple exrapolation of velocities. - -#include -#include - -#include - -#include "KinematicController.h" - -class SimpleEntityKinematicController : public KinematicController { -public: - SimpleEntityKinematicController() = delete; // prevent compiler from making a default ctor - - SimpleEntityKinematicController(EntityItem* entity) : KinematicController(), _entity(entity) { assert(entity); } - - ~SimpleEntityKinematicController() { _entity = NULL; } - - void stepForward(); - -private: - EntityItem* _entity; -}; - -#endif // hifi_SimpleEntityKinematicController_h