mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review Lua examples and formatting

Browse Source
This commit is contained in:
Ray 2016-08-07 11:14:08 +02:00
parent 46248b0922
commit 2c079d7c6e
4 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/core_drop_files.lua
View File

@ -19,7 +19,7 @@ local screenHeight = 450
InitWindow(screenWidth, screenHeight, "raylib [core] example - drop files")
local count = 0
--char **droppedFiles -- ???
local droppedFiles = {}
SetTargetFPS(60)
-------------------------------------------------------------------------------------------
@ -29,9 +29,9 @@ while not WindowShouldClose() do -- Detect window close button or ESC key
-- Update
---------------------------------------------------------------------------------------
if (IsFileDropped()) then
droppedFiles = GetDroppedFiles()
count = #droppedFiles
end
droppedFiles = GetDroppedFiles()
count = #droppedFiles
end
---------------------------------------------------------------------------------------
-- Draw

14
examples/rlua_execute_file.c
View File

@ -35,11 +35,11 @@ int main()
// ExecuteLuaFile("core_input_gamepad.lua"); // OK!
// ExecuteLuaFile("core_random_values.lua"); // OK!
// ExecuteLuaFile("core_color_select.lua"); // OK!
// ExecuteLuaFile("core_drop_files.lua"); // ERROR: GetDroppedFiles()
// ExecuteLuaFile("core_drop_files.lua"); // OK!
// ExecuteLuaFile("core_storage_values.lua"); // OK!
// ExecuteLuaFile("core_gestures_detection.lua"); // OK!
// ExecuteLuaFile("core_3d_mode.lua"); // OK!
// ExecuteLuaFile("core_3d_picking.lua"); // ISSUE: CheckCollisionRayBox() returns false despite touching box
// ExecuteLuaFile("core_3d_picking.lua"); // OK!
// ExecuteLuaFile("core_3d_camera_free.lua"); // OK!
// ExecuteLuaFile("core_3d_camera_first_person.lua"); // OK!
// ExecuteLuaFile("core_2d_camera.lua"); // OK!
@ -54,8 +54,8 @@ int main()
// ExecuteLuaFile("textures_rectangle.lua"); // OK!
// ExecuteLuaFile("textures_srcrec_dstrec.lua"); // OK!
// ExecuteLuaFile("textures_to_image.lua"); // OK!
// ExecuteLuaFile("textures_raw_data.lua"); // ERROR: bad argument #2 to 'LoadImageEx' (number expected, got no value)
// ExecuteLuaFile("textures_formats_loading.lua"); // ISSUE: texture.id not exposed to be checked (not really an issue...)
// ExecuteLuaFile("textures_raw_data.lua"); // ERROR: LoadImageEx()
// ExecuteLuaFile("textures_formats_loading.lua"); // OK!
// ExecuteLuaFile("textures_particles_trail_blending.lua"); // OK!
// ExecuteLuaFile("textures_image_processing.lua"); // ERROR: GetImageData() --> UpdateTexture()
// ExecuteLuaFile("textures_image_drawing.lua"); // OK!
@ -73,13 +73,13 @@ int main()
// ExecuteLuaFile("models_cubicmap.lua"); // OK!
// ExecuteLuaFile("shaders_model_shader.lua"); // OK!
// ExecuteLuaFile("shaders_shapes_textures.lua"); // OK!
// ExecuteLuaFile("shaders_custom_uniform.lua"); // ISSUE: SetShaderValue()
// ExecuteLuaFile("shaders_custom_uniform.lua"); // OK!
// ExecuteLuaFile("shaders_postprocessing.lua"); // OK!
// ExecuteLuaFile("shaders_standard_lighting.lua"); // ERROR: CreateLight() returns an opaque pointer (fields can not be accessed)
// ExecuteLuaFile("shaders_standard_lighting.lua"); // OK!
// ExecuteLuaFile("audio_sound_loading.lua"); // OK!
// ExecuteLuaFile("audio_music_stream.lua"); // OK!
// ExecuteLuaFile("audio_module_playing.lua"); // OK!
ExecuteLuaFile("audio_raw_stream.lua"); // ERROR: UpdateAudioStream()
// ExecuteLuaFile("audio_raw_stream.lua"); // ERROR: UpdateAudioStream()
// De-Initialization
//--------------------------------------------------------------------------------------

8
src/rlgl.c
View File

