Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 31, 2011, 11:45:56 AM (13 years ago)
Author:
landauf
Message:

added new output level "message" for output directed to the user

Location:
code/branches/output/src/libraries/core
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/output/src/libraries/core/GUIManager.cc

    r8799 r8805  
    9393namespace orxonox
    9494{
    95     namespace context
    96     {
    97         namespace
    98         {
    99             REGISTER_OUTPUT_CONTEXT(cegui);
    100         }
    101     }
    102 
    10395    static void key_esc()
    10496        { GUIManager::getInstance().keyESC(); }

  • code/branches/output/src/libraries/core/GraphicsManager.cc

    r8798 r8805  
    6868namespace orxonox
    6969{
    70     namespace context
    71     {
    72         namespace
    73         {
    74             REGISTER_OUTPUT_CONTEXT(ogre);
    75         }
    76     }
    77 
    7870    static const std::string __CC_GraphicsManager_group = "GraphicsManager";
    7971    static const std::string __CC_setScreenResolution_name = "setScreenResolution";

  • code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc

    r8803 r8805  
    240240        switch (type)
    241241        {
     242            case Shell::Message:
    242243            case Shell::DebugOutput:     this->cout_ << "\033[0m"; break;
    243244

  • code/branches/output/src/libraries/core/command/IOConsoleWindows.cc

    r8803 r8805  
    201201        switch (type)
    202202        {
     203            case Shell::Message:
    203204            case Shell::DebugOutput:     colour = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; break;
    204205
    … …  
    249250            || !SetConsoleMode(this->stdInHandle_, 0))
    250251        {
    251             COUT(1) << "Error: Could not set Windows console settings" << std::endl;
     252            orxout(user_error) << "Error: Could not set Windows console settings" << endl;
    252253            return;
    253254        }

  • code/branches/output/src/libraries/core/command/Shell.h

    r8803 r8805  
    9191            {
    9292                DebugOutput     = debug_output,
     93                Message         = message,
    9394                UserError       = user_error,
    9495                UserWarning     = user_warning,
Note: See TracChangeset for help on using the changeset viewer.