Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 30, 2011, 6:45:06 PM (13 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.