Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 523 for code/branches/FICN/src


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/FICN/src/orxonox/CMakeLists.txt

    r512 r523  
    1616  main.cc
    1717  graphicsEngine.cc
    18   InputManager.cc
    1918)
    2019
  • code/branches/FICN/src/orxonox/inertial_node.h

    r342 r523  
    1 /*
    2  *   ORXONOX - the hottest 3D action shooter ever to exist
    3  *
    4  *
    5  *   License notice:
    6  *
    7  *   This program is free software: you can redistribute it and/or modify
    8  *   it under the terms of the GNU General Public License as published by
    9  *   the Free Software Foundation, either version 3 of the License, or
    10  *   (at your option) any later version.
    11  *
    12  *   This program is distributed in the hope that it will be useful,
    13  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  *   GNU General Public License for more details.
    16  *
    17  *   You should have received a copy of the GNU General Public License
    18  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19  *
    20  *
    21  *   Author:
    22  *      Reto Grieder
    23  *   Co-authors:
    24  *      ...
    25  *
    26  */
    27 
    28 
    291#ifndef INERTIAL_NODE_H
    302#define INERTIAL_NODE_H
     
    4113  public:
    4214    InertialNode(Ogre::SceneNode*, Ogre::Vector3);
    43           ~InertialNode();
     15    ~InertialNode();
    4416
    4517    InertialNode* createChildNode();
     
    6739
    6840    Ogre::SceneNode *node_;
    69           Ogre::Vector3 speed_;
     41    Ogre::Vector3 speed_;
    7042
    7143    InertialNode* parentNode_;
  • code/branches/FICN/src/orxonox/orxonox.cc

    r519 r523  
    457457    // the call to reset the mouse clipping size should probably be somewhere
    458458    // else, however this works for the moment.
    459                 unsigned int width, height, depth;
    460                 int left, top;
    461                 ogre_->getRoot()->getAutoCreatedWindow()->getMetrics(width, height, depth, left, top);
    462 
    463                 const OIS::MouseState &ms = mouse_->getMouseState();
    464                 ms.width = width;
    465                 ms.height = height;
     459    unsigned int width, height, depth;
     460    int left, top;
     461    ogre_->getRoot()->getAutoCreatedWindow()->getMetrics(width, height, depth, left, top);
     462
     463    const OIS::MouseState &ms = mouse_->getMouseState();
     464    ms.width = width;
     465    ms.height = height;
    466466
    467467    ogre_->getRoot()->startRendering();
Note: See TracChangeset for help on using the changeset viewer.