Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 23, 2011, 12:45:53 AM (13 years ago)
Author:
landauf
Message:

merged output branch back to trunk.

Changes:

  • you have to include util/Output.h instead of util/Debug.h
  • COUT(x) is now called orxout(level)
  • output levels are now defined by an enum instead of numbers. see util/Output.h for the definition
  • it's possible to use output contexts with orxout(level, context). see util/Output.h for some common contexts. you can define more contexts
  • you must use 'endl' at the end of an output message, '\n' does not flush the message

Output levels:

  • instead of COUT(0) use orxout()
  • instead of COUT(1) use orxout(user_error) or orxout(internal_error)
  • instead of COUT(2) use orxout(user_warning) or orxout(internal_warning)
  • instead of COUT(3) use orxout(user_status/user_info) or orxout(internal_status/internal_info)
  • instead of COUT(4) use orxout(verbose)
  • instead of COUT(5) use orxout(verbose_more)
  • instead of COUT(6) use orxout(verbose_ultra)

Guidelines:

  • user_* levels are for the user, visible in the console and the log-file
  • internal_* levels are for developers, visible in the log-file
  • verbose_* levels are for debugging, only visible if the context of the output is activated

Usage in C++:

  • orxout() << "message" << endl;
  • orxout(level) << "message" << endl;
  • orxout(level, context) << "message" << endl;

Usage in Lua:

  • orxout("message")
  • orxout(orxonox.level.levelname, "message")
  • orxout(orxonox.level.levelname, "context", "message")

Usage in Tcl (and in the in-game-console):

  • orxout levelname message
  • orxout_context levelname context message
  • shortcuts: log message, error message, warning message, status message, info message, debug message
