From 919d276f5e73c45f5b6e15680706f5026c975996 Mon Sep 17 00:00:00 2001 From: KingGurke Date: Mon, 2 Oct 2023 20:31:22 +0200 Subject: [PATCH] fixed being able to drive with options menu up, fixed brightness slider position --- src/game/levels/level_1.tscn | 6 +++--- src/game/levels/level_2.tscn | 8 ++++---- src/gui/menu/brightness.gd | 3 ++- src/gui/menu/options.tscn | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/game/levels/level_1.tscn b/src/game/levels/level_1.tscn index 44cceff..c00a96d 100644 --- a/src/game/levels/level_1.tscn +++ b/src/game/levels/level_1.tscn @@ -5,7 +5,7 @@ [ext_resource type="Texture2D" uid="uid://ds0un04pocx6i" path="res://assets/track_90_bk.png" id="3_en5wc"] [ext_resource type="Texture2D" uid="uid://dmcrms0qu0mtt" path="res://assets/finish2.png" id="4_qeube"] [ext_resource type="PackedScene" uid="uid://ckau5s2tsb3oc" path="res://src/game/player.tscn" id="5_2n8nj"] -[ext_resource type="PackedScene" uid="uid://dyo5dblkfivwn" path="res://src/gui/menu/level.tscn" id="6_hs25h"] +[ext_resource type="PackedScene" uid="uid://c0sexrwxdge73" path="res://src/gui/menu/level.tscn" id="6_hs25h"] [ext_resource type="PackedScene" uid="uid://cdlbh3smpgg42" path="res://src/gui/hud/hud.tscn" id="6_r1i0q"] [ext_resource type="Texture2D" uid="uid://bq151lkkfdlf4" path="res://assets/sign.png" id="7_xmahe"] [ext_resource type="AudioStream" uid="uid://dh5jxxwim7ra8" path="res://assets/sounds/music/death_by_waveshaper.wav" id="8_qlkhp"] @@ -24,7 +24,7 @@ path = NodePath("TrackPath") line = NodePath("TrackLine") player = NodePath("player") finish = NodePath("FinishLine") -menu = NodePath("CanvasLayer/menu_box/level") +menu = NodePath("CanvasLayer/menu_box") [node name="Background" type="TextureRect" parent="."] self_modulate = Color(0.827451, 0.521569, 0.313726, 1) @@ -66,6 +66,7 @@ brake_strength = 800.0 size_flags_horizontal = 3 [node name="menu_box" type="Control" parent="CanvasLayer"] +visible = false layout_mode = 3 anchors_preset = 8 anchor_left = 0.5 @@ -80,7 +81,6 @@ grow_horizontal = 2 grow_vertical = 2 [node name="level" parent="CanvasLayer/menu_box" instance=ExtResource("6_hs25h")] -visible = false layout_mode = 1 [node name="Node2D" type="Node2D" parent="."] diff --git a/src/game/levels/level_2.tscn b/src/game/levels/level_2.tscn index 51fa51f..bde6c25 100644 --- a/src/game/levels/level_2.tscn +++ b/src/game/levels/level_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://c4dloid4y3of3"] +[gd_scene load_steps=11 format=3 uid="uid://c4rvmgnixp6ap"] [ext_resource type="Script" path="res://src/game/levels/level.gd" id="1_ijrq0"] [ext_resource type="Texture2D" uid="uid://dio3rrptd6w7c" path="res://assets/bg_90_bk.png" id="2_tghpu"] @@ -6,9 +6,9 @@ [ext_resource type="Texture2D" uid="uid://dmcrms0qu0mtt" path="res://assets/finish2.png" id="4_1w2e5"] [ext_resource type="PackedScene" uid="uid://ckau5s2tsb3oc" path="res://src/game/player.tscn" id="5_4d0xw"] [ext_resource type="PackedScene" uid="uid://cdlbh3smpgg42" path="res://src/gui/hud/hud.tscn" id="6_tmqkf"] -[ext_resource type="PackedScene" uid="uid://dyo5dblkfivwn" path="res://src/gui/menu/level.tscn" id="7_bv3bp"] +[ext_resource type="PackedScene" uid="uid://c0sexrwxdge73" path="res://src/gui/menu/level.tscn" id="7_bv3bp"] [ext_resource type="AudioStream" uid="uid://dh5jxxwim7ra8" path="res://assets/sounds/music/death_by_waveshaper.wav" id="9_vi54e"] -[ext_resource type="PackedScene" uid="uid://ya1ctigi23wa" path="res://src/game/sign.tscn" id="10_q5p01"] +[ext_resource type="PackedScene" path="res://src/game/sign.tscn" id="10_q5p01"] [sub_resource type="Curve2D" id="Curve2D_ll8bj"] _data = { @@ -24,7 +24,7 @@ path = NodePath("TrackPath") line = NodePath("TrackLine") player = NodePath("player") finish = NodePath("FinishLine") -menu = NodePath("CanvasLayer/menu_box/level") +menu = NodePath("CanvasLayer/menu_box") [node name="Background" type="TextureRect" parent="."] self_modulate = Color(0.0313726, 0.737255, 0, 1) diff --git a/src/gui/menu/brightness.gd b/src/gui/menu/brightness.gd index 4da4354..5fb2c6b 100644 --- a/src/gui/menu/brightness.gd +++ b/src/gui/menu/brightness.gd @@ -1,6 +1,7 @@ extends HSlider - +func _ready(): + value = GlobalWorldEnvironment.environment.adjustment_brightness func _on_value_changed(value): print_debug("setting brightness to ", value) diff --git a/src/gui/menu/options.tscn b/src/gui/menu/options.tscn index b5ac2ca..0c6dae8 100644 --- a/src/gui/menu/options.tscn +++ b/src/gui/menu/options.tscn @@ -131,7 +131,7 @@ horizontal_alignment = 1 custom_minimum_size = Vector2(125, 0) layout_mode = 2 min_value = 0.01 -max_value = 4.0 +max_value = 2.0 step = 0.01 value = 1.0 script = ExtResource("4_gybdg")