From f35ec6f8d44d0091fedea6a5f3d00da5b8457c77 Mon Sep 17 00:00:00 2001 From: Joakim Kilby Date: Wed, 17 Jun 2015 08:38:25 +0200 Subject: [PATCH] Removed remotecontroller class --- .../openspace/interaction/remotecontroller.h | 58 ---------------- src/CMakeLists.txt | 2 - src/interaction/remotecontroller.cpp | 68 ------------------- 3 files changed, 128 deletions(-) delete mode 100644 include/openspace/interaction/remotecontroller.h delete mode 100644 src/interaction/remotecontroller.cpp diff --git a/include/openspace/interaction/remotecontroller.h b/include/openspace/interaction/remotecontroller.h deleted file mode 100644 index e23f020c75..0000000000 --- a/include/openspace/interaction/remotecontroller.h +++ /dev/null @@ -1,58 +0,0 @@ -/***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ - -#ifndef __REMOTECONTROLLER_H__ -#define __REMOTECONTROLLER_H__ - -#include -#include - -#include - -namespace openspace { - namespace interaction { - - struct ControllerKeyFrame{ - glm::mat4 _viewRotationMatrix; - psc _position; - double _timeStamp; - }; - - class RemoteController : public Controller { - public: - RemoteController(); - virtual ~RemoteController(); - virtual void update(const double& dt); - virtual void sendKeyFrame(); - virtual void keyFrameReceived(const ControllerKeyFrame& keyframe); - protected: - bool _isBroadcasting; - double _lastTimeStap; - std::ifstream ff; - }; - - } // namespace interaction -} // namespace openspace - -#endif // __REMOTECONTROLLER_H__ \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22c2bf60b7..9ec41ef3cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,7 +34,6 @@ set(OPENSPACE_SOURCE ${OPENSPACE_BASE_DIR}/src/engine/moduleengine.cpp ${OPENSPACE_BASE_DIR}/src/engine/openspaceengine.cpp ${OPENSPACE_BASE_DIR}/src/interaction/controller.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/remotecontroller.cpp ${OPENSPACE_BASE_DIR}/src/interaction/deviceidentifier.cpp ${OPENSPACE_BASE_DIR}/src/interaction/interactionhandler.cpp ${OPENSPACE_BASE_DIR}/src/interaction/interactionhandler_lua.inl @@ -98,7 +97,6 @@ set(OPENSPACE_HEADER ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.h ${OPENSPACE_BASE_DIR}/include/openspace/engine/openspaceengine.h ${OPENSPACE_BASE_DIR}/include/openspace/interaction/controller.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/remotecontroller.h ${OPENSPACE_BASE_DIR}/include/openspace/interaction/deviceidentifier.h ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interactionhandler.h ${OPENSPACE_BASE_DIR}/include/openspace/interaction/keyboardcontroller.h diff --git a/src/interaction/remotecontroller.cpp b/src/interaction/remotecontroller.cpp deleted file mode 100644 index 6417a8226b..0000000000 --- a/src/interaction/remotecontroller.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2015 * - * * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this * - * software and associated documentation files (the "Software"), to deal in the Software * - * without restriction, including without limitation the rights to use, copy, modify, * - * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * - * permit persons to whom the Software is furnished to do so, subject to the following * - * conditions: * - * * - * The above copyright notice and this permission notice shall be included in all copies * - * or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * - * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - ****************************************************************************************/ - -#include - -#include - -#include - -#include - -namespace openspace { -namespace interaction { - - RemoteController::RemoteController() - : _isBroadcasting(false), - _lastTimeStap(0.0) - { - //ff.open("path.txt"); - } - - RemoteController::~RemoteController(){ - - } - - void RemoteController::update(const double& dt){ - ControllerKeyFrame kf; - kf._position = _handler->camera()->position(); - kf._viewRotationMatrix = _handler->camera()->viewRotationMatrix(); - kf._timeStamp = Time::ref().currentTime(); - - std::string write = std::to_string(kf._position.vec4().x) + "\t" + std::to_string(kf._position.vec4().y) + "\t" + std::to_string(kf._position.vec4().z) + "\t" + std::to_string(kf._position.vec4().w) + "\n"; - //write += - //printf("%s", write.c_str()); - } - - void RemoteController::sendKeyFrame(){ - - } - - void RemoteController::keyFrameReceived(const ControllerKeyFrame& keyframe){ - - } - - -} // namespace interaction -} // namespace openspace