Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8805 for code/branches


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
Files:
8 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,
  • code/branches/output/src/libraries/util/output/OutputDefinitions.h

    r8799 r8805  
    4545        static const OutputLevel none             = 0x0000;
    4646
    47         static const OutputLevel debug_output     = 0x0001;
    48         static const OutputLevel user_error       = 0x0002;
    49         static const OutputLevel user_warning     = 0x0004;
    50         static const OutputLevel user_status      = 0x0008;
    51         static const OutputLevel user_info        = 0x0010;
    52         static const OutputLevel internal_error   = 0x0020;
    53         static const OutputLevel internal_warning = 0x0040;
    54         static const OutputLevel internal_status  = 0x0080;
    55         static const OutputLevel internal_info    = 0x0100;
    56         static const OutputLevel verbose          = 0x0200;
    57         static const OutputLevel verbose_more     = 0x0400;
    58         static const OutputLevel verbose_ultra    = 0x0800;
     47        static const OutputLevel message          = 0x0001;
     48        static const OutputLevel debug_output     = 0x0002;
     49        static const OutputLevel user_error       = 0x0004;
     50        static const OutputLevel user_warning     = 0x0008;
     51        static const OutputLevel user_status      = 0x0010;
     52        static const OutputLevel user_info        = 0x0020;
     53        static const OutputLevel internal_error   = 0x0040;
     54        static const OutputLevel internal_warning = 0x0080;
     55        static const OutputLevel internal_status  = 0x0100;
     56        static const OutputLevel internal_info    = 0x0200;
     57        static const OutputLevel verbose          = 0x0400;
     58        static const OutputLevel verbose_more     = 0x0800;
     59        static const OutputLevel verbose_ultra    = 0x1000;
    5960    }
    6061
     
    7374            REGISTER_OUTPUT_CONTEXT(undefined);
    7475
    75             REGISTER_OUTPUT_CONTEXT(test1);
    76             REGISTER_OUTPUT_CONTEXT(test2);
    77             REGISTER_OUTPUT_CONTEXT(output);
     76            REGISTER_OUTPUT_CONTEXT(ogre);
     77            REGISTER_OUTPUT_CONTEXT(cegui);
    7878            REGISTER_OUTPUT_CONTEXT(lua);
    7979            REGISTER_OUTPUT_CONTEXT(tcl);
     80            REGISTER_OUTPUT_CONTEXT(identifier);
     81            REGISTER_OUTPUT_CONTEXT(object_list);
     82            REGISTER_OUTPUT_CONTEXT(super);
     83            REGISTER_OUTPUT_CONTEXT(language);
     84            REGISTER_OUTPUT_CONTEXT(output);
     85            REGISTER_OUTPUT_CONTEXT(commands);
     86            REGISTER_OUTPUT_CONTEXT(executor);
     87            REGISTER_OUTPUT_CONTEXT(input);
     88            REGISTER_OUTPUT_CONTEXT(events);
     89            REGISTER_OUTPUT_CONTEXT(config);
    8090        }
    8191    }
  • code/branches/output/src/libraries/util/output/OutputManager.cc

    r8801 r8805  
    136136        {
    137137            case level::none:               { static std::string name = "None"; return name; }
     138            case level::message:            { static std::string name = "Message"; return name; }
    138139            case level::debug_output:       { static std::string name = "Debug"; return name; }
    139140            case level::user_error:         { static std::string name = "Error"; return name; }
  • code/branches/output/src/orxonox/overlays/InGameConsole.cc

    r8803 r8805  
    559559        switch (type)
    560560        {
     561            case Shell::Message:
    561562            case Shell::DebugOutput:     colourTop = ColourValue(0.9f, 0.9f, 0.9f); break;
    562563
Note: See TracChangeset for help on using the changeset viewer.