diff --git a/src/love/modules/constants.lua b/src/love/modules/constants.lua index f09a7f53..5dce0b75 100644 --- a/src/love/modules/constants.lua +++ b/src/love/modules/constants.lua @@ -35,6 +35,8 @@ for i, v in ipairs(CONSTANTS.RAW_ARROW_COLORS) do } end +CONSTANTS.MS_PER_SEC = 1000 + CONSTANTS.WEEKS = { STRUM_Y = -400, STRUM_X_OFFSET = 0, diff --git a/src/love/modules/graphics.lua b/src/love/modules/graphics.lua index 1a8b3eb5..5595d38d 100644 --- a/src/love/modules/graphics.lua +++ b/src/love/modules/graphics.lua @@ -366,10 +366,6 @@ return { end end - if self.updateShaderAlpha then - self.shader:send("a", self.alpha) - end - self.holdTimer = self.holdTimer + dt if self.specialAnim then diff --git a/src/love/shaders/RGBPallette.glsl b/src/love/shaders/RGBPallette.glsl index cc39da5b..a61e6c30 100644 --- a/src/love/shaders/RGBPallette.glsl +++ b/src/love/shaders/RGBPallette.glsl @@ -1,10 +1,9 @@ extern vec3 r; extern vec3 g; extern vec3 b; -extern float a = 1.0; extern float mult = 1.0; -vec4 effect(vec4 _, Image texture, vec2 texture_coords, vec2 screen_coords) +vec4 effect(vec4 color2, Image texture, vec2 texture_coords, vec2 screen_coords) { vec4 color = Texel(texture, texture_coords); @@ -14,7 +13,7 @@ vec4 effect(vec4 _, Image texture, vec2 texture_coords, vec2 screen_coords) vec4 newColor = color; newColor.rgb = min(color.r * r + color.g * g + color.b * b, vec3(1.0)); - newColor.a = color.a * a; + newColor.a = color.a * color2.a; color = mix(color, newColor, mult); diff --git a/src/love/weeks/test.lua b/src/love/weeks/test.lua index a6c15723..ed1035a1 100644 --- a/src/love/weeks/test.lua +++ b/src/love/weeks/test.lua @@ -49,7 +49,6 @@ return { else note.alpha = 0.7 end - note.shader:send("a", note.alpha) if note:getAnimName() == "hold" or note:getAnimName() == "end" then -- just remove it from boyfriendNotes[i] @@ -78,7 +77,6 @@ return { else note.alpha = 0.7 end - note.shader:send("a", note.alpha) if note:getAnimName() == "hold" or note:getAnimName() == "end" then -- just remove it from enemyNotes[i]