diff --git a/assets/shaders.json b/assets/shaders.json index 7600731..d451a60 100644 --- a/assets/shaders.json +++ b/assets/shaders.json @@ -7,11 +7,11 @@ "file_name": "assets/shaders/ui_error.frag", "type": "fragment" }, - "flame": { + "rayview_sprites": { "file_name": "assets/shaders/rayview_sprites.frag", "type": "fragment" }, - "rayview_sprites": { + "flame": { "file_name": "assets/shaders/flame_trash.frag", "type": "fragment" } diff --git a/assets/shaders/flame_trash.frag b/assets/shaders/flame_trash.frag index d1ce72e..efcceca 100644 --- a/assets/shaders/flame_trash.frag +++ b/assets/shaders/flame_trash.frag @@ -1,6 +1,6 @@ uniform vec2 u_resolution; uniform float u_time; -uniform sampler2D texture; +uniform sampler2D source; uniform float u_mouse; uniform float value = 0.2; @@ -69,9 +69,9 @@ void main() { color *= (f*f*f+0.5*f*f+0.6*f) * value; - vec4 pixel = texture2D(texture, gl_TexCoord[0].xy); + vec4 pixel = texture2D(source, gl_TexCoord[0].xy); float mask = color.r * pixel.a; - gl_FragColor = gl_Color * vec4(color, pixel.a) + pixel; + gl_FragColor = gl_Color * vec4(color, mask) + pixel; } diff --git a/combat_ui.cpp b/combat_ui.cpp index 9f03455..9849800 100644 --- a/combat_ui.cpp +++ b/combat_ui.cpp @@ -16,7 +16,7 @@ namespace gui { void CombatUI::make_button(std::string name, std::wstring label, Events::GUI event) { auto button = $gui.entity(name); $gui.set(button, {"leather_pouch-128"}); - // $gui.set(button, {}); + $gui.set(button, {}); $gui.set(button, {"ui_click"}); $gui.set