AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 08:58:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

animation: fixes, improvements

Browse Source
This commit is contained in:
Moritz Zwerger 2023-12-23 21:08:24 +01:00
parent 7d89736fb7
commit 92c9c99efc
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 57 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/resources/assets/minosoft/rendering/shader/includes/animation.glsl
View File

@ -34,22 +34,24 @@ layout(std140) uniform uSpriteBuffer
// in/out // in/out
#if defined SHADER_TYPE_VERTEX #if defined SHADER_TYPE_VERTEX
#ifdef HAS_GEOMETRY_SHADER uint animationArray1; float animationLayer1;
uint finAnimationArray1; vec3 finAnimationPosition1; uint animationArray2; float animationLayer2;
uint finAnimationArray2; vec3 finAnimationPosition2; float animationInterpolation;
float finAnimationInterpolation; #ifndef HAS_GEOMETRY_SHADER
#else flat out uint finAnimationArray1; out float finAnimationLayer1;
flat out uint finAnimationArray1; out vec3 finAnimationPosition1; flat out uint finAnimationArray2; out float finAnimationLayer2;
flat out uint finAnimationArray2; out vec3 finAnimationPosition2; out vec2 finAnimationUV;
out float finAnimationInterpolation; out float finAnimationInterpolation;
#endif #endif
#elif defined SHADER_TYPE_GEOMETRY #elif defined SHADER_TYPE_GEOMETRY
flat out uint finAnimationArray1; out vec3 finAnimationPosition1; flat out uint finAnimationArray1; out float finAnimationLayer1;
flat out uint finAnimationArray2; out vec3 finAnimationPosition2; flat out uint finAnimationArray2; out float finAnimationLayer2;
out vec2 finAnimationUV;
out float finAnimationInterpolation; out float finAnimationInterpolation;
#elif defined SHADER_TYPE_FRAGMENT #elif defined SHADER_TYPE_FRAGMENT
flat in uint finAnimationArray1; in vec3 finAnimationPosition1; flat in uint finAnimationArray1; in float finAnimationLayer1;
flat in uint finAnimationArray2; in vec3 finAnimationPosition2; flat in uint finAnimationArray2; in float finAnimationLayer2;
in vec2 finAnimationUV;
in float finAnimationInterpolation; in float finAnimationInterpolation;
#endif #endif
@ -60,7 +62,7 @@ in float finAnimationInterpolation;
#include "minosoft:alpha" #include "minosoft:alpha"
vec4 getAnimationTexture() { vec4 getAnimationTexture() {
vec4 texel1 = getTexture(finAnimationArray1, finAnimationPosition1); vec4 texel1 = getTexture(finAnimationArray1, vec3(finAnimationUV, finAnimationLayer1));
discard_if_0(texel1.a); discard_if_0(texel1.a);
float interpolation = finAnimationInterpolation; float interpolation = finAnimationInterpolation;
@ -68,7 +70,7 @@ vec4 getAnimationTexture() {
if (interpolation == 0.0f) { // no animation if (interpolation == 0.0f) { // no animation
return texel1; return texel1;
} }
vec4 texel2 = getTexture(finAnimationArray2, finAnimationPosition2); vec4 texel2 = getTexture(finAnimationArray2, vec3(finAnimationUV, finAnimationLayer2));
discard_if_0(texel2.a); discard_if_0(texel2.a);
return mix(texel1, texel2, interpolation); return mix(texel1, texel2, interpolation);
@ -97,42 +99,54 @@ uint animation_extractArray(uint animation) {
uint animation_extractLayer(uint animation) { uint animation_extractLayer(uint animation) {
return (animation >> 12) & 0xFFFFu; return (animation >> 12) & 0xFFFFu;
} }
vec3 animation_texturePosition(vec2 uv, uint animation) {
return vec3(uv, animation_extractLayer(animation)); void animation_notAnimated(uint animation) {
animationArray1 = animation_extractArray(animation);
animationLayer1 = animation_extractLayer(animation);
animationInterpolation = 0.0f;
} }
void animation_notAnimated(vec2 uv, uint animation) { void animation_animated(uint animationId) {
finAnimationArray1 = animation_extractArray(animation);
finAnimationPosition1 = animation_texturePosition(uv, animation);
finAnimationInterpolation = 0.0f;
}
void animation_animated(uint animationId, vec2 uv) {
uvec4 data = uAnimationData[animationId]; uvec4 data = uAnimationData[animationId];
uint texture1 = data.x; uint texture1 = data.x;
finAnimationArray1 = animation_extractArray(texture1); animationArray1 = animation_extractArray(texture1);
finAnimationPosition1 = animation_texturePosition(uv, texture1); animationLayer1 = animation_extractLayer(texture1);
uint texture2 = data.y; uint texture2 = data.y;
finAnimationArray2 = animation_extractArray(texture2); animationArray2 = animation_extractArray(texture2);
finAnimationPosition2 = animation_texturePosition(uv, texture2); animationLayer2 = animation_extractLayer(texture2);
finAnimationInterpolation = data.z / 100.0f; animationInterpolation = data.z / 100.0f;
} }
void setTexture(vec2 uv, uint animation) { void setTexture(uint animation) {
uint animationId = animation_extractAnimationId(animation); uint animationId = animation_extractAnimationId(animation);
if (animationId == INVALID_ANIMATION) { if (animationId == INVALID_ANIMATION) {
animation_notAnimated(uv, animation); animation_notAnimated(animation);
return; return;
} }
animation_animated(animationId, uv); animation_animated(animationId);
}
void setTexture(float animation) {
setTexture(floatBitsToUint(animation));
}
#ifndef HAS_GEOMETRY_SHADER
void setTexture(vec2 uv, uint animation) {
setTexture(animation);
finAnimationUV = uv;
finAnimationArray1 = animationArray1; finAnimationLayer1 = animationLayer1;
finAnimationArray2 = animationArray2; finAnimationLayer2 = animationLayer2;
finAnimationInterpolation = animationInterpolation;
} }
void setTexture(vec2 uv, float animation) { void setTexture(vec2 uv, float animation) {
setTexture(uv, floatBitsToUint(animation)); setTexture(uv, floatBitsToUint(animation));
} }
#endif #endif
#endif
#endif #endif

13
src/main/resources/assets/minosoft/rendering/shader/particle/particle.gsh
View File

@ -26,9 +26,9 @@ in Vertex
{ {
vec2 minUV; vec2 minUV;
vec2 maxUV; vec2 maxUV;
uint array1; float layer1; flat uint array1; flat float layer1;
uint array2; float layer2; flat uint array2; flat float layer2;
float interpolation; flat float interpolation;
float scale; float scale;
vec4 tintColor; vec4 tintColor;
@ -43,16 +43,15 @@ void emit(vec3 offset, vec2 uv) {
vec3 pointPosition = gl_in[0].gl_Position.xyz; vec3 pointPosition = gl_in[0].gl_Position.xyz;
gl_Position = uViewProjectionMatrix * vec4(pointPosition + offset * ginVertex[0].scale, 1.0); gl_Position = uViewProjectionMatrix * vec4(pointPosition + offset * ginVertex[0].scale, 1.0);
finAnimationPosition1.xz = uv; finAnimationUV = uv;
finAnimationPosition2.xz = uv;
EmitVertex(); EmitVertex();
} }
void main() { void main() {
finTintColor = ginVertex[0].tintColor; finTintColor = ginVertex[0].tintColor;
finAnimationArray1 = ginVertex[0].array1; finAnimationPosition1.z = ginVertex[0].layer1; finAnimationArray1 = ginVertex[0].array1; finAnimationLayer1 = ginVertex[0].layer1;
finAnimationArray2 = ginVertex[0].array2; finAnimationPosition2.z = ginVertex[0].layer2; finAnimationArray2 = ginVertex[0].array2; finAnimationLayer2 = ginVertex[0].layer2;
finAnimationInterpolation = ginVertex[0].interpolation; finAnimationInterpolation = ginVertex[0].interpolation;

14
src/main/resources/assets/minosoft/rendering/shader/particle/particle.vsh
View File

@ -30,9 +30,9 @@ out Vertex
{ {
vec2 minUV; vec2 minUV;
vec2 maxUV; vec2 maxUV;
uint array1; float layer1; flat uint array1;flat float layer1;
uint array2; float layer2; flat uint array2;flat float layer2;
float interpolation; flat float interpolation;
float scale; float scale;
vec4 tintColor; vec4 tintColor;
@ -50,8 +50,8 @@ void main() {
ginVertex.scale = vinScale; ginVertex.scale = vinScale;
ginVertex.tintColor = getRGBAColor(floatBitsToUint(vinTintColor)) * getLight(floatBitsToUint(vinLight) & 0xFFu); ginVertex.tintColor = getRGBAColor(floatBitsToUint(vinTintColor)) * getLight(floatBitsToUint(vinLight) & 0xFFu);
setTexture(vec2(0.0f, 0.0f), vinIndexLayerAnimation); setTexture(vinIndexLayerAnimation);
ginVertex.array1 = finAnimationArray1; ginVertex.layer1 = finAnimationPosition1.z; ginVertex.array1 = animationArray1; ginVertex.layer1 = animationLayer1;
ginVertex.array2 = finAnimationArray2; ginVertex.layer2 = finAnimationPosition2.z; ginVertex.array2 = animationArray2; ginVertex.layer2 = animationArray2;
ginVertex.interpolation = finAnimationInterpolation; ginVertex.interpolation = animationInterpolation;
} }