thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix small LE whoopsie
Some checks failed
Build coop / build-ubuntu (push) Has been cancelled
Details
Build coop / build-windows (push) Has been cancelled
Details
Build coop / build-macos-arm (push) Has been cancelled
Details
Build coop / build-macos-intel (push) Has been cancelled
Details

Browse source
This commit is contained in:
Agent X 2025-03-29 13:41:55 -04:00
parent 3abbb2039d
commit 43f4f7aec2
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docs/lua/functions-3.md
View file

@ -6366,7 +6366,7 @@ Removes a lighting engine point light corresponding to `id`
- None
### C Prototype
`void le_remove_light(s16 id);`
`void le_remove_light(s32 id);`
[:arrow_up_small:](#)
@ -6417,7 +6417,7 @@ Sets a lighting engine point light's color to `r`, `g`, `b`
- None
### C Prototype
`void le_set_light_color(s16 id, u8 r, u8 g, u8 b);`
`void le_set_light_color(s32 id, u8 r, u8 g, u8 b);`
[:arrow_up_small:](#)
@ -6441,7 +6441,7 @@ Sets a lighting engine point light's `intensity`
- None
### C Prototype
`void le_set_light_intensity(s16 id, f32 intensity);`
`void le_set_light_intensity(s32 id, f32 intensity);`
[:arrow_up_small:](#)
@ -6467,7 +6467,7 @@ Sets a lighting engine point light's position to `x`, `y`, `z`
- None
### C Prototype
`void le_set_light_pos(s16 id, f32 x, f32 y, f32 z);`
`void le_set_light_pos(s32 id, f32 x, f32 y, f32 z);`
[:arrow_up_small:](#)
@ -6491,7 +6491,7 @@ Sets a lighting engine point light's `radius`
- None
### C Prototype
`void le_set_light_radius(s16 id, f32 radius);`
`void le_set_light_radius(s32 id, f32 radius);`
[:arrow_up_small:](#)

12
src/engine/lighting_engine.c
View file

@ -86,7 +86,7 @@ void le_calculate_lighting_dir(Vec3f pos, Vec3f out) {
if (sLights == NULL) { return; }
Vec3f lightingDir = { 0, 0, 0 };
s16 count = 1;
s32 count = 1;
for (struct LELight* light = hmap_begin(sLights); light != NULL; light = hmap_next(sLights)) {
f32 diffX = light->posX - pos[0];
f32 diffY = light->posY - pos[1];
@ -136,7 +136,7 @@ s32 le_add_light(f32 x, f32 y, f32 z, u8 r, u8 g, u8 b, f32 radius, f32 intensit
return sLightID;
}
void le_remove_light(s16 id) {
void le_remove_light(s32 id) {
if (sLights == NULL || id <= 0) { return; }
free(hmap_get(sLights, id));
@ -152,7 +152,7 @@ void le_set_ambient_color(u8 r, u8 g, u8 b) {
color_set(sAmbientColor, r, g, b);
}
void le_set_light_pos(s16 id, f32 x, f32 y, f32 z) {
void le_set_light_pos(s32 id, f32 x, f32 y, f32 z) {
if (sLights == NULL || id <= 0) { return; }
struct LELight* light = hmap_get(sLights, id);
@ -162,7 +162,7 @@ void le_set_light_pos(s16 id, f32 x, f32 y, f32 z) {
light->posZ = z;
}
void le_set_light_color(s16 id, u8 r, u8 g, u8 b) {
void le_set_light_color(s32 id, u8 r, u8 g, u8 b) {
if (sLights == NULL || id <= 0) { return; }
struct LELight* light = hmap_get(sLights, id);
@ -172,7 +172,7 @@ void le_set_light_color(s16 id, u8 r, u8 g, u8 b) {
light->colorB = b;
}
void le_set_light_radius(s16 id, f32 radius) {
void le_set_light_radius(s32 id, f32 radius) {
if (sLights == NULL || id <= 0) { return; }
struct LELight* light = hmap_get(sLights, id);
@ -180,7 +180,7 @@ void le_set_light_radius(s16 id, f32 radius) {
light->radius = radius;
}
void le_set_light_intensity(s16 id, f32 intensity) {
void le_set_light_intensity(s32 id, f32 intensity) {
if (sLights == NULL || id <= 0) { return; }
struct LELight* light = hmap_get(sLights, id);

10
src/engine/lighting_engine.h
View file

@ -23,19 +23,19 @@ void le_calculate_lighting_dir(Vec3f pos, Vec3f out);
/* |description|Adds a lighting engine point light at `x`, `y`, `z` with color `r`, `g`, `b` and `radius` with `intensity`|descriptionEnd| */
s32 le_add_light(f32 x, f32 y, f32 z, u8 r, u8 g, u8 b, f32 radius, f32 intensity);
/* |description|Removes a lighting engine point light corresponding to `id`|descriptionEnd| */
void le_remove_light(s16 id);
void le_remove_light(s32 id);
/* |description|Gets the total number of lights currently loaded in the lighting engine|descriptionEnd| */
s32 le_get_light_count(void);
/* |description|Sets the lighting engine ambient color|descriptionEnd| */
void le_set_ambient_color(u8 r, u8 g, u8 b);
/* |description|Sets a lighting engine point light's position to `x`, `y`, `z`|descriptionEnd| */
void le_set_light_pos(s16 id, f32 x, f32 y, f32 z);
void le_set_light_pos(s32 id, f32 x, f32 y, f32 z);
/* |description|Sets a lighting engine point light's color to `r`, `g`, `b`|descriptionEnd| */
void le_set_light_color(s16 id, u8 r, u8 g, u8 b);
void le_set_light_color(s32 id, u8 r, u8 g, u8 b);
/* |description|Sets a lighting engine point light's `radius`|descriptionEnd| */
void le_set_light_radius(s16 id, f32 radius);
void le_set_light_radius(s32 id, f32 radius);
/* |description|Sets a lighting engine point light's `intensity`|descriptionEnd| */
void le_set_light_intensity(s16 id, f32 intensity);
void le_set_light_intensity(s32 id, f32 intensity);
void le_clear(void);
void le_shutdown(void);

10
src/pc/lua/smlua_functions_autogen.c
View file

@ -15121,7 +15121,7 @@ int smlua_func_le_remove_light(lua_State* L) {
return 0;
}
s16 id = smlua_to_integer(L, 1);
s32 id = smlua_to_integer(L, 1);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "le_remove_light"); return 0; }
le_remove_light(id);
@ -15159,7 +15159,7 @@ int smlua_func_le_set_light_color(lua_State* L) {
return 0;
}
s16 id = smlua_to_integer(L, 1);
s32 id = smlua_to_integer(L, 1);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "le_set_light_color"); return 0; }
u8 r = smlua_to_integer(L, 2);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "le_set_light_color"); return 0; }
@ -15182,7 +15182,7 @@ int smlua_func_le_set_light_intensity(lua_State* L) {
return 0;
}
s16 id = smlua_to_integer(L, 1);
s32 id = smlua_to_integer(L, 1);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "le_set_light_intensity"); return 0; }
f32 intensity = smlua_to_number(L, 2);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "le_set_light_intensity"); return 0; }
@ -15201,7 +15201,7 @@ int smlua_func_le_set_light_pos(lua_State* L) {
return 0;
}
s16 id = smlua_to_integer(L, 1);
s32 id = smlua_to_integer(L, 1);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "le_set_light_pos"); return 0; }
f32 x = smlua_to_number(L, 2);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "le_set_light_pos"); return 0; }
@ -15224,7 +15224,7 @@ int smlua_func_le_set_light_radius(lua_State* L) {
return 0;
}
s16 id = smlua_to_integer(L, 1);
s32 id = smlua_to_integer(L, 1);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "le_set_light_radius"); return 0; }
f32 radius = smlua_to_number(L, 2);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "le_set_light_radius"); return 0; }