summaryrefslogtreecommitdiff
path: root/examples/raygui_extensions
diff options
context:
space:
mode:
Diffstat (limited to 'examples/raygui_extensions')
-rw-r--r--examples/raygui_extensions/main.lua26
-rw-r--r--examples/raygui_extensions/property_list.lua10
-rw-r--r--examples/raygui_extensions/tree_item.lua2
-rw-r--r--examples/raygui_extensions/tree_view.lua12
4 files changed, 25 insertions, 25 deletions
diff --git a/examples/raygui_extensions/main.lua b/examples/raygui_extensions/main.lua
index cdfd7b8..a5d9760 100644
--- a/examples/raygui_extensions/main.lua
+++ b/examples/raygui_extensions/main.lua
@@ -19,11 +19,11 @@ local buttonTexture = nil
local winSize = Vec2:new( 1024, 720 )
local cat = {
texture = nil,
- source = Rect:new(),
- dest = Rect:new(),
- origin = Vec2:new(),
+ source = Rect:new( 0, 0, 0, 0 ),
+ dest = Rect:new( 0, 0, 0, 0 ),
+ origin = Vec2:new( 0, 0 ),
rotation = 0.0,
- tint = Color:new( RL.WHITE ),
+ tint = Color:newT( RL.WHITE ),
visible = true,
flipped = false
}
@@ -88,7 +88,7 @@ local function addPropertyList()
RL.GuiSetStyle( RL.SPINNER, RL.TEXT_ALIGNMENT, RL.TEXT_ALIGN_LEFT )
PropertyList:addControl( PropertyList.gui:Line(
- Rect:new(),
+ Rect:new( 0, 0, 0, 0 ),
"Cat Texture"
) )
@@ -98,7 +98,7 @@ local function addPropertyList()
-- Position.
PropertyList:addControl( PropertyList.gui:Label(
- Rect:new(),
+ Rect:new( 0, 0, 0, 0 ),
"Position:"
), transformGroup )
PropertyList:addControl( PropertyList.gui:TextBox(
@@ -133,7 +133,7 @@ local function addPropertyList()
), transformGroup )
-- Origin.
PropertyList:addControl( PropertyList.gui:Label(
- Rect:new(),
+ Rect:new( 0, 0, 0, 0 ),
"Origin:"
), transformGroup )
PropertyList:addControl( PropertyList.gui:TextBox(
@@ -219,19 +219,19 @@ local function addPropertyList()
PropertyList:addControl( PropertyList.gui:ColorPicker(
Rect:new( 0, 0, 128, 128 ),
"Color Picker",
- Color:new(),
+ Color:new( 255, 255, 255, 255 ),
{ -- Callbacks.
edit = function( self ) cat.tint = self.color end
}
), tintGroup )
PropertyList:addControl( PropertyList.gui:Line(
- Rect:new(),
+ Rect:new( 0, 0, 0, 0 ),
"Testing"
) )
PropertyList:addControl( PropertyList.gui:DropdownBox(
- Rect:new(),
+ Rect:new( 0, 0, 0, 0 ),
"Dog\nGiraffe\nLion\nHorse",
0,
false,
@@ -298,8 +298,8 @@ end
function RL.init()
local monitor = 0
- local mPos = Vec2:new( RL.GetMonitorPosition( monitor ) )
- local mSize = Vec2:new( RL.GetMonitorSize( monitor ) )
+ local mPos = Vec2:newT( RL.GetMonitorPosition( monitor ) )
+ local mSize = Vec2:newT( RL.GetMonitorSize( monitor ) )
RL.SetWindowState( RL.FLAG_WINDOW_RESIZABLE )
RL.SetWindowState( RL.FLAG_VSYNC_HINT )
@@ -312,7 +312,7 @@ function RL.init()
-- RL.GuiSetStyle( RL.SPINNER, RL.TEXT_PADDING, 2 )
cat.texture = RL.LoadTexture( RL.GetBasePath().."../resources/images/cat.png" )
- local texSize = Vec2:new( RL.GetTextureSize( cat.texture ) )
+ local texSize = Vec2:newT( RL.GetTextureSize( cat.texture ) )
cat.source:set( 0, 0, texSize.x, texSize.y )
cat.dest = cat.source:clone()
diff --git a/examples/raygui_extensions/property_list.lua b/examples/raygui_extensions/property_list.lua
index d379d72..1a8c30f 100644
--- a/examples/raygui_extensions/property_list.lua
+++ b/examples/raygui_extensions/property_list.lua
@@ -10,8 +10,8 @@ function PropertyList:new( bounds, text, callbacks, styles, tooltip )
object.bounds = bounds:clone()
object.text = text
- object.scroll = Vec2:new()
- object.view = Rect:new()
+ object.scroll = Vec2:new( 0, 0 )
+ object.view = Rect:new( 0, 0, 0, 0 )
object.callbacks = callbacks -- scroll, grab, drag.
object.styles = styles
object.tooltip = tooltip
@@ -183,8 +183,8 @@ end
function PropertyList:draw()
local oldScroll = self.scroll:clone()
local _, scroll, view = RL.GuiScrollPanel( self.bounds, self.text, self.content, self.scroll, self.view )
- self.view:set( view )
- self.scroll:set( scroll )
+ self.view:setT( view )
+ self.scroll:setT( scroll )
if self.scroll ~= oldScroll or self._forceCheckScroll then
if not self._forceCheckScroll then
@@ -237,7 +237,7 @@ function PropertyList:setSize( size )
self.defaultControlSize = Vec2:new( self.content.width, self.defaultControlHeight )
local _, _, view = RL.GuiScrollPanel( self.bounds, self.text, self.content, self.scroll, self.view )
- self.view = Rect:new( view )
+ self.view = Rect:newT( view )
self.gui.view = Rect:new( 0, 0, self.view.width, self.view.height )
self.framebufferSize = Vec2:new( self.bounds.width, self.bounds.height - self.gui.RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT )
diff --git a/examples/raygui_extensions/tree_item.lua b/examples/raygui_extensions/tree_item.lua
index 1986faf..919eae0 100644
--- a/examples/raygui_extensions/tree_item.lua
+++ b/examples/raygui_extensions/tree_item.lua
@@ -42,7 +42,7 @@ function TreeItem:setOpenIcon()
end
function TreeItem:draw()
- local buttonRect = Rect:new()
+ local buttonRect = Rect:new( 0, 0, 0, 0 )
local hasContainer = 0 < #self.controls
local lineCol = RL.GetColor( RL.GuiGetStyle( RL.DEFAULT, RL.LINE_COLOR ) )
diff --git a/examples/raygui_extensions/tree_view.lua b/examples/raygui_extensions/tree_view.lua
index ac73d4a..055694d 100644
--- a/examples/raygui_extensions/tree_view.lua
+++ b/examples/raygui_extensions/tree_view.lua
@@ -20,8 +20,8 @@ function TreeView:new( bounds, text, callbacks, styles, tooltip )
object.bounds = bounds:clone()
object.text = text
- object.scroll = Vec2:new()
- object.view = Rect:new()
+ object.scroll = Vec2:new( 0, 0 )
+ object.view = Rect:new( 0, 0, 0, 0 )
object.callbacks = callbacks -- select, grab, drag.
object.styles = styles
object.tooltip = tooltip
@@ -269,7 +269,7 @@ function TreeView:itemSelect( item )
end
function TreeView:update()
- local mousePos = Vec2:new( RL.GetMousePosition() )
+ local mousePos = Vec2:newT( RL.GetMousePosition() )
local guiMousePos = mousePos + self.gui.mouseOffset
local mouseInView = self.view:checkCollisionPoint( mousePos )
@@ -336,8 +336,8 @@ end
function TreeView:draw()
local oldScroll = self.scroll:clone()
local _, scroll, view = RL.GuiScrollPanel( self.bounds, self.text, self.content, self.scroll, self.view )
- self.view:set( view )
- self.scroll:set( scroll )
+ self.view:setT( view )
+ self.scroll:setT( scroll )
if self.scroll ~= oldScroll or self._forceCheckScroll then
if not self._forceCheckScroll then
@@ -386,7 +386,7 @@ function TreeView:setSize( size )
self.defaultControlSize = Vec2:new( self.content.width, self.defaultControlHeight )
local _, _, view = RL.GuiScrollPanel( self.bounds, self.text, self.content, self.scroll, self.view )
- self.view = Rect:new( view )
+ self.view = Rect:newT( view )
self.gui.view = Rect:new( 0, 0, self.view.width, self.view.height )
self.framebufferSize = Vec2:new( self.bounds.width, self.bounds.height - self.gui.RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT )