Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5914 for code/branches


Ignore:
Timestamp:
Oct 9, 2009, 1:12:16 PM (15 years ago)
Author:
rgrieder
Message:
  • Fixed missing includes
  • Fixed non-world coordinate camera position in HumanController
  • Removed std::cout debug output in Level.cc
Location:
code/branches/core5/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core5/src/libraries/core/EventIncludes.h

    r5893 r5914  
    3232#include "CorePrereqs.h"
    3333#include "Executor.h"
     34#include "XMLPort.h"
    3435
    3536/**
  • code/branches/core5/src/orxonox/Level.cc

    r5892 r5914  
    110110            this->gametype_ = gametype;
    111111
    112 std::cout << "Load Gametype: " << this->gametype_ << std::endl;
    113 
    114112        Gametype* rootgametype = orxonox_cast<Gametype*>(identifier->fabricate(this));
    115113        this->setGametype(rootgametype);
    116 
    117 std::cout << "root gametype: " << rootgametype->getIdentifier()->getName() << std::endl;
    118114
    119115        for (std::list<BaseObject*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
  • code/branches/core5/src/orxonox/Scene.cc

    r5911 r5914  
    4242#include "core/CoreIncludes.h"
    4343#include "core/GameMode.h"
     44#include "core/GUIManager.h"
    4445#include "core/XMLPort.h"
    4546#include "tools/BulletConversions.h"
  • code/branches/core5/src/orxonox/controllers/HumanController.cc

    r5913 r5914  
    8787            if (camera)
    8888            {
    89                 SoundManager::getInstance().setListenerPosition(camera->getPosition());
    90                 SoundManager::getInstance().setListenerOrientation(camera->getOrientation());
     89                SoundManager::getInstance().setListenerPosition(camera->getWorldPosition());
     90                SoundManager::getInstance().setListenerOrientation(camera->getWorldOrientation());
    9191            }
    9292            else
  • code/branches/core5/src/orxonox/sound/AmbientSound.cc

    r5899 r5914  
    2929#include "AmbientSound.h"
    3030
     31#include "core/CoreIncludes.h"
    3132#include "core/EventIncludes.h"
    3233#include "core/XMLPort.h"
  • code/branches/core5/src/orxonox/sound/WorldSound.cc

    r5899 r5914  
    3232#include <AL/alut.h>
    3333#include "util/Math.h"
     34#include "core/CoreIncludes.h"
    3435#include "core/EventIncludes.h"
    3536#include "core/XMLPort.h"
Note: See TracChangeset for help on using the changeset viewer.