Merge pull request #5 from WildRP/feature/reflection-probes

Version 0.5.0
WildRP · Apr 20, 2024 · 75f4ed5 · 75f4ed5
2 parents e9fa72f + 344f009
commit 75f4ed5
Show file tree

Hide file tree

Showing 52 changed files with 3,111 additions and 678 deletions.
diff --git a/WildRP-AMV-Tool.csproj b/WildRP-AMV-Tool.csproj
@@ -1,17 +1,30 @@
 <Project Sdk="Godot.NET.Sdk/4.2.1">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
-    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
-    <RootNamespace>WildRPAMVTool</RootNamespace>
+    <RootNamespace>WildRP.AMVTool</RootNamespace>
+    <Company>WildRP</Company>
+    <Product>WildRP AMV Tool</Product>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>wrpamvtool.snk</AssemblyOriginatorKeyFile>
+    <PublicSign>true</PublicSign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="help\AMV XML Tags.md" />
     <Content Include="help\Instructions.md" />
     <Content Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SimpleImageIO" Version="1.5.5" />
+    <PackageReference Include="SimpleImageIO" Version="1.6.0" />
+    <PackageReference Include="StbImageWriteSharp" Version="1.16.7" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="wrpamvtool.snk" />
   </ItemGroup>
 </Project>
diff --git a/WildRP-AMV-Tool.sln.DotSettings b/WildRP-AMV-Tool.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeEditing/SuppressNullableWarningFix/Enabled/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>
diff --git a/WildRP-AMV-Tool.sln.DotSettings.user b/WildRP-AMV-Tool.sln.DotSettings.user
@@ -1,4 +1,8 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CDirectXTexNetImpl_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005Cadmin_005CDocuments_005CWRPDev_005CAMVToolBuild_005CDirectXTexNet_005Cbin_005CDebug_005Cnet8_002E0_005CDirectXTexNetImpl_002Edll/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="C:\Users\admin\.nuget\packages\directxtexnet\1.0.3\lib\net5.0\DirectXTexNet.dll" /&gt;&#xD;
+  &lt;PhysicalFolder Path="C:\Users\admin\.nuget\packages\directxtexnet\1.0.5" Loaded="True" /&gt;&#xD;
+  &lt;Assembly Path="C:\Users\admin\.nuget\packages\simpleimageio\1.5.5\lib\net7.0\SimpleImageIO.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>
diff --git a/amv_tool_theme.tres b/amv_tool_theme.tres
@@ -219,13 +219,18 @@ content_margin_right = 8.0
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_pgp2j"]
 content_margin_top = 2.0
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cfx35"]
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_y24bj"]
 content_margin_left = 14.0
 content_margin_top = 8.0
 content_margin_right = 14.0
 content_margin_bottom = 8.0
-bg_color = Color(0.101961, 0.101961, 0.101961, 1)
-border_color = Color(0.101569, 0.101569, 0.101569, 1)
+bg_color = Color(0, 0, 0, 0.466667)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(1, 1, 1, 0.117647)
+border_blend = true
 corner_radius_top_left = 8
 corner_radius_top_right = 8
 corner_radius_bottom_right = 8
@@ -539,7 +544,7 @@ ItemList/styles/selected_focus = SubResource("StyleBoxFlat_32au3")
 Label/colors/font_color = Color(1, 1, 1, 0.627451)
 Label/styles/normal = SubResource("StyleBoxEmpty_pgp2j")
 LineEdit/colors/font_placeholder_color = Color(1, 1, 1, 0.27451)
-LineEdit/styles/focus = SubResource("StyleBoxFlat_cfx35")
+LineEdit/styles/focus = SubResource("StyleBoxFlat_y24bj")
 LineEdit/styles/normal = SubResource("StyleBoxFlat_0nfa3")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_fdq0g")
 MenuButton/styles/disabled = SubResource("StyleBoxFlat_l5ore")

diff --git a/gui/ErrorPopup.cs b/gui/ErrorPopup.cs
@@ -0,0 +1,31 @@
+using Godot;
+using System;
+
+public partial class ErrorPopup : PopupPanel
+{
+	[Export] private Label _label;
+	[Export] private Button _closeBtn;
+
+	public static ErrorPopup Instance;
+
+	public override void _Ready()
+	{
+		if (Instance == null)
+		{
+			Instance = this;
+		}
+		else
+		{
+			QueueFree();
+			return;
+		}
+
+		_closeBtn.Pressed += Hide;
+	}
+
+	public void Trigger(string error)
+	{
+		PopupCentered();
+		_label.Text = error;
+	}
+}
diff --git a/gui/amv_map_gui.tscn b/gui/amv_map_gui.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=21 format=3 uid="uid://i02qsc7fr6co"]
 
 [ext_resource type="Theme" uid="uid://b0c4jwsh62jan" path="res://amv_tool_theme.tres" id="1_3bhh4"]
-[ext_resource type="Script" path="res://gui/AmvMapGui.cs" id="2_nw1dj"]
+[ext_resource type="Script" path="res://scripts/GUI/AmvMapGui.cs" id="2_nw1dj"]
 [ext_resource type="PackedScene" uid="uid://cybmgfmox1xe6" path="res://objects/amv_map_object.tscn" id="3_kqffa"]
 [ext_resource type="Script" path="res://scripts/GUI/MapViewPanel.cs" id="4_cbxl5"]
 [ext_resource type="Script" path="res://scripts/gdscript/markdownlabel.gd" id="5_isht1"]
@@ -228,7 +228,7 @@ layout_mode = 2
 custom_minimum_size = Vector2(300, 0)
 layout_mode = 2
 bbcode_enabled = true
-text = "[font_size=19]Source[/font_size]
+text = "[font_size=22]Source[/font_size]
 position: (X, Y, Z)
 scale: (X, Y, Z)
 rotation: X