Skip to content

Commit

Permalink
Merge pull request RobLoach#38 from nayaku/master
Browse files Browse the repository at this point in the history 
Update raylib to 68f664a to fix some bugs in Android
  • Loading branch information
@RobLoach
RobLoach authored Apr 18, 2021
2 parents 18ae833 + 2e22b3e commit c6d02ee
Show file tree
Hide file tree
Showing 4 changed files with 425 additions and 233 deletions.
138 changes: 105 additions & 33 deletions include/raylib-lua-sol-rlgl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,47 @@
#include "rlgl.h"

void raylib_lua_sol_rlgl(sol::state& lua) {
lua["DEFAULT_BATCH_BUFFER_ELEMENTS"] = DEFAULT_BATCH_BUFFER_ELEMENTS;
lua["DEFAULT_BATCH_BUFFERS"] = DEFAULT_BATCH_BUFFERS;
lua["DEFAULT_BATCH_DRAWCALLS"] = DEFAULT_BATCH_DRAWCALLS;
lua["MAX_BATCH_ACTIVE_TEXTURES"] = MAX_BATCH_ACTIVE_TEXTURES;
lua["MAX_MATRIX_STACK_SIZE"] = MAX_MATRIX_STACK_SIZE;
lua["MAX_MESH_VERTEX_BUFFERS"] = MAX_MESH_VERTEX_BUFFERS;
lua["MAX_SHADER_LOCATIONS"] = MAX_SHADER_LOCATIONS;
lua["MAX_MATERIAL_MAPS"] = MAX_MATERIAL_MAPS;
lua["RL_CULL_DISTANCE_NEAR"] = RL_CULL_DISTANCE_NEAR;
lua["RL_CULL_DISTANCE_FAR"] = RL_CULL_DISTANCE_FAR;

lua["RL_TEXTURE_WRAP_S"] = RL_TEXTURE_WRAP_S;
lua["RL_TEXTURE_WRAP_T"] = RL_TEXTURE_WRAP_T;
lua["RL_TEXTURE_MAG_FILTER"] = RL_TEXTURE_MAG_FILTER;
lua["RL_TEXTURE_MIN_FILTER"] = RL_TEXTURE_MIN_FILTER;
lua["RL_TEXTURE_ANISOTROPIC_FILTER"] = RL_TEXTURE_ANISOTROPIC_FILTER;
lua["RL_FILTER_NEAREST"] = RL_FILTER_NEAREST;
lua["RL_FILTER_LINEAR"] = RL_FILTER_LINEAR;
lua["RL_FILTER_MIP_NEAREST"] = RL_FILTER_MIP_NEAREST;
lua["RL_FILTER_NEAREST_MIP_LINEAR"] = RL_FILTER_NEAREST_MIP_LINEAR;
lua["RL_FILTER_LINEAR_MIP_NEAREST"] = RL_FILTER_LINEAR_MIP_NEAREST;
lua["RL_FILTER_MIP_LINEAR"] = RL_FILTER_MIP_LINEAR;
lua["RL_WRAP_REPEAT"] = RL_WRAP_REPEAT;
lua["RL_WRAP_CLAMP"] = RL_WRAP_CLAMP;
lua["RL_WRAP_MIRROR_REPEAT"] = RL_WRAP_MIRROR_REPEAT;
lua["RL_WRAP_MIRROR_CLAMP"] = RL_WRAP_MIRROR_CLAMP;

lua["RL_TEXTURE_FILTER_NEAREST"] = RL_TEXTURE_FILTER_NEAREST;
lua["RL_TEXTURE_FILTER_LINEAR "] = RL_TEXTURE_FILTER_LINEAR ;
lua["RL_TEXTURE_FILTER_MIP_NEAREST"] = RL_TEXTURE_FILTER_MIP_NEAREST;
lua["RL_TEXTURE_FILTER_NEAREST_MIP_LINEAR"] = RL_TEXTURE_FILTER_NEAREST_MIP_LINEAR;
lua["RL_TEXTURE_FILTER_LINEAR_MIP_NEAREST"] = RL_TEXTURE_FILTER_LINEAR_MIP_NEAREST;
lua["RL_TEXTURE_FILTER_MIP_LINEAR"] = RL_TEXTURE_FILTER_MIP_LINEAR;
lua["RL_TEXTURE_FILTER_ANISOTROPIC"] = RL_TEXTURE_FILTER_ANISOTROPIC;

lua["RL_TEXTURE_WRAP_REPEAT"] = RL_TEXTURE_WRAP_REPEAT;
lua["RL_TEXTURE_WRAP_CLAMP"] = RL_TEXTURE_WRAP_CLAMP;
lua["RL_TEXTURE_WRAP_MIRROR_REPEAT"] = RL_TEXTURE_WRAP_MIRROR_REPEAT;
lua["RL_TEXTURE_WRAP_MIRROR_CLAMP"] = RL_TEXTURE_WRAP_MIRROR_CLAMP;

lua["RL_MODELVIEW"] = RL_MODELVIEW;
lua["RL_PROJECTION"] = RL_PROJECTION;
lua["RL_TEXTURE"] = RL_TEXTURE;

lua["RL_LINES"] = RL_LINES;
lua["RL_TRIANGLES"] = RL_TRIANGLES;
lua["RL_QUADS"] = RL_QUADS;

lua["RL_UNSIGNED_BYTE"] = RL_UNSIGNED_BYTE;
lua["RL_FLOAT"] = RL_FLOAT;


lua.set_function("rlMatrixMode", rlMatrixMode);
lua.set_function("rlPushMatrix", rlPushMatrix);
lua.set_function("rlPopMatrix", rlPopMatrix);
Expand All @@ -57,37 +69,80 @@ void raylib_lua_sol_rlgl(sol::state& lua) {
lua.set_function("rlColor4ub", rlColor4ub);
lua.set_function("rlColor3f", rlColor3f);
lua.set_function("rlColor4f", rlColor4f);
lua.set_function("rlEnableVertexArray", rlEnableVertexArray);
lua.set_function("rlDisableVertexArray", rlDisableVertexArray);
lua.set_function("rlEnableVertexBuffer", rlEnableVertexBuffer);
lua.set_function("rlDisableVertexBuffer", rlDisableVertexBuffer);
lua.set_function("rlEnableVertexBufferElement", rlEnableVertexBufferElement);
lua.set_function("rlDisableVertexBufferElement", rlDisableVertexBufferElement);
lua.set_function("rlEnableVertexAttribute", rlEnableVertexAttribute);
lua.set_function("rlDisableVertexAttribute", rlDisableVertexAttribute);

lua.set_function("rlActiveTextureSlot", rlActiveTextureSlot);
lua.set_function("rlEnableTexture", rlEnableTexture);
lua.set_function("rlDisableTexture", rlDisableTexture);
lua.set_function("rlEnableTextureCubemap", rlEnableTextureCubemap);
lua.set_function("rlDisableTextureCubemap", rlDisableTextureCubemap);
lua.set_function("rlTextureParameters", rlTextureParameters);
lua.set_function("rlEnableRenderTexture", rlEnableRenderTexture);
lua.set_function("rlDisableRenderTexture", rlDisableRenderTexture);
lua.set_function("rlEnableShader", rlEnableShader);
lua.set_function("rlDisableShader", rlDisableShader);
lua.set_function("rlEnableFramebuffer", rlEnableFramebuffer);
lua.set_function("rlDisableFramebuffer", rlDisableFramebuffer);
lua.set_function("rlEnableDepthTest", rlEnableDepthTest);
lua.set_function("rlDisableDepthTest", rlDisableDepthTest);
lua.set_function("rlEnableDepthMask", rlEnableDepthMask);
lua.set_function("rlDisableDepthMask", rlDisableDepthMask);
lua.set_function("rlEnableBackfaceCulling", rlEnableBackfaceCulling);
lua.set_function("rlDisableBackfaceCulling", rlDisableBackfaceCulling);
lua.set_function("rlEnableScissorTest", rlEnableScissorTest);
lua.set_function("rlDisableScissorTest", rlDisableScissorTest);
lua.set_function("rlScissor", rlScissor);
lua.set_function("rlEnableWireMode", rlEnableWireMode);
lua.set_function("rlDisableWireMode", rlDisableWireMode);
lua.set_function("rlDeleteTextures", rlDeleteTextures);
lua.set_function("rlDeleteRenderTextures", rlDeleteRenderTextures);
lua.set_function("rlDeleteShader", rlDeleteShader);
lua.set_function("rlDeleteVertexArrays", rlDeleteVertexArrays);
lua.set_function("rlDeleteBuffers", rlDeleteBuffers);
lua.set_function("rlSetLineWidth", rlSetLineWidth);
lua.set_function("rlGetLineWidth", rlGetLineWidth);
lua.set_function("rlEnableSmoothLines", rlEnableSmoothLines);
lua.set_function("rlDisableSmoothLines", rlDisableSmoothLines);
lua.set_function("rlEnableStereoRender", rlEnableStereoRender);
lua.set_function("rlDisableStereoRender", rlDisableStereoRender);
lua.set_function("rlIsStereoRenderEnabled", rlIsStereoRenderEnabled);

lua.set_function("rlClearColor", rlClearColor);
lua.set_function("rlClearScreenBuffers", rlClearScreenBuffers);
lua.set_function("rlUpdateBuffer", rlUpdateBuffer);
lua.set_function("rlLoadAttribBuffer", rlLoadAttribBuffer);
lua.set_function("rlCheckErrors", rlCheckErrors);
lua.set_function("rlSetBlendMode", rlSetBlendMode);
lua.set_function("rlSetBlendFactors", rlSetBlendFactors);
lua.set_function("rlglInit", rlglInit);
lua.set_function("rlglClose", rlglClose);
lua.set_function("rlglDraw", rlglDraw);
lua.set_function("rlGetVersion", rlGetVersion);
lua.set_function("rlCheckBufferLimit", rlCheckBufferLimit);
lua.set_function("rlSetDebugMarker", rlSetDebugMarker);
lua.set_function("rlLoadExtensions", rlLoadExtensions);
lua.set_function("rlUnproject", rlUnproject);
lua.set_function("rlGetVersion", rlGetVersion);
lua.set_function("rlGetFramebufferWidth", rlGetFramebufferWidth);
lua.set_function("rlGetFramebufferHeight", rlGetFramebufferHeight);

lua.set_function("rlGetShaderDefault", rlGetShaderDefault);
lua.set_function("rlGetTextureDefault", rlGetTextureDefault);
lua.set_function("rlLoadRenderBatch", rlLoadRenderBatch);
lua.set_function("rlUnloadRenderBatch", rlUnloadRenderBatch);
lua.set_function("rlDrawRenderBatch", rlDrawRenderBatch);
lua.set_function("rlSetRenderBatchActive", rlSetRenderBatchActive);
lua.set_function("rlDrawRenderBatchActive", rlDrawRenderBatchActive);
lua.set_function("rlCheckRenderBatchLimit", rlCheckRenderBatchLimit);
lua.set_function("rlSetTexture", rlSetTexture);
lua.set_function("rlLoadVertexArray", rlLoadVertexArray);
lua.set_function("rlLoadVertexBuffer", rlLoadVertexBuffer);
lua.set_function("rlLoadVertexBufferElement", rlLoadVertexBufferElement);
lua.set_function("rlUpdateVertexBuffer", rlUpdateVertexBuffer);
lua.set_function("rlUnloadVertexArray", rlUnloadVertexArray);
lua.set_function("rlUnloadVertexBuffer", rlUnloadVertexBuffer);
lua.set_function("rlSetVertexAttribute", rlSetVertexAttribute);
lua.set_function("rlSetVertexAttributeDivisor", rlSetVertexAttributeDivisor);
lua.set_function("rlSetVertexAttributeDefault", rlSetVertexAttributeDefault);
lua.set_function("rlDrawVertexArray", rlDrawVertexArray);
lua.set_function("rlDrawVertexArrayElements", rlDrawVertexArrayElements);
lua.set_function("rlDrawVertexArrayInstanced", rlDrawVertexArrayInstanced);
lua.set_function("rlDrawVertexArrayElementsInstanced", rlDrawVertexArrayElementsInstanced);

// lua.set_function("rlLoadExtensions", rlLoadExtensions);
lua.set_function("rlLoadTexture", rlLoadTexture);
lua.set_function("rlLoadTextureDepth", rlLoadTextureDepth);
lua.set_function("rlLoadTextureCubemap", rlLoadTextureCubemap);
Expand All @@ -97,14 +152,31 @@ void raylib_lua_sol_rlgl(sol::state& lua) {
lua.set_function("rlGenerateMipmaps", rlGenerateMipmaps);
lua.set_function("rlReadTexturePixels", rlReadTexturePixels);
lua.set_function("rlReadScreenPixels", rlReadScreenPixels);
lua.set_function("rlLoadRenderTexture", rlLoadRenderTexture);
lua.set_function("rlRenderTextureAttach", rlRenderTextureAttach);
lua.set_function("rlRenderTextureComplete", rlRenderTextureComplete);
lua.set_function("rlLoadMesh", rlLoadMesh);
lua.set_function("rlUpdateMesh", rlUpdateMesh);
lua.set_function("rlUpdateMeshAt", rlUpdateMeshAt);
lua.set_function("rlDrawMesh", rlDrawMesh);
lua.set_function("rlUnloadMesh", rlUnloadMesh);
lua.set_function("rlLoadFramebuffer", rlLoadFramebuffer);
lua.set_function("rlFramebufferAttach", rlFramebufferAttach);
lua.set_function("rlFramebufferComplete", rlFramebufferComplete);
lua.set_function("rlUnloadFramebuffer", rlUnloadFramebuffer);
lua.set_function("rlLoadShaderCode", rlLoadShaderCode);
lua.set_function("rlCompileShader", rlCompileShader);
lua.set_function("rlLoadShaderProgram", rlLoadShaderProgram);
lua.set_function("rlUnloadShaderProgram", rlUnloadShaderProgram);
lua.set_function("rlGetLocationUniform", rlGetLocationUniform);
lua.set_function("rlGetLocationAttrib", rlGetLocationAttrib);
lua.set_function("rlSetUniform", rlSetUniform);
lua.set_function("rlSetUniformMatrix", rlSetUniformMatrix);
lua.set_function("rlSetUniformSampler", rlSetUniformSampler);
lua.set_function("rlSetShader", rlSetShader);
lua.set_function("rlGetMatrixModelview", rlGetMatrixModelview);
lua.set_function("rlGetMatrixProjection", rlGetMatrixProjection);
lua.set_function("rlGetMatrixTransform", rlGetMatrixTransform);
lua.set_function("rlGetMatrixProjectionStereo", rlGetMatrixProjectionStereo);
lua.set_function("rlGetMatrixViewOffsetStereo", rlGetMatrixViewOffsetStereo);
lua.set_function("rlSetMatrixProjection", rlSetMatrixProjection);
lua.set_function("rlSetMatrixModelview", rlSetMatrixModelview);
lua.set_function("rlSetMatrixProjectionStereo", rlSetMatrixProjectionStereo);
lua.set_function("rlSetMatrixViewOffsetStereo", rlSetMatrixViewOffsetStereo);
lua.set_function("rlLoadDrawCube", rlLoadDrawCube);
lua.set_function("rlLoadDrawQuad", rlLoadDrawQuad);
}

#endif
Loading

0 comments on commit c6d02ee

Please sign in to comment.