diff options
| -rw-r--r-- | API.md | 70 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ReiLua_API.lua | 22 | ||||
| -rw-r--r-- | build/.gitignore | 11 | ||||
| -rw-r--r-- | changelog | 2 | ||||
| -rw-r--r-- | docgen.lua | 2 | ||||
| -rw-r--r-- | src/audio.c | 2 | ||||
| -rw-r--r-- | src/lua_core.c | 17 |
8 files changed, 115 insertions, 13 deletions
@@ -1616,6 +1616,24 @@ Shader location: sampler2d texture: brdf --- +> SHADER_LOC_VERTEX_BONEIDS = 26 + +Shader location: vertex attribute: boneIds + +--- + +> SHADER_LOC_VERTEX_BONEWEIGHTS = 27 + +Shader location: vertex attribute: boneWeights + +--- + +> SHADER_LOC_BONE_MATRICES = 28 + +Shader location: array of matrices uniform: boneMatrices + +--- + > SHADER_LOC_MAP_DIFFUSE = 15 Shader location: sampler2d texture: diffuce (same as: SHADER_LOC_MAP_ALBEDO) @@ -4088,6 +4106,58 @@ GL_BLEND_COLOR --- +> RL_READ_FRAMEBUFFER = 36008 + +GL_READ_FRAMEBUFFER + +--- + +> RL_DRAW_FRAMEBUFFER = 36009 + +GL_DRAW_FRAMEBUFFER + +--- + + +## Defines - RLGL Default shader vertex attribute locations +> RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION = 0 + +--- + +> RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD = 1 + +--- + +> RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL = 2 + +--- + +> RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR = 3 + +--- + +> RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT = 4 + +--- + +> RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2 = 5 + +--- + +> RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES = 6 + +--- + + +RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS = nil + +--- + + +RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS = nil + +--- + ## Defines - RLGL GlVersion > RL_OPENGL_11 = 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cfba5b..2bedca9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project( ReiLua ) set( CMAKE_C_STANDARD 99 ) # Requires C99 standard option( SHARED "Build using dynamic libraries." off ) -option( LUAJIT "Use LuaJIT." off ) +option( LUAJIT "Use LuaJIT." on ) option( LUA_EVENTS "Enable Lua event callbacks (RL.event)." off ) option( DYNAMIC_SYMBOLS "Expose all dynamic symbols with rdynamic." off ) option( EXPOSE_API_SYMBOLS "Expose dynamic symbols only for get and push functions of variable types." off ) diff --git a/ReiLua_API.lua b/ReiLua_API.lua index 99e1c7a..1ba8b71 100644 --- a/ReiLua_API.lua +++ b/ReiLua_API.lua @@ -477,6 +477,12 @@ RL.SHADER_LOC_MAP_IRRADIANCE=23 RL.SHADER_LOC_MAP_PREFILTER=24 ---Shader location: sampler2d texture: brdf RL.SHADER_LOC_MAP_BRDF=25 +---Shader location: vertex attribute: boneIds +RL.SHADER_LOC_VERTEX_BONEIDS=26 +---Shader location: vertex attribute: boneWeights +RL.SHADER_LOC_VERTEX_BONEWEIGHTS=27 +---Shader location: array of matrices uniform: boneMatrices +RL.SHADER_LOC_BONE_MATRICES=28 ---Shader location: sampler2d texture: diffuce (same as: SHADER_LOC_MAP_ALBEDO) RL.SHADER_LOC_MAP_DIFFUSE=15 ---Shader location: sampler2d texture: specular (same as: SHADER_LOC_MAP_METALNESS) @@ -1320,6 +1326,22 @@ RL.RL_BLEND_DST_ALPHA=32970 RL.RL_BLEND_SRC_ALPHA=32971 ---GL_BLEND_COLOR RL.RL_BLEND_COLOR=32773 +---GL_READ_FRAMEBUFFER +RL.RL_READ_FRAMEBUFFER=36008 +---GL_DRAW_FRAMEBUFFER +RL.RL_DRAW_FRAMEBUFFER=36009 + +-- Defines - RLGL Default shader vertex attribute locations + +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION=0 +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD=1 +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL=2 +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR=3 +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT=4 +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2=5 +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES=6 +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS=nil +RL.RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS=nil -- Defines - RLGL GlVersion diff --git a/build/.gitignore b/build/.gitignore index 7a0b42a..f59ec20 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1,10 +1 @@ -CMakeCache.txt -cmake_install.cmake -Makefile -CMakeFiles -ReiLua -resources -ReiLua.data -ReiLua.html -ReiLua.js -ReiLua.wasm
\ No newline at end of file +*
\ No newline at end of file @@ -62,6 +62,8 @@ DETAILED CHANGES: - CHANGE: Bit fastes uluaGet* functions for vectors, color, rectangle and quaternion. - FIXED: fast_tilemap and texture_atlas_repeat examples were giving truncated vectors which isn't allowed anymore. + - CHANGE: Set LuaJIT to default build option. + - FIXED: SetMusicPan was setting pitch. ------------------------------------------------------------------------ Release: ReiLua version 0.8.0 Using Raylib 5.0 and Forked Raygui 4.0 @@ -316,7 +316,7 @@ for _, src in ipairs( sourceFiles ) do local gategorySplit = split( line, "*" ) apiFile:write( "\n## Defines - "..gategorySplit[2]:sub( 2, #gategorySplit[2] - 1 ).."\n" ) luaApiFile:write( "\n-- Defines - "..gategorySplit[2]:sub( 2, #gategorySplit[2] - 1 ).."\n\n" ) - else + elseif lineSplit[1] ~= "#ifdef" and lineSplit[1] ~= "#endif" then -- Remove comma from the end. local defineName = lineSplit[2]:sub( 1, -2 ) local value = RL[ defineName ] diff --git a/src/audio.c b/src/audio.c index d07f806..ca24a9a 100644 --- a/src/audio.c +++ b/src/audio.c @@ -668,7 +668,7 @@ int laudioSetMusicPan( lua_State* L ) { Music* music = uluaGetMusic( L, 1 ); float pan = luaL_checknumber( L, 2 ); - SetMusicPitch( *music, pan ); + SetMusicPan( *music, pan ); return 0; } diff --git a/src/lua_core.c b/src/lua_core.c index 61a522c..c619b9c 100644 --- a/src/lua_core.c +++ b/src/lua_core.c @@ -675,6 +675,9 @@ static void defineGlobals() { assignGlobalInt( SHADER_LOC_MAP_IRRADIANCE, "SHADER_LOC_MAP_IRRADIANCE" ); // Shader location: samplerCube texture: irradiance assignGlobalInt( SHADER_LOC_MAP_PREFILTER, "SHADER_LOC_MAP_PREFILTER" ); // Shader location: samplerCube texture: prefilter assignGlobalInt( SHADER_LOC_MAP_BRDF, "SHADER_LOC_MAP_BRDF" ); // Shader location: sampler2d texture: brdf + assignGlobalInt( SHADER_LOC_VERTEX_BONEIDS, "SHADER_LOC_VERTEX_BONEIDS" ); // Shader location: vertex attribute: boneIds + assignGlobalInt( SHADER_LOC_VERTEX_BONEWEIGHTS, "SHADER_LOC_VERTEX_BONEWEIGHTS" ); // Shader location: vertex attribute: boneWeights + assignGlobalInt( SHADER_LOC_BONE_MATRICES, "SHADER_LOC_BONE_MATRICES" ); // Shader location: array of matrices uniform: boneMatrices assignGlobalInt( SHADER_LOC_MAP_DIFFUSE, "SHADER_LOC_MAP_DIFFUSE" ); // Shader location: sampler2d texture: diffuce (same as: SHADER_LOC_MAP_ALBEDO) assignGlobalInt( SHADER_LOC_MAP_SPECULAR, "SHADER_LOC_MAP_SPECULAR" ); // Shader location: sampler2d texture: specular (same as: SHADER_LOC_MAP_METALNESS) /* Shader uniform data type */ @@ -1206,6 +1209,20 @@ static void defineGlobals() { assignGlobalInt( RL_BLEND_DST_ALPHA, "RL_BLEND_DST_ALPHA" ); // GL_BLEND_DST_ALPHA assignGlobalInt( RL_BLEND_SRC_ALPHA, "RL_BLEND_SRC_ALPHA" ); // GL_BLEND_SRC_ALPHA assignGlobalInt( RL_BLEND_COLOR, "RL_BLEND_COLOR" ); // GL_BLEND_COLOR + assignGlobalInt( RL_READ_FRAMEBUFFER, "RL_READ_FRAMEBUFFER" ); // GL_READ_FRAMEBUFFER + assignGlobalInt( RL_DRAW_FRAMEBUFFER, "RL_DRAW_FRAMEBUFFER" ); // GL_DRAW_FRAMEBUFFER + /* RLGL Default shader vertex attribute locations */ + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION" ); + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD" ); + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL" ); + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR" ); + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT" ); + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2" ); + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES" ); +#ifdef RL_SUPPORT_MESH_GPU_SKINNING + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS" ); + assignGlobalInt( RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS, "RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS" ); +#endif /* RLGL GlVersion */ assignGlobalInt( RL_OPENGL_11, "RL_OPENGL_11" ); // OpenGL 1.1 assignGlobalInt( RL_OPENGL_21, "RL_OPENGL_21" ); // OpenGL 2.1 (GLSL 120) |