voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-11 05:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' into new-animation-features

Browse source
This commit is contained in:
MihailRis 2026-09-17 00:14:03 +03:00
commit d40070abab
16 changed files with 178 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/modules/internal/stdcomp.lua
View file

@ -58,8 +58,8 @@ local Skeleton = {__index={
index=function(self, s) return __skeleton.index(self.eid, s) end,
is_visible=function(self, i) return __skeleton.is_visible(self.eid, i) end,
set_visible=function(self, i, b) return __skeleton.set_visible(self.eid, i, b) end,
get_color=function(self) return __skeleton.get_color(self.eid) end,
set_color=function(self, color) return __skeleton.set_color(self.eid, color) end,
get_color=function(self, ...) return __skeleton.get_color(self.eid, ...) end,
set_color=function(self, color, ...) return __skeleton.set_color(self.eid, color, ...) end,
set_interpolated=function(self, b) return __skeleton.set_interpolated(self.eid, b) end,
}}

6
res/shaders/entity.glslv
View file

@ -2,7 +2,7 @@
layout (location = 0) in vec3 v_position;
layout (location = 1) in vec2 v_texCoord;
layout (location = 2) in vec3 v_color;
layout (location = 2) in vec4 v_color;
layout (location = 3) in vec4 v_light;
layout (location = 4) in vec4 v_normal;
@ -29,8 +29,8 @@ void main() {
a_dir = a_modelpos.xyz - u_cameraPos;
vec3 skyLightColor = pick_sky_color(u_skybox, u_dayTime, u_minSkyLight);
a_color.rgb = max(a_color.rgb, skyLightColor.rgb * v_light.a) * v_color;
a_color.a = u_opacity;
a_color.rgb = max(a_color.rgb, skyLightColor.rgb * v_light.a) * v_color.rgb;
a_color.a = u_opacity * v_color.a;
mat4 viewmodel = u_view * u_model;
a_distance = length(viewmodel * vec4(pos3d, 0.0));