Merge branch 'master' into merging_master_into_xml_converter

AsherGlick · Oct 25, 2023 · ac0fbb4 · ac0fbb4
2 parents cbf0273 + a344bdf
commit ac0fbb4
Show file tree

Hide file tree

Showing 16 changed files with 1,190 additions and 362 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -93,14 +93,23 @@ jobs:
 
       - name: Build Burrito Link
         run: |
+          mkdir burrito_link/build
           cd burrito_link
+          cmake ..
           make
 
-      - name: Upload created file
+      - name: Upload Standalone Executable Burrito Link
+        uses: actions/upload-artifact@v3
+        with:
+          name: burrito_link_exe
+          path: burrito_link/build/burrito_link.exe
+          if-no-files-found: error
+
+      - name: Upload Shared Library Burrito Link
         uses: actions/upload-artifact@v3
         with:
-          name: burrito_link
-          path: burrito_link/burrito_link.exe
+          name: burrito_link_dll
+          path: burrito_link/build/d3d11.dll
           if-no-files-found: error 
 
   Build-BurritoFG-Linux:
@@ -228,15 +237,22 @@ jobs:
         with:
           name: xml_converter
 
-      - name: Download Burrito Link
+      - name: Download Burrito Link Exe
         uses: actions/download-artifact@v3
         with:
-          name: burrito_link
+          name: burrito_link_exe
+
+      - name: Download Burrito Link DLL
+        uses: actions/download-artifact@v3
+        with:
+          name: burrito_link_dll
+
 
       - name: Move Burrito Link
         run: |
           mkdir burrito_link/
           mv burrito_link.exe burrito_link/
+          mv d3d11.dll burrito_link/
 
       - uses: actions/upload-artifact@v3
         with:

diff --git a/Gizmo/PointEdit.gd b/Gizmo/PointEdit.gd
@@ -69,5 +69,5 @@ func _process(delta):
 		)
 		$Plane.scale = new_scale
 		$Pillar.scale = new_scale
-		
+
 		update_point()
diff --git a/Route.gd b/Route.gd
@@ -16,7 +16,7 @@ func refresh_mesh():
 	var tmpMesh = Mesh.new()
 	var i = 0
 	var last_uv: float = 0.0
-	for point_index in range(len(point_list)-1):	
+	for point_index in range(len(point_list)-1):
 		var point:Vector3 = point_list[point_index]
 		var next_point:Vector3 = point_list[point_index+1]
 		# If the line starts or ends at map coordinates (0,0,0), don't draw the line.
@@ -56,7 +56,7 @@ func refresh_mesh():
 		var st = SurfaceTool.new()
 		st.begin(Mesh.PRIMITIVE_TRIANGLE_FAN)
 
-		for v in vertices.size(): 
+		for v in vertices.size():
 			st.add_color(color)
 			st.add_uv(UVs[v])
 			st.add_vertex(vertices[v])

diff --git a/Settings.gd b/Settings.gd
@@ -5,6 +5,9 @@ const CONFIG_PATH = "user://settings.json"
 var _config_data = {}
 var local_category_data = {}
 
+var minimum_width: int = 800
+var minimum_height: int = 600
+
 var override_size_enabled: bool = false;
 var override_size_height: int = 1080
 var override_size_width: int = 1920
@@ -18,14 +21,18 @@ func _ready():
 	var file = File.new()
 	file.open(CONFIG_PATH, file.READ)
 	var text = file.get_as_text()
-	var datum = JSON.parse(text)	
+	var datum = JSON.parse(text)
 	self._config_data = JSON.parse(text).result
 
 	if self._config_data == null:
 		self._config_data = {}
 
 	if "local_category_data" in self._config_data:
 		self.local_category_data = self._config_data["local_category_data"]
+	if "minimum_width" in self._config_data:
+		self.minimum_width = self._config_data["minimum_width"]
+	if "minimum_height" in self._config_data:
+		self.minimum_height = self._config_data["minimum_height"]
 	if "override_size_enabled" in self._config_data:
 		self.override_size_enabled = self._config_data["override_size_enabled"]
 	if "override_size_height" in self._config_data:
