indrajith/reilua-enhanced
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New argument style for gui and easings.

Browse Source
This commit is contained in:
jussi
2023-04-10 14:33:15 +03:00
parent 8abed46dfd
commit 1cbadf56f3
7 changed files with 411 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
API.md
View File

@@ -5854,7 +5854,7 @@ Get one style property
--- ---
> success = RL.GuiLoadStyle( int control, int property ) > success = RL.GuiLoadStyle( string fileName )
Load style file over global style variable ( .rgs ) Load style file over global style variable ( .rgs )

5
ReiLua_API.lua
View File

@@ -4671,10 +4671,9 @@ function RL.GuiGetStyle( control, property ) end
---Load style file over global style variable ( .rgs ) ---Load style file over global style variable ( .rgs )
---- Failure return false ---- Failure return false
---- Success return true ---- Success return true
---@param control integer ---@param fileName string
---@param property integer
---@return any success ---@return any success
function RL.GuiLoadStyle( control, property ) end function RL.GuiLoadStyle( fileName ) end
---Load style default over global style ---Load style default over global style
---@return any RL.GuiLoadStyleDefault ---@return any RL.GuiLoadStyleDefault

2
devnotes
View File

@@ -1,5 +1,4 @@
Current { Current {
* New argument styles for: rgui, easings.
* ReiLua camera3D lib. * ReiLua camera3D lib.
* Check new functions from https://github.com/raysan5/raylib/blob/master/CHANGELOG * Check new functions from https://github.com/raysan5/raylib/blob/master/CHANGELOG
} }
@@ -39,6 +38,7 @@ Backlog {
* GenMeshCustom * GenMeshCustom
* UpdateMesh * UpdateMesh
* DrawMeshInstanced * DrawMeshInstanced
* LoadModelAnimations
* LoadMaterialDefault * LoadMaterialDefault
* CreateMaterial * CreateMaterial
* LoadModel * LoadModel

2
examples/gui/main.lua
View File

@@ -87,7 +87,7 @@ function RL.draw()
end end
textInputBox.buttonIndex, textInputBox.text, textInputBox.secretViewActive textInputBox.buttonIndex, textInputBox.text, textInputBox.secretViewActive
= RL.GuiTextInputBox( { 420, 510, 300, 150 }, "Input Box", "Put text here", "Button",textInputBox.text, 200, textInputBox.secretViewActive ) = RL.GuiTextInputBox( { 420, 510, 300, 150 }, "Input Box", "Put text here", "Button", textInputBox.text, 200, textInputBox.secretViewActive )
if 0 <= textInputBox.buttonIndex then if 0 <= textInputBox.buttonIndex then
print( "textInputBox.buttonIndex", textInputBox.buttonIndex ) print( "textInputBox.buttonIndex", textInputBox.buttonIndex )

225
src/easings.c
View File

@@ -17,12 +17,17 @@ Ease linear
- Success return float - Success return float
*/ */
int leasingsEaseLinear( lua_State *L ) { int leasingsEaseLinear( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseLinear( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseLinear( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseLinearNone( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseLinearNone( t, b, c, d ) );
return 1; return 1;
} }
@@ -40,12 +45,17 @@ Ease sine in
- Success return float - Success return float
*/ */
int leasingsEaseSineIn( lua_State *L ) { int leasingsEaseSineIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseSineIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseSineIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseSineIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseSineIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -59,12 +69,17 @@ Ease sine out
- Success return float - Success return float
*/ */
int leasingsEaseSineOut( lua_State *L ) { int leasingsEaseSineOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseSineOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseSineOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseSineOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseSineOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -78,12 +93,17 @@ Ease sine in out
- Success return float - Success return float
*/ */
int leasingsEaseSineInOut( lua_State *L ) { int leasingsEaseSineInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseSineInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseSineInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseSineInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseSineInOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -101,12 +121,17 @@ Ease circle in
- Success return float - Success return float
*/ */
int leasingsEaseCircIn( lua_State *L ) { int leasingsEaseCircIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCircIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCircIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseCircIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseCircIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -120,12 +145,17 @@ Ease circle out
- Success return float - Success return float
*/ */
int leasingsEaseCircOut( lua_State *L ) { int leasingsEaseCircOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCircOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCircOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseCircOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseCircOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -139,12 +169,17 @@ Ease circle in out
- Success return float - Success return float
*/ */
int leasingsEaseCircInOut( lua_State *L ) { int leasingsEaseCircInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCircInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCircInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseCircInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseCircInOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -162,12 +197,17 @@ Ease cubic in
- Success return float - Success return float
*/ */
int leasingsEaseCubicIn( lua_State *L ) { int leasingsEaseCubicIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCubicIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCubicIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseCubicIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseCubicIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -181,12 +221,17 @@ Ease cubic out
- Success return float - Success return float
*/ */
int leasingsEaseCubicOut( lua_State *L ) { int leasingsEaseCubicOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCubicOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCubicOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseCubicOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseCubicOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -200,12 +245,17 @@ Ease cubic in out
- Success return float - Success return float
*/ */
int leasingsEaseCubicInOut( lua_State *L ) { int leasingsEaseCubicInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCubicInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseCubicInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseCubicInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseCubicInOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -223,12 +273,17 @@ Ease quadratic in
- Success return float - Success return float
*/ */
int leasingsEaseQuadIn( lua_State *L ) { int leasingsEaseQuadIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseQuadIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseQuadIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseQuadIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseQuadIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -242,12 +297,17 @@ Ease quadratic out
- Success return float - Success return float
*/ */
int leasingsEaseQuadOut( lua_State *L ) { int leasingsEaseQuadOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseQuadOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseQuadOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseQuadOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseQuadOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -261,12 +321,17 @@ Ease quadratic in out
- Success return float - Success return float
*/ */
int leasingsEaseQuadInOut( lua_State *L ) { int leasingsEaseQuadInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseQuadInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseQuadInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseQuadInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseQuadInOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -284,12 +349,17 @@ Ease exponential in
- Success return float - Success return float
*/ */
int leasingsEaseExpoIn( lua_State *L ) { int leasingsEaseExpoIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseExpoIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseExpoIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseExpoIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseExpoIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -303,12 +373,17 @@ Ease exponential out
- Success return float - Success return float
*/ */
int leasingsEaseExpoOut( lua_State *L ) { int leasingsEaseExpoOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseExpoOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseExpoOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseExpoOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseExpoOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -322,12 +397,17 @@ Ease exponential in out
- Success return float - Success return float
*/ */
int leasingsEaseExpoInOut( lua_State *L ) { int leasingsEaseExpoInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseExpoInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseExpoInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseExpoInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseExpoInOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -345,12 +425,17 @@ Ease back in
- Success return float - Success return float
*/ */
int leasingsEaseBackIn( lua_State *L ) { int leasingsEaseBackIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBackIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBackIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseBackIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseBackIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -364,12 +449,17 @@ Ease back out
- Success return float - Success return float
*/ */
int leasingsEaseBackOut( lua_State *L ) { int leasingsEaseBackOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBackOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBackOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseBackOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseBackOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -383,12 +473,17 @@ Ease back in out
- Success return float - Success return float
*/ */
int leasingsEaseBackInOut( lua_State *L ) { int leasingsEaseBackInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBackInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBackInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseBackInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseBackInOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -406,12 +501,17 @@ Ease bounce in
- Success return float - Success return float
*/ */
int leasingsEaseBounceIn( lua_State *L ) { int leasingsEaseBounceIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBounceIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBounceIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseBounceIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseBounceIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -425,12 +525,17 @@ Ease bounce out
- Success return float - Success return float
*/ */
int leasingsEaseBounceOut( lua_State *L ) { int leasingsEaseBounceOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBounceOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBounceOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseBounceOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseBounceOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -444,12 +549,17 @@ Ease bounce in out
- Success return float - Success return float
*/ */
int leasingsEaseBounceInOut( lua_State *L ) { int leasingsEaseBounceInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBounceInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseBounceInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseBounceInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseBounceInOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -467,12 +577,17 @@ Ease elastic in
- Success return float - Success return float
*/ */
int leasingsEaseElasticIn( lua_State *L ) { int leasingsEaseElasticIn( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseElasticIn( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseElasticIn( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseElasticIn( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseElasticIn( t, b, c, d ) );
return 1; return 1;
} }
@@ -486,12 +601,17 @@ Ease elastic out
- Success return float - Success return float
*/ */
int leasingsEaseElasticOut( lua_State *L ) { int leasingsEaseElasticOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseElasticOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseElasticOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseElasticOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseElasticOut( t, b, c, d ) );
return 1; return 1;
} }
@@ -505,12 +625,17 @@ Ease elastic in out
- Success return float - Success return float
*/ */
int leasingsEaseElasticInOut( lua_State *L ) { int leasingsEaseElasticInOut( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseElasticInOut( float t, float b, float c, float d )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.EaseElasticInOut( float t, float b, float c, float d )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
lua_pushnumber( L, EaseElasticInOut( lua_tonumber( L, -4 ), lua_tonumber( L, -3 ), lua_tonumber( L, -2 ), lua_tonumber( L, -1 ) ) ); float t = lua_tonumber( L, 1 );
float b = lua_tonumber( L, 2 );
float c = lua_tonumber( L, 3 );
float d = lua_tonumber( L, 4 );
lua_pushnumber( L, EaseElasticInOut( t, b, c, d ) );
return 1; return 1;
} }

25
src/models.c
View File

@@ -1728,10 +1728,17 @@ int lmodelsLoadModel( lua_State *L ) {
lua_pushinteger( L, -1 ); lua_pushinteger( L, -1 );
return 1; return 1;
} }
int i = newModel();
if ( FileExists( lua_tostring( L, 1 ) ) ) {
int i = newModel();
*state->models[i] = LoadModel( lua_tostring( L, 1 ) ); *state->models[i] = LoadModel( lua_tostring( L, 1 ) );
lua_pushinteger( L, i ); lua_pushinteger( L, i );
return 1;
}
else {
lua_pushinteger( L, -1 );
return 1;
}
return 1; return 1;
} }
@@ -2063,21 +2070,19 @@ int lmodelsLoadModelAnimations( lua_State *L ) {
lua_pushinteger( L, -1 ); lua_pushinteger( L, -1 );
return 1; return 1;
} }
int i = 0;
for ( i = 0; i < state->animationCount; i++ ) { if ( FileExists( lua_tostring( L, 1 ) ) ) {
if ( state->animations[i] == NULL ) { int i = newAnimation();
break;
}
}
state->animations[i] = malloc( sizeof( ModelAnimations ) );
state->animations[i]->animations = LoadModelAnimations( lua_tostring( L, 1 ), &state->animations[i]->animCount ); state->animations[i]->animations = LoadModelAnimations( lua_tostring( L, 1 ), &state->animations[i]->animCount );
checkAnimationRealloc( i );
lua_pushinteger( L, i ); lua_pushinteger( L, i );
lua_pushinteger( L, state->animations[i]->animCount ); lua_pushinteger( L, state->animations[i]->animCount );
return 2; return 2;
}
else {
lua_pushinteger( L, -1 );
return 1;
}
} }
/* /*

555
src/rgui.c
View File

File diff suppressed because it is too large Load Diff