Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 30, 2011, 6:45:06 PM (14 years ago)
Author:
rgrieder
Message:

Adjusted implementation of tribool to work well with tolua and integrated it into our GUI code.
Use tribool(true), tribool(false) and tribool(dontcare) in Lua.

Location:
code/branches/unity_build/data
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/unity_build/data/gui/scripts/ChatBox-inputonly.lua

    r7801 r8687  
    11-- ChatBox-inputonly.lua
    22
    3 local P = createMenuSheet("ChatBox-inputonly", true, TriBool.True, TriBool.Dontcare, false)
     3local P = createMenuSheet("ChatBox-inputonly", true, tribool(true), tribool(dontcare), false)
    44return P
    55
  • code/branches/unity_build/data/gui/scripts/ChatBox.lua

    r7801 r8687  
    11-- ChatBox.lua
    22
    3 local P = createMenuSheet("ChatBox", true, TriBool.True, TriBool.Dontcare, false)
     3local P = createMenuSheet("ChatBox", true, tribool(true), tribool(dontcare), false)
    44
    55function P.ChatBoxCloseButton_clicked(e)
  • code/branches/unity_build/data/gui/scripts/MenuSheet.lua

    r7689 r8687  
    1111-- Parameters:
    1212-- Except for _name, you can provide nil. Then the default value will be used.
    13 -- For _tShowCusor and _tUseKeyboard you can specify TriBool.Dontcare if the value doesn't matter at all. Then the value of the underlaying sheet will be used.
     13-- For _tShowCusor and _tUseKeyboard you can specify tribool(dontcare) if the value doesn't matter at all. Then the value of the underlaying sheet will be used.
    1414function P.new(_name, _bHidePrevious, _tShowCursor, _tUseKeyboard, _bBlockJoyStick)
    1515    local newSheet = GUISheet.new(_name)
    1616    newSheet.bHidePrevious  = handleDefArg(_bHidePrevious,  true)
    17     newSheet.tShowCursor    = handleDefArg(_tShowCusor,     TriBool.True)
    18     newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.True)
     17    newSheet.tShowCursor    = handleDefArg(_tShowCusor,     tribool(true))
     18    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   tribool(true))
    1919    newSheet.bBlockJoyStick = handleDefArg(_bBlockJoyStick, false)
    2020
  • code/branches/unity_build/data/gui/scripts/MiscConfigMenu.lua

    r8079 r8687  
    11-- MiscConfigMenu.lua
    22
    3 local P = createMenuSheet("MiscConfigMenu", true, TriBool.True, TriBool.True)
     3local P = createMenuSheet("MiscConfigMenu", true, tribool(true), tribool(true))
    44
    55P.commandList = {}
  • code/branches/unity_build/data/gui/scripts/NotificationLayer.lua

    r8351 r8687  
    11-- NotificationLayer.lua
    22
    3 local P = createMenuSheet("NotificationLayer", true, TriBool.True, TriBool.True)
     3local P = createMenuSheet("NotificationLayer", true, tribool(true), tribool(true))
    44
    55P.queueList = {}
  • code/branches/unity_build/data/gui/scripts/SheetManager.lua

    r8079 r8687  
    8181
    8282    if bNoInput == true then
    83         menuSheet.tShowCursor = TriBool.Dontcare
     83        menuSheet.tShowCursor = tribool(dontcare)
    8484    end
    8585
     
    110110    end
    111111
    112     -- Only change cursor situation if menuSheet.tShowCursor ~= TriBool.Dontcare
    113     if menuSheet.tShowCursor == TriBool.True then
     112    -- Only change cursor situation if menuSheet.tShowCursor ~= tribool(dontcare)
     113    if menuSheet.tShowCursor == tribool(true) then
    114114        showCursor()
    115     elseif menuSheet.tShowCursor == TriBool.False then
     115    elseif menuSheet.tShowCursor == tribool(false) then
    116116        hideCursor()
    117117    end
     
    186186    -- CURSOR SHOWING
    187187    local i = activeMenuSheets.size
    188     -- Find top most sheet that doesn't have tShowCusor == TriBool.Dontcare
    189     while i > 0 and activeMenuSheets[i].sheet.tShowCursor == TriBool.Dontcare do
     188    -- Find top most sheet that doesn't have tShowCusor == tribool(dontcare)
     189    while i > 0 and activeMenuSheets[i].sheet.tShowCursor == tribool(dontcare) do
    190190        i = i - 1
    191191    end
    192     if i > 0 and activeMenuSheets[i].sheet.tShowCursor == TriBool.True then
     192    if i > 0 and activeMenuSheets[i].sheet.tShowCursor == tribool(true) then
    193193        showCursor()
    194194    else
     
    254254function windowResized(e)
    255255    for name, sheet in pairs(loadedSheets) do
    256         if orxonox.GraphicsManager:getInstance():isFullScreen() or sheet.tShowCursor == TriBool.False then
    257             inputMgr:setMouseExclusive(sheet.inputState, TriBool.True)
     256        if orxonox.GraphicsManager:getInstance():isFullScreen() or sheet.tShowCursor == tribool(false) then
     257            inputMgr:setMouseExclusive(sheet.inputState, tribool(true))
    258258        else
    259             inputMgr:setMouseExclusive(sheet.inputState, TriBool.False)
     259            inputMgr:setMouseExclusive(sheet.inputState, tribool(false))
    260260        end
    261261    end
    262262    local sheetTuple = activeMenuSheets[activeMenuSheets.size]
    263263    if sheetTuple then
    264         if orxonox.GraphicsManager:getInstance():isFullScreen() and sheetTuple.sheet.tShowCursor ~= TriBool.False then
     264        if orxonox.GraphicsManager:getInstance():isFullScreen() and sheetTuple.sheet.tShowCursor ~= tribool(false) then
    265265            showCursor()
    266266        else
  • code/branches/unity_build/data/lua/Tools.lua

    r6746 r8687  
    1616end
    1717
    18 -- Short forms for TriBool
    19 TriBool =
    20 {
    21     True     = orxonox.TriBool.True,
    22     False    = orxonox.TriBool.False,
    23     Dontcare = orxonox.TriBool.Dontcare
    24 }
     18-- Shortcuts for tribool
     19tribool  = orxonox.tribool
     20dontcare = orxonox.dontcare_keyword_t()
Note: See TracChangeset for help on using the changeset viewer.