starting work on Main Menu, theming improvements

This commit is contained in:
betalars 2023-03-13 13:15:43 +01:00
parent bbad43efc1
commit b67ca9e328
12 changed files with 170 additions and 70 deletions

View File

@ -0,0 +1,16 @@
extends Node3D
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass
func start():
$PlayerController.active = true
$light_animation.play("light_up")
$AudioPlayer.play("intro")

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://balmcptv73l2j"
path="res://.godot/imported/menu_background.png-31b5c8bc1b37e18d4b34f07682d503f3.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://dev-util/menu_background.png"
dest_files=["res://.godot/imported/menu_background.png-31b5c8bc1b37e18d4b34f07682d503f3.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d3ewjumh0b0g6"
path="res://.godot/imported/logo.png-2a2bb67beae729051be0dd4ef4434919.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://logic-scenes/main menu/logo.png"
dest_files=["res://.godot/imported/logo.png-2a2bb67beae729051be0dd4ef4434919.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

View File

@ -31,6 +31,7 @@ var crouched:bool = false
func set_active(activate):
active = activate
if !is_inside_tree(): return
if activate:
camera.make_current()
@ -71,7 +72,8 @@ func _handle_movement(delta:float):
func _handle_rotation(delta:float):
var smoothness = 60/Engine.get_frames_per_second()
var input_speed = Vector2( Input.get_action_strength("look_right")-Input.get_action_strength("look_left"), Input.get_action_strength("look_down")-Input.get_action_strength("look_up")) * gamepad_response
#var input_speed = Vector2( Input.get_action_strength("look_right")-Input.get_action_strength("look_left"), Input.get_action_strength("look_down")-Input.get_action_strength("look_up")) * gamepad_response
var input_speed = Vector2()
if current_mouse_rotation.length()>0:
input_speed = current_mouse_rotation

View File

@ -112,7 +112,7 @@ script = ExtResource("1_0b4mi")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.22534, 0)
[node name="Pitch" type="Node3D" parent="Yaw"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.256493, 0)
transform = Transform3D(1, 0, 0, 0, 0.5, -0.866025, 0, 0.866025, 0.5, 0, 0.256493, 0)
[node name="Mount" type="Node3D" parent="Yaw/Pitch"]

View File

@ -1,64 +1,9 @@
[gd_scene load_steps=23 format=3 uid="uid://pct2mp6w5331"]
[gd_scene load_steps=10 format=3 uid="uid://cq2s8oa1ql28l"]
[ext_resource type="FontFile" uid="uid://4wx5nyeoy673" path="res://import/fonts/messy_handwriting.tres" id="1_4kpo1"]
[ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://logic-scenes/startup/start_frame.png" id="1_8giso"]
[ext_resource type="Texture2D" uid="uid://bm0bul7vyv88j" path="res://import/interface-elements/checked-mark.png" id="1_bbp4s"]
[ext_resource type="FontFile" uid="uid://cb66e4mqysgf8" path="res://import/fonts/title_handwriting.tres" id="1_ym10u"]
[ext_resource type="Texture2D" uid="uid://c7uwosetog3st" path="res://import/interface-elements/en-disabled-mark.png" id="2_3f8yi"]
[ext_resource type="Texture2D" uid="uid://csjta1nh077ad" path="res://import/interface-elements/unchecked-mark.png" id="2_onqn6"]
[ext_resource type="Theme" uid="uid://b056fn288p8ha" path="res://logic-scenes/themes/messy.theme" id="1_b01tw"]
[ext_resource type="Script" path="res://logic-scenes/startup/volume_sliders.gd" id="3_q2gbh"]
[ext_resource type="Texture2D" uid="uid://bwicl5q0lw06q" path="res://logic-scenes/startup/start_bottom.png" id="3_s5ssh"]
[ext_resource type="Texture2D" uid="uid://ci6tgs33nrnp7" path="res://import/interface-elements/disabled-mark.png" id="4_yy1g1"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5xeat"]
[sub_resource type="Gradient" id="Gradient_wsjl7"]
interpolation_mode = 2
offsets = PackedFloat32Array(0, 0.993266)
colors = PackedColorArray(0, 0, 0.372549, 1, 0.0627451, 0.054902, 0.133333, 1)
[sub_resource type="GradientTexture2D" id="GradientTexture2D_a7d4d"]
gradient = SubResource("Gradient_wsjl7")
fill = 1
fill_from = Vector2(0.649573, 0.74359)
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_prndt"]
texture = SubResource("GradientTexture2D_a7d4d")
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ns4mm"]
bg_color = Color(0.054902, 0.054902, 0.105882, 0.376471)
border_blend = true
corner_radius_top_left = 10
corner_radius_top_right = 10
corner_radius_bottom_right = 10
corner_radius_bottom_left = 10
shadow_color = Color(0, 0, 0.137255, 0.254902)
shadow_size = 40
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_67ngq"]
content_margin_left = 30.0
content_margin_top = 30.0
content_margin_right = 30.0
content_margin_bottom = 0.0
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_f1xwb"]
[sub_resource type="Theme" id="Theme_m5s0x"]
default_font = ExtResource("1_4kpo1")
default_font_size = 30
CheckBox/icons/checked = ExtResource("1_bbp4s")
CheckBox/icons/checked_disabled = ExtResource("2_3f8yi")
CheckBox/icons/unchecked = ExtResource("2_onqn6")
CheckBox/icons/unchecked_disabled = ExtResource("4_yy1g1")
HeaderLarge/font_sizes/font_size = 45
HeaderLarge/fonts/font = ExtResource("1_ym10u")
MarginContainer/constants/margin_bottom = 10
MarginContainer/constants/margin_left = 20
OptionButton/styles/normal = SubResource("StyleBoxFlat_5xeat")
Panel/styles/panel = SubResource("StyleBoxTexture_prndt")
PanelContainer/styles/panel = SubResource("StyleBoxFlat_ns4mm")
TabContainer/styles/panel = SubResource("StyleBoxEmpty_67ngq")
VSeparator/styles/separator = SubResource("StyleBoxEmpty_f1xwb")
[sub_resource type="GDScript" id="GDScript_8885d"]
script/source = "extends TabContainer
@ -100,7 +45,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme = SubResource("Theme_m5s0x")
theme = ExtResource("1_b01tw")
[node name="Label" type="Label" parent="."]
layout_mode = 1
@ -150,7 +95,6 @@ use_hidden_tabs_for_min_size = true
script = SubResource("GDScript_8885d")
[node name="physical Accessibility" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer"]
visible = false
layout_mode = 2
[node name="Label" type="Label" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer/physical Accessibility"]
@ -345,6 +289,7 @@ layout_mode = 2
text = "okay"
[node name="Content Notes" type="VBoxContainer" parent="CenterContainer/PanelContainer/VBoxContainer/TabContainer"]
visible = false
custom_minimum_size = Vector2(512, 0)
layout_mode = 2

Binary file not shown.

67
src/main.tscn Normal file
View File

@ -0,0 +1,67 @@
[gd_scene load_steps=7 format=3 uid="uid://befxf8uruwnrl"]
[ext_resource type="Texture2D" uid="uid://balmcptv73l2j" path="res://dev-util/menu_background.png" id="1_0oiki"]
[ext_resource type="PackedScene" uid="uid://cq2s8oa1ql28l" path="res://logic-scenes/startup/startup.tscn" id="1_v5rpm"]
[ext_resource type="PackedScene" uid="uid://b3b0gyvklqn50" path="res://base-environments/youth_room/youth_room.tscn" id="2_23ia3"]
[ext_resource type="Theme" uid="uid://b056fn288p8ha" path="res://logic-scenes/themes/messy.theme" id="3_8hrj7"]
[ext_resource type="Texture2D" uid="uid://d3ewjumh0b0g6" path="res://logic-scenes/main menu/logo.png" id="4_kslkj"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_njt06"]
[node name="root" type="Node3D"]
[node name="MenuBackground" type="TextureRect" parent="."]
visible = false
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("1_0oiki")
[node name="Startup Menu" parent="." instance=ExtResource("1_v5rpm")]
visible = false
[node name="Main Menu" type="Panel" parent="."]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme = ExtResource("3_8hrj7")
theme_override_styles/panel = SubResource("StyleBoxEmpty_njt06")
[node name="TextureRect" type="TextureRect" parent="Main Menu"]
layout_mode = 1
anchors_preset = 3
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -553.0
offset_top = -546.0
offset_right = 471.0
offset_bottom = 478.0
grow_horizontal = 0
grow_vertical = 0
scale = Vector2(0.5, 0.5)
texture = ExtResource("4_kslkj")
[node name="PanelContainer" type="PanelContainer" parent="Main Menu"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
grow_horizontal = 2
grow_vertical = 2
[node name="Button" type="Button" parent="Main Menu/PanelContainer"]
layout_mode = 2
text = "new Game"
[node name="youth room" parent="." instance=ExtResource("2_23ia3")]
[connection signal="pressed" from="Main Menu/PanelContainer/Button" to="Main Menu" method="hide"]
[connection signal="pressed" from="Main Menu/PanelContainer/Button" to="youth room" method="start"]

View File

@ -11,8 +11,9 @@ config_version=5
[application]
config/name="Frame of Mind"
run/main_scene="res://main.tscn"
config/features=PackedStringArray("4.0", "Forward Plus")
config/icon="res://icon.svg"
config/icon="res://icon.png"
[autoload]
@ -22,6 +23,7 @@ State="*res://singletons/global_state.gd"
window/size/viewport_width=1440
window/size/viewport_height=1080
window/size/mode=3
window/stretch/mode="canvas_items"
window/stretch/aspect="expand"