summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/audio.c8
-rw-r--r--src/core.c35
-rw-r--r--src/lua_core.c10
-rw-r--r--src/models.c4
-rw-r--r--src/text.c2
-rw-r--r--src/textures.c6
6 files changed, 50 insertions, 15 deletions
diff --git a/src/audio.c b/src/audio.c
index 8ef7e2d..dee3744 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -56,7 +56,7 @@ int laudioSetMasterVolume( lua_State* L ) {
}
/*
-> isReady = RL.GetMasterVolume()
+> volume = RL.GetMasterVolume()
Get master volume (listener)
@@ -129,7 +129,7 @@ int laudioLoadWaveFromMemory( lua_State* L ) {
}
/*
-> isReady = RL.IsWaveValid( Wave wave )
+> isValid = RL.IsWaveValid( Wave wave )
Checks if wave data is valid (data loaded and parameters)
@@ -174,7 +174,7 @@ int laudioLoadSoundAlias( lua_State* L ) {
}
/*
-> isReady = RL.IsSoundValid( Sound sound )
+> isValid = RL.IsSoundValid( Sound sound )
Checks if a sound is valid (data loaded and buffers initialized)
@@ -497,7 +497,7 @@ int laudioLoadMusicStreamFromMemory( lua_State* L ) {
}
/*
-> isReady = RL.IsMusicValid( Music music )
+> isValid = RL.IsMusicValid( Music music )
Checks if a music stream is valid (context and buffers initialized)
diff --git a/src/core.c b/src/core.c
index c5736da..093c07b 100644
--- a/src/core.c
+++ b/src/core.c
@@ -932,7 +932,7 @@ int lcoreLoadShaderFromMemory( lua_State* L ) {
}
/*
-> isReady = RL.IsShaderValid( Shader shader )
+> isValid = RL.IsShaderValid( Shader shader )
Check if a shader is valid (loaded on GPU)
@@ -1138,6 +1138,39 @@ int lcoreSetShaderValueV( lua_State* L ) {
}
/*
+> RL.SetShaderValueWithBuffer( Shader shader, int locIndex, Buffer values, int uniformType )
+
+Set shader uniform value using Buffer object
+*/
+int lcoreSetShaderValueWithBuffer( lua_State* L ) {
+ Shader* shader = uluaGetShader( L, 1 );
+ int locIndex = luaL_checkinteger( L, 2 );
+ Buffer* value = uluaGetBuffer( L, 3 );
+ int uniformType = luaL_checkinteger( L, 4 );
+
+ SetShaderValue( *shader, locIndex, value->data, uniformType );
+
+ return 0;
+}
+
+/*
+> RL.SetShaderValueVWithBuffer( Shader shader, int locIndex, Buffer values, int uniformType, int count )
+
+Set shader uniform value vector using Buffer object
+*/
+int lcoreSetShaderValueVWithBuffer( lua_State* L ) {
+ Shader* shader = uluaGetShader( L, 1 );
+ int locIndex = luaL_checkinteger( L, 2 );
+ Buffer* value = uluaGetBuffer( L, 3 );
+ int uniformType = luaL_checkinteger( L, 4 );
+ int count = luaL_checkinteger( L, 5 );
+
+ SetShaderValueV( *shader, locIndex, value->data, uniformType, count );
+
+ return 0;
+}
+
+/*
> RL.UnloadShader( Shader shader )
Unload shader from GPU memory (VRAM)
diff --git a/src/lua_core.c b/src/lua_core.c
index aea751a..d37f9f1 100644
--- a/src/lua_core.c
+++ b/src/lua_core.c
@@ -1374,6 +1374,8 @@ void luaRegister() {
assingGlobalFunction( "SetShaderValueTexture", lcoreSetShaderValueTexture );
assingGlobalFunction( "SetShaderValue", lcoreSetShaderValue );
assingGlobalFunction( "SetShaderValueV", lcoreSetShaderValueV );
+ assingGlobalFunction( "SetShaderValueWithBuffer", lcoreSetShaderValueWithBuffer );
+ assingGlobalFunction( "SetShaderValueVWithBuffer", lcoreSetShaderValueVWithBuffer );
assingGlobalFunction( "UnloadShader", lcoreUnloadShader );
/* Screen-space-related functions. */
assingGlobalFunction( "GetScreenToWorldRay", lcoreGetScreenToWorldRay );
@@ -2962,9 +2964,9 @@ BoneInfo uluaGetBoneInfo( lua_State* L, int index ) {
bone.parent = lua_tointeger( L, -1 );
}
}
- i++;
- lua_pop( L, 1 );
}
+ i++;
+ lua_pop( L, 1 );
}
return bone;
}
@@ -3005,9 +3007,9 @@ Transform uluaGetTransform( lua_State* L, int index ) {
transform.scale = uluaGetVector3( L, lua_gettop( L ) );
}
}
- i++;
- lua_pop( L, 1 );
}
+ i++;
+ lua_pop( L, 1 );
}
return transform;
}
diff --git a/src/models.c b/src/models.c
index 1ede774..45bb825 100644
--- a/src/models.c
+++ b/src/models.c
@@ -492,7 +492,7 @@ int lmodelsLoadModelFromMesh( lua_State* L ) {
}
/*
-> isReady = RL.IsModelValid( Model model )
+> isValid = RL.IsModelValid( Model model )
Check if a model is valid (loaded in GPU, VAO/VBOs)
@@ -1889,7 +1889,7 @@ int lmodelsCreateMaterial( lua_State* L ) {
}
/*
-> isReady = RL.IsMaterialValid( Material material )
+> isValid = RL.IsMaterialValid( Material material )
Check if a material is valid (shader assigned, map textures loaded in GPU)
diff --git a/src/text.c b/src/text.c
index 2740bed..ad2cbc4 100644
--- a/src/text.c
+++ b/src/text.c
@@ -295,7 +295,7 @@ int ltextFontCopy( lua_State* L ) {
}
/*
-> isReady = RL.IsFontValid( Font font )
+> isValid = RL.IsFontValid( Font font )
Check if a font is valid (font data loaded, WARNING: GPU texture not checked)
diff --git a/src/textures.c b/src/textures.c
index eaf2284..e185470 100644
--- a/src/textures.c
+++ b/src/textures.c
@@ -167,7 +167,7 @@ int ltexturesLoadImageFromScreen( lua_State* L ) {
}
/*
-> isReady = RL.IsImageValid( Image image )
+> isValid = RL.IsImageValid( Image image )
Check if an image is valid (data and parameters)
@@ -1422,7 +1422,7 @@ int ltexturesLoadRenderTextureFromData( lua_State* L ) {
}
/*
-> isReady = RL.IsTextureValid( Texture texture )
+> isValid = RL.IsTextureValid( Texture texture )
Check if a texture is valid (loaded in GPU)
@@ -1451,7 +1451,7 @@ int ltextureUnloadTexture( lua_State* L ) {
}
/*
-> isReady = RL.IsRenderTextureValid( RenderTexture target )
+> isValid = RL.IsRenderTextureValid( RenderTexture target )
Check if a render texture is valid (loaded in GPU)