@ -2559,13 +2559,13 @@ void DestroyLight(Light light)
{
if (light != NULL)
{
int light_id = light->id;
int lightId = light->id;
// Free dynamic memory allocation
free(lights[light_id]);
free(lights[lightId]);
// Remove *obj from the pointers array
for (int i = light_id; i < lightsCount; i++)
for (int i = lightId; i < lightsCount; i++)
{
// Resort all the following pointers of the array
if ((i + 1) < lightsCount)

100
src/rlua.h
View File

@ -300,29 +300,29 @@ static int LuaIndexSpriteFont(lua_State* L)
static int LuaIndexLight(lua_State* L)
{
Light light = LuaGetArgument_Light(L, 1);
const char *key = luaL_checkstring(L, 2);
if (!strcmp(key, "id"))
lua_pushinteger(L, light->id);
else if (!strcmp(key, "enabled"))
lua_pushboolean(L, light->enabled);
else if (!strcmp(key, "type"))
lua_pushinteger(L, light->type);
else if (!strcmp(key, "position"))
LuaPush_Vector3(L, light->position);
else if (!strcmp(key, "target"))
LuaPush_Vector3(L, light->target);
else if (!strcmp(key, "radius"))
lua_pushnumber(L, light->radius);
else if (!strcmp(key, "diffuse"))
LuaPush_Color(L, light->diffuse);
else if (!strcmp(key, "intensity"))
lua_pushnumber(L, light->intensity);
else if (!strcmp(key, "coneAngle"))
lua_pushnumber(L, light->coneAngle);
else
return 0;
return 1;
Light light = LuaGetArgument_Light(L, 1);
const char *key = luaL_checkstring(L, 2);
if (!strcmp(key, "id"))
lua_pushinteger(L, light->id);
else if (!strcmp(key, "enabled"))
lua_pushboolean(L, light->enabled);
else if (!strcmp(key, "type"))
lua_pushinteger(L, light->type);
else if (!strcmp(key, "position"))
LuaPush_Vector3(L, light->position);
else if (!strcmp(key, "target"))
LuaPush_Vector3(L, light->target);
else if (!strcmp(key, "radius"))
lua_pushnumber(L, light->radius);
else if (!strcmp(key, "diffuse"))
LuaPush_Color(L, light->diffuse);
else if (!strcmp(key, "intensity"))
lua_pushnumber(L, light->intensity);
else if (!strcmp(key, "coneAngle"))
lua_pushnumber(L, light->coneAngle);
else
return 0;
return 1;
}
static int LuaNewIndexLight(lua_State* L)
@ -335,17 +335,17 @@ static int LuaNewIndexLight(lua_State* L)
light->enabled = lua_toboolean(L, 3);
else if (!strcmp(key, "type"))
light->type = LuaGetArgument_int(L, 3);
else if (!strcmp(key, "position"))
else if (!strcmp(key, "position"))
light->position = LuaGetArgument_Vector3(L, 3);
else if (!strcmp(key, "target"))
else if (!strcmp(key, "target"))
light->target = LuaGetArgument_Vector3(L, 3);
else if (!strcmp(key, "radius"))
else if (!strcmp(key, "radius"))
light->radius = LuaGetArgument_float(L, 3);
else if (!strcmp(key, "diffuse"))
else if (!strcmp(key, "diffuse"))
light->diffuse = LuaGetArgument_Color(L, 3);
else if (!strcmp(key, "intensity"))
else if (!strcmp(key, "intensity"))
light->intensity = LuaGetArgument_float(L, 3);
else if (!strcmp(key, "coneAngle"))
else if (!strcmp(key, "coneAngle"))
light->coneAngle = LuaGetArgument_float(L, 3);
return 0;
}
@ -367,17 +367,17 @@ static void LuaBuildOpaqueMetatables(void)
lua_setfield(L, -2, "__index");
lua_pop(L, 1);
luaL_newmetatable(L, "SpriteFont");
lua_pushcfunction(L, &LuaIndexSpriteFont);
lua_setfield(L, -2, "__index");
lua_pop(L, 1);
luaL_newmetatable(L, "SpriteFont");
lua_pushcfunction(L, &LuaIndexSpriteFont);
lua_setfield(L, -2, "__index");
lua_pop(L, 1);
luaL_newmetatable(L, "Light");
lua_pushcfunction(L, &LuaIndexLight);
lua_setfield(L, -2, "__index");
lua_pushcfunction(L, &LuaNewIndexLight);
lua_setfield(L, -2, "__newindex");
lua_pop(L, 1);
luaL_newmetatable(L, "Light");
lua_pushcfunction(L, &LuaIndexLight);
lua_setfield(L, -2, "__index");
lua_pushcfunction(L, &LuaNewIndexLight);
lua_setfield(L, -2, "__newindex");
lua_pop(L, 1);
}
//----------------------------------------------------------------------------------
@ -1121,14 +1121,14 @@ int lua_IsFileDropped(lua_State* L)
int lua_GetDroppedFiles(lua_State* L)
{
int count = 0;
int count = 0;
char ** result = GetDroppedFiles(&count);
lua_createtable(L, count, 0);
for (int i = 0; i < count; i++)
{
lua_pushstring(L, result[i]);
lua_rawseti(L, -2, i + 1);
}
lua_createtable(L, count, 0);
for (int i = 0; i < count; i++)
{
lua_pushstring(L, result[i]);
lua_rawseti(L, -2, i + 1);
}
return 1;
}
@ -2401,9 +2401,9 @@ int lua_DrawGizmo(lua_State* L)
int lua_DrawLight(lua_State* L)
{
Light arg1 = LuaGetArgument_Light(L, 1);
DrawLight(arg1);
return 0;
Light arg1 = LuaGetArgument_Light(L, 1);
DrawLight(arg1);
return 0;
}
int lua_Draw3DLine(lua_State* L)
@ -3769,7 +3769,7 @@ static luaL_Reg raylib_functions[] = {
REG(DrawGrid)
REG(DrawGizmo)
REG(DrawLight)
REG(DrawLight)
REG(LoadModel)
REG(LoadModelEx)