From d804972dd220842f2aa9ed76d8e0eb5d5b10b509 Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Fri, 15 Dec 2023 08:08:58 -0700 Subject: [PATCH 1/4] should not be in repo --- Doprez.Stride/Interfaces/IEquippable.cs | 14 ------ Doprez.Stride/Interfaces/IInteractable.cs | 17 ------- Doprez.Stride/Interfaces/IUIControllable.cs | 14 ------ Doprez.Stride/Utilities/JsonHelper.cs | 56 --------------------- 4 files changed, 101 deletions(-) delete mode 100644 Doprez.Stride/Interfaces/IEquippable.cs delete mode 100644 Doprez.Stride/Interfaces/IInteractable.cs delete mode 100644 Doprez.Stride/Interfaces/IUIControllable.cs delete mode 100644 Doprez.Stride/Utilities/JsonHelper.cs diff --git a/Doprez.Stride/Interfaces/IEquippable.cs b/Doprez.Stride/Interfaces/IEquippable.cs deleted file mode 100644 index b5b4937..0000000 --- a/Doprez.Stride/Interfaces/IEquippable.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Doprez.Stride.Interfaces; -public interface IEquippable -{ - - public void UsePrimary(); - public void UseSecondary(); - -} diff --git a/Doprez.Stride/Interfaces/IInteractable.cs b/Doprez.Stride/Interfaces/IInteractable.cs deleted file mode 100644 index b5ddf79..0000000 --- a/Doprez.Stride/Interfaces/IInteractable.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Stride.Engine; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Doprez.Stride.Interfaces -{ - public interface IInteractable - { - /// - /// Interacts with the Entity - /// - public void Interact(Entity caller); - } -} diff --git a/Doprez.Stride/Interfaces/IUIControllable.cs b/Doprez.Stride/Interfaces/IUIControllable.cs deleted file mode 100644 index 430633d..0000000 --- a/Doprez.Stride/Interfaces/IUIControllable.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Doprez.Stride.Interfaces -{ - public interface IUIControllable - { - public void EnterUI(); - public void ExitUI(); - } -} diff --git a/Doprez.Stride/Utilities/JsonHelper.cs b/Doprez.Stride/Utilities/JsonHelper.cs deleted file mode 100644 index d4bcf98..0000000 --- a/Doprez.Stride/Utilities/JsonHelper.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Text.Json; -using System.Threading.Tasks; - -namespace Immolation.Core.Utilities -{ - public static class JsonHelper - { - private static readonly JsonSerializerOptions _options; - - static JsonHelper() - { - _options = new JsonSerializerOptions() - { - WriteIndented = true, - }; - } - - public static string SerializeJson(T objectToSerialize) - { - return JsonSerializer.Serialize(objectToSerialize, _options); - } - - public static T DeserializeJson(string json) - { - return JsonSerializer.Deserialize(json, _options); - } - - // Method that accepts a generic type T and a file name, and serializes an object of type T to a JSON string - // and writes the JSON string to the specified file - public static void WriteJsonToFile(string fileName, T obj) - { - // Serialize the object to a JSON string - string json = JsonSerializer.Serialize(obj, _options); - - // Write the JSON string to a file - File.WriteAllText(fileName, json); - } - - // Method that accepts a generic type T and a file name, reads a JSON string from the specified file, - // and deserializes it back into an object of type T - public static T ReadJsonFromFile(string fileName) - { - // Read the JSON string from the file - string jsonFromFile = File.ReadAllText(fileName); - - // Deserialize the JSON string back into an object of type T - return JsonSerializer.Deserialize(jsonFromFile, _options); - } - - } -} From 1cf2bd6563979e51b63e5a8e42efec45fafdbbad Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Fri, 15 Dec 2023 08:09:18 -0700 Subject: [PATCH 2/4] update versions --- Doprez.Stride/Doprez.Stride.csproj | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Doprez.Stride/Doprez.Stride.csproj b/Doprez.Stride/Doprez.Stride.csproj index abae1cc..05a980c 100644 --- a/Doprez.Stride/Doprez.Stride.csproj +++ b/Doprez.Stride/Doprez.Stride.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml Doprez.Stride True @@ -8,7 +8,7 @@ en-CA https://github.com/Doprez/Doprez.Stride https://github.com/Doprez/Doprez.Stride - 2.1.0 + 3.0.0.0 A package of helper classes for use in the Stride Game Engine README.md Stride3d;Game Engine;Stride; @@ -24,9 +24,6 @@ * true - - - True @@ -38,13 +35,13 @@ - - - - - - - + + + + + + + From d9a60d21bbd809eba8f1c697cb08ee61159c2a21 Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Fri, 15 Dec 2023 08:09:37 -0700 Subject: [PATCH 3/4] editor-component-fix --- Doprez.Stride/Module.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Doprez.Stride/Module.cs diff --git a/Doprez.Stride/Module.cs b/Doprez.Stride/Module.cs new file mode 100644 index 0000000..494c5b0 --- /dev/null +++ b/Doprez.Stride/Module.cs @@ -0,0 +1,13 @@ +using Stride.Core; +using Stride.Core.Reflection; +using System.Reflection; + +namespace Doprez.Stride; +internal class Module +{ + [ModuleInitializer] + public static void Initialize() + { + AssemblyRegistry.Register(typeof(Module).GetTypeInfo().Assembly, AssemblyCommonCategories.Assets); + } +} From ff450c81c42de00d72e028b66936448585f30059 Mon Sep 17 00:00:00 2001 From: Doprez <73259914+Doprez@users.noreply.github.com> Date: Fri, 15 Dec 2023 08:09:46 -0700 Subject: [PATCH 4/4] clean up --- Doprez.Stride/DoprezMath/MathHelper.cs | 5 ----- Doprez.Stride/Extensions/StrideMathExtensions.cs | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 Doprez.Stride/Extensions/StrideMathExtensions.cs diff --git a/Doprez.Stride/DoprezMath/MathHelper.cs b/Doprez.Stride/DoprezMath/MathHelper.cs index 4468dfd..8bd3cbb 100644 --- a/Doprez.Stride/DoprezMath/MathHelper.cs +++ b/Doprez.Stride/DoprezMath/MathHelper.cs @@ -1,10 +1,5 @@ using Stride.Core.Mathematics; -using Stride.Engine; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Doprez.Stride.DoprezMath; public static class MathHelper diff --git a/Doprez.Stride/Extensions/StrideMathExtensions.cs b/Doprez.Stride/Extensions/StrideMathExtensions.cs new file mode 100644 index 0000000..2fff086 --- /dev/null +++ b/Doprez.Stride/Extensions/StrideMathExtensions.cs @@ -0,0 +1,7 @@ +using Stride.Core.Mathematics; + +namespace Doprez.Stride.Extensions; +public static class StrideMathExtensions +{ + +}