2.11.21

Author: Waterpicker

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "gg.generations"
-version = "2.11.20"
+version = "2.11.21"
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 

src/library/java/gg/generations/rarecandy/renderer/pipeline/Pipeline.java

@@ -71,15 +71,8 @@ private void addShader(String text, int type, int programId) {
             if (shader == 0) RareCandy.fatal("an error occurred creating the shader object. We don't know what it is.");
             GL20C.glShaderSource(shader, text);
             GL20C.glCompileShader(shader);
-            if (GL20C.glGetShaderi(shader, GL20C.GL_COMPILE_STATUS) == 0) {
-
-                System.out.println("Printing shader:");
-
-                System.out.println(text);
-
+            if (GL20C.glGetShaderi(shader, GL20C.GL_COMPILE_STATUS) == 0)
                 RareCandy.fatal(GL20C.glGetShaderInfoLog(shader, 1024));
-
-            }
             GL20C.glAttachShader(programId, shader);
         }
 

src/main/java/gg/generations/rarecandy/tools/gui/GuiPipelines.java

@@ -132,7 +132,7 @@ private static void addLight(Pipeline.Builder builder) {
 
     public static Pipeline.Builder createLayered(String effect) {
         return new Pipeline.Builder(BASE)
-                .shader(builtin("animated/animated.vs.glsl"), builtin("process/layered.fs.glsl", "process/%s.lib.glsl".formatted(effect)))
+                .shader(builtin("animated/animated.vs.glsl"), builtin("animated/layered.fs.glsl", "process/%s.lib.glsl".formatted(effect)))
                 .configure(GuiPipelines::baseColors)
                 .configure(GuiPipelines::emissionColors)
                 .supplyUniform("layer", ctx -> {
@@ -154,7 +154,7 @@ public static Pipeline.Builder createLayered(String effect) {
     }
 
     public static Pipeline.Builder createSolid(String effect) {
-        return new Pipeline.Builder(BASE).shader(builtin("animated/animated.vs.glsl"), builtin("process/base.fs.glsl", "process/%s.lib.glsl".formatted(effect)));
+        return new Pipeline.Builder(BASE).shader(builtin("animated/animated.vs.glsl"), builtin("animated/solid.fs.glsl", "process/%s.lib.glsl".formatted(effect)));
     }
 
     public static Pipeline.Builder createMasked(String effect) {
@@ -264,7 +264,6 @@ public static void onInitialize() {
         var effects = List.of("cartoon", "galaxy", "paradox", "shadow", "sketch", "vintage", "passthrough");
 
         for (var effect : effects) {
-            System.out.println(effect);
             var solid = createSolid(effect);
             var masked = createMasked(effect);
             var layered = createLayered(effect);

src/main/resources/shaders/animated/layered.fs.glsl

@@ -65,7 +65,7 @@ vec4 getColor() {
     base = mix(base, applyEmission(base, emiColor2, emiIntensity2), layerMasks.g);
     base = mix(base, applyEmission(base, emiColor3, emiIntensity3), layerMasks.b);
     base = mix(base, applyEmission(base, emiColor4, emiIntensity4), layerMasks.a);
-    base = mix(base, applyEmission(vec3(0), emiColor5, emiIntensity5), maskColor);
+    base = mix(base, applyEmission(vec3(1), emiColor5, emiIntensity5), maskColor);
 
     return vec4(base, color.a);
 }