summaryrefslogtreecommitdiff
path: root/examples/resources/lib/vector2.lua
diff options
context:
space:
mode:
authorjussi2022-05-22 14:47:06 +0300
committerjussi2022-05-22 14:47:06 +0300
commit44e8b06603d91d398c0955f34da33d0242b7551a (patch)
treea14e70cc7bff7673ccc5b8a04750ed7aed56b701 /examples/resources/lib/vector2.lua
parent85fc6cd6a3865f19ceac448dcb33b0c19b8e6b77 (diff)
downloadreilua-enhanced-44e8b06603d91d398c0955f34da33d0242b7551a.tar.gz
reilua-enhanced-44e8b06603d91d398c0955f34da33d0242b7551a.tar.bz2
reilua-enhanced-44e8b06603d91d398c0955f34da33d0242b7551a.zip
Pong example, type named fields and vector lib changes.
Diffstat (limited to 'examples/resources/lib/vector2.lua')
-rw-r--r--examples/resources/lib/vector2.lua65
1 files changed, 48 insertions, 17 deletions
diff --git a/examples/resources/lib/vector2.lua b/examples/resources/lib/vector2.lua
index 0ea10b9..305f483 100644
--- a/examples/resources/lib/vector2.lua
+++ b/examples/resources/lib/vector2.lua
@@ -43,6 +43,10 @@ Vector2.meta = {
}
function Vector2:new( x, y )
+ if type( x ) == "table" then
+ x, y = table.unpack( x )
+ end
+
local o = {
x = x,
y = y,
@@ -51,15 +55,23 @@ function Vector2:new( x, y )
return o
end
-function Vector2:set( vec )
- self.x = vec[1]
- self.y = vec[2]
+function Vector2:set( x, y )
+ if type( x ) == "table" then
+ x, y = table.unpack( x )
+ end
+
+ self.x = x
+ self.y = y
end
function Vector2:arr()
return { self.x, self.y }
end
+function Vector2:unpack()
+ return self.x, self.y
+end
+
function Vector2:clone()
return Vector2:new( self.x, self.y )
end
@@ -68,45 +80,64 @@ function Vector2:abs()
return Vector2:new( math.abs( self.x ), math.abs( self.y ) )
end
+function Vector2:min( v2 )
+ return Vector2:new( math.min( self.x, v2.x ), math.min( self.y, v2.y ) )
+end
+
+function Vector2:max( v2 )
+ return Vector2:new( math.max( self.x, v2.x ), math.max( self.y, v2.y ) )
+end
+
+function Vector2:addValue( value )
+ return Vector2:new( RL_Vector2AddValue( self, value ) )
+end
+
+function Vector2:subValue( value )
+ return Vector2:new( RL_Vector2SubtractValue( self, value ) )
+end
+
function Vector2:length()
- return RL_Vector2Length( self:arr() )
+ return RL_Vector2Length( self )
+end
+
+function Vector2:lengthSqr()
+ return RL_Vector2LengthSqr( self )
end
function Vector2:dot( v2 )
- return RL_Vector2DotProduct( self:arr(), v2:arr() )
+ return RL_Vector2DotProduct( self, v2 )
end
function Vector2:distance( v2 )
- return RL_Vector2Distance( self:arr(), v2:arr() )
+ return RL_Vector2Distance( self, v2 )
end
function Vector2:angle( v2 )
- return RL_Vector2Angle( self:arr(), v2:arr() )
+ return RL_Vector2Angle( self, v2 )
+end
+
+function Vector2:scale( scale )
+ return Vector2:new( RL_Vector2Scale( self, scale ) )
end
function Vector2:normalize()
- local r = RL_Vector2Normalize( self:arr() )
- return Vector2:new( r[1], r[2] )
+ return Vector2:new( RL_Vector2Normalize( self ) )
end
function Vector2:lerp( v2, value )
- local r = RL_Vector2Lerp( self:arr(), v2:arr(), value )
- return Vector2:new( r[1], r[2] )
+ return Vector2:new( RL_Vector2Lerp( self, v2, value ) )
end
function Vector2:reflect( normal )
- local r = RL_Vector2Reflect( self:arr(), normal:arr() )
- return Vector2:new( r[1], r[2] )
+ return Vector2:new( RL_Vector2Reflect( self, normal ) )
end
function Vector2:rotate( angle )
- local r = RL_Vector2Rotate( self:arr(), angle )
- return Vector2:new( r[1], r[2] )
+ return Vector2:new( RL_Vector2Rotate( self, angle ) )
end
function Vector2:moveTowards( target, maxDistance )
- local r = RL_Vector2MoveTowards( self:arr(), target:arr(), maxDistance )
- return Vector2:new( r[1], r[2] )
+ return Vector2:new( RL_Vector2MoveTowards( self, target, maxDistance ) )
end
return Vector2