[Orxonox-commit 615] r3147 - branches/pch/src/core/input
rgrieder at orxonox.net
rgrieder at orxonox.net
Thu Jun 11 22:03:39 CEST 2009
Author: rgrieder
Date: 2009-06-11 22:03:38 +0200 (Thu, 11 Jun 2009)
New Revision: 3147
Removed:
branches/pch/src/core/input/CalibratorCallback.cc
branches/pch/src/core/input/CalibratorCallback.h
Modified:
branches/pch/src/core/input/CMakeLists.txt
branches/pch/src/core/input/InputManager.cc
Log:
Found another zombie.
Modified: branches/pch/src/core/input/CMakeLists.txt
===================================================================
--- branches/pch/src/core/input/CMakeLists.txt 2009-06-11 19:40:24 UTC (rev 3146)
+++ branches/pch/src/core/input/CMakeLists.txt 2009-06-11 20:03:38 UTC (rev 3147)
@@ -1,6 +1,5 @@
ADD_SOURCE_FILES(CORE_SRC_FILES
Button.cc
- CalibratorCallback.cc
ExtendedInputState.cc
HalfAxis.cc
InputBuffer.cc
Deleted: branches/pch/src/core/input/CalibratorCallback.cc
===================================================================
--- branches/pch/src/core/input/CalibratorCallback.cc 2009-06-11 19:40:24 UTC (rev 3146)
+++ branches/pch/src/core/input/CalibratorCallback.cc 2009-06-11 20:03:38 UTC (rev 3147)
@@ -1,47 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-/**
- at file
- at brief
- Implementation of the different input handlers.
-*/
-
-#include "CalibratorCallback.h"
-#include "InputManager.h"
-
-namespace orxonox
-{
- void CalibratorCallback::keyPressed(const orxonox::KeyEvent &evt)
- {
- if (evt.key == KeyCode::Return)
- {
- //InputManager::setInputState(InputManager::IS_NOCALIBRATE);
- }
- }
-}
Deleted: branches/pch/src/core/input/CalibratorCallback.h
===================================================================
--- branches/pch/src/core/input/CalibratorCallback.h 2009-06-11 19:40:24 UTC (rev 3146)
+++ branches/pch/src/core/input/CalibratorCallback.h 2009-06-11 20:03:38 UTC (rev 3147)
@@ -1,58 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-/**
- at file
- at brief
- Different definitions of input processing.
-*/
-
-#ifndef _CalibratorCallback_H__
-#define _CalibratorCallback_H__
-
-#include "core/CorePrereqs.h"
-#include "InputInterfaces.h"
-
-namespace orxonox
-{
- class _CoreExport CalibratorCallback : public KeyHandler
- {
- public:
- CalibratorCallback() { }
- ~CalibratorCallback() { }
-
- private:
- void keyPressed (const KeyEvent& evt);
- void keyReleased(const KeyEvent& evt) { }
- void keyHeld (const KeyEvent& evt) { }
-
- void updateInput(float dt) { }
- };
-}
-
-#endif /* _CalibratorCallback_H__ */
Modified: branches/pch/src/core/input/InputManager.cc
===================================================================
--- branches/pch/src/core/input/InputManager.cc 2009-06-11 19:40:24 UTC (rev 3146)
+++ branches/pch/src/core/input/InputManager.cc 2009-06-11 20:03:38 UTC (rev 3147)
@@ -58,7 +58,6 @@
#include "InputBuffer.h"
#include "KeyBinder.h"
#include "KeyDetector.h"
-#include "CalibratorCallback.h"
#include "InputState.h"
#include "SimpleInputState.h"
#include "ExtendedInputState.h"
More information about the Orxonox-commit
mailing list