From 8e6dc46b3831bbad4b2ddd085f4b4834df4084a9 Mon Sep 17 00:00:00 2001
From: orosmatthew <orosmatthew@pm.me>
Date: Tue, 17 Jan 2023 10:00:20 -0500
Subject: [PATCH] Fix font and #8

---
 MainMenu/MainMenu.tscn                        | 55 +++++++++----------
 .../Simulation/ParticleSimulation.cs          |  2 +-
 project.godot                                 |  1 +
 ui/ui_theme.tres                              | 23 ++++----
 4 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/MainMenu/MainMenu.tscn b/MainMenu/MainMenu.tscn
index adcf8af..d72daa4 100644
--- a/MainMenu/MainMenu.tscn
+++ b/MainMenu/MainMenu.tscn
@@ -14,9 +14,6 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 theme = ExtResource( 1 )
 script = ExtResource( 3 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="MenuButtons" type="VBoxContainer" parent="."]
 anchor_left = 0.5
@@ -34,17 +31,17 @@ __meta__ = {
 
 [node name="Inputs" type="HBoxContainer" parent="MenuButtons"]
 margin_right = 608.0
-margin_bottom = 150.0
+margin_bottom = 138.0
 alignment = 1
 
 [node name="Seed" type="VBoxContainer" parent="MenuButtons/Inputs"]
 margin_right = 200.0
-margin_bottom = 150.0
+margin_bottom = 138.0
 rect_min_size = Vector2( 200, 0 )
 
 [node name="SeedLabel" type="Label" parent="MenuButtons/Inputs/Seed"]
 margin_right = 200.0
-margin_bottom = 27.0
+margin_bottom = 21.0
 text = "Seed Number"
 align = 1
 __meta__ = {
@@ -52,16 +49,16 @@ __meta__ = {
 }
 
 [node name="SeedText" type="TextEdit" parent="MenuButtons/Inputs/Seed"]
-margin_top = 31.0
+margin_top = 25.0
 margin_right = 200.0
-margin_bottom = 95.769
+margin_bottom = 89.769
 rect_min_size = Vector2( 0, 64.769 )
 text = "12345"
 
 [node name="RandomizeButton" type="Button" parent="MenuButtons/Inputs/Seed"]
-margin_top = 99.0
+margin_top = 93.0
 margin_right = 200.0
-margin_bottom = 150.251
+margin_bottom = 138.251
 text = "Randomize!"
 __meta__ = {
 "_edit_use_anchors_": false
@@ -70,80 +67,80 @@ __meta__ = {
 [node name="ParticleCount" type="VBoxContainer" parent="MenuButtons/Inputs"]
 margin_left = 204.0
 margin_right = 404.0
-margin_bottom = 150.0
+margin_bottom = 138.0
 rect_min_size = Vector2( 200, 0 )
 
 [node name="ParticleCountLabel" type="Label" parent="MenuButtons/Inputs/ParticleCount"]
 margin_right = 200.0
-margin_bottom = 27.0
+margin_bottom = 21.0
 text = "Particle Count"
 align = 1
 
 [node name="ParticleCountText" type="TextEdit" parent="MenuButtons/Inputs/ParticleCount"]
-margin_top = 31.0
+margin_top = 25.0
 margin_right = 200.0
-margin_bottom = 96.0
+margin_bottom = 90.0
 rect_min_size = Vector2( 0, 65 )
 text = "1000"
 
 [node name="Zoom" type="VBoxContainer" parent="MenuButtons/Inputs"]
 margin_left = 408.0
 margin_right = 608.0
-margin_bottom = 150.0
+margin_bottom = 138.0
 rect_min_size = Vector2( 200, 0 )
 
 [node name="ZoomLabel" type="Label" parent="MenuButtons/Inputs/Zoom"]
 margin_right = 200.0
-margin_bottom = 27.0
-text = "Zoom"
+margin_bottom = 21.0
+text = "World Size"
 align = 1
 
 [node name="ZoomValue" type="Label" parent="MenuButtons/Inputs/Zoom"]
-margin_top = 31.0
+margin_top = 25.0
 margin_right = 200.0
-margin_bottom = 58.0
+margin_bottom = 46.0
 text = "1.4"
 align = 1
 
 [node name="ZoomSlider" type="HSlider" parent="MenuButtons/Inputs/Zoom"]
-margin_top = 62.0
+margin_top = 50.0
 margin_right = 200.0
-margin_bottom = 104.0
+margin_bottom = 92.0
 min_value = 0.5
 max_value = 5.0
 step = 0.1
 value = 1.4
 
 [node name="SimulateButton" type="Button" parent="MenuButtons"]
-margin_top = 162.0
+margin_top = 150.0
 margin_right = 608.0
-margin_bottom = 213.251
+margin_bottom = 195.251
 text = "Simulate!"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="Warning" type="Label" parent="MenuButtons"]
-margin_top = 225.0
+margin_top = 207.0
 margin_right = 608.0
-margin_bottom = 270.0
+margin_bottom = 252.0
 custom_fonts/font = SubResource( 1 )
 text = "Simulation cannot be resized 
 once simulation starts!"
 align = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="MenuButtons"]
-margin_top = 282.0
+margin_top = 264.0
 margin_right = 608.0
-margin_bottom = 282.0
+margin_bottom = 264.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="ToggleFullscreenButton" type="Button" parent="MenuButtons"]
-margin_top = 294.0
+margin_top = 276.0
 margin_right = 608.0
-margin_bottom = 345.251
+margin_bottom = 321.251
 text = "Toggle Fullscreen!"
 
 [node name="Logo" type="TextureRect" parent="."]
diff --git a/ParticleSimulation/Simulation/ParticleSimulation.cs b/ParticleSimulation/Simulation/ParticleSimulation.cs
index c59e81c..a2b498d 100644
--- a/ParticleSimulation/Simulation/ParticleSimulation.cs
+++ b/ParticleSimulation/Simulation/ParticleSimulation.cs
@@ -1,4 +1,4 @@
-#define MULTITHREADED
+//#define MULTITHREADED
 
 using System.Collections.Generic;
 using System.Linq;
diff --git a/project.godot b/project.godot
index 1d20818..2526b8f 100644
--- a/project.godot
+++ b/project.godot
@@ -81,6 +81,7 @@ enable_interaction={
 
 [mono]
 
+project/assembly_name="Particles"
 profiler/enabled=true
 
 [physics]
diff --git a/ui/ui_theme.tres b/ui/ui_theme.tres
index 5b4bb64..e398cc0 100644
--- a/ui/ui_theme.tres
+++ b/ui/ui_theme.tres
@@ -1,7 +1,11 @@
 [gd_resource type="Theme" load_steps=34 format=2]
 
 [ext_resource path="res://ui/UIpack_vector.svg" type="Texture" id=1]
-[ext_resource path="res://ui/ColorTube-Regular.ttf" type="DynamicFontData" id=2]
+[ext_resource path="res://ui/kenvector_future.ttf" type="DynamicFontData" id=2]
+
+[sub_resource type="DynamicFont" id=33]
+size = 18
+font_data = ExtResource( 2 )
 
 [sub_resource type="StyleBoxTexture" id=1]
 texture = ExtResource( 1 )
@@ -173,9 +177,6 @@ region = Rect2( 1007, 450, 39, 31 )
 texture = ExtResource( 1 )
 region_rect = Rect2( 1051, 317, 4, 100 )
 
-[sub_resource type="DynamicFont" id=33]
-font_data = ExtResource( 2 )
-
 [resource]
 default_font = SubResource( 33 )
 Button/colors/font_color = Color( 0, 0, 0, 1 )
@@ -184,7 +185,7 @@ Button/colors/font_color_focus = Color( 0, 0, 0, 1 )
 Button/colors/font_color_hover = Color( 0.34902, 0.34902, 0.34902, 1 )
 Button/colors/font_color_pressed = Color( 0.388235, 0.388235, 0.388235, 1 )
 Button/constants/hseparation = 2
-Button/fonts/font = null
+Button/fonts/font = SubResource( 33 )
 Button/styles/disabled = SubResource( 1 )
 Button/styles/focus = SubResource( 2 )
 Button/styles/hover = SubResource( 3 )
@@ -197,7 +198,7 @@ CheckBox/colors/font_color_hover_pressed = Color( 0.34902, 0.34902, 0.34902, 1 )
 CheckBox/colors/font_color_pressed = Color( 0.388235, 0.388235, 0.388235, 1 )
 CheckBox/constants/check_vadjust = 0
 CheckBox/constants/hseparation = 4
-CheckBox/fonts/font = null
+CheckBox/fonts/font = SubResource( 33 )
 CheckBox/icons/checked = SubResource( 6 )
 CheckBox/icons/radio_checked = SubResource( 7 )
 CheckBox/icons/radio_unchecked = SubResource( 8 )
@@ -215,7 +216,7 @@ CheckButton/colors/font_color_hover_pressed = Color( 0.388235, 0.388235, 0.38823
 CheckButton/colors/font_color_pressed = Color( 0.388235, 0.388235, 0.388235, 1 )
 CheckButton/constants/check_vadjust = 0
 CheckButton/constants/hseparation = 4
-CheckButton/fonts/font = null
+CheckButton/fonts/font = SubResource( 33 )
 CheckButton/icons/off = SubResource( 31 )
 CheckButton/icons/off_disabled = SubResource( 31 )
 CheckButton/icons/on = SubResource( 32 )
@@ -241,7 +242,7 @@ LineEdit/colors/font_color_selected = Color( 0.894118, 0.894118, 0.894118, 1 )
 LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 )
 LineEdit/colors/selection_color = Color( 0.34902, 0.34902, 0.34902, 1 )
 LineEdit/constants/minimum_spaces = 12
-LineEdit/fonts/font = null
+LineEdit/fonts/font = SubResource( 33 )
 LineEdit/icons/clear = null
 LineEdit/styles/focus = SubResource( 16 )
 LineEdit/styles/normal = SubResource( 17 )
@@ -252,7 +253,7 @@ OptionButton/colors/font_color_hover = Color( 0.34902, 0.34902, 0.34902, 1 )
 OptionButton/colors/font_color_pressed = Color( 0, 0, 0, 1 )
 OptionButton/constants/arrow_margin = 2
 OptionButton/constants/hseparation = 2
-OptionButton/fonts/font = null
+OptionButton/fonts/font = SubResource( 33 )
 OptionButton/icons/arrow = SubResource( 18 )
 OptionButton/styles/disabled = null
 OptionButton/styles/focus = null
@@ -266,7 +267,7 @@ PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 )
 PopupMenu/colors/font_color_hover = Color( 0.388235, 0.388235, 0.388235, 1 )
 PopupMenu/constants/hseparation = 4
 PopupMenu/constants/vseparation = 32
-PopupMenu/fonts/font = null
+PopupMenu/fonts/font = SubResource( 33 )
 PopupMenu/icons/checked = SubResource( 20 )
 PopupMenu/icons/radio_checked = SubResource( 26 )
 PopupMenu/icons/radio_unchecked = SubResource( 27 )
@@ -308,7 +309,7 @@ TextEdit/constants/completion_lines = 7
 TextEdit/constants/completion_max_width = 50
 TextEdit/constants/completion_scroll_width = 3
 TextEdit/constants/line_spacing = 4
-TextEdit/fonts/font = null
+TextEdit/fonts/font = SubResource( 33 )
 TextEdit/icons/fold = null
 TextEdit/icons/folded = null
 TextEdit/icons/space = null