Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8840 for code/branches


Ignore:
Timestamp:
Aug 13, 2011, 11:58:07 PM (13 years ago)
Author:
landauf
Message:

Exported orxout() and the output levels to lua, replaces logMessage() and cout().
Note that OutputDefinitions.h is now included in the tolua section of core, even though the file is in util. But I guess that's ok.

Location:
code/branches/output
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • code/branches/output/data/gui/scripts/GameplayMenu.lua

    r6746 r8840  
    1818function P.GameplayThemeCombobox_changed(e)
    1919    -- theme
    20     logMessage(0, "event: theme")
     20    orxout("event: theme")
    2121end
    2222
    2323function P.GameplayDifficultyEasyButton_clicked(e)
    2424    -- difficulty easy
    25     logMessage(0, "event: easy")
     25    orxout("event: easy")
    2626end
    2727
    2828function P.GameplayDifficultyNormalButton_clicked(e)
    2929    -- difficulty normal
    30     logMessage(0, "event: normal")
     30    orxout("event: normal")
    3131end
    3232
    3333function P.GameplayDifficultyHardButton_clicked(e)
    3434    -- difficulty hard
    35     logMessage(0, "event: hard")
     35    orxout("event: hard")
    3636end
    3737
  • code/branches/output/data/gui/scripts/MultiplayerMenu.lua

    r8832 r8840  
    118118        CEGUI.toListbox(listbox):resetList()
    119119        local discovery = orxonox.WANDiscovery()
    120         cout(0, "discovering.\n" )
     120        orxout("discovering." )
    121121        discovery:discover()
    122         cout(0, "discovered.\n" )
     122        orxout("discovered." )
    123123        P.serverList = {}
    124124        local index = 0
  • code/branches/output/data/gui/scripts/NotificationLayer.lua

    r8729 r8840  
    136136    if index > queue.first then -- Move all older notifications up in the list.
    137137        for i=index-1,-1,queue.first do
    138             cout(0, i)
     138            orxout(i)
    139139            item = queue.items[i]
    140140            item:setYposition(CEGUI.UDim(0, itemHeight*(queue.last-i-1)))
  • code/branches/output/data/gui/scripts/QuestGUI.lua

    r8706 r8840  
    220220function P.selectQuest(list, quest)
    221221    if quest == nil then -- If the input quest is nil, there is nothing to be selected, an error is output and the first quest is selected instead.
    222         cout(1, "Error in QuestGUI: selectQuest(), input quest is nil. Selecting first.")
     222        orxout(orxonox.level.internal_error, "Error in QuestGUI: selectQuest(), input quest is nil. Selecting first.")
    223223        list:setItemSelectState(list:getListboxItemFromIndex(0), true) -- Select first
    224224        return
     
    240240        list:setItemSelectState(list:getListboxItemFromIndex(index), true)
    241241    else -- If the quest isn't found an error is output and the first quest is selected instead.
    242         cout(1, "Error in QuestGUI: selectQuest(), input quest is not in list. Selecting first.")
     242        orxout(orxonox.level.internal_error, "Error in QuestGUI: selectQuest(), input quest is not in list. Selecting first.")
    243243        list:setItemSelectState(list:getListboxItemFromIndex(0), true) -- Select first
    244244    end
     
    313313            end
    314314        else
    315             cout(1, "Error in QuestGUI: changeToSubquest(), quest was nil. Ignoring...")
     315            orxout(orxonox.level.internal_error, "Error in QuestGUI: changeToSubquest(), quest was nil. Ignoring...")
    316316        end
    317317    end
  • code/branches/output/data/lua/LuaStateInit.lua

    r6746 r8840  
    77end
    88
    9 -- Create function to log text like COUT, but always prints a line!
    10 logMessage = function(level, message)
    11   luaState:luaLog(level, message)
     9-- Prints output to the console and the logfile
     10--
     11-- Accepts the following arguments:
     12--   orxout("message")
     13--   orxout(orxonox.level.levelname, "message")
     14--   orxout(orxonox.level.levelname, "context", "message)
     15orxout = function(arg1, arg2, arg3)
     16  if arg1 and arg2 and arg3 then
     17    luaState:luaOutput(arg1, arg2, arg3)
     18  elseif arg1 and arg2 then
     19    luaState:luaOutput(arg1, arg2)
     20  else
     21    luaState:luaOutput(arg1)
     22  end
    1223end
    13 cout = logMessage
    1424
    1525-- Redirect dofile in order to load with the resource manager
     
    4252require = function(moduleName)
    4353  if not luaState:fileExists(moduleName .. ".lua") then
    44     logMessage(2, "Warning: Lua function require() could not find file '" .. moduleName .. ".lua' ")
     54    orxout(orxonox.level.internal_warning, "Warning: Lua function require() could not find file '" .. moduleName .. ".lua' ")
    4555    return nil
    4656  end
     
    8595  -- Fallback pause function
    8696  pause = function()
    87     logMessage(2, [["Warning: debug() called in Lua, but Debugger is not active.
     97    orxout(orxonox.level.internal_warning, [["Warning: debug() called in Lua, but Debugger is not active.
    8898Do you have the IOConsole disabled and are you using Lua version 5.1?"]])
    8999  end
     
    98108    end
    99109    -- Display the error message
    100     logMessage(1, "Lua runtime error: "..err)
     110    orxout(orxonox.level.internal_error, "Lua runtime error: "..err)
    101111  end
    102112
     
    106116  else
    107117    -- Fallback: print stack trace
    108     logMessage(3, debug.traceback(""))
     118    orxout(orxonox.level.internal_error, debug.traceback(""))
    109119  end
    110120  return err -- Hello Lua debugger user! Please type 'set 2' to get to the
  • code/branches/output/src/libraries/core/CMakeLists.txt

    r8729 r8840  
    8686    input/KeyBinder.h
    8787    input/KeyBinderManager.h
     88    ../util/output/OutputDefinitions.h
    8889  PCH_FILE
    8990    CorePrecompiledHeaders.h
  • code/branches/output/src/libraries/core/LuaState.cc

    r8806 r8840  
    3636}
    3737#include <loki/ScopeGuard.h>
    38 #include <boost/preprocessor/stringize.hpp>
    3938
    4039#include "util/Output.h"
     
    237236    }
    238237
    239     void LuaState::luaLog(unsigned int level, const std::string& message)
    240     {
    241 #pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: use correct level, inspect lua support (and remove boost include)")
    242         orxout(debug_output, context::lua) << "luaLog (level: " << level << "): " << message << endl;
     238    void LuaState::luaOutput(OutputLevel level, const std::string& context, const std::string& message)
     239    {
     240        orxout(level, registerContext(context)) << message << endl;
     241    }
     242
     243    void LuaState::luaOutput(OutputLevel level, const std::string& message)
     244    {
     245        orxout(level, context::lua) << message << endl;
     246    }
     247
     248    void LuaState::luaOutput(const std::string& message)
     249    {
     250        orxout(debug_output, context::lua) << message << endl;
    243251    }
    244252
  • code/branches/output/src/libraries/core/LuaState.h

    r8729 r8840  
    8383
    8484        void luaPrint(const std::string& str); // tolua_export
    85         void luaLog(unsigned int level, const std::string& message); // tolua_export
     85        void luaOutput(orxonox::level::OutputLevel level, const std::string& context, const std::string& message); // tolua_export
     86        void luaOutput(orxonox::level::OutputLevel level, const std::string& message); // tolua_export
     87        void luaOutput(const std::string& message); // tolua_export
    8688        bool fileExists(const std::string& filename); // tolua_export
    8789        std::string getSourceCode(const std::string& filename); // tolua_export
  • code/branches/output/src/libraries/core/command/Shell.cc

    r8837 r8840  
    3333
    3434#include "Shell.h"
    35 
    36 #include <boost/preprocessor/stringize.hpp>
    3735
    3836#include "util/Math.h"
  • code/branches/output/src/libraries/util/output/OutputDefinitions.h

    r8835 r8840  
    3939    const OutputContextContainer& subname() { static const OutputContextContainer& context = registerContext(#name, #subname); return context; }
    4040
     41// tolua_begin
    4142namespace orxonox
    4243{
     
    6364        };
    6465    }
     66// tolua_end
    6567
    6668    using namespace level;
     
    128130        }
    129131    }
    130 }
     132} // tolua_export
    131133
    132134#endif /* _OutputDefinitions_H__ */
Note: See TracChangeset for help on using the changeset viewer.