From ac56eb0b476544b8f04a2fb3da936c88b980946f Mon Sep 17 00:00:00 2001 From: Luna Brovchuk Date: Mon, 2 Oct 2023 18:07:50 +0200 Subject: [PATCH] Test Disabling Outline --- res/shaders/outline.tres | 3 ++- src/models/player/player.gd | 3 ++- src/scripts/global.gd | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/res/shaders/outline.tres b/res/shaders/outline.tres index a1aac4e..b5b81af 100644 --- a/res/shaders/outline.tres +++ b/res/shaders/outline.tres @@ -1,7 +1,8 @@ [gd_resource type="Shader" format=2] [resource] -code = "shader_type canvas_item; +code = " +shader_type canvas_item; uniform vec4 color : hint_color = vec4(1.0); uniform float width : hint_range(0, 10) = 1.0; diff --git a/src/models/player/player.gd b/src/models/player/player.gd index 67d9e68..4466554 100644 --- a/src/models/player/player.gd +++ b/src/models/player/player.gd @@ -2,7 +2,8 @@ extends KinematicBody2D onready var fireball_preload = preload("res://src/models/fireball/Fireball.tscn") onready var bullet_preload = preload("res://src/models/bullet/Bullet.tscn") -var outline_material = load("res://res/shaders/outline_material.tres") +#var outline_material = load("res://res/shaders/outline_material.tres") +var outline_material = load("res://res/shaders/empty_material.tres") var speed_multiplier: float = 1.0 var invincibility_timer = .0 var velocity = Vector2.ZERO diff --git a/src/scripts/global.gd b/src/scripts/global.gd index 9bf2152..1e0788c 100644 --- a/src/scripts/global.gd +++ b/src/scripts/global.gd @@ -19,7 +19,7 @@ func add_health(amount): get_tree().get_root().get_node("Game/UIWrapper/UI/Left/Health/HealthSprite").frame = health if health == 0: playing = false - var animplayer = get_tree().get_root().get_node("Game/UIWrapper/Gameover/AnimationPlayer") + var animplayer = get_tree().get_root().get_node("Game/UIWrapper/UI/Gameover/AnimationPlayer") animplayer.play("gameover") yield(animplayer, "animation_finished") return_to_menu()