Merge pull request #7 from Team-Fennec/feat/engine-tools

Feat/engine tools

Game/engine/resource/ToolsScheme.res

@@ -74,4 +74,4 @@
         "SliderGrab" "IcyTrans"
         "SliderGrabActive" "Icy"
     }
-}
+}

Game/engine/shaders/UnlitTextured.glsl

@@ -12,14 +12,13 @@ void main()
 {
     // joint/weight reference:
     // https://github.khronos.org/glTF-Tutorials/gltfTutorial/gltfTutorial_020_Skins.html
-    /*mat4 skinMat =
+    mat4 skinMat =
         v_Weight.x * Joints[int(v_Joint.x)] +
         v_Weight.y * Joints[int(v_Joint.y)] +
         v_Weight.z * Joints[int(v_Joint.z)] +
         v_Weight.w * Joints[int(v_Joint.w)];
 
-    vec4 worldPosition = World * skinMat * vec4(v_Pos, 1);*/
-    vec4 worldPosition = World * vec4(v_Pos, 1);
+    vec4 worldPosition = World * skinMat * vec4(v_Pos, 1);
     vec4 viewPosition = View * worldPosition;
     gl_Position = Projection * viewPosition;
     fsin_texCoords = v_Uv;

Game/engine/shaders/include/Buffers.glsl

@@ -15,5 +15,5 @@ layout(set = 0, binding = 2) uniform WorldBuffer
 
 layout(set = 0, binding = 3) uniform JointBuffer
 {
-    mat4 Joints;
+    mat4 Joints[32];
 };

Game/enginetools.vdf

@@ -1,4 +1,6 @@
 "EngineTools"
 {
-	// no tools currently
-}
+	"dll" "console"
+	"dll" "modeleditor"
+	"dll" "materialeditor"
+}

Game/testgame/gameinfo.gi

@@ -5,8 +5,9 @@
     // engine is loaded automatically
     ResourcePaths {
         "dir" "testgame"
+        //"vpk" "{gameinfo_dir}/test_content.vpk"
     }
-    
+
     SupportedLanguages
     {
         "english" "1"

Game/testgame/resource/testgame_english.txt

@@ -1,6 +1,9 @@
-"Lang" {
+"Lang"
+{
 	"Language" "english"
-	"tokens" {
-		// none: for now
+	"tokens"
+	{
+		"GameMenu_StartTest" "Start Test Scene"
+		"GameMenu_Quit" "Quit"
 	}
 }

LibVpk/LibVPK.csproj

@@ -6,11 +6,18 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <ContentWithTargetPath Include="libvpkeditc.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libvpkeditc.dll</TargetPath>
     </ContentWithTargetPath>
   </ItemGroup>
+
+  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+    <ContentWithTargetPath Include="libvpkeditc.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>libvpkeditc.so</TargetPath>
+    </ContentWithTargetPath>
+  </ItemGroup>
 
 </Project>

Source/Engine/Core/ConCmd.cs

@@ -1,32 +1,22 @@
-using System;
-using System.Diagnostics;
-
-namespace WinterEngine.Core;
-
-[Flags]
-public enum CmdFlags
-{
-    None,
-    Cheat,
-    Development,
-    Debug
-}
-
-#if HAS_MACROS
-//#macro ConsoleCommand(name, desc, fn) internal sealed class nameConCommand : ConCmd {\
-    public override string Command => "name";\
-    public override string Description => desc;\
-    public override CmdFlags Flags => CmdFlags.None;\
-    public override void Exec(string[] args)\
-    fn\
-}
-#endif
-
-public abstract class ConCmd
-{
-    public abstract string Command { get; }
-    public abstract string Description { get; }
-    public abstract CmdFlags Flags { get; }
-
-    public abstract void Exec(string[] args);
-}
+using System;
+using System.Diagnostics;
+
+namespace WinterEngine.Core;
+
+[Flags]
+public enum CmdFlags
+{
+    None,
+    Cheat,
+    Development,
+    Debug
+}
+
+public abstract class ConCmd
+{
+    public abstract string Command { get; }
+    public abstract string Description { get; }
+    public abstract CmdFlags Flags { get; }
+
+    public abstract void Exec(string[] args);
+}

Source/Engine/Core/Config.cs

@@ -0,0 +1,120 @@
+using System.IO;
+using ValveKeyValue;
+using Veldrid;
+
+namespace WinterEngine.Core;
+
+public struct ConVar
+{
+    public string Key { get; }
+    public Type Type { get; }
+    public object Value;
+    public object DefaultValue { get; }
+
+    public ConVar(string key, object value)
+    {
+        Key = key;
+        Type = value.GetType();
+        Value = value;
+        DefaultValue = value;
+    }
+}
+
+public static class ConfigManager
+{
+    private static readonly ILog m_Log = LogManager.GetLogger("Config");
+
+    private static List<ConVar> m_ConVars = new List<ConVar>();
+    private static Dictionary<string, ConVar> m_CVars = new Dictionary<string, ConVar>();
+
+    public static void Init()
+    {
+        m_Log.Info("Initializing ConfigManager");
+    }
+
+    public static void SaveConfig()
+    {
+        string path = Path.Combine(Engine.GameDir, "cfg", "config.cfg");
+        Datamodel.Datamodel configDmx = new Datamodel.Datamodel("config", 1);
+        configDmx.Root = new Datamodel.Element(configDmx, "DmeConfig");
+
+        foreach (string key in m_CVars.Keys)
+        {
+            //configDmx.Root.Add(key, m_CVars[])
+        }
+    }
+
+    public static void RegisterCVar(string key, object value)
+    {
+        if (m_ConVars.Where(i => i.Key == key).ToList().Count > 0)
+        {
+            m_Log.Error($"Convar {key} aready exists!");
+        }
+        else
+        {
+            m_ConVars.Add(new ConVar(key, value));
+        }
+    }
+
+    public static ConVar? GetCVar(string key)
+    {
+        foreach (ConVar cvar in m_ConVars)
+        {
+            if (cvar.Key == key)
+            {
+                return cvar;
+            }
+        }
+
+        m_Log.Error($"No convar by key {key}");
+        return null;
+    }
+
+    public static void SetValue(string key, object value)
+    {
+        // no you can't null check this variable, it's typed. (CS0019,CS0037)
+        // you also can't make it nullable, that makes it readonly. (CS0200)
+        ConVar cvar = m_ConVars.Where(i => i.Key == key).First();
+        try
+        {
+            cvar.Value = value;
+        }
+        catch
+        {
+            m_Log.Error($"No convar by key {key}");
+        }
+    }
+
+    public static void SetValue<T>(string key, T value)
+    {
+        // no you can't null check this variable, it's typed. (CS0019,CS0037)
+        // you also can't make it nullable, that makes it readonly. (CS0200)
+        ConVar cvar = m_ConVars.Where(i => i.Key == key).First();
+        try
+        {
+            if (cvar.Type == typeof(T))
+                cvar.Value = value;
+            else
+                m_Log.Error($"Convar {key} is not of type {typeof(T)}");
+        }
+        catch
+        {
+            m_Log.Error($"No convar by key {key}");
+        }
+    }
+
+    public static object? GetValue(string key)
+    {
+        foreach (ConVar cvar in m_ConVars)
+        {
+            if (cvar.Key == key)
+            {
+                return cvar.Value;
+            }
+        }
+
+        m_Log.Error($"No convar by key {key}");
+        return null;
+    }
+    public static T? GetValue<T>(string key) => (T)GetValue(key);
+}