From a5d40f70258644b4c631e6917f1883ce548ebbeb Mon Sep 17 00:00:00 2001 From: jussi Date: Thu, 30 Nov 2023 19:41:22 +0200 Subject: Raygui wrapper library is now object based. --- examples/raygui_examples/calculator.lua | 16 ++++++++-------- examples/raygui_examples/main.lua | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'examples/raygui_examples') diff --git a/examples/raygui_examples/calculator.lua b/examples/raygui_examples/calculator.lua index 0bbad98..2b3fcb1 100644 --- a/examples/raygui_examples/calculator.lua +++ b/examples/raygui_examples/calculator.lua @@ -1,4 +1,4 @@ -Calculator = {} +local Calculator = {} Calculator.__index = Calculator Calculator.OPERATIONS = { @@ -13,7 +13,7 @@ Calculator.OPERATIONS = { function Calculator:new( pos ) local object = setmetatable( {}, Calculator ) - object.window = Raygui.WindowBox:new( + object.window = Gui:WindowBox( Rect:new( pos.x, pos.y, 188, 216 ), "Calculator", -- Close callback. @@ -23,7 +23,7 @@ function Calculator:new( pos ) -- Drag callback. function( self ) object:setPosition( Vec2:new( self.bounds.x, self.bounds.y ) ) end ) - object.display = Raygui.Label:new( + object.display = Gui:Label( Rect:new( 0, 0, 180, 20 ), "" ) @@ -54,7 +54,7 @@ function Calculator:new( pos ) local buttonSpacing = 6 for i, button in ipairs( buttons ) do - table.insert( object.buttons, Raygui.Button:new( + table.insert( object.buttons, Gui:Button( buttonRect:clone(), button[1], button[2] @@ -139,11 +139,11 @@ function Calculator:setPosition( pos ) end function Calculator:set2Top() - Raygui.set2Top( self.window ) - Raygui.set2Top( self.display ) + Gui:set2Top( self.window ) + Gui:set2Top( self.display ) for _, button in ipairs( self.buttons ) do - Raygui.set2Top( button ) + Gui:set2Top( button ) end end @@ -157,4 +157,4 @@ function Calculator:setVisible( visible ) end end -return Calculator \ No newline at end of file +return Calculator diff --git a/examples/raygui_examples/main.lua b/examples/raygui_examples/main.lua index 01eac32..fce741b 100644 --- a/examples/raygui_examples/main.lua +++ b/examples/raygui_examples/main.lua @@ -9,6 +9,8 @@ Color = require( "color" ) Raygui = require( "raygui" ) Calculator = require( "calculator" ) +Gui = Raygui:new() + local calculator = nil local calculator2 = nil @@ -32,11 +34,11 @@ function RL.init() end function RL.process( delta ) - Raygui:process() + Gui:process() end function RL.draw() RL.ClearBackground( RL.DARKBLUE ) - Raygui:draw() + Gui:draw() end -- cgit v1.2.3