Changeset 523

Timestamp:

Dec 13, 2007, 11:27:55 PM (17 years ago)

Author:

nicolasc

Message:

• removed an not needed header
• made cmakeclearcache safe, that it only deletes files that it should

Location:

code/branches/FICN/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• inertial_node.h (modified) (3 diffs)
• orxonox.cc (modified) (1 diff)

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -16 +16 @@
   main.cc
   graphicsEngine.cc
-  InputManager.cc
 )
 

code/branches/FICN/src/orxonox/inertial_node.h

@@ -1 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- *
- *
- *   Author:
- *      Reto Grieder
- *   Co-authors:
- *      ...
- *
- */
-
-
 #ifndef INERTIAL_NODE_H
 #define INERTIAL_NODE_H
@@ -41 +13 @@
   public:
     InertialNode(Ogre::SceneNode*, Ogre::Vector3);
-          ~InertialNode();
+    ~InertialNode();
 
     InertialNode* createChildNode();
@@ -67 +39 @@
 
     Ogre::SceneNode *node_;
-          Ogre::Vector3 speed_;
+    Ogre::Vector3 speed_;
 
     InertialNode* parentNode_;

code/branches/FICN/src/orxonox/orxonox.cc

@@ -457 +457 @@
     // the call to reset the mouse clipping size should probably be somewhere
     // else, however this works for the moment.
-                unsigned int width, height, depth;
-                int left, top;
-                ogre_->getRoot()->getAutoCreatedWindow()->getMetrics(width, height, depth, left, top);
-
-                const OIS::MouseState &ms = mouse_->getMouseState();
-                ms.width = width;
-                ms.height = height;
+    unsigned int width, height, depth;
+    int left, top;
+    ogre_->getRoot()->getAutoCreatedWindow()->getMetrics(width, height, depth, left, top);
+
+    const OIS::MouseState &ms = mouse_->getMouseState();
+    ms.width = width;
+    ms.height = height;
 
     ogre_->getRoot()->startRendering();