diff --git a/digibord_tools/godot/Tools/Calculator.tscn b/digibord_tools/godot/Tools/Calculator.tscn index 9bcd9f5..d68b065 100644 --- a/digibord_tools/godot/Tools/Calculator.tscn +++ b/digibord_tools/godot/Tools/Calculator.tscn @@ -7,182 +7,182 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -200.0 -margin_top = -150.0 -margin_right = 200.0 -margin_bottom = 250.0 -rect_min_size = Vector2( 400, 0 ) -custom_constants/vseparation = 10 -custom_constants/hseparation = 10 +offset_left = -200.0 +offset_top = -150.0 +offset_right = 200.0 +offset_bottom = 250.0 +custom_minimum_size = Vector2( 400, 0 ) +theme_override_constants/v_separation = 10 +theme_override_constants/h_separation = 10 columns = 4 [node name="ButtonGhost" type="Button" parent="NumPad"] -margin_right = 93.0 -margin_bottom = 72.0 +offset_right = 93.0 +offset_bottom = 72.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "X" [node name="ButtonPlusMin" type="Button" parent="NumPad"] -margin_left = 103.0 -margin_right = 196.0 -margin_bottom = 72.0 +offset_left = 103.0 +offset_right = 196.0 +offset_bottom = 72.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "+/-" [node name="ButtonPerc" type="Button" parent="NumPad"] -margin_left = 206.0 -margin_right = 298.0 -margin_bottom = 72.0 +offset_left = 206.0 +offset_right = 298.0 +offset_bottom = 72.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "%" [node name="ButtonDivide" type="Button" parent="NumPad"] -margin_left = 308.0 -margin_right = 400.0 -margin_bottom = 72.0 +offset_left = 308.0 +offset_right = 400.0 +offset_bottom = 72.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = ":" [node name="Button7" type="Button" parent="NumPad"] -margin_top = 82.0 -margin_right = 93.0 -margin_bottom = 154.0 +offset_top = 82.0 +offset_right = 93.0 +offset_bottom = 154.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "7" [node name="Button8" type="Button" parent="NumPad"] -margin_left = 103.0 -margin_top = 82.0 -margin_right = 196.0 -margin_bottom = 154.0 +offset_left = 103.0 +offset_top = 82.0 +offset_right = 196.0 +offset_bottom = 154.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "8" [node name="Button9" type="Button" parent="NumPad"] -margin_left = 206.0 -margin_top = 82.0 -margin_right = 298.0 -margin_bottom = 154.0 +offset_left = 206.0 +offset_top = 82.0 +offset_right = 298.0 +offset_bottom = 154.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "9" [node name="ButtonMultiply" type="Button" parent="NumPad"] -margin_left = 308.0 -margin_top = 82.0 -margin_right = 400.0 -margin_bottom = 154.0 +offset_left = 308.0 +offset_top = 82.0 +offset_right = 400.0 +offset_bottom = 154.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "x" [node name="Button4" type="Button" parent="NumPad"] -margin_top = 164.0 -margin_right = 93.0 -margin_bottom = 236.0 +offset_top = 164.0 +offset_right = 93.0 +offset_bottom = 236.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "4" [node name="Button5" type="Button" parent="NumPad"] -margin_left = 103.0 -margin_top = 164.0 -margin_right = 196.0 -margin_bottom = 236.0 +offset_left = 103.0 +offset_top = 164.0 +offset_right = 196.0 +offset_bottom = 236.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "5" [node name="Button6" type="Button" parent="NumPad"] -margin_left = 206.0 -margin_top = 164.0 -margin_right = 298.0 -margin_bottom = 236.0 +offset_left = 206.0 +offset_top = 164.0 +offset_right = 298.0 +offset_bottom = 236.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "6" [node name="ButtonMinus" type="Button" parent="NumPad"] -margin_left = 308.0 -margin_top = 164.0 -margin_right = 400.0 -margin_bottom = 236.0 +offset_left = 308.0 +offset_top = 164.0 +offset_right = 400.0 +offset_bottom = 236.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "-" [node name="Button1" type="Button" parent="NumPad"] -margin_top = 246.0 -margin_right = 93.0 -margin_bottom = 318.0 +offset_top = 246.0 +offset_right = 93.0 +offset_bottom = 318.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "1" [node name="Button2" type="Button" parent="NumPad"] -margin_left = 103.0 -margin_top = 246.0 -margin_right = 196.0 -margin_bottom = 318.0 +offset_left = 103.0 +offset_top = 246.0 +offset_right = 196.0 +offset_bottom = 318.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "2" [node name="Button3" type="Button" parent="NumPad"] -margin_left = 206.0 -margin_top = 246.0 -margin_right = 298.0 -margin_bottom = 318.0 +offset_left = 206.0 +offset_top = 246.0 +offset_right = 298.0 +offset_bottom = 318.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "3" [node name="ButtonPlus" type="Button" parent="NumPad"] -margin_left = 308.0 -margin_top = 246.0 -margin_right = 400.0 -margin_bottom = 318.0 +offset_left = 308.0 +offset_top = 246.0 +offset_right = 400.0 +offset_bottom = 318.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "+" [node name="ButtonAC" type="Button" parent="NumPad"] -margin_top = 328.0 -margin_right = 93.0 -margin_bottom = 400.0 +offset_top = 328.0 +offset_right = 93.0 +offset_bottom = 400.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "AC" [node name="Button0" type="Button" parent="NumPad"] -margin_left = 103.0 -margin_top = 328.0 -margin_right = 196.0 -margin_bottom = 400.0 +offset_left = 103.0 +offset_top = 328.0 +offset_right = 196.0 +offset_bottom = 400.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "0" [node name="ButtonDot" type="Button" parent="NumPad"] -margin_left = 206.0 -margin_top = 328.0 -margin_right = 298.0 -margin_bottom = 400.0 +offset_left = 206.0 +offset_top = 328.0 +offset_right = 298.0 +offset_bottom = 400.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "." [node name="ButtonEquals" type="Button" parent="NumPad"] -margin_left = 308.0 -margin_top = 328.0 -margin_right = 400.0 -margin_bottom = 400.0 +offset_left = 308.0 +offset_top = 328.0 +offset_right = 400.0 +offset_bottom = 400.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "=" @@ -190,10 +190,10 @@ text = "=" [node name="PrintoutArea" type="Control" parent="."] anchor_left = 0.5 anchor_right = 0.5 -margin_left = -200.0 -margin_top = 55.0 -margin_right = 200.0 -margin_bottom = 135.0 +offset_left = -200.0 +offset_top = 55.0 +offset_right = 200.0 +offset_bottom = 135.0 [node name="ColorRect" type="ColorRect" parent="PrintoutArea"] anchor_right = 1.0 @@ -203,10 +203,10 @@ color = Color( 0.0509804, 0.0313726, 0.286275, 1 ) [node name="NumberLine" type="Label" parent="PrintoutArea"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 5.0 -margin_top = 5.0 -margin_right = -5.0 -margin_bottom = -5.0 +offset_left = 5.0 +offset_top = 5.0 +offset_right = -5.0 +offset_bottom = -5.0 text = "1234" align = 2 uppercase = true diff --git a/digibord_tools/godot/Tools/Dice.gd b/digibord_tools/godot/Tools/Dice.gd index 76cb2ce..9b7a8ec 100644 --- a/digibord_tools/godot/Tools/Dice.gd +++ b/digibord_tools/godot/Tools/Dice.gd @@ -1,7 +1,7 @@ extends Button -onready var dice_label_one = get_node("../DiceLabelOne") +@onready var dice_label_one = get_node("../DiceLabelOne") var dice_print_value = 0 var rng = RandomNumberGenerator.new() diff --git a/digibord_tools/godot/Tools/Dice.tscn b/digibord_tools/godot/Tools/Dice.tscn index 468d80f..f335921 100644 --- a/digibord_tools/godot/Tools/Dice.tscn +++ b/digibord_tools/godot/Tools/Dice.tscn @@ -9,18 +9,18 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -18.0 -margin_top = -10.0 -margin_right = 18.0 -margin_bottom = 10.0 +offset_left = -18.0 +offset_top = -10.0 +offset_right = 18.0 +offset_bottom = 10.0 text = "Roll" script = ExtResource( 1 ) [node name="DiceLabelOne" type="Label" parent="."] -margin_left = 507.0 -margin_top = 260.0 -margin_right = 547.0 -margin_bottom = 274.0 +offset_left = 507.0 +offset_top = 260.0 +offset_right = 547.0 +offset_bottom = 274.0 text = "6" [connection signal="pressed" from="ButtonRoll" to="ButtonRoll" method="_on_ButtonRoll_pressed"] diff --git a/digibord_tools/godot/default_env.tres b/digibord_tools/godot/default_env.tres index 20207a4..a62c784 100644 --- a/digibord_tools/godot/default_env.tres +++ b/digibord_tools/godot/default_env.tres @@ -1,7 +1,7 @@ -[gd_resource type="Environment" load_steps=2 format=2] +[gd_resource type="Environment" load_steps=2 format=3 uid="uid://vsbbdbf8fi82"] -[sub_resource type="ProceduralSky" id=1] +[sub_resource type="Sky" id="1"] [resource] background_mode = 2 -background_sky = SubResource( 1 ) +sky = SubResource("1") diff --git a/digibord_tools/godot/icon.png.import b/digibord_tools/godot/icon.png.import index a4c02e6..d6c3cb2 100644 --- a/digibord_tools/godot/icon.png.import +++ b/digibord_tools/godot/icon.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +type="CompressedTexture2D" +uid="uid://b7aj111rcsa8o" +path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] +dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/digibord_tools/godot/main_buttons.gd b/digibord_tools/godot/main_buttons.gd index 4ce1329..5efce21 100644 --- a/digibord_tools/godot/main_buttons.gd +++ b/digibord_tools/godot/main_buttons.gd @@ -1,9 +1,9 @@ extends Button -onready var start_screen = get_node("../..") -onready var calculator_screen = get_node("../../CalculatorScreen") -onready var dice_screen = get_node("../../DiceScreen") +@onready var start_screen = get_node("../..") +@onready var calculator_screen = get_node("../../CalculatorScreen") +@onready var dice_screen = get_node("../../DiceScreen") # Called when the node enters the scene tree for the first time. diff --git a/digibord_tools/godot/project.godot b/digibord_tools/godot/project.godot index 8cdc982..1d5d5c2 100644 --- a/digibord_tools/godot/project.godot +++ b/digibord_tools/godot/project.godot @@ -6,12 +6,13 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=4 +config_version=5 [application] config/name="Digibord Tools" run/main_scene="res://startup.tscn" +config/features=PackedStringArray("4.0") config/icon="res://icon.png" [display] @@ -29,4 +30,4 @@ common/enable_pause_aware_picking=true [rendering] -environment/default_environment="res://default_env.tres" +environment/defaults/default_environment="res://default_env.tres" diff --git a/digibord_tools/godot/startup.tscn b/digibord_tools/godot/startup.tscn index 73b27c2..2e2430a 100644 --- a/digibord_tools/godot/startup.tscn +++ b/digibord_tools/godot/startup.tscn @@ -1,110 +1,88 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=6 format=3 uid="uid://cfl44pq56f8ht"] -[ext_resource path="res://Tools/Calculator.tscn" type="PackedScene" id=1] -[ext_resource path="res://startup.gd" type="Script" id=2] -[ext_resource path="res://main_buttons.gd" type="Script" id=3] -[ext_resource path="res://Tools/Dice.tscn" type="PackedScene" id=4] +[ext_resource type="PackedScene" path="res://Tools/Calculator.tscn" id="1"] +[ext_resource type="Script" path="res://startup.gd" id="2"] +[ext_resource type="Script" path="res://main_buttons.gd" id="3"] +[ext_resource type="PackedScene" path="res://Tools/Dice.tscn" id="4"] -[sub_resource type="Theme" id=1] +[sub_resource type="Theme" id="1"] [node name="StartupScreen" type="CanvasLayer"] -script = ExtResource( 2 ) +script = ExtResource("2") [node name="GridContainer" type="GridContainer" parent="."] +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 60.0 -theme = SubResource( 1 ) -custom_constants/vseparation = 10 -custom_constants/hseparation = 10 +offset_top = 60.0 +theme = SubResource("1") +theme_override_constants/h_separation = 10 +theme_override_constants/v_separation = 10 columns = 2 [node name="ButtonHangman" type="Button" parent="GridContainer"] -margin_right = 507.0 -margin_bottom = 100.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Hangman" [node name="ButtonCalculator" type="Button" parent="GridContainer"] -margin_left = 517.0 -margin_right = 1024.0 -margin_bottom = 100.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Calculator" -script = ExtResource( 3 ) +script = ExtResource("3") [node name="ButtonClock" type="Button" parent="GridContainer"] -margin_top = 110.0 -margin_right = 507.0 -margin_bottom = 210.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Clock" [node name="ButtonTimer" type="Button" parent="GridContainer"] -margin_left = 517.0 -margin_top = 110.0 -margin_right = 1024.0 -margin_bottom = 210.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Timer" [node name="ButtonFractions" type="Button" parent="GridContainer"] -margin_top = 220.0 -margin_right = 507.0 -margin_bottom = 320.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Fractions" [node name="ButtonMultiplications" type="Button" parent="GridContainer"] -margin_left = 517.0 -margin_top = 220.0 -margin_right = 1024.0 -margin_bottom = 320.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Multiplications" [node name="ButtonBirthday" type="Button" parent="GridContainer"] -margin_top = 330.0 -margin_right = 507.0 -margin_bottom = 430.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Birthday" [node name="ButtonDice" type="Button" parent="GridContainer"] -margin_left = 517.0 -margin_top = 330.0 -margin_right = 1024.0 -margin_bottom = 430.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Dice" [node name="ButtonTimeOuts" type="Button" parent="GridContainer"] -margin_top = 440.0 -margin_right = 507.0 -margin_bottom = 540.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 text = "TimeOuts!" [node name="ButtonDaily" type="Button" parent="GridContainer"] -margin_left = 517.0 -margin_top = 440.0 -margin_right = 1024.0 -margin_bottom = 540.0 +layout_mode = 2 text = "Daily Inspiration" -[node name="CalculatorScreen" parent="." instance=ExtResource( 1 )] +[node name="CalculatorScreen" parent="." instance=ExtResource("1")] visible = false -[node name="DiceScreen" parent="." instance=ExtResource( 4 )] +[node name="DiceScreen" parent="." instance=ExtResource("4")] visible = false [connection signal="pressed" from="GridContainer/ButtonCalculator" to="GridContainer/ButtonCalculator" method="_on_ButtonCalculator_pressed"] diff --git a/education_philosophy/default_env.tres b/education_philosophy/default_env.tres index 20207a4..10eadf2 100644 --- a/education_philosophy/default_env.tres +++ b/education_philosophy/default_env.tres @@ -1,7 +1,7 @@ -[gd_resource type="Environment" load_steps=2 format=2] +[gd_resource type="Environment" load_steps=2 format=3 uid="uid://cux7k4grn3xq"] -[sub_resource type="ProceduralSky" id=1] +[sub_resource type="Sky" id="1"] [resource] background_mode = 2 -background_sky = SubResource( 1 ) +sky = SubResource("1") diff --git a/education_philosophy/icon.png.import b/education_philosophy/icon.png.import index a4c02e6..d55ee1e 100644 --- a/education_philosophy/icon.png.import +++ b/education_philosophy/icon.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +type="CompressedTexture2D" +uid="uid://bcev0gdbpeda" +path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] +dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/education_philosophy/main_screen.tscn b/education_philosophy/main_screen.tscn index 20e93bd..5b0a972 100644 --- a/education_philosophy/main_screen.tscn +++ b/education_philosophy/main_screen.tscn @@ -1,3 +1,3 @@ -[gd_scene format=2] +[gd_scene format=3 uid="uid://boebwdnq06hp2"] [node name="CanvasLayer" type="CanvasLayer"] diff --git a/education_philosophy/project.godot b/education_philosophy/project.godot index c927ff4..255fbe5 100644 --- a/education_philosophy/project.godot +++ b/education_philosophy/project.godot @@ -6,12 +6,13 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=4 +config_version=5 [application] config/name="Education Philosophy" run/main_scene="res://main_screen.tscn" +config/features=PackedStringArray("4.0") config/icon="res://icon.png" [gui] @@ -24,4 +25,4 @@ common/enable_pause_aware_picking=true [rendering] -environment/default_environment="res://default_env.tres" +environment/defaults/default_environment="res://default_env.tres" diff --git a/kellett_screen_starter/AvenirLTStd-Medium.otf.import b/kellett_screen_starter/AvenirLTStd-Medium.otf.import new file mode 100644 index 0000000..133c33a --- /dev/null +++ b/kellett_screen_starter/AvenirLTStd-Medium.otf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://dgol18pnn3d7c" +path="res://.godot/imported/AvenirLTStd-Medium.otf-1b7d83c1861d42cdde4d966a0d89de47.fontdata" + +[deps] + +source_file="res://AvenirLTStd-Medium.otf" +dest_files=["res://.godot/imported/AvenirLTStd-Medium.otf-1b7d83c1861d42cdde4d966a0d89de47.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/KellettDragon_Red_On_Blue.png.import b/kellett_screen_starter/KellettDragon_Red_On_Blue.png.import index 567aef4..f01f57e 100644 --- a/kellett_screen_starter/KellettDragon_Red_On_Blue.png.import +++ b/kellett_screen_starter/KellettDragon_Red_On_Blue.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/KellettDragon_Red_On_Blue.png-51426dc98c823608e52a2f67dd39df02.stex" +type="CompressedTexture2D" +uid="uid://cnbw6prptb6qh" +path="res://.godot/imported/KellettDragon_Red_On_Blue.png-51426dc98c823608e52a2f67dd39df02.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://KellettDragon_Red_On_Blue.png" -dest_files=[ "res://.import/KellettDragon_Red_On_Blue.png-51426dc98c823608e52a2f67dd39df02.stex" ] +dest_files=["res://.godot/imported/KellettDragon_Red_On_Blue.png-51426dc98c823608e52a2f67dd39df02.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/Settings.gd b/kellett_screen_starter/Settings.gd index 8e31207..c20ea03 100644 --- a/kellett_screen_starter/Settings.gd +++ b/kellett_screen_starter/Settings.gd @@ -1,21 +1,21 @@ extends Control -onready var mist_shader = get_node("%Mist") -onready var mood_light = get_node("%MoodLight") +@onready var mist_shader = get_node("%Mist") +@onready var mood_light = get_node("%MoodLight") -onready var line_text = get_node("%LineEdit") -onready var settings_menu = get_node("%Settings") -onready var center_text = get_node("%CenterText") -onready var settings_button = get_node("%SettingsButton") +@onready var line_text = get_node("%LineEdit") +@onready var settings_menu = get_node("%Settings") +@onready var center_text = get_node("%CenterText") +@onready var settings_button = get_node("%SettingsButton") -var dynamic_font = DynamicFont.new() +var dynamic_font = FontFile.new() # Called when the node enters the scene tree for the first time. func _ready() -> void: line_text.text = "This presentation will begin shortly" dynamic_font.font_data = load("res://futura_font/FutuBk.ttf") - dynamic_font.size = 64 - center_text.set("custom_fonts/font", dynamic_font) +# dynamic_font.size = 64 + center_text.set("theme_override_fonts/font", dynamic_font) # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/kellett_screen_starter/cog_dark.png.import b/kellett_screen_starter/cog_dark.png.import index 11806cd..5fb886b 100644 --- a/kellett_screen_starter/cog_dark.png.import +++ b/kellett_screen_starter/cog_dark.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/cog_dark.png-2d4b396663fbc1c8c3e214d7ab6ccf09.stex" +type="CompressedTexture2D" +uid="uid://c0788q07tdkho" +path="res://.godot/imported/cog_dark.png-2d4b396663fbc1c8c3e214d7ab6ccf09.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://cog_dark.png" -dest_files=[ "res://.import/cog_dark.png-2d4b396663fbc1c8c3e214d7ab6ccf09.stex" ] +dest_files=["res://.godot/imported/cog_dark.png-2d4b396663fbc1c8c3e214d7ab6ccf09.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/cross_white.png.import b/kellett_screen_starter/cross_white.png.import index ae0e59b..e7c45e0 100644 --- a/kellett_screen_starter/cross_white.png.import +++ b/kellett_screen_starter/cross_white.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/cross_white.png-5664ce5691ea16a47e00bbed0786d053.stex" +type="CompressedTexture2D" +uid="uid://bw1lwbxvmb68b" +path="res://.godot/imported/cross_white.png-5664ce5691ea16a47e00bbed0786d053.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://cross_white.png" -dest_files=[ "res://.import/cross_white.png-5664ce5691ea16a47e00bbed0786d053.stex" ] +dest_files=["res://.godot/imported/cross_white.png-5664ce5691ea16a47e00bbed0786d053.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/default_env.tres b/kellett_screen_starter/default_env.tres index 20207a4..7508142 100644 --- a/kellett_screen_starter/default_env.tres +++ b/kellett_screen_starter/default_env.tres @@ -1,7 +1,7 @@ -[gd_resource type="Environment" load_steps=2 format=2] +[gd_resource type="Environment" load_steps=2 format=3 uid="uid://pg5ktjepvho4"] -[sub_resource type="ProceduralSky" id=1] +[sub_resource type="Sky" id="1"] [resource] background_mode = 2 -background_sky = SubResource( 1 ) +sky = SubResource("1") diff --git a/kellett_screen_starter/futura_font/FUTURAB.TTF.import b/kellett_screen_starter/futura_font/FUTURAB.TTF.import new file mode 100644 index 0000000..ee326a1 --- /dev/null +++ b/kellett_screen_starter/futura_font/FUTURAB.TTF.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://cxly1yijhc5ap" +path="res://.godot/imported/FUTURAB.TTF-2f0491066663946ee4eb8ffa7a681e18.fontdata" + +[deps] + +source_file="res://futura_font/FUTURAB.TTF" +dest_files=["res://.godot/imported/FUTURAB.TTF-2f0491066663946ee4eb8ffa7a681e18.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FUTURAN.TTF.import b/kellett_screen_starter/futura_font/FUTURAN.TTF.import new file mode 100644 index 0000000..4a39850 --- /dev/null +++ b/kellett_screen_starter/futura_font/FUTURAN.TTF.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://b50rbpmbp31py" +path="res://.godot/imported/FUTURAN.TTF-3cc1c3934ce8942f366c3afd2aeec193.fontdata" + +[deps] + +source_file="res://futura_font/FUTURAN.TTF" +dest_files=["res://.godot/imported/FUTURAN.TTF-3cc1c3934ce8942f366c3afd2aeec193.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FutuBk.ttf.import b/kellett_screen_starter/futura_font/FutuBk.ttf.import new file mode 100644 index 0000000..45732b7 --- /dev/null +++ b/kellett_screen_starter/futura_font/FutuBk.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://y2c1b01why6e" +path="res://.godot/imported/FutuBk.ttf-84e3efeeeb0e204a5c81e70869cb99a5.fontdata" + +[deps] + +source_file="res://futura_font/FutuBk.ttf" +dest_files=["res://.godot/imported/FutuBk.ttf-84e3efeeeb0e204a5c81e70869cb99a5.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FutuBkIt.ttf.import b/kellett_screen_starter/futura_font/FutuBkIt.ttf.import new file mode 100644 index 0000000..846d78e --- /dev/null +++ b/kellett_screen_starter/futura_font/FutuBkIt.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bcfekpdy8oc3" +path="res://.godot/imported/FutuBkIt.ttf-8160c68c2df5e96691253cc34665b52b.fontdata" + +[deps] + +source_file="res://futura_font/FutuBkIt.ttf" +dest_files=["res://.godot/imported/FutuBkIt.ttf-8160c68c2df5e96691253cc34665b52b.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FutuMdIt.ttf.import b/kellett_screen_starter/futura_font/FutuMdIt.ttf.import new file mode 100644 index 0000000..6f5c846 --- /dev/null +++ b/kellett_screen_starter/futura_font/FutuMdIt.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://c8dyj42iyauiv" +path="res://.godot/imported/FutuMdIt.ttf-414aa792aef49d65d86b5e6230bad3ed.fontdata" + +[deps] + +source_file="res://futura_font/FutuMdIt.ttf" +dest_files=["res://.godot/imported/FutuMdIt.ttf-414aa792aef49d65d86b5e6230bad3ed.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FuturaBoldBT.ttf.import b/kellett_screen_starter/futura_font/FuturaBoldBT.ttf.import new file mode 100644 index 0000000..8331ab1 --- /dev/null +++ b/kellett_screen_starter/futura_font/FuturaBoldBT.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://dbr1xnimkg48c" +path="res://.godot/imported/FuturaBoldBT.ttf-55d53e37e9e9a4b6aedd8ea2a9e48d89.fontdata" + +[deps] + +source_file="res://futura_font/FuturaBoldBT.ttf" +dest_files=["res://.godot/imported/FuturaBoldBT.ttf-55d53e37e9e9a4b6aedd8ea2a9e48d89.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FuturaBoldItalicBT.ttf.import b/kellett_screen_starter/futura_font/FuturaBoldItalicBT.ttf.import new file mode 100644 index 0000000..d9ebe9c --- /dev/null +++ b/kellett_screen_starter/futura_font/FuturaBoldItalicBT.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://3i7xalsvvv7j" +path="res://.godot/imported/FuturaBoldItalicBT.ttf-a1071065eda3442a6eaa12fc3aae1f3c.fontdata" + +[deps] + +source_file="res://futura_font/FuturaBoldItalicBT.ttf" +dest_files=["res://.godot/imported/FuturaBoldItalicBT.ttf-a1071065eda3442a6eaa12fc3aae1f3c.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FuturaBookBT.ttf.import b/kellett_screen_starter/futura_font/FuturaBookBT.ttf.import new file mode 100644 index 0000000..2e33c32 --- /dev/null +++ b/kellett_screen_starter/futura_font/FuturaBookBT.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://j6vhijt16jgm" +path="res://.godot/imported/FuturaBookBT.ttf-0536979540c878760b958c0cb17f2863.fontdata" + +[deps] + +source_file="res://futura_font/FuturaBookBT.ttf" +dest_files=["res://.godot/imported/FuturaBookBT.ttf-0536979540c878760b958c0cb17f2863.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/FuturaBookItalicBT.ttf.import b/kellett_screen_starter/futura_font/FuturaBookItalicBT.ttf.import new file mode 100644 index 0000000..6c1346f --- /dev/null +++ b/kellett_screen_starter/futura_font/FuturaBookItalicBT.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://dn7o0k2fjxnmr" +path="res://.godot/imported/FuturaBookItalicBT.ttf-bebd248ac52754af7a6056dcd2f43e6d.fontdata" + +[deps] + +source_file="res://futura_font/FuturaBookItalicBT.ttf" +dest_files=["res://.godot/imported/FuturaBookItalicBT.ttf-bebd248ac52754af7a6056dcd2f43e6d.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/futura_font/Futura_20Medium_20BT.ttf.import b/kellett_screen_starter/futura_font/Futura_20Medium_20BT.ttf.import new file mode 100644 index 0000000..de1f58c --- /dev/null +++ b/kellett_screen_starter/futura_font/Futura_20Medium_20BT.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bnev27po303np" +path="res://.godot/imported/Futura_20Medium_20BT.ttf-1120a44815aa40622df6d09ef7731dc6.fontdata" + +[deps] + +source_file="res://futura_font/Futura_20Medium_20BT.ttf" +dest_files=["res://.godot/imported/Futura_20Medium_20BT.ttf-1120a44815aa40622df6d09ef7731dc6.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/kellett_screen_starter/icon.png.import b/kellett_screen_starter/icon.png.import index a4c02e6..1a8558e 100644 --- a/kellett_screen_starter/icon.png.import +++ b/kellett_screen_starter/icon.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +type="CompressedTexture2D" +uid="uid://brlt0tt3tjusx" +path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] +dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/kellett_app.tres b/kellett_screen_starter/kellett_app.tres index 51d90b1..7f769c2 100644 --- a/kellett_screen_starter/kellett_app.tres +++ b/kellett_screen_starter/kellett_app.tres @@ -1,41 +1,65 @@ -[gd_resource type="Theme" load_steps=5 format=2] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://xg5fa2cs6b84"] -[ext_resource path="res://AvenirLTStd-Medium.otf" type="DynamicFontData" id=1] +[ext_resource type="FontFile" uid="uid://dgol18pnn3d7c" path="res://AvenirLTStd-Medium.otf" id="1"] -[sub_resource type="DynamicFont" id=1] -size = 25 -font_data = ExtResource( 1 ) +[sub_resource type="FontFile" id="1"] +fallbacks = Array[Font]([ExtResource("1")]) +face_index = null +embolden = null +transform = null +cache/0/16/0/ascent = 0.0 +cache/0/16/0/descent = 0.0 +cache/0/16/0/underline_position = 0.0 +cache/0/16/0/underline_thickness = 0.0 +cache/0/16/0/scale = 1.0 +cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) -[sub_resource type="DynamicFont" id=3] -size = 25 -font_data = ExtResource( 1 ) +[sub_resource type="FontFile" id="3"] +fallbacks = Array[Font]([ExtResource("1")]) +face_index = null +embolden = null +transform = null +cache/0/16/0/ascent = 0.0 +cache/0/16/0/descent = 0.0 +cache/0/16/0/underline_position = 0.0 +cache/0/16/0/underline_thickness = 0.0 +cache/0/16/0/scale = 1.0 +cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) -[sub_resource type="DynamicFont" id=2] -size = 25 -font_data = ExtResource( 1 ) +[sub_resource type="FontFile" id="2"] +fallbacks = Array[Font]([ExtResource("1")]) +face_index = null +embolden = null +transform = null +cache/0/16/0/ascent = 0.0 +cache/0/16/0/descent = 0.0 +cache/0/16/0/underline_position = 0.0 +cache/0/16/0/underline_thickness = 0.0 +cache/0/16/0/scale = 1.0 +cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [resource] -Button/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) -Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) -Button/colors/font_color_focus = Color( 0.94, 0.94, 0.94, 1 ) -Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) -Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/colors/font_color = Color(0.88, 0.88, 0.88, 1) +Button/colors/font_color_disabled = Color(0.9, 0.9, 0.9, 0.2) +Button/colors/font_color_focus = Color(0.94, 0.94, 0.94, 1) +Button/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1) +Button/colors/font_color_pressed = Color(1, 1, 1, 1) Button/constants/hseparation = 2 -Button/fonts/font = SubResource( 1 ) +Button/fonts/font = SubResource("1") Button/styles/disabled = null Button/styles/focus = null Button/styles/hover = null Button/styles/normal = null Button/styles/pressed = null -CheckBox/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) -CheckBox/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) -CheckBox/colors/font_color_focus = Color( 0.94, 0.94, 0.94, 1 ) -CheckBox/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) -CheckBox/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 ) -CheckBox/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +CheckBox/colors/font_color = Color(0.88, 0.88, 0.88, 1) +CheckBox/colors/font_color_disabled = Color(0.9, 0.9, 0.9, 0.2) +CheckBox/colors/font_color_focus = Color(0.94, 0.94, 0.94, 1) +CheckBox/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1) +CheckBox/colors/font_color_hover_pressed = Color(1, 1, 1, 1) +CheckBox/colors/font_color_pressed = Color(1, 1, 1, 1) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = SubResource( 3 ) +CheckBox/fonts/font = SubResource("3") CheckBox/icons/checked = null CheckBox/icons/checked_disabled = null CheckBox/icons/radio_checked = null @@ -50,15 +74,15 @@ CheckBox/styles/hover = null CheckBox/styles/hover_pressed = null CheckBox/styles/normal = null CheckBox/styles/pressed = null -LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) -LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) -LineEdit/colors/cursor_color = Color( 0.94, 0.94, 0.94, 1 ) -LineEdit/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) -LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) -LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 ) -LineEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) +LineEdit/colors/clear_button_color = Color(0.88, 0.88, 0.88, 1) +LineEdit/colors/clear_button_color_pressed = Color(1, 1, 1, 1) +LineEdit/colors/cursor_color = Color(0.94, 0.94, 0.94, 1) +LineEdit/colors/font_color = Color(0.88, 0.88, 0.88, 1) +LineEdit/colors/font_color_selected = Color(0, 0, 0, 1) +LineEdit/colors/font_color_uneditable = Color(0.88, 0.88, 0.88, 0.5) +LineEdit/colors/selection_color = Color(0.49, 0.49, 0.49, 1) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = SubResource( 2 ) +LineEdit/fonts/font = SubResource("2") LineEdit/icons/clear = null LineEdit/styles/focus = null LineEdit/styles/normal = null diff --git a/kellett_screen_starter/light.png.import b/kellett_screen_starter/light.png.import index c21fa21..cf83177 100644 --- a/kellett_screen_starter/light.png.import +++ b/kellett_screen_starter/light.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/light.png-06e94102f0cce323cff7daad56cf3030.stex" +type="CompressedTexture2D" +uid="uid://dhmnsneg55cwp" +path="res://.godot/imported/light.png-06e94102f0cce323cff7daad56cf3030.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://light.png" -dest_files=[ "res://.import/light.png-06e94102f0cce323cff7daad56cf3030.stex" ] +dest_files=["res://.godot/imported/light.png-06e94102f0cce323cff7daad56cf3030.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/logo.png.import b/kellett_screen_starter/logo.png.import index 43df7a6..d89a907 100644 --- a/kellett_screen_starter/logo.png.import +++ b/kellett_screen_starter/logo.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/logo.png-cca8726399059c8d4f806e28e356b14d.stex" +type="CompressedTexture2D" +uid="uid://balnxkh0yqsnp" +path="res://.godot/imported/logo.png-cca8726399059c8d4f806e28e356b14d.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://logo.png" -dest_files=[ "res://.import/logo.png-cca8726399059c8d4f806e28e356b14d.stex" ] +dest_files=["res://.godot/imported/logo.png-cca8726399059c8d4f806e28e356b14d.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/main_scene.tscn b/kellett_screen_starter/main_scene.tscn index 4308fa0..ddac8e1 100644 --- a/kellett_screen_starter/main_scene.tscn +++ b/kellett_screen_starter/main_scene.tscn @@ -1,177 +1,186 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=9 format=3 uid="uid://cfpxwxgjjgaim"] -[ext_resource path="res://KellettDragon_Red_On_Blue.png" type="Texture" id=1] -[ext_resource path="res://fog.gdshader" type="Shader" id=3] -[ext_resource path="res://noun-cog-1471544.png" type="Texture" id=4] -[ext_resource path="res://kellett_app.tres" type="Theme" id=5] -[ext_resource path="res://noun-cross-1707162.png" type="Texture" id=6] -[ext_resource path="res://Settings.gd" type="Script" id=7] -[ext_resource path="res://light.png" type="Texture" id=8] +[ext_resource type="Texture2D" uid="uid://cnbw6prptb6qh" path="res://KellettDragon_Red_On_Blue.png" id="1"] +[ext_resource type="Shader" path="res://fog.gdshader" id="3"] +[ext_resource type="Texture2D" uid="uid://1ngc0sjng4uv" path="res://noun-cog-1471544.png" id="4"] +[ext_resource type="Theme" uid="uid://xg5fa2cs6b84" path="res://kellett_app.tres" id="5"] +[ext_resource type="Texture2D" uid="uid://kdtf0qo5o30x" path="res://noun-cross-1707162.png" id="6"] +[ext_resource type="Script" path="res://Settings.gd" id="7"] +[ext_resource type="Texture2D" uid="uid://dhmnsneg55cwp" path="res://light.png" id="8"] -[sub_resource type="ShaderMaterial" id=3] -shader = ExtResource( 3 ) -shader_param/color = Vector3( 0.35, 0.48, 0.95 ) -shader_param/OCTAVES = 4 +[sub_resource type="ShaderMaterial" id="3"] +shader = ExtResource("3") +shader_parameter/color = Vector3(0.35, 0.48, 0.95) +shader_parameter/OCTAVES = 4 [node name="KellettPresentation" type="Node2D"] -[node name="KellettDragonRedOnBlue" type="Sprite" parent="."] -position = Vector2( 639.8, 434.3 ) -scale = Vector2( 0.631055, 0.628613 ) -texture = ExtResource( 1 ) +[node name="KellettDragonRedOnBlue" type="Sprite2D" parent="."] +position = Vector2(639.8, 434.3) +scale = Vector2(0.631055, 0.628613) +texture = ExtResource("1") -[node name="MoodLight" type="Light2D" parent="."] +[node name="MoodLight" type="PointLight2D" parent="."] unique_name_in_owner = true visible = false show_behind_parent = true -position = Vector2( 634, 360 ) -scale = Vector2( 637.969, 95.4781 ) -texture = ExtResource( 8 ) -texture_scale = 0.01 +position = Vector2(634, 360) +scale = Vector2(637.969, 95.4781) energy = 0.95 shadow_enabled = true -shadow_color = Color( 1, 1, 1, 0 ) +shadow_color = Color(1, 1, 1, 0) +texture = ExtResource("8") +texture_scale = 0.01 [node name="CanvasLayer" type="CanvasLayer" parent="."] [node name="Mist" type="ColorRect" parent="CanvasLayer"] unique_name_in_owner = true -material = SubResource( 3 ) +material = SubResource("3") +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 [node name="CenterText" type="Label" parent="CanvasLayer"] unique_name_in_owner = true +anchors_preset = 14 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -margin_top = -29.0 -margin_bottom = 29.0 +offset_top = -29.0 +offset_bottom = 29.0 text = "This presentation will begin shortly" -align = 1 [node name="SettingsButton" type="TextureButton" parent="CanvasLayer"] unique_name_in_owner = true +anchors_preset = 3 anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -26.0 -margin_top = -26.0 -margin_right = 1174.0 -margin_bottom = 1174.0 -rect_scale = Vector2( 0.02, 0.02 ) -texture_normal = ExtResource( 4 ) +offset_left = -26.0 +offset_top = -26.0 +offset_right = 1174.0 +offset_bottom = 1174.0 +scale = Vector2(0.02, 0.02) +texture_normal = ExtResource("4") [node name="Settings" type="Control" parent="CanvasLayer"] unique_name_in_owner = true visible = false +layout_mode = 3 +anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -20.0 -margin_top = -20.0 -margin_right = 20.0 -margin_bottom = 20.0 -script = ExtResource( 7 ) +offset_left = -20.0 +offset_top = -20.0 +offset_right = 20.0 +offset_bottom = 20.0 +script = ExtResource("7") [node name="MainPanel" type="Panel" parent="CanvasLayer/Settings"] +layout_mode = 0 anchor_left = 0.5 anchor_right = 0.5 -margin_left = -432.0 -margin_top = -319.0 -margin_right = 432.0 -margin_bottom = -48.0 +offset_left = -432.0 +offset_top = -319.0 +offset_right = 432.0 +offset_bottom = -48.0 [node name="LineEdit" type="LineEdit" parent="CanvasLayer/Settings/MainPanel"] unique_name_in_owner = true +layout_mode = 0 anchor_left = 0.5 anchor_right = 0.5 -margin_left = -418.5 -margin_top = 52.0 -margin_right = 418.5 -margin_bottom = 88.0 -theme = ExtResource( 5 ) +offset_left = -418.5 +offset_top = 52.0 +offset_right = 418.5 +offset_bottom = 88.0 +theme = ExtResource("5") caret_blink = true -caret_blink_speed = 0.5 +caret_blink_interval = 0.5 [node name="OKButton" type="Button" parent="CanvasLayer/Settings/MainPanel"] +layout_mode = 0 anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -margin_left = -15.5 -margin_top = -44.0 -margin_right = 33.5 -margin_bottom = -12.0 -theme = ExtResource( 5 ) +offset_left = -15.5 +offset_top = -44.0 +offset_right = 33.5 +offset_bottom = -12.0 +theme = ExtResource("5") text = "OK" [node name="ChangeText" type="Label" parent="CanvasLayer/Settings/MainPanel"] -margin_left = 17.0 -margin_top = 35.0 -margin_right = 222.0 -margin_bottom = 49.0 +layout_mode = 0 +offset_left = 17.0 +offset_top = 35.0 +offset_right = 222.0 +offset_bottom = 49.0 text = "Change presentation line below:" [node name="ChooseEffect" type="Label" parent="CanvasLayer/Settings/MainPanel"] +layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -102.5 -margin_top = 11.0 -margin_right = 102.5 -margin_bottom = 25.0 +offset_left = -102.5 +offset_top = 11.0 +offset_right = 102.5 +offset_bottom = 25.0 text = "Change effects below:" -align = 1 [node name="FontSizeMin" type="Button" parent="CanvasLayer/Settings/MainPanel"] -margin_left = 807.0 -margin_top = 92.0 -margin_right = 824.0 -margin_bottom = 112.0 +layout_mode = 0 +offset_left = 807.0 +offset_top = 92.0 +offset_right = 824.0 +offset_bottom = 112.0 text = "-" [node name="FontSizePlus" type="Button" parent="CanvasLayer/Settings/MainPanel"] -margin_left = 830.0 -margin_top = 92.0 -margin_right = 850.0 -margin_bottom = 112.0 +layout_mode = 0 +offset_left = 830.0 +offset_top = 92.0 +offset_right = 850.0 +offset_bottom = 112.0 text = "+" [node name="EffectsBox" type="HBoxContainer" parent="CanvasLayer/Settings/MainPanel"] +layout_mode = 0 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -margin_top = 38.5 -margin_bottom = 72.5 +offset_top = 38.5 +offset_bottom = 72.5 [node name="LightBox" type="CheckBox" parent="CanvasLayer/Settings/MainPanel/EffectsBox"] -margin_right = 160.0 -margin_bottom = 34.0 -theme = ExtResource( 5 ) -text = "Mood Light" +layout_mode = 2 +theme = ExtResource("5") +text = "Mood Light3D" [node name="MistBox" type="CheckBox" parent="CanvasLayer/Settings/MainPanel/EffectsBox"] -margin_left = 164.0 -margin_right = 241.0 -margin_bottom = 34.0 -theme = ExtResource( 5 ) +layout_mode = 2 +theme = ExtResource("5") text = "Mist" -script = ExtResource( 7 ) +script = ExtResource("7") [node name="CloseButton" type="TextureButton" parent="CanvasLayer"] visible = false +anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 -margin_left = -60.0 -margin_top = 1.0 -margin_right = 1140.0 -margin_bottom = 1201.0 -rect_scale = Vector2( 0.05, 0.05 ) -texture_normal = ExtResource( 6 ) +offset_left = -60.0 +offset_top = 1.0 +offset_right = 1140.0 +offset_bottom = 1201.0 +scale = Vector2(0.05, 0.05) +texture_normal = ExtResource("6") [connection signal="pressed" from="CanvasLayer/SettingsButton" to="CanvasLayer/Settings" method="_on_SettingsButton_pressed"] [connection signal="pressed" from="CanvasLayer/Settings/MainPanel/OKButton" to="CanvasLayer/Settings" method="_on_OKButton_pressed"] diff --git a/kellett_screen_starter/noun-cog-1471544.png.import b/kellett_screen_starter/noun-cog-1471544.png.import index 5421e14..960226d 100644 --- a/kellett_screen_starter/noun-cog-1471544.png.import +++ b/kellett_screen_starter/noun-cog-1471544.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/noun-cog-1471544.png-19f215aa4cddca4546d68fb303403e83.stex" +type="CompressedTexture2D" +uid="uid://1ngc0sjng4uv" +path="res://.godot/imported/noun-cog-1471544.png-19f215aa4cddca4546d68fb303403e83.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://noun-cog-1471544.png" -dest_files=[ "res://.import/noun-cog-1471544.png-19f215aa4cddca4546d68fb303403e83.stex" ] +dest_files=["res://.godot/imported/noun-cog-1471544.png-19f215aa4cddca4546d68fb303403e83.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/noun-cog-1471544.svg.import b/kellett_screen_starter/noun-cog-1471544.svg.import index 2125cb7..4eac84c 100644 --- a/kellett_screen_starter/noun-cog-1471544.svg.import +++ b/kellett_screen_starter/noun-cog-1471544.svg.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/noun-cog-1471544.svg-a71a8fcd31337a0fd4e4dd332b78231a.stex" +type="CompressedTexture2D" +uid="uid://b463cb22klnp0" +path="res://.godot/imported/noun-cog-1471544.svg-a71a8fcd31337a0fd4e4dd332b78231a.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,27 @@ metadata={ [deps] source_file="res://noun-cog-1471544.svg" -dest_files=[ "res://.import/noun-cog-1471544.svg-a71a8fcd31337a0fd4e4dd332b78231a.stex" ] +dest_files=["res://.godot/imported/noun-cog-1471544.svg-a71a8fcd31337a0fd4e4dd332b78231a.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/kellett_screen_starter/noun-cross-1707162.png.import b/kellett_screen_starter/noun-cross-1707162.png.import index 5179c7f..7befbda 100644 --- a/kellett_screen_starter/noun-cross-1707162.png.import +++ b/kellett_screen_starter/noun-cross-1707162.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/noun-cross-1707162.png-b11ccab37e308fa7a0623930b6603534.stex" +type="CompressedTexture2D" +uid="uid://kdtf0qo5o30x" +path="res://.godot/imported/noun-cross-1707162.png-b11ccab37e308fa7a0623930b6603534.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://noun-cross-1707162.png" -dest_files=[ "res://.import/noun-cross-1707162.png-b11ccab37e308fa7a0623930b6603534.stex" ] +dest_files=["res://.godot/imported/noun-cross-1707162.png-b11ccab37e308fa7a0623930b6603534.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/kellett_screen_starter/project.godot b/kellett_screen_starter/project.godot index 1084424..3f9056f 100644 --- a/kellett_screen_starter/project.godot +++ b/kellett_screen_starter/project.godot @@ -6,7 +6,7 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=4 +config_version=5 [application] @@ -15,17 +15,17 @@ config/description="This Screen Starter can be used on any computer before you a The screen effects are designed to be soothing yet provide some visual interest." run/main_scene="res://main_scene.tscn" +config/features=PackedStringArray("4.0") config/icon="res://logo.png" config/macos_native_icon="res://logo.icns" [display] -window/size/width=1280 -window/size/height=720 -window/size/test_width=2560 -window/size/test_height=1440 +window/size/viewport_width=1280 +window/size/viewport_height=720 +window/size/window_width_override=2560 +window/size/window_height_override=1440 window/stretch/mode="2d" -window/stretch/aspect="keep" [gui] @@ -37,4 +37,4 @@ common/enable_pause_aware_picking=true [rendering] -environment/default_environment="res://default_env.tres" +environment/defaults/default_environment="res://default_env.tres" diff --git a/kellett_screen_starter/wind_sprite.gdshader b/kellett_screen_starter/wind_sprite.gdshader index 5cf43a1..9cc0137 100644 --- a/kellett_screen_starter/wind_sprite.gdshader +++ b/kellett_screen_starter/wind_sprite.gdshader @@ -36,7 +36,7 @@ float getWind(vec2 vertex, vec2 uv, float time){ } void vertex() { - vec4 pos = WORLD_MATRIX * vec4(0.0, 0.0, 0.0, 1.0); + vec4 pos = MODEL_MATRIX * vec4(0.0, 0.0, 0.0, 1.0); float time = TIME * speed + offset; //float time = TIME * speed + pos.x * pos.y ; not working when moving... VERTEX.x += getWind(VERTEX.xy, UV, time);