Location:
code/trunk
Files:
6 deleted
61 edited
9 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/orxonox/CMakeLists.txt

    r8729 r8858  
    3232  PlayerManager.cc
    3333  Radar.cc
    34   ChatHistory.cc
    35   ChatInputHandler.cc
    3634#  Test.cc
    3735
    … …  
    4240)
    4341
     42ADD_SUBDIRECTORY(chat)
    4443ADD_SUBDIRECTORY(collisionshapes)
    4544ADD_SUBDIRECTORY(controllers)
    … …  
    5958  FIND_HEADER_FILES
    6059  TOLUA_FILES
    61     ChatInputHandler.h
     60    chat/ChatInputHandler.h
    6261    LevelInfo.h
    6362    LevelManager.h

  • code/trunk/src/orxonox/Level.cc

    r7648 r8858  
    8888    void Level::networkcallback_applyXMLFile()
    8989    {
    90         COUT(0) << "Loading level \"" << this->xmlfilename_ << "\"..." << std::endl;
     90        orxout(user_status) << "Loading level \"" << this->xmlfilename_ << "\"..." << endl;
    9191
    9292        ClassTreeMask mask;
    … …  
    115115        if (!identifier || !identifier->isA(Class(Gametype)))
    116116        {
    117             COUT(0) << "Error: \"" << gametype << "\" is not a valid gametype." << std::endl;
     117            orxout(internal_error) << "\"" << gametype << "\" is not a valid gametype." << endl;
    118118            identifier = Class(Gametype);
    119119            this->gametype_ = "Gametype";
    … …  
    157157//         this->lodInformation_.insert(std::make_pair(meshName,lodInformation));
    158158        if( this->lodInformation_.find(meshName) != this->lodInformation_.end())
    159           CCOUT(4) << "replacing lod information for " << meshName << endl;
     159            orxout(verbose, context::lod) << "replacing lod information for " << meshName << endl;
    160160        this->lodInformation_[meshName] = lodInformation;
    161161    }
    … …  
    171171    void Level::playerEntered(PlayerInfo* player)
    172172    {
    173         COUT(3) << "player entered level (id: " << player->getClientID() << ", name: " << player->getName() << ')' << std::endl;
     173        orxout(internal_info) << "player entered level (id: " << player->getClientID() << ", name: " << player->getName() << ')' << endl;
    174174        player->setGametype(this->getGametype());
    175175    }
    … …  
    177177    void Level::playerLeft(PlayerInfo* player)
    178178    {
    179         COUT(3) << "player left level (id: " << player->getClientID() << ", name: " << player->getName() << ')' << std::endl;
     179        orxout(internal_info) << "player left level (id: " << player->getClientID() << ", name: " << player->getName() << ')' << endl;
    180180        player->setGametype(0);
    181181    }

  • code/trunk/src/orxonox/LevelInfo.cc

    r7652 r8858  
    125125        if(!this->validateTag(tag))
    126126        {
    127             COUT(2) << "Bad LevelInfo tag '" << tag << "' in " << this->getXMLFilename() << ". Ignoring..." << std::endl;
     127            orxout(internal_warning) << "Bad LevelInfo tag '" << tag << "' in " << this->getXMLFilename() << ". Ignoring..." << endl;
    128128            return false;
    129129        }

  • code/trunk/src/orxonox/LevelManager.cc

    r8706 r8858  
    251251
    252252        // Iterate over all the found *.oxw files
    253         COUT(3) << "Loading LevelInfos..." << std::endl;
     253        orxout(internal_info) << "Loading LevelInfos..." << endl;
    254254        std::set<std::string> names;
    255255        for (Ogre::StringVector::const_iterator it = levels->begin(); it != levels->end(); ++it)
    … …  
    281281                // Warn about levels with the same name.
    282282                if(!names.insert(info->getName()).second)
    283                     COUT(2) << "Warning: Multiple levels (" << info->getXMLFilename() << ") with name '" << info->getName() << "' found!" << std::endl;
     283                    orxout(internal_warning) << "Multiple levels (" << info->getXMLFilename() << ") with name '" << info->getName() << "' found!" << endl;
    284284
    285285                // Warn about multiple items so that it gets fixed quickly
    286286                if(availableLevels_.find(info) != availableLevels_.end())
    287287                {
    288                     COUT(2) << "Warning: Multiple levels (" << info->getXMLFilename() << ") with same name '" << info->getName() << "' and filename found! Exluding..." << std::endl;
     288                    orxout(internal_warning) << "Multiple levels (" << info->getXMLFilename() << ") with same name '" << info->getName() << "' and filename found! Exluding..." << endl;
    289289                    // Delete LevelInfoItem to avoid a dangling pointer
    290290                    delete info;

  • code/trunk/src/orxonox/Main.cc

    r8729 r8858  
    6161    int main(const std::string& strCmdLine)
    6262    {
     63        orxout(internal_status) << "entering orxonox::main()" << endl;
     64        orxout(internal_info) << "command line: " << strCmdLine << endl;
     65
     66        orxout(internal_info) << "creating Game object:" << endl;
    6367        Game* game = new Game(strCmdLine);
     68        orxout(user_status) << "Finished initialization" << endl;
    6469
    6570        if (CommandLineParser::getValue("generateDoc").getString().empty())
    6671        {
     72            orxout(internal_info) << "preparing game states" << endl;
     73
    6774            /* TODO make this clear */
    6875            game->setStateHierarchy(
    … …  
    98105            }
    99106
     107            orxout(internal_info) << "starting game" << endl;
    100108            game->run();
    101109        }

  • code/trunk/src/orxonox/MoodManager.cc

    r8706 r8858  
    5454        {
    5555            // TODO: Non-fatal error handling (non-critical resource missing)
    56             COUT(2) << "Mood Warning: Folder for default mood (" << MoodManager::defaultMood_ << ") does not exist!" << std::endl;
     56            orxout(internal_warning) << "Mood Warning: Folder for default mood (" << MoodManager::defaultMood_ << ") does not exist!" << endl;
    5757        }
    5858       
    … …  
    8282        if (!Resource::exists(path))
    8383        {
    84             COUT(3) << "Mood " << mood_ << " does not exist. Will not change." << std::endl;
     84            orxout(internal_warning) << "Mood " << mood_ << " does not exist. Will not change." << endl;
    8585            this->setMood(oldMood_);
    8686        }
    8787        else
    8888        {
    89             COUT(3) << "Mood changed to " << mood_ << std::endl;
     89            orxout(internal_info) << "Mood changed to " << mood_ << endl;
    9090            MoodListener::changedMood(mood_);
    9191        }

  • code/trunk/src/orxonox/OrxonoxPrereqs.h

    r8351 r8858  
    7777    class Radar;
    7878    class Scene;
     79
     80    // chat
     81    class ChatHistory;
     82    class ChatInputHandler;
     83    class ChatListener;
     84    class ChatManager;
    7985
    8086    // collisionshapes

  • code/trunk/src/orxonox/PlayerManager.cc

    r8327 r8858  
    5757        {
    5858            if (clientID != 0)
    59                 COUT(3) << "client connected" << std::endl;
     59                orxout(internal_info) << "client connected" << endl;
    6060
    6161            // create new HumanPlayer instance
    … …  
    7777        {
    7878            if (clientID != 0)
    79                 COUT(3) << "client disconnected" << std::endl;
     79                orxout(internal_info) << "client disconnected" << endl;
    8080
    8181            // remove from clients-map

  • code/trunk/src/orxonox/Radar.cc

    r7284 r8858  
    195195    void Radar::listObjects() const
    196196    {
    197         COUT(3) << "List of RadarObjects:\n";
     197        orxout(debug_output) << "List of RadarObjects:" << endl;
    198198        // iterate through all Radar Objects
    199199        unsigned int i = 0;
    200200        for (ObjectList<RadarViewable>::iterator it = ObjectList<RadarViewable>::begin(); it; ++it, ++i)
    201201        {
    202             COUT(3) << i++ << ": " << (*it)->getRVWorldPosition() << std::endl;
     202            orxout(debug_output) << i++ << ": " << (*it)->getRVWorldPosition() << endl;
    203203        }
    204204    }

  • code/trunk/src/orxonox/Scene.cc

    r7163 r8858  
    141141        if (range.length() < 10.0f)
    142142        {
    143             CCOUT(2) << "Warning: Setting the negative world range to a very small value: "
    144                      << multi_cast<std::string>(range) << std::endl;
    145         }
    146         if (this->hasPhysics())
    147         {
    148             CCOUT(2) << "Warning: Attempting to set the physical world range at run time. "
    149                      << "This causes a complete physical reload which might take some time." << std::endl;
     143            orxout(internal_warning) << "Setting the negative world range to a very small value: "
     144                                     << multi_cast<std::string>(range) << endl;
     145        }
     146        if (this->hasPhysics())
     147        {
     148            orxout(internal_warning) << "Attempting to set the physical world range at run time. "
     149                                     << "This causes a complete physical reload which might take some time." << endl;
    150150            this->setPhysicalWorld(false);
    151151            this->negativeWorldRange_ = range;
    … …  
    160160        if (range.length() < 10.0f)
    161161        {
    162             CCOUT(2) << "Warning: Setting the positive world range to a very small value: "
    163                      << multi_cast<std::string>(range) << std::endl;
    164         }
    165         if (this->hasPhysics())
    166         {
    167             CCOUT(2) << "Warning: Attempting to set the physical world range at run time. "
    168                      << "This causes a complete physical reload which might take some time." << std::endl;
     162            orxout(internal_warning) << "Setting the positive world range to a very small value: "
     163                                     << multi_cast<std::string>(range) << endl;
     164        }
     165        if (this->hasPhysics())
     166        {
     167            orxout(internal_warning) << "Attempting to set the physical world range at run time. "
     168                                     << "This causes a complete physical reload which might take some time." << endl;
    169169            this->setPhysicalWorld(false);
    170170            this->positiveWorldRange_ = range;

  • code/trunk/src/orxonox/Test.cc

    r7284 r8858  
    127127    //     mt2.importData( temp );
    128128    //     assert( temp-mem == mt1.getNetworkSize() );
    129     //     COUT(0) << mt2 << endl;
     129    //     orxout() << mt2 << endl;
    130130    //     if(!Core::isMaster())
    131131    //       call2(0, "bal", "a", "n", "ce");
    … …  
    135135    void Test::printBlaBla(std::string s1, std::string s2, std::string s3, std::string s4, std::string s5)
    136136    {
    137         COUT(0) << s1 << s2 << s3 << s4 << s5 << endl;
     137        orxout() << s1 << s2 << s3 << s4 << s5 << endl;
    138138    }
    139139
    140     void Test::checkU1(){ COUT(1) << "U1 changed: " << u1 << std::endl; }
    141     void Test::checkU2(){ COUT(1) << "U2 changed: " << u2 << std::endl; }
    142     void Test::checkU3(){ COUT(1) << "U3 changed: " << u3 << std::endl; }
    143     void Test::checkU4(){ COUT(1) << "U4 changed: " << u4 << std::endl; }
     140    void Test::checkU1(){ orxout() << "U1 changed: " << u1 << endl; }
     141    void Test::checkU2(){ orxout() << "U2 changed: " << u2 << endl; }
     142    void Test::checkU3(){ orxout() << "U3 changed: " << u3 << endl; }
     143    void Test::checkU4(){ orxout() << "U4 changed: " << u4 << endl; }
    144144
    145     void Test::checkS1(){ COUT(1) << "S1 changed: " << s1 << std::endl; }
    146     void Test::checkS2(){ COUT(1) << "S2 changed: " << s2 << std::endl; }
    147     void Test::checkS3(){ COUT(1) << "S3 changed: " << s3 << std::endl; }
    148     void Test::checkS4(){ COUT(1) << "S4 changed: " << s4 << std::endl; }
     145    void Test::checkS1(){ orxout() << "S1 changed: " << s1 << endl; }
     146    void Test::checkS2(){ orxout() << "S2 changed: " << s2 << endl; }
     147    void Test::checkS3(){ orxout() << "S3 changed: " << s3 << endl; }
     148    void Test::checkS4(){ orxout() << "S4 changed: " << s4 << endl; }
    149149
    150     void Test::printPointer(){ CCOUT(1) << "pointer: " << this->pointer_ << endl; }
     150    void Test::printPointer(){ orxout() << "pointer: " << this->pointer_ << endl; }
    151151
    152152}

  • code/trunk/src/orxonox/Test.h

    r7163 r8858  
    108108     
    109109      void blub2()
    110       { for( std::set<uint32_t>::iterator it=mySet_.begin(); it!=mySet_.end(); ++it ) COUT(0) << *it << endl; }
     110      { for( std::set<uint32_t>::iterator it=mySet_.begin(); it!=mySet_.end(); ++it ) orxout() << *it << endl; }
    111111  };
    112112}

  • code/trunk/src/orxonox/collisionshapes/CollisionShape.cc

    r8706 r8858  
    203203        if(scale_.crossProduct(scale).squaredLength() != 0.0f)
    204204        {
    205             CCOUT(2) << "Warning: Non-uniform scaling is not yet supported." << endl;
     205            orxout(internal_warning) << "Non-uniform scaling is not yet supported." << endl;
    206206            return;
    207207        }

  • code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc

    r8706 r8858  
    9898        if (this->attachedShapes_.find(shape) != this->attachedShapes_.end())
    9999        {
    100             CCOUT(2) << "Warning: Attaching a CollisionShape twice is not yet supported." << std::endl;
     100            orxout(internal_warning) << "Attaching a CollisionShape twice is not yet supported." << endl;
    101101            return;
    102102        }
    … …  
    139139        }
    140140        else
    141             CCOUT(2) << "Warning: Cannot detach non child collision shape" << std::endl;
     141            orxout(internal_warning) << "Cannot detach non child collision shape" << endl;
    142142    }
    143143
    … …  
    168168        if (it == this->attachedShapes_.end())
    169169        {
    170             CCOUT(2) << "Warning: Cannot update child shape: Instance not a child." << std::endl;
     170            orxout(internal_warning) << "Cannot update child shape: Instance not a child." << endl;
    171171            return;
    172172        }

  • code/trunk/src/orxonox/controllers/ArtificialController.cc

    r8706 r8858  
    9898                    if (it->myMaster_ == this)
    9999                    {
    100                         COUT(1) << "error: " << this << " is still master in " << (*it) << std::endl;
     100                        orxout(internal_error) << this << " is still master in " << (*it) << endl;
    101101                        it->myMaster_ = 0;
    102102                    }
    … …  
    107107                        if (it2 != it->slaves_.end())
    108108                        {
    109                             COUT(1) << "error: " << this << " is still slave in " << (*it) << std::endl;
     109                            orxout(internal_error) << this << " is still slave in " << (*it) << endl;
    110110                            it->slaves_.erase(it2);
    111111                        }
    … …  
    737737        float speedDiv = this->getControllableEntity()->getVelocity().squaredLength() - this->target_->getVelocity().squaredLength();
    738738
    739 COUT(0) << "~follow distance: " << distance << "SpeedCounter: " << this->speedCounter_ << "~speedDiv: " << speedDiv << std::endl;
     739orxout() << "~follow distance: " << distance << "SpeedCounter: " << this->speedCounter_ << "~speedDiv: " << speedDiv << endl;
    740740        if (distance < 800)
    741741        {

  • code/trunk/src/orxonox/controllers/HumanController.cc

    r8706 r8858  
    9393            Camera* camera = HumanController::localController_s->controllableEntity_->getCamera();
    9494            if (!camera)
    95                 COUT(3) << "HumanController, Warning: Using a ControllableEntity without Camera" << std::endl;
     95                orxout(internal_warning) << "HumanController, Warning: Using a ControllableEntity without Camera" << endl;
    9696        }
    9797    }
    … …  
    197197           
    198198            this->controllableEntity_->boost(this->boosting_);
    199             COUT(4) << "Start boosting" << endl;
     199//            orxout() << "Start boosting" << endl;
    200200        }
    201201    }
    … …  
    211211
    212212        this->controllableEntity_->boost(this->boosting_);
    213         COUT(4) << "Stop boosting" << endl;
     213//        orxout() << "Stop boosting" << endl;
    214214    }
    215215
    … …  
    257257            const Quaternion& orientation = HumanController::localController_s->controllableEntity_->getOrientation();
    258258
    259             COUT(0) << "position=\"" << position.x << ", " << position.y << ", " << position.z << "\" ";
    260             COUT(0) << "orientation=\"" << orientation.w << ", " << orientation.x << ", " << orientation.y << ", " << orientation.z << "\"" << std::endl;
     259            orxout(message) << "position=\"" << position.x << ", " << position.y << ", " << position.z << "\" "
     260                            << "orientation=\"" << orientation.w << ", " << orientation.x << ", " << orientation.y << ", " << orientation.z << "\"" << endl;
    261261        }
    262262    }

  • code/trunk/src/orxonox/controllers/NewHumanController.cc

    r8436 r8858  
    388388        for (itr = result.begin(); itr != result.end(); ++itr)
    389389        {
    390 //             CCOUT(0) << "testing object as target" << endl;
     390//             orxout() << "testing object as target" << endl;
    391391            if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity" && itr->distance > 200)
    392392            {

  • code/trunk/src/orxonox/gamestates/GSClient.cc

    r7163 r8858  
    2929#include "GSClient.h"
    3030
    31 #include "util/Debug.h"
    3231#include "util/Exception.h"
    3332#include "core/CommandLineParser.h"
    … …  
    5352    void GSClient::activate()
    5453    {
     54        orxout(user_status) << "Starting client" << endl;
     55
    5556        GameMode::setIsClient(true);
    5657

  • code/trunk/src/orxonox/gamestates/GSLevel.cc

    r8729 r8858  
    7474    void GSLevel::activate()
    7575    {
     76        orxout(user_status) << "Loading level" << endl;
     77
    7678        if (GameMode::showsGraphics())
    7779        {
    … …  
    155157
    156158        // call the loader
    157         COUT(0) << "Loading level..." << std::endl;
    158159        startFile_ = new XMLFile(LevelManager::getInstance().getDefaultLevel());
    159160        bool loaded = Loader::open(startFile_);
    … …  
    169170        delete startFile_;
    170171
    171         COUT(3) << "Unloaded level. Remaining objects:" << std::endl;
     172        orxout(internal_info) << "Remaining objects:" << endl;
    172173        unsigned int i = 0;
    173174        for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
    … …  
    176177            if (find == this->staticObjects_.end())
    177178            {
    178                 COUT(3) << ++i << ": " << it->getIdentifier()->getName() << " (" << *it << "), references: " << it->getReferenceCount() << std::endl;
     179                orxout(internal_info) << ++i << ": " << it->getIdentifier()->getName() << " (" << *it << "), references: " << it->getReferenceCount() << endl;
    179180            }
    180181        }
    181         COUT(3) << i << " objects remaining.";
     182        orxout(internal_info) << i << " objects remaining.";
    182183        if (i == 0)
    183             COUT(3) << " Well done!" << std::endl;
     184            orxout(internal_info) << " Well done!" << endl;
    184185        else
    185             COUT(3) << " Try harder!" << std::endl;
     186            orxout(internal_info) << " Try harder!" << endl;
    186187    }
    187188

  • code/trunk/src/orxonox/gamestates/GSMainMenu.cc

    r8079 r8858  
    9595    void GSMainMenu::activate()
    9696    {
     97        orxout(user_status) << "Loading main menu" << endl;
     98
    9799        // show main menu
    98100        GraphicsManager::getInstance().setCamera(this->camera_);

  • code/trunk/src/orxonox/gamestates/GSMasterServer.cc

    r7801 r8858  
    3030#include "GSMasterServer.h"
    3131
    32 #include "util/Debug.h"
     32#include "util/Output.h"
    3333#include "core/Game.h"
    3434#include "core/GameMode.h"
    … …  
    5050  void GSMasterServer::activate()
    5151  {
     52    orxout(user_status) << "Starting masterserver" << endl;
     53
    5254    /* TODO make this work for masterserver as well */
    5355    //GameMode::setIsServer(true);
    5456
    5557    this->mserver = new MasterServer();
    56     COUT(0) << "Loading masterserver mode" << std::endl;
    57 
    5858    this->mserver->run();
    5959  }

  • code/trunk/src/orxonox/gamestates/GSRoot.cc

    r8706 r8858  
    7777        {
    7878            if (dynamic_cast<Synchronisable*>(*it))
    79                 COUT(0) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << std::endl;
     79                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << endl;
    8080            else
    81                 COUT(0) << "object: " << it->getIdentifier()->getName() << std::endl;
     81                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << endl;
    8282            nr++;
    8383        }
    84         COUT(0) << "currently got " << nr << " objects" << std::endl;
     84        orxout(debug_output) << "currently got " << nr << " objects" << endl;
    8585    }
    8686

  • code/trunk/src/orxonox/gamestates/GSServer.cc

    r7801 r8858  
    2929#include "GSServer.h"
    3030
    31 #include "util/Debug.h"
     31#include "util/Output.h"
    3232#include "core/CommandLineParser.h"
    3333#include "core/Game.h"
    … …  
    5454    void GSServer::activate()
    5555    {
     56        orxout(user_status) << "Starting server" << endl;
     57
    5658        GameMode::setIsServer(true);
    5759
    5860        this->server_ = new Server(CommandLineParser::getValue("port"));
    59         COUT(0) << "Loading scene in server mode" << std::endl;
     61        orxout(user_status) << "Loading scene in server mode" << endl;
    6062
    6163        server_->open();

  • code/trunk/src/orxonox/gametypes/Asteroids.cc

    r7655 r8858  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "network/Host.h"
     32#include "chat/ChatManager.h"
    3333#include "worldentities/pawns/Pawn.h"
    3434
    … …  
    7474
    7575        std::string message("The match has started! Reach the first chekpoint within 15 seconds! But be aware, there may be pirates around...");
    76         COUT(0) << message << std::endl;
    77         Host::Broadcast(message);
     76        ChatManager::message(message);
    7877
    7978    }
    … …  
    8483
    8584        std::string message("The match has ended.");
    86         COUT(0) << message << std::endl;
    87         Host::Broadcast(message);
     85        ChatManager::message(message);
    8886    }
    8987}

  • code/trunk/src/orxonox/gametypes/Deathmatch.cc

    r6417 r8858  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "network/Host.h"
     32#include "chat/ChatManager.h"
    3333#include "infos/PlayerInfo.h"
    3434#include "worldentities/pawns/Pawn.h"
    … …  
    4848
    4949        std::string message("The match has started!");
    50         COUT(0) << message << std::endl;
    51         Host::Broadcast(message);
     50        ChatManager::message(message);
    5251    }
    5352
    … …  
    5756
    5857        std::string message("The match has ended.");
    59         COUT(0) << message << std::endl;
    60         Host::Broadcast(message);
     58        ChatManager::message(message);
    6159    }
    6260
    … …  
    6664
    6765        const std::string& message = player->getName() + " entered the game";
    68         COUT(0) << message << std::endl;
    69         Host::Broadcast(message);
     66        ChatManager::message(message);
    7067    }
    7168
    … …  
    7774        {
    7875            const std::string& message = player->getName() + " left the game";
    79             COUT(0) << message << std::endl;
    80             Host::Broadcast(message);
     76            ChatManager::message(message);
    8177        }
    8278
    … …  
    9187        {
    9288            const std::string& message = player->getOldName() + " changed name to " + player->getName();
    93             COUT(0) << message << std::endl;
    94             Host::Broadcast(message);
     89            ChatManager::message(message);
    9590        }
    9691
    … …  
    113108                message = victim->getPlayer()->getName() + " died";
    114109
    115             COUT(0) << message << std::endl;
    116             Host::Broadcast(message);
     110            ChatManager::message(message);
    117111        }
    118112
    … …  
    127121        {
    128122            const std::string& message = player->getName() + " scores!";
    129             COUT(0) << message << std::endl;
    130             Host::Broadcast(message);
     123            ChatManager::message(message);
    131124        }
    132125    }

  • code/trunk/src/orxonox/gametypes/Dynamicmatch.cc

    r8729 r8858  
    4949#include "core/CoreIncludes.h"
    5050#include "core/command/Executor.h"
    51 #include "network/Host.h"
     51#include "chat/ChatManager.h"
    5252#include "infos/PlayerInfo.h"
    5353#include "worldentities/pawns/Pawn.h"
    … …  
    342342        numberOf[chaser]++;
    343343        Gametype::playerEntered(player);
    344         const std::string& message6 = player->getName() + " entered the game";
    345         COUT(0) << message6 << std::endl;
    346         Host::Broadcast(message6);
     344        const std::string& message = player->getName() + " entered the game";
     345        ChatManager::message(message);
    347346    }
    348347
    … …  
    359358            }
    360359            const std::string& message = player->getName() + " left the game";
    361             COUT(0) << message << std::endl;
    362             Host::Broadcast(message);
     360            ChatManager::message(message);
    363361            //remove player from map
    364362            playerParty_.erase (player);
    … …  
    617615        {
    618616            const std::string& message = player->getOldName() + " changed name to " + player->getName();
    619             COUT(0) << message << std::endl;
    620             Host::Broadcast(message);
     617            ChatManager::message(message);
    621618        }
    622619
    … …  
    630627        {
    631628            std::string message("Dynamicmatch started!");
    632             COUT(0) << message << std::endl;
    633             Host::Broadcast(message);
     629            ChatManager::message(message);
    634630        }
    635631        else if(tutorial) // Announce selectionphase
    … …  
    647643    {
    648644        std::string message("Earn points:\n\n\n\tIf you're red: Chase the blue player!\n\n\tIf you're blue shoot at a red player or hide.\n\n\tIf you're green: You've got the licence to kill red players!");
    649         COUT(0) << message << std::endl;
    650         Host::Broadcast(message);
     645        ChatManager::message(message);
    651646        callInstructions_.setTimer(10, false, createExecutor(createFunctor(&Dynamicmatch::furtherInstructions, this)));
    652647    }
    … …  
    655650    {
    656651        std::string message("After 3 Minutes the game is over.");
    657         COUT(0) << message << std::endl;
    658         Host::Broadcast(message);
     652        ChatManager::message(message);
    659653    }*/
    660654    void Dynamicmatch::end()
    … …  
    663657
    664658        std::string message("Time out. Press F2 to see the points you scored.");
    665         COUT(0) << message << std::endl;
    666         Host::Broadcast(message);
     659        ChatManager::message(message);
    667660    }
    668661    SpawnPoint* Dynamicmatch::getBestSpawnPoint(PlayerInfo* player) const

  • code/trunk/src/orxonox/gametypes/Gametype.cc

    r8706 r8858  
    297297            }
    298298            else
    299                 COUT(2) << "Warning: Killed Pawn was not in the playerlist" << std::endl;
     299                orxout(internal_warning) << "Killed Pawn was not in the playerlist" << endl;
    300300        }
    301301    }
    … …  
    344344            }
    345345
    346             COUT(2) << "Warning: Fallback SpawnPoint was used, because there were no active SpawnPoints." << endl;
     346            orxout(internal_warning) << "Fallback SpawnPoint was used because there were no active SpawnPoints." << endl;
    347347            return fallbackSpawnPoint;
    348348        }
    … …  
    444444        else
    445445        {
    446             COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
     446            orxout(user_error) << "No SpawnPoints in current Gametype" << endl;
    447447            abort();
    448448        }
    … …  
    461461        else
    462462        {
    463             COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
     463            orxout(user_error) << "No SpawnPoints in current Gametype" << endl;
    464464            abort();
    465465        }

  • code/trunk/src/orxonox/gametypes/LastManStanding.cc

    r8327 r8858  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "network/Host.h"
     32#include "chat/ChatManager.h"
    3333#include "infos/PlayerInfo.h"
    3434#include "worldentities/pawns/Pawn.h"
    … …  
    9090                const std::string& message = ""; // resets Camper-Warning-message
    9191                this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
    92             }   
     92            }
    9393        }
    9494        return true;
    … …  
    105105            this->playersAlive--;
    106106            const std::string& message = victim->getPlayer()->getName() + " has lost all lives";
    107             COUT(0) << message << std::endl;
    108             Host::Broadcast(message);
     107            ChatManager::message(message);
    109108        }
    110109
    … …  
    128127    {
    129128        Gametype::end();
    130        
     129
    131130        for (std::map<PlayerInfo*, int>::iterator it = this->playerLives_.begin(); it != this->playerLives_.end(); ++it)
    132131        {
    … …  
    148147            return 0;
    149148    }
    150    
     149
    151150    int LastManStanding::getNumPlayersAlive() const
    152151    {
    … …  
    190189        this->timeToAct_[player]=timeRemaining+3.0f+respawnDelay;//reset timer
    191190        this->playerDelayTime_[player]=respawnDelay;
    192        
     191
    193192        std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
    194193        if (it != this->players_.end())
    … …  
    198197            const std::string& message = ""; // resets Camper-Warning-message
    199198            this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
    200         } 
     199        }
    201200    }
    202201
    … …  
    239238            }
    240239            for (std::map<PlayerInfo*, float>::iterator it = this->timeToAct_.begin(); it != this->timeToAct_.end(); ++it)
    241             {   
     240            {
    242241                if (playerGetLives(it->first)<=0)//Players without lives shouldn't be affected by time.
    243                     continue;     
     242                    continue;
    244243                it->second-=dt;//Decreases punishment time.
    245                 if (!inGame_[it->first])//Manages respawn delay - player is forced to respawn after the delaytime is used up. 
     244                if (!inGame_[it->first])//Manages respawn delay - player is forced to respawn after the delaytime is used up.
    246245                {
    247246                    playerDelayTime_[it->first]-=dt;

  • code/trunk/src/orxonox/gametypes/LastTeamStanding.cc

    r8706 r8858  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "network/NetworkPrereqs.h"
    33 #include "network/Host.h"
     32#include "chat/ChatManager.h"
    3433#include "infos/PlayerInfo.h"
    3534#include "worldentities/pawns/Pawn.h"
    … …  
    119118                this->teamsAlive--;
    120119            const std::string& message = victim->getPlayer()->getName() + " has lost all lives";
    121             COUT(0) << message << std::endl;
    122             Host::Broadcast(message);
     120            ChatManager::message(message);
    123121        }
    124122        return allow;

  • code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc

    r8327 r8858  
    141141            return;
    142142
    143         COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
    144         if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) COUT(0) << "Team 1 is near victory!" << std::endl;
    145         if(pointsTeam2_ >=1700 && pointsTeam2_ < 2000) COUT(0) << "Team 2 is near victory!" << std::endl;
     143        orxout(message) << "Points standing:" << '\n' << "Team 1: "<< pointsTeam1_ << '\n' << "Team 2: " << pointsTeam2_ << endl;
     144        if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) orxout(message) << "Team 1 is near victory!" << endl;
     145        if(pointsTeam2_ >=1700 && pointsTeam2_ < 2000) orxout(message) << "Team 2 is near victory!" << endl;
    146146    }
    147147
    … …  
    179179            if (this->pointsTeam1_ > this->pointsTeam2_)
    180180            {
    181                 COUT(0) << "Team 1 has won the match" << std::endl;
     181                orxout(message) << "Team 1 has won the match" << endl;
    182182                winningteam = 0;
    183183            }
    184184            else
    185185            {
    186                 COUT(0) << "Team 2 has won the match" << std::endl;
     186                orxout(message) << "Team 2 has won the match" << endl;
    187187                winningteam = 1;
    188188            }

  • code/trunk/src/orxonox/gametypes/UnderAttack.cc

    r8327 r8858  
    3232#include "core/CoreIncludes.h"
    3333#include "core/ConfigValueIncludes.h"
    34 #include "network/Host.h"
     34#include "chat/ChatManager.h"
    3535#include "worldentities/pawns/Destroyer.h"
    3636#include "infos/PlayerInfo.h"
    … …  
    7070        this->end(); //end gametype
    7171        std::string message("Ship destroyed! Team 0 has won!");
    72         COUT(0) << message << std::endl;
    73         Host::Broadcast(message);
     72        ChatManager::message(message);
    7473        this->gameEnded_ = true;
    7574
    … …  
    153152                this->end();
    154153                std::string message("Time is up! Team 1 has won!");
    155                 COUT(0) << message << std::endl;
    156                 Host::Broadcast(message);
     154                ChatManager::message(message);
    157155
    158156                for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
    … …  
    173171                const std::string& message = multi_cast<std::string>(timesequence_) + " seconds left!";
    174172/*
    175                 COUT(0) << message << std::endl;
    176                 Host::Broadcast(message);
     173                ChatManager::message(message);
    177174*/
    178175                this->gtinfo_->sendAnnounceMessage(message);

  • code/trunk/src/orxonox/graphics/AnimatedModel.cc

    r7163 r8858  
    2222 *   Author:
    2323 *      Benjamin de Capitani
    24  *
     24 *   Co-authors:
     25 *      ...
    2526 *
    2627 */

  • code/trunk/src/orxonox/graphics/AnimatedModel.h

    r7163 r8858  
    2121 *
    2222 *   Author:
    23  *      Fabian 'x3n' Landau
     23 *      Benjamin de Capitani
    2424 *   Co-authors:
    2525 *      ...

  • code/trunk/src/orxonox/graphics/Model.cc

    r8079 r8858  
    142142            if( this->numLodLevels_>10 )
    143143            {
    144                 CCOUT(2) << "More than 10 LoD levels requested. Creating only 10." << endl;
     144                orxout(internal_warning, context::lod) << "More than 10 LoD levels requested. Creating only 10." << endl;
    145145                this->numLodLevels_ = 10;
    146146            }
    … …  
    158158                    creatorPtr = creatorPtr->getCreator();
    159159                }
    160                 COUT(0) << "name: " << this->meshSrc_ << "scaleFactor: " << scaleFactor << ", volume: " << volume << endl;
     160                orxout() << "name: " << this->meshSrc_ << "scaleFactor: " << scaleFactor << ", volume: " << volume << endl;
    161161*/
    162                 COUT(4) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << std::endl;
     162                orxout(verbose, context::lod) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << endl;
    163163
    164164#if OGRE_VERSION >= 0x010700
    … …  
    173173                    float factor = pow(volume, 2.0f / 3.0f) * 15.0f / lodLevel_;
    174174
    175                     COUT(4) << "LodLevel set with factor: " << factor << endl;
     175                    orxout(verbose, context::lod) << "LodLevel set with factor: " << factor << endl;
    176176
    177177                    distList.push_back(70.0f*factor);
    … …  
    200200                        what = "<0";
    201201
    202                     COUT(4)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"." << endl;
     202                    orxout(verbose, context::lod) << "LodLevel not set because lodLevel(" << lodLevel_ << ") was " << what << "." << endl;
    203203                }
    204204            }
    205205            else
    206                 COUT(4) << "LodLevel for " << this->meshSrc_ << " not set because is disabled." << endl;
     206                orxout(verbose, context::lod) << "LodLevel for " << this->meshSrc_ << " not set because is disabled." << endl;
    207207        }
    208208    }

  • code/trunk/src/orxonox/graphics/ParticleEmitter.cc

    r7174 r8858  
    116116            catch (const std::exception& ex)
    117117            {
    118                 COUT(1) << "Error: Couln't load particle effect \"" << this->source_ << "\" because:" << std::endl
    119                         << ex.what() << std::endl;
     118                orxout(internal_error) << "Couldn't load particle effect \"" << this->source_ << "\" because:" << endl
     119                                       << ex.what() << endl;
    120120            }
    121121        }

  • code/trunk/src/orxonox/infos/GametypeInfo.cc

    r8706 r8858  
    196196        this->startCountdown_ = countdown;
    197197        // Set the counter to the ceiling of the current countdown.
    198         this->counter_ = std::ceil(countdown);
     198        this->counter_ = static_cast<unsigned int>(std::ceil(countdown));
    199199        this->changedCountdownCounter();
    200200    }

  • code/trunk/src/orxonox/interfaces/PickupCarrier.cc

    r8351 r8858  
    7575            if(it != this->pickups_.end() && temp == *it) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.
    7676            {
    77                 COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << temp << ") didn't unregister itself as it should have." << std::endl;;
     77                orxout(internal_warning, context::pickups) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << temp << ") didn't unregister itself as it should have." << endl;;
    7878                it++;
    7979            }
    … …  
    158158    bool PickupCarrier::addPickup(Pickupable* pickup)
    159159    {
    160         COUT(4) << "Adding Pickupable (&" << pickup << ") to PickupCarrier (&" << this << ")" << std::endl;
     160        orxout(verbose, context::pickups) << "Adding Pickupable (&" << pickup << ") to PickupCarrier (&" << this << ")" << endl;
    161161        return this->pickups_.insert(pickup).second;
    162162    }
    … …  
    172172    bool PickupCarrier::removePickup(Pickupable* pickup)
    173173    {
    174         COUT(4) << "Removing Pickupable (&" << pickup << ") from PickupCarrier (&" << this << ")" << std::endl;
     174        orxout(verbose, context::pickups) << "Removing Pickupable (&" << pickup << ") from PickupCarrier (&" << this << ")" << endl;
    175175        return this->pickups_.erase(pickup) == 1;
    176176    }

  • code/trunk/src/orxonox/interfaces/Pickupable.cc

    r8464 r8858  
    7171        if(this->pickupIdentifier_ != NULL)
    7272        {
    73             COUT(4) << "Pickupable (&" << this << ") destroyed." << std::endl;
     73            orxout(verbose, context::pickups) << "Pickupable (&" << this << ") destroyed." << endl;
    7474            this->pickupIdentifier_->destroy();
    7575        }
    … …  
    107107            this->OrxonoxClass::destroy();
    108108        else
    109             COUT(2) << this->getIdentifier()->getName() << " may be unsafe. " << std::endl;
     109            orxout(internal_warning, context::pickups) << this->getIdentifier()->getName() << " may be unsafe. " << endl;
    110110    }
    111111
    … …  
    126126            return false;
    127127
    128         COUT(4) << "Pickupable (&" << this << ") set to used " << used << "." << std::endl;
     128        orxout(verbose, context::pickups) << "Pickupable (&" << this << ") set to used " << used << "." << endl;
    129129
    130130        this->used_ = used;
    … …  
    201201            return false;
    202202
    203         COUT(4) << "Target " << target->getName() << " added to Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ")." << std::endl;
     203        orxout(verbose, context::pickups) << "Target " << target->getName() << " added to Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ")." << endl;
    204204        this->targets_.push_back(target);
    205205        return true;
    … …  
    221221        if(!this->setCarrier(carrier))
    222222        {
    223             COUT(3) << "A Pickupable (&" << this << ") was trying to be added to a PickupCarrier, but was already present." << std::endl;
     223            orxout(internal_warning, context::pickups) << "A Pickupable (&" << this << ") was trying to be added to a PickupCarrier, but was already present." << endl;
    224224            return false;
    225225        }
    226226
    227227        this->setPickedUp(true);
    228         COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
     228        orxout(verbose, context::pickups) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << endl;
    229229        return true;
    230230    }
    … …  
    245245        assert(this->getCarrier()); // The Carrier cannot be NULL at this point.
    246246        if(!this->getCarrier()->removePickup(this)) //TODO Shouldn't this be a little later?
    247             COUT(2) << "Pickupable (&" << this << ", " << this->getIdentifier()->getName() << ") is being dropped, but it was not present in the PickupCarriers list of pickups." << std::endl;
    248 
    249         COUT(4) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;
     247            orxout(internal_warning, context::pickups) << "Pickupable (&" << this << ", " << this->getIdentifier()->getName() << ") is being dropped, but it was not present in the PickupCarriers list of pickups." << endl;
     248
     249        orxout(verbose, context::pickups) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << endl;
    250250        this->setUsed(false);
    251251        this->setPickedUp(false);
    … …  
    276276            return false;
    277277
    278         COUT(4) << "Pickupable (&" << this << ") set to pickedUp " << pickedUp << "." << std::endl;
     278        orxout(verbose, context::pickups) << "Pickupable (&" << this << ") set to pickedUp " << pickedUp << "." << endl;
    279279
    280280        this->pickedUp_ = pickedUp;
    … …  
    305305            return false;
    306306
    307         COUT(4) << "Pickupable (&" << this << ") changed Carrier (& " << carrier << ")." << std::endl;
     307        orxout(verbose, context::pickups) << "Pickupable (&" << this << ") changed Carrier (& " << carrier << ")." << endl;
    308308
    309309        if(carrier != NULL && tell)
    … …  
    340340        Pickupable* pickup = dynamic_cast<Pickupable*>(item);
    341341
    342         COUT(4) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl;
     342        orxout(verbose, context::pickups) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << endl;
    343343        return pickup;
    344344    }

  • code/trunk/src/orxonox/interfaces/RadarViewable.cc

    r8738 r8858  
    8383//         else
    8484//         {
    85 //             CCOUT(2) << "Attempting to access the radar, but the radar is non existent." << std::endl;
     85//             orxout(internal_warning) << "Attempting to access the radar, but the radar is non existent." << endl;
    8686//         }
    8787//         this->radarObjectDescription_ = str;
    … …  
    106106        if (!object)
    107107        {
    108             COUT(1) << "Assertion: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl;
     108            orxout(user_error) << "Assertion: Every RadarViewable has to be assigned a WorldEntity pointer!" << endl;
    109109            assert(0);
    110110        }

  • code/trunk/src/orxonox/items/Engine.cc

    r8727 r8858  
    261261        if(!this->engineTemplate_.empty())
    262262        {
    263             COUT(4)<<"Loading an engine template: "<<this->engineTemplate_<<"\n";
     263            orxout(verbose, context::templates) << "Loading an engine template: " << this->engineTemplate_ << endl;
    264264            Template *temp = Template::getTemplate(this->engineTemplate_);
    265265            if(temp)

  • code/trunk/src/orxonox/overlays/InGameConsole.cc

    r8729 r8858  
    4646#include "util/DisplayStringConversions.h"
    4747#include "util/ScopedSingletonManager.h"
     48#include "util/output/MemoryWriter.h"
    4849#include "core/CoreIncludes.h"
    4950#include "core/ConfigValueIncludes.h"
    … …  
    5859{
    5960    const int LINES = 30;
    60     const float CHAR_WIDTH = 7.45f; // fix this please - determine the char-width dynamically
     61    const float CHAR_WIDTH = 8.0f; // fix this please - determine the char-width dynamically
    6162
    6263    SetConsoleCommand("InGameConsole", "openConsole", &InGameConsole::openConsole);
    … …  
    9495        // Output buffering is not anymore needed. Not the best solution to do
    9596        // this here, but there isn't much of another way.
    96         OutputHandler::getInstance().disableMemoryLog();
     97        MemoryWriter::getInstance().disable();
    9798    }
    9899
    … …  
    262263        this->consoleOverlayContainer_->setTop(-1.3f * this->relativeHeight);
    263264
    264         COUT(4) << "Info: InGameConsole initialized" << std::endl;
     265        orxout(internal_info) << "InGameConsole initialized" << endl;
    265266    }
    266267
    … …  
    288289
    289290        for (int i = LINES - 1; i > max; --i)
    290             this->print("", Shell::None, i, true);
     291            this->print("", Shell::DebugOutput, i, true);
    291292
    292293        for (int i = max; i >= 1; --i)
    … …  
    298299
    299300    /**
    300         @brief Called if only the last output-line has changed.
    301     */
    302     void InGameConsole::onlyLastLineChanged()
    303     {
     301        @brief Called if a new output-line was added.
     302    */
     303    void InGameConsole::lineAdded()
     304    {
     305        this->numLinesShifted_ = 0;
     306        this->shiftLines();
    304307        if (LINES > 1)
    305308            this->print(this->shell_->getNewestLineIterator()->first, this->shell_->getNewestLineIterator()->second, 1);
    306     }
    307 
    308     /**
    309         @brief Called if a new output-line was added.
    310     */
    311     void InGameConsole::lineAdded()
    312     {
    313         this->numLinesShifted_ = 0;
    314         this->shiftLines();
    315         this->onlyLastLineChanged();
    316309    }
    317310
    … …  
    346339    void InGameConsole::executed()
    347340    {
    348         this->shell_->addOutput(this->shell_->getInput() + '\n', Shell::Command);
     341        this->shell_->addOutput(this->shell_->getInput(), Shell::Command);
    349342    }
    350343
    … …  
    437430
    438431        // now adjust the text lines...
    439         this->desiredTextWidth_ = static_cast<int>(this->windowW_ * this->relativeWidth) - 12;
     432        this->desiredTextWidth_ = static_cast<int>(this->windowW_ * this->relativeWidth) - 24;
    440433
    441434        if (LINES > 0)
    … …  
    566559        switch (type)
    567560        {
    568         case Shell::Error:   colourTop = ColourValue(0.95f, 0.25f, 0.25f, 1.00f);
    569                           colourBottom = ColourValue(1.00f, 0.50f, 0.50f, 1.00f); break;
    570 
    571         case Shell::Warning: colourTop = ColourValue(0.95f, 0.50f, 0.20f, 1.00f);
    572                           colourBottom = ColourValue(1.00f, 0.70f, 0.50f, 1.00f); break;
    573 
    574         case Shell::Info:    colourTop = ColourValue(0.50f, 0.50f, 0.95f, 1.00f);
    575                           colourBottom = ColourValue(0.80f, 0.80f, 1.00f, 1.00f); break;
    576 
    577         case Shell::Debug:   colourTop = ColourValue(0.65f, 0.48f, 0.44f, 1.00f);
    578                           colourBottom = ColourValue(1.00f, 0.90f, 0.90f, 1.00f); break;
    579 
    580         case Shell::Verbose: colourTop = ColourValue(0.40f, 0.20f, 0.40f, 1.00f);
    581                           colourBottom = ColourValue(0.80f, 0.60f, 0.80f, 1.00f); break;
    582 
    583         case Shell::Ultra:   colourTop = ColourValue(0.21f, 0.69f, 0.21f, 1.00f);
    584                           colourBottom = ColourValue(0.80f, 1.00f, 0.80f, 1.00f); break;
    585 
    586         case Shell::Command: colourTop = ColourValue(0.80f, 0.80f, 0.80f, 1.00f);
    587                           colourBottom = ColourValue(0.90f, 0.90f, 0.90f, 0.90f); break;
    588 
    589         case Shell::Hint:    colourTop = ColourValue(0.80f, 0.80f, 0.80f, 1.00f);
    590                           colourBottom = ColourValue(0.90f, 0.90f, 0.90f, 1.00f); break;
    591 
    592         case Shell::TDebug:  colourTop = ColourValue(0.90f, 0.00f, 0.90f, 1.00f);
    593                           colourBottom = ColourValue(1.00f, 0.00f, 1.00f, 1.00f); break;
    594 
    595         default:             colourTop = ColourValue(0.90f, 0.90f, 0.90f, 1.00f);
    596                           colourBottom = ColourValue(1.00f, 1.00f, 1.00f, 1.00f); break;
    597         }
     561            case Shell::Message:
     562            case Shell::DebugOutput:     colourTop = ColourValue(0.9f, 0.9f, 0.9f); break;
     563
     564            case Shell::UserError:       colourTop = ColourValue(0.9f, 0.0f, 0.0f); break;
     565            case Shell::UserWarning:     colourTop = ColourValue(0.9f, 0.5f, 0.0f); break;
     566            case Shell::UserStatus:      colourTop = ColourValue(0.0f, 0.9f, 0.0f); break;
     567            case Shell::UserInfo:        colourTop = ColourValue(0.0f, 0.8f, 0.8f); break;
     568
     569            case Shell::InternalError:   colourTop = ColourValue(0.5f, 0.0f, 0.0f); break;
     570            case Shell::InternalWarning: colourTop = ColourValue(0.5f, 0.2f, 0.0f); break;
     571            case Shell::InternalStatus:  colourTop = ColourValue(0.0f, 0.5f, 0.0f); break;
     572            case Shell::InternalInfo:    colourTop = ColourValue(0.0f, 0.4f, 0.4f); break;
     573
     574            case Shell::Verbose:         colourTop = ColourValue(0.3f, 0.3f, 0.9f); break;
     575            case Shell::VerboseMore:     colourTop = ColourValue(0.2f, 0.2f, 0.7f); break;
     576            case Shell::VerboseUltra:    colourTop = ColourValue(0.1f, 0.1f, 0.5f); break;
     577
     578            case Shell::Command:         colourTop = ColourValue(0.8f, 0.2f, 0.8f); break;
     579            case Shell::Hint:            colourTop = ColourValue(0.4f, 0.0f, 0.4f); break;
     580            case Shell::Input:           colourTop = ColourValue(0.9f, 0.9f, 0.9f); break;
     581
     582            default:                     colourTop = ColourValue(0.5f, 0.5f, 0.5f); break;
     583        }
     584
     585        colourBottom = ColourValue(sqrt(colourTop.r), sqrt(colourTop.g), sqrt(colourTop.b));
    598586
    599587        this->consoleOverlayTextAreas_[index]->setColourTop   (colourTop);

  • code/trunk/src/orxonox/overlays/InGameConsole.h

    r7284 r8858  
    6464
    6565        void linesChanged();
    66         void onlyLastLineChanged();
    6766        void lineAdded();
    6867        void inputChanged();

  • code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

    r8706 r8858  
    147147
    148148        if (OrxonoxOverlay::overlays_s.find(this->getName()) != OrxonoxOverlay::overlays_s.end())
    149             COUT(1) << "Overlay names should be unique or you cannnot access them via console. Name: \"" << this->getName() << '"' << std::endl;
     149            orxout(internal_warning) << "Overlay names should be unique or you cannnot access them via console. Name: \"" << this->getName() << '"' << endl;
    150150
    151151        OrxonoxOverlay::overlays_s[this->getName()] = this;
    … …  
    362362            {
    363363                overlay->hide();
    364                 COUT(4) << "HIDE " << name << std::endl;
     364                orxout(verbose, context::misc::overlays) << "HIDE " << name << endl;
    365365            }
    366366            else
    367367            {
    368368                overlay->show();
    369                 COUT(4) << "SHOW " << name << std::endl;
     369                orxout(verbose, context::misc::overlays) << "SHOW " << name << endl;
    370370            }
    371371        }

  • code/trunk/src/orxonox/pickup/PickupIdentifier.cc

    r7494 r8858  
    5151
    5252        if(pickup == NULL)
    53             COUT(1) << "Error, PickupIdentifier was created without a valid Pickupable." << std::endl;
     53            orxout(internal_error, context::pickups) << "PickupIdentifier was created without a valid Pickupable." << endl;
    5454
    5555        this->pickup_ = pickup;
    … …  
    8383        if(!(this->parameters_.size() == identifier->parameters_.size()))
    8484        {
    85             COUT(1) << "Something went wrong in PickupIdentifier!" << std::endl;
     85            orxout(internal_error, context::pickups) << "Something went wrong in PickupIdentifier!" << endl;
    8686            return this->parameters_.size()-identifier->parameters_.size();
    8787        }
    … …  
    9393            if(identifier->parameters_.find(it->first) == identifier->parameters_.end())
    9494            {
    95                 COUT(1) << "Something went wrong in PickupIdentifier!" << std::endl;
     95                orxout(internal_error, context::pickups) << "Something went wrong in PickupIdentifier!" << endl;
    9696                return -1;
    9797            }
    … …  
    115115    bool PickupIdentifier::addParameter(std::string & name, std::string & value)
    116116    {
    117         COUT(4) << "PickupIdentifier " << name << ", " << value << std::endl;
     117        orxout(verbose, context::pickups) << "PickupIdentifier " << name << ", " << value << endl;
    118118
    119119        if(!(this->parameters_.find(name) == this->parameters_.end()))
    120120        {
    121             COUT(4) << "Request for adding a parameter that already exists for the PickupIdentififer was denied. name: '" << name << "', value: '" << value << "'."<<  std::endl;
     121            orxout(verbose, context::pickups) << "Request for adding a parameter that already exists for the PickupIdentififer was denied. name: '" << name << "', value: '" << value << "'."<<  endl;
    122122            return false;
    123123        }

  • code/trunk/src/orxonox/sound/AmbientSound.cc

    r8706 r8858  
    9494                this->setSource(path);
    9595            else
    96                 COUT(3) << "Sound: " << this->ambientSource_ << ": Not a valid name! Ambient sound will not change." << std::endl;
     96                orxout(internal_warning, context::sound) << this->ambientSource_ << ": Not a valid name! Ambient sound will not change." << endl;
    9797        }
    9898    }

  • code/trunk/src/orxonox/sound/BaseSound.cc

    r8729 r8858  
    9494            alSourcePlay(this->audioSource_);
    9595            if (int error = alGetError())
    96                 COUT(2) << "Sound: Error playing sound: " << SoundManager::getALErrorString(error) << std::endl;
     96                orxout(internal_error, context::sound) << "Error playing sound: " << SoundManager::getALErrorString(error) << endl;
    9797        }
    9898    }
    … …  
    147147        alSource3f(this->audioSource_, AL_DIRECTION, 0, 0, 0);
    148148        if (ALint error = alGetError())
    149             COUT(2) << "Sound Warning: Setting source parameters to 0 failed: "
    150                     << SoundManager::getALErrorString(error) << std::endl;
     149            orxout(internal_warning, context::sound) << "Setting source parameters to 0 failed: "
     150                                                     << SoundManager::getALErrorString(error) << endl;
    151151        assert(this->soundBuffer_ != NULL);
    152152        alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
    153153        if (ALuint error = alGetError())
    154             COUT(1) << "Sound Error: Could not set buffer \"" << this->source_ << "\": " << SoundManager::getALErrorString(error) << std::endl;
     154            orxout(internal_error, context::sound) << "Could not set buffer \"" << this->source_ << "\": " << SoundManager::getALErrorString(error) << endl;
    155155    }
    156156
    … …  
    159159        this->volume_ = clamp(vol, 0.0f, 1.0f);
    160160        if (this->volume_ != vol)
    161             COUT(2) << "Sound warning: volume out of range, clamping value." << std::endl;
     161            orxout(internal_warning, context::sound) << "Volume out of range, clamping value." << endl;
    162162        this->updateVolume();
    163163    }
    … …  
    170170            alSourcef(this->audioSource_, AL_GAIN, volume);
    171171            if (int error = alGetError())
    172                 COUT(2) << "Sound: Error setting volume to " << volume
    173                         << ": " << SoundManager::getALErrorString(error) << std::endl;
     172                orxout(internal_error, context::sound) << "Error setting volume to " << volume
     173                                                       << ": " << SoundManager::getALErrorString(error) << endl;
    174174        }
    175175    }
    … …  
    186186        if (pitch > 2 || pitch < 0.5f)
    187187        {
    188             COUT(2) << "Sound warning: pitch out of range, cropping value." << std::endl;
     188            orxout(internal_warning, context::sound) << "Pitch out of range, cropping value." << endl;
    189189            pitch = pitch > 2.0f ? 2.0f : pitch;
    190190            pitch = pitch < 0.5f ? 0.5f : pitch;
    … …  
    195195            alSourcef(this->audioSource_, AL_PITCH, pitch);
    196196            if (int error = alGetError())
    197                 COUT(2) << "Sound: Error setting pitch: " << SoundManager::getALErrorString(error) << std::endl;
     197                orxout(internal_error, context::sound) << "Error setting pitch: " << SoundManager::getALErrorString(error) << endl;
    198198        }
    199199    }
    … …  
    240240            if (ALuint error = alGetError())
    241241            {
    242                 COUT(1) << "Sound Error: Could not set buffer \"" << source << "\": " << SoundManager::getALErrorString(error) << std::endl;
     242                orxout(internal_error, context::sound) << "Could not set buffer \"" << source << "\": " << SoundManager::getALErrorString(error) << endl;
    243243                return;
    244244            }
    … …  
    248248            alSourcePlay(this->audioSource_);
    249249            if (int error = alGetError())
    250                 COUT(2) << "Sound: Error playing sound: " << SoundManager::getALErrorString(error) << std::endl;
     250                orxout(internal_error, context::sound) << "Error playing sound: " << SoundManager::getALErrorString(error) << endl;
    251251            if (this->isPaused())
    252252                alSourcePause(this->audioSource_);

  • code/trunk/src/orxonox/sound/SoundBuffer.cc

    r8351 r8858  
    5151        if (fileInfo == NULL)
    5252        {
    53             COUT(2) << "Sound: Warning: Sound file '" << filename << "' not found" << std::endl;
     53            orxout(internal_error, context::sound) << "Sound file '" << filename << "' not found" << endl;
    5454            return;
    5555        }
    … …  
    144144        if (ret < 0)
    145145        {
    146             COUT(2) << "Sound: libvorbisfile: File does not seem to be an Ogg Vorbis bitstream" << std::endl;
     146            orxout(internal_error, context::sound) << "libvorbisfile: File does not seem to be an Ogg Vorbis bitstream" << endl;
    147147            ov_clear(&vf);
    148148            ThrowException(General, "Sound Error: Ogg file loader failed when opening the bitstream");
    … …  
    160160            else if (ret < 0)
    161161            {
    162                 COUT(2) << "Sound: libvorbisfile: error reading the file" << std::endl;
     162                orxout(internal_error, context::sound) << "libvorbisfile: error reading the file" << endl;
    163163                ov_clear(&vf);
    164164                ThrowException(General, "Sound Error: Ogg file loader failed when decoding the file");

  • code/trunk/src/orxonox/sound/SoundManager.cc

    r8521 r8858  
    7171        RegisterRootObject(SoundManager);
    7272
     73        orxout(user_status) << "Loading sound" << endl;
     74
    7375        this->bDestructorCalled_ = false;
    7476         
    … …  
    8991        std::string renderDevice;
    9092        SetConfigValue(renderDevice, std::string(device)).description("Sound device used for rendering");
    91         COUT(4) << "Sound: Available devices: ";
     93        orxout(verbose, context::sound) << "Sound: Available devices: ";
    9294        while (true)
    9395        {
    9496            this->deviceNames_.push_back(devices);
    95             COUT(4) << '"' << devices << "\", ";
     97            orxout(verbose, context::sound) << '"' << devices << "\", ";
    9698            devices += strlen(devices) + 1;
    9799            if (*devices == '\0')
    98100                break;
    99101        }
    100         COUT(4) << std::endl;
     102        orxout(verbose, context::sound) << endl;
    101103
    102104        // Open the selected device
    103         COUT(3) << "Sound: Opening device \"" << renderDevice << '\' << std::endl;
     105        orxout(internal_info, context::sound) << "Sound: Opening device \"" << renderDevice << '\' << endl;
    104106        this->device_ = alcOpenDevice(renderDevice.c_str());
    105107*/
    … …  
    122124        // Get some information about the sound
    123125        if (const char* version = alGetString(AL_VERSION))
    124             COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;
     126            orxout(internal_info, context::sound) << "Sound: --- OpenAL Version: " << version << endl;
    125127        if (const char* vendor = alGetString(AL_VENDOR))
    126             COUT(4) << "Sound: --- OpenAL Vendor : " << vendor << std::endl;
     128            orxout(internal_info, context::sound) << "Sound: --- OpenAL Vendor : " << vendor << endl;
    127129        if (const char* types = alutGetMIMETypes(ALUT_LOADER_BUFFER))
    128             COUT(4) << "Sound: --- Supported MIME Types: " << types << std::endl;
     130            orxout(internal_info, context::sound) << "Sound: --- Supported MIME Types: " << types << endl;
    129131        else
    130             COUT(2) << "Sound Warning: MIME Type retrieval failed: " << alutGetErrorString(alutGetError()) << std::endl;
     132            orxout(internal_warning, context::sound) << "MIME Type retrieval failed: " << alutGetErrorString(alutGetError()) << endl;
    131133
    132134        this->mute_[SoundType::All]     = 1.0f;
    … …  
    152154        resetPlaysSoundGuard.Dismiss();
    153155
    154         COUT(4) << "Sound: Initialisation complete" << std::endl;
     156        orxout(internal_status, context::sound) << "Sound: Initialisation complete" << endl;
    155157    }
    156158
    … …  
    164166        // If there are still used buffers around, well, that's just very bad...
    165167        if (this->soundBuffers_.size() != this->effectsPool_.size())
    166             COUT(1) << "Sound Error: Some sound buffers are still in use but OpenAL is about to shut down. Fix this!" << std::endl;
     168            orxout(internal_error, context::sound) << "Some sound buffers are still in use but OpenAL is about to shut down. Fix this!" << endl;
    167169        // Empty buffer pool and buffer list
    168170        this->effectsPool_.clear();
    … …  
    171173        // There should not be any sources in use anymore
    172174        if (!this->usedSoundSources_.empty())
    173             COUT(1) << "Sound Error: Some sound sources are still in use but OpenAL is about to shut down. Fix this!" << std::endl;
     175            orxout(internal_error, context::sound) << "Some sound sources are still in use but OpenAL is about to shut down. Fix this!" << endl;
    174176        while (!this->availableSoundSources_.empty())
    175177        {
    … …  
    182184        // Relieve context to destroy it
    183185        if (!alcMakeContextCurrent(NULL))
    184             COUT(1) << "Sound Error: Could not unset ALC context" << std::endl;
     186            orxout(internal_error, context::sound) << "Could not unset ALC context" << endl;
    185187        alcDestroyContext(this->context_);
    186188        if (ALCenum error = alcGetError(this->device_))
    187189        {
    188190            if (error == AL_INVALID_OPERATION)
    189                 COUT(1) << "Sound Error: Could not destroy ALC context because it is the current one" << std::endl;
     191                orxout(internal_error, context::sound) << "Could not destroy ALC context because it is the current one" << endl;
    190192            else
    191                 COUT(1) << "Sound Error: Could not destroy ALC context because it is invalid" << std::endl;
     193                orxout(internal_error, context::sound) << "Could not destroy ALC context because it is invalid" << endl;
    192194        }
    193195#ifdef AL_VERSION_1_1
    194196        if (!alcCloseDevice(this->device_))
    195             COUT(1) << "Sound Error: Could not destroy ALC device. This might be because there are still buffers in use!" << std::endl;
     197            orxout(internal_error, context::sound) << "Could not destroy ALC device. This might be because there are still buffers in use!" << endl;
    196198#else
    197199        alcCloseDevice(this->device_);
    198200#endif
    199201        if (!alutExit())
    200             COUT(1) << "Sound Error: Closing ALUT failed: " << alutGetErrorString(alutGetError()) << std::endl;
     202            orxout(internal_error, context::sound) << "Closing ALUT failed: " << alutGetErrorString(alutGetError()) << endl;
    201203    }
    202204
    … …  
    244246        if (crossFadeStep_ <= 0.0 || crossFadeStep_ >= 1.0 )
    245247        {
    246             COUT(2) << "Sound warning: fade step out of range, ignoring change." << std::endl;
     248            orxout(internal_warning, context::sound) << "Fade step out of range, ignoring change." << endl;
    247249            ResetConfigValue(crossFadeStep_);
    248250        }
    … …  
    253255        float clampedVolume = clamp(this->volume_[type], 0.0f, 1.0f);
    254256        if (clampedVolume != this->volume_[type])
    255             COUT(2) << "Sound warning: Volume setting (" << type << ") out of range, clamping." << std::endl;
     257            orxout(internal_warning, context::sound) << "Volume setting (" << type << ") out of range, clamping." << endl;
    256258        this->updateVolume(type);
    257259    }
    … …  
    321323        if (error == AL_INVALID_VALUE)
    322324            // @TODO: Follow this constantly appearing, nerve-racking warning
    323             COUT(2) << "Sound: OpenAL: Invalid listener position" << std::endl;
     325            orxout(internal_error, context::sound) << "OpenAL: Invalid listener position" << endl;
    324326    }
    325327
    … …  
    335337        ALenum error = alGetError();
    336338        if (error == AL_INVALID_VALUE)
    337             COUT(2) << "Sound: OpenAL: Invalid listener orientation" << std::endl;
     339            orxout(internal_error, context::sound) << "OpenAL: Invalid listener orientation" << endl;
    338340    }
    339341
    … …  
    346348                if (it->first == newAmbient)
    347349                {
    348                     COUT(2) << "Sound warning: Will not play an AmbientSound twice." << std::endl;
     350                    orxout(internal_warning, context::sound) << "Will not play an AmbientSound twice." << endl;
    349351                    return;
    350352                }
    … …  
    520522            catch (const std::exception& ex)
    521523            {
    522                 COUT(1) << ex.what() << std::endl;
     524                orxout(internal_error, context::sound) << ex.what() << endl;
    523525                return buffer;
    524526            }
    … …  
    614616            alDeleteSources(1, &this->availableSoundSources_.back());
    615617            if (alGetError())
    616                 COUT(1) << "Sound Error: Failed to delete a source --> lost forever" << std::endl;
     618                orxout(internal_error, context::sound) << "Failed to delete a source --> lost forever" << endl;
    617619            this->availableSoundSources_.pop_back();
    618620        }

  • code/trunk/src/orxonox/sound/SoundStreamer.cc

    r7163 r8858  
    5151        if (ret < 0)
    5252        {
    53             COUT(2) << "Sound: libvorbisfile: File does not seem to be an Ogg Vorbis bitstream" << std::endl;
     53            orxout(internal_error, context::sound) << "libvorbisfile: File does not seem to be an Ogg Vorbis bitstream" << endl;
    5454            ov_clear(&vf);
    5555            return;
    … …  
    7777            else if (ret < 0)
    7878            {
    79                 COUT(2) << "Sound: libvorbisfile: error reading the file" << std::endl;
     79                orxout(internal_error, context::sound) << "libvorbisfile: error reading the file" << endl;
    8080                ov_clear(&vf);
    8181                return;
    … …  
    9191            alGetSourcei(audioSource, AL_BUFFERS_PROCESSED, &processed);
    9292            if (ALint error = alGetError())
    93             COUT(2) << "Sound Warning: Couldn't get number of processed buffers: "
    94                     << SoundManager::getALErrorString(error) << std::endl;
     93            orxout(internal_warning, context::sound) << "Couldn't get number of processed buffers: "
     94                                                     << SoundManager::getALErrorString(error) << endl;
    9595
    9696            if(processed > 0)
    … …  
    9999                alSourceUnqueueBuffers(audioSource, processed, buffers);
    100100                if (ALint error = alGetError())
    101                     COUT(2) << "Sound Warning: Couldn't unqueue buffers: "
    102                     << SoundManager::getALErrorString(error) << std::endl;
     101                    orxout(internal_warning, context::sound) << "Couldn't unqueue buffers: "
     102                                                             << SoundManager::getALErrorString(error) << endl;
    103103
    104104                for(int i = 0; i < processed; i++)
    … …  
    111111                    else if (ret < 0)
    112112                    {
    113                         COUT(2) << "Sound: libvorbisfile: error reading the file" << std::endl;
     113                        orxout(internal_error, context::sound) << "libvorbisfile: error reading the file" << endl;
    114114                        ov_clear(&vf);
    115115                        return;
    … …  
    121121                alSourceQueueBuffers(audioSource, processed, buffers);
    122122                if (ALint error = alGetError())
    123                     COUT(2) << "Sound Warning: Couldn't queue buffers: "
    124                     << SoundManager::getALErrorString(error) << std::endl;
     123                    orxout(internal_warning, context::sound) << "Couldn't queue buffers: "
     124                                                             << SoundManager::getALErrorString(error) << endl;
    125125            }
    126126        }

  • code/trunk/src/orxonox/sound/WorldSound.cc

    r8351 r8858  
    9494            ALenum error = alGetError();
    9595            if (error == AL_INVALID_VALUE)
    96                 COUT(2) << "Sound: OpenAL: Invalid sound position" << std::endl;
     96                orxout(internal_error, context::sound) << "OpenAL: Invalid sound position" << endl;
    9797
    9898            const Vector3& vel = this->getVelocity();
    … …  
    100100            error = alGetError();
    101101            if (error == AL_INVALID_VALUE)
    102                 COUT(2) << "Sound: OpenAL: Invalid sound velocity" << std::endl;
     102                orxout(internal_error, context::sound) << "OpenAL: Invalid sound velocity" << endl;
    103103
    104104            const Vector3& direction = -this->getWorldOrientation().zAxis();
    … …  
    106106            error = alGetError();
    107107            if (error == AL_INVALID_VALUE)
    108                 COUT(2) << "Sound: OpenAL: Invalid sound direction" << std::endl;
     108                orxout(internal_error, context::sound) << "OpenAL: Invalid sound direction" << endl;
    109109        }
    110110    }

  • code/trunk/src/orxonox/weaponsystem/WeaponMode.cc

    r8706 r8858  
    188188            this->munitiontype_ = identifier;
    189189        else
    190             COUT(2) << "Warning: No munition class defined in WeaponMode " << this->getName() << std::endl;
     190            orxout(internal_warning) << "No munition class defined in WeaponMode " << this->getName() << endl;
    191191        this->updateMunition();
    192192    }
    … …  
    249249            Vector3 muzzleDirection;
    250250            muzzleDirection = target - this->muzzlePosition_;
    251 //             COUT(0) << "muzzleDirection " << muzzleDirection << endl;
    252251            this->muzzleOrientation_ = (this->weapon_->getWorldOrientation() * WorldEntity::FRONT).getRotationTo(muzzleDirection) * this->weapon_->getWorldOrientation();
    253252        }

  • code/trunk/src/orxonox/worldentities/BigExplosion.cc

    r7284 r8858  
    6161            catch (const std::exception& ex)
    6262            {
    63                 COUT(1) << "Error: Couln't load particle effect in BigExplosion: " << ex.what() << std::endl;
     63                orxout(internal_error) << "Couldn't load particle effect in BigExplosion: " << ex.what() << endl;
    6464                this->initZero();
    6565            }

  • code/trunk/src/orxonox/worldentities/ControllableEntity.cc

    r8706 r8858  
    457457        }
    458458        else
    459             COUT(2) << "Warning: ControllableEntity \"" << this->getName() << "\" already has a Controller." << std::endl;
     459            orxout(internal_warning) << "ControllableEntity \"" << this->getName() << "\" already has a Controller." << endl;
    460460    }
    461461

  • code/trunk/src/orxonox/worldentities/ExplosionChunk.cc

    r7284 r8858  
    6161            catch (const std::exception& ex)
    6262            {
    63                 COUT(1) << "Error: Couln't load particle effect in ExplosionChunk: " << ex.what() << std::endl;
     63                orxout(internal_error) << "Couldn't load particle effect in ExplosionChunk: " << ex.what() << endl;
    6464                this->fire_ = 0;
    6565                this->smoke_ = 0;

  • code/trunk/src/orxonox/worldentities/MobileEntity.cc

    r8727 r8858  
    189189        if (type == WorldEntity::Static)
    190190        {
    191             CCOUT(1) << "Error: Cannot tell a MobileEntity to have static collision type! Ignoring." << std::endl;
     191            orxout(internal_warning) << "Cannot tell a MobileEntity to have static collision type! Ignoring." << endl;
    192192            assert(false); // Only in debug mode
    193193            return false;

  • code/trunk/src/orxonox/worldentities/SpawnPoint.cc

    r8706 r8858  
    4848            this->getGametype()->registerSpawnPoint(this);
    4949        else
    50             COUT(1) << "Error: SpawnPoint has no Gametype" << std::endl;
     50            orxout(internal_error) << "SpawnPoint has no Gametype" << endl;
    5151
    5252        this->setSyncMode(ObjectDirection::None);

  • code/trunk/src/orxonox/worldentities/StaticEntity.cc

    r6417 r8858  
    6363        if (this->addedToPhysicalWorld())
    6464        {
    65             CCOUT(2) << "Warning: Attempting to change the position of a StaticEntity at physics run time. Ignoring change." << std::endl;
     65            orxout(internal_warning) << "Attempting to change the position of a StaticEntity at physics run time. Ignoring change." << endl;
    6666            return;
    6767        }
    … …  
    8080        if (this->addedToPhysicalWorld())
    8181        {
    82             CCOUT(2) << "Warning: Attempting to change the orientation of a StaticEntity at physics run time. Ignoring change." << std::endl;
     82            orxout(internal_warning) << "Attempting to change the orientation of a StaticEntity at physics run time. Ignoring change." << endl;
    8383            return;
    8484        }
    … …  
    9797        if (type == WorldEntity::Kinematic || type == WorldEntity::Dynamic)
    9898        {
    99             CCOUT(1) << "Error: Cannot tell a StaticEntity to have kinematic or dynamic collision type! Ignoring." << std::endl;
     99            orxout(internal_warning) << "Cannot tell a StaticEntity to have kinematic or dynamic collision type! Ignoring." << endl;
    100100            assert(false); // Only in debug mode
    101101            return false;

  • code/trunk/src/orxonox/worldentities/WorldEntity.cc

    r8706 r8858  
    9595        this->collisionType_             = None;
    9696        this->collisionTypeSynchronised_ = None;
    97         this->mass_           = 0;
     97        this->mass_           = 1.0f;
    9898        this->childrenMass_   = 0;
    9999        // Using bullet default values
    … …  
    311311            this->collisionTypeSynchronised_ != None)
    312312        {
    313             CCOUT(1) << "Error when collsion Type was received over network. Unknown enum value:" << this->collisionTypeSynchronised_ << std::endl;
     313            orxout(internal_error) << "Error when collsion Type was received over network. Unknown enum value:" << this->collisionTypeSynchronised_ << endl;
    314314        }
    315315        else if (this->collisionTypeSynchronised_ != collisionType_)
    316316        {
    317317            if (this->parent_)
    318                 CCOUT(2) << "Warning: Network connection tried to set the collision type of an attached WE. Ignoring." << std::endl;
     318                orxout(internal_warning) << "Network connection tried to set the collision type of an attached WE. Ignoring." << endl;
    319319            else
    320320                this->setCollisionType(this->collisionTypeSynchronised_);
    … …  
    373373        if (object == this)
    374374        {
    375             COUT(2) << "Warning: Can't attach a WorldEntity to itself." << std::endl;
     375            orxout(internal_warning) << "Can't attach a WorldEntity to itself." << endl;
    376376            return;
    377377        }
    … …  
    406406            if (!newParent->hasPhysics())
    407407            {
    408                 COUT(2) << "Warning: Cannot attach a physical object to a non physical one." << std::endl;
     408                orxout(internal_warning) << " Cannot attach a physical object to a non physical one." << endl;
    409409                return false;
    410410            }
    411411            else if (this->isDynamic())
    412412            {
    413                 COUT(2) << "Warning: Cannot attach a dynamic object to a WorldEntity." << std::endl;
     413                orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
    414414                return false;
    415415            }
    416416            else if (this->isKinematic() && newParent->isDynamic())
    417417            {
    418                 COUT(2) << "Warning: Cannot attach a kinematic object to a dynamic one." << std::endl;
     418                orxout(internal_warning) << "Cannot attach a kinematic object to a dynamic one." << endl;
    419419                return false;
    420420            }
    421421            else if (this->isKinematic())
    422422            {
    423                 COUT(2) << "Warning: Cannot attach a kinematic object to a static or kinematic one: Not yet implemented." << std::endl;
     423                orxout(internal_warning) << "Cannot attach a kinematic object to a static or kinematic one: Not yet implemented." << endl;
    424424                return false;
    425425            }
    … …  
    455455        if (it == this->children_.end())
    456456        {
    457             CCOUT(2) << "Warning: Cannot detach an object that is not a child." << std::endl;
     457            orxout(internal_warning) << "Cannot detach an object that is not a child." << endl;
    458458            return;
    459459        }
    … …  
    799799        if (this->parent_)
    800800        {
    801             CCOUT(2) << "Warning: Cannot set the collision type of a WorldEntity with a parent." << std::endl;
     801            orxout(internal_warning) << "Cannot set the collision type of a WorldEntity with a parent." << endl;
    802802            return;
    803803        }
    … …  
    822822            if (!this->node_->getScale().positionEquals(Vector3(1, 1, 1), 0.001))
    823823            {
    824                 CCOUT(2) << "Warning: Cannot create a physical body if there is scaling applied to the node: Not yet implemented." << std::endl;
     824                orxout(internal_warning) << "Cannot create a physical body if there is scaling applied to the node: Not yet implemented." << endl;
    825825                return;
    826826            }
    … …  
    968968                this->physicalBody_->setMassProps(0.0f, btVector3(0, 0, 0));
    969969            }
    970             else if ((this->mass_ + this->childrenMass_) == 0.0f)
     970            else if (totalMass == 0.0f)
    971971            {
    972972                // Use default values to avoid very large or very small values
    973                 CCOUT(4) << "Warning: Setting the internal physical mass to 1.0 because mass_ is 0.0" << std::endl;
     973                orxout(internal_warning) << "Setting the internal physical mass to 1.0 because mass_ is 0.0" << endl;
    974974                btVector3 inertia(0, 0, 0);
    975975                this->collisionShape_->calculateLocalInertia(1.0f, inertia);

  • code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc

    r7184 r8858  
    132132        if (type != WorldEntity::Dynamic)
    133133        {
    134             CCOUT(1) << "Error: Cannot tell a FpsPlayer not to be dynamic! Ignoring." << std::endl;
     134            orxout(internal_warning) << "Cannot tell a FpsPlayer not to be dynamic! Ignoring." << endl;
    135135            assert(false); // Only in debug mode
    136136            return false;

  • code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc

    r8727 r8858  
    145145        if (type != WorldEntity::Dynamic)
    146146        {
    147             CCOUT(1) << "Error: Cannot tell a SpaceShip not to be dynamic! Ignoring." << std::endl;
     147            orxout(internal_warning) << "Cannot tell a SpaceShip not to be dynamic! Ignoring." << endl;
    148148            assert(false); // Only in debug mode
    149149            return false;
    … …  
    507507        if (camera == 0)
    508508        {
    509             COUT(2) << "Failed to reset camera!";
     509            orxout(internal_warning) << "Failed to reset camera!" << endl;
    510510            return;
    511511        }
Note: See TracChangeset for help on using the changeset viewer.