@@ -42,6 +49,8 @@ func _ready():
 
 func save():
 	_config_data = {
+		"minimum_width": minimum_width,
+		"minimum_height": minimum_height,
 		"override_size_enabled": override_size_enabled,
 		"override_size_height": override_size_height,
 		"override_size_width": override_size_width,
@@ -50,7 +59,7 @@ func save():
 		"burrito_link_env_args": burrito_link_env_args,
 		"local_category_data": local_category_data
 	}
-	
+
 	var file = File.new()
 	file.open(CONFIG_PATH, File.WRITE)
 	file.store_string(JSON.print(self._config_data, "    "))
diff --git a/SettingsDialog.gd b/SettingsDialog.gd
@@ -1,34 +1,44 @@
 extends WindowDialog
 
 func load_settings():
-	var override_size: CheckButton = $GridContainer/OverrideSize
+	var minimum_width: LineEdit = $ScrollContainer/GridContainer/MinimumWidth
+	minimum_width.text = String(Settings.minimum_width)
+	var minimum_height: LineEdit = $ScrollContainer/GridContainer/MinimumHeight
+	minimum_height.text = String(Settings.minimum_height)
+
+	var override_size: CheckButton = $ScrollContainer/GridContainer/OverrideSize
 	override_size.pressed = Settings.override_size_enabled
-	var override_height: LineEdit = $GridContainer/OverrideHeight
+	var override_height: LineEdit = $ScrollContainer/GridContainer/OverrideHeight
 	override_height.text = String(Settings.override_size_height)
-	var override_width: LineEdit = $GridContainer/OverrideWidth
+	var override_width: LineEdit = $ScrollContainer/GridContainer/OverrideWidth
 	override_width.text = String(Settings.override_size_width)
 
-	var autolaunch_burrito_link: CheckButton = $GridContainer/AutoLaunchBurritoLink
+	var autolaunch_burrito_link: CheckButton = $ScrollContainer/GridContainer/AutoLaunchBurritoLink
 	autolaunch_burrito_link.pressed = Settings.burrito_link_auto_launch_enabled
-	var wine_path: LineEdit = $GridContainer/WinePath
+	var wine_path: LineEdit = $ScrollContainer/GridContainer/WinePath
 	wine_path.text = Settings.burrito_link_wine_path
-	var environment_vars: TextEdit = $GridContainer/EnvironmentVars
+	var environment_vars: TextEdit = $ScrollContainer/GridContainer/EnvironmentVars
 	environment_vars.text = Settings.burrito_link_env_args
 
 func save_settings(new_value=null):
-	var override_size: CheckButton = $GridContainer/OverrideSize
+	var minimum_width: LineEdit = $ScrollContainer/GridContainer/MinimumWidth
+	Settings.minimum_width = int(minimum_width.text)
+	var minimum_height: LineEdit = $ScrollContainer/GridContainer/MinimumHeight
+	Settings.minimum_height = int(minimum_height.text)
+
+	var override_size: CheckButton = $ScrollContainer/GridContainer/OverrideSize
 	Settings.override_size_enabled = override_size.pressed
-	var override_height: LineEdit = $GridContainer/OverrideHeight
+	var override_height: LineEdit = $ScrollContainer/GridContainer/OverrideHeight
 	Settings.override_size_height = int(override_height.text)
-	var override_width: LineEdit = $GridContainer/OverrideWidth
+	var override_width: LineEdit = $ScrollContainer/GridContainer/OverrideWidth
 	Settings.override_size_width = int(override_width.text)
 
-	var autolaunch_burrito_link: CheckButton = $GridContainer/AutoLaunchBurritoLink
+	var autolaunch_burrito_link: CheckButton = $ScrollContainer/GridContainer/AutoLaunchBurritoLink
 	Settings.burrito_link_auto_launch_enabled = autolaunch_burrito_link.pressed
-	var wine_path: LineEdit = $GridContainer/WinePath
+	var wine_path: LineEdit = $ScrollContainer/GridContainer/WinePath
 	Settings.burrito_link_wine_path = wine_path.text
-	var environment_vars: TextEdit = $GridContainer/EnvironmentVars
+	var environment_vars: TextEdit = $ScrollContainer/GridContainer/EnvironmentVars
 	Settings.burrito_link_env_args = environment_vars.text
-	
+
 	Settings.save()