Win32, path tracer fixes

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "submodules/glslang"]
 	path = submodules/glslang
-	url = https://github.com/KhronosGroup/glslang
+	url = https://github.com/notomorrow/glslang
+	branch = hyp-modifications
 [submodule "submodules/libdatachannel"]
 	path = submodules/libdatachannel
 	url = https://github.com/paullouisageneau/libdatachannel

CMakeLists.txt

@@ -258,6 +258,7 @@ if (${NATIVE})
     # if glslang folder exists, link with it.
     if(EXISTS "${CMAKE_SOURCE_DIR}/submodules/glslang/glslang/CMakeLists.txt")
         add_definitions(-DHYP_GLSLANG=1)
+        add_definitions(-DHYP_GLSLANG_MODIFICATIONS=1)
 
         include_directories(BEFORE submodules/glslang)
         add_subdirectory(submodules/glslang)

containers.natvis

@@ -20,7 +20,7 @@
 
       <ArrayItems Condition="use_inline_storage == false || m_storage.m_is_dynamic == true">
         <Size>(m_size - m_start_offset)</Size>
-        <ValuePointer>($T1 *)(m_storage.m_buffer + m_start_offset)</ValuePointer>
+        <ValuePointer>(($T1 *)m_storage.m_buffer + m_start_offset)</ValuePointer>
       </ArrayItems>
       <ArrayItems Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false">
         <Size>(m_size - m_start_offset)</Size>
@@ -31,27 +31,27 @@
   </Type>
 
   <Type Name="hyperion::containers::detail::String&lt;*&gt;">
-    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 2">{{ {(m_storage.m_buffer + m_start_offset), s8} }}</DisplayString>
+    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 2">{{ {((CharType *)m_storage.m_buffer + m_start_offset), s8} }}</DisplayString>
     <DisplayString Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; $T1 == 2">{{ {(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), s8} }}</DisplayString>
-    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 1 &amp;&amp; is_ansi">{{ {(m_storage.m_buffer + m_start_offset), s} }}</DisplayString>
+    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 1 &amp;&amp; is_ansi">{{ {((CharType *)m_storage.m_buffer + m_start_offset), s} }}</DisplayString>
     <DisplayString Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; $T1 == 1 &amp;&amp; is_ansi">{{ {(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), s} }}</DisplayString>
-    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 3 &amp;&amp; is_utf16">{{ {(m_storage.m_buffer + m_start_offset), su} }}</DisplayString>
+    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 3 &amp;&amp; is_utf16">{{ {((CharType *)m_storage.m_buffer + m_start_offset), su} }}</DisplayString>
     <DisplayString Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; $T1 == 3 &amp;&amp; is_utf16">{{ {(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), su} }}</DisplayString>
-    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 4 &amp;&amp; is_utf32">{{ {(m_storage.m_buffer + m_start_offset), s32} }}</DisplayString>
+    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 4 &amp;&amp; is_utf32">{{ {((CharType *)m_storage.m_buffer + m_start_offset), s32} }}</DisplayString>
     <DisplayString Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; $T1 == 4 &amp;&amp; is_utf32">{{ {(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), s32} }}</DisplayString>
-    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 5 &amp;&amp; is_wide">{{ {(m_storage.m_buffer + m_start_offset), su} }}</DisplayString>
+    <DisplayString Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; $T1 == 5 &amp;&amp; is_wide">{{ {((CharType *)m_storage.m_buffer + m_start_offset), su} }}</DisplayString>
     <DisplayString Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; $T1 == 5 &amp;&amp; is_wide">{{ {(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), su} }}</DisplayString>
 
     <Expand>
-      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_utf8">(m_storage.m_buffer + m_start_offset), s8</Item>
+      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_utf8">((CharType *)m_storage.m_buffer + m_start_offset), s8</Item>
       <Item Name="[Text]" Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; is_utf8">(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), s8</Item>
-      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_ansi">(m_storage.m_buffer + m_start_offset), s</Item>
+      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_ansi">((CharType *)m_storage.m_buffer + m_start_offset), s</Item>
       <Item Name="[Text]" Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; is_ansi">(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), s</Item>
-      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_utf16">(m_storage.m_buffer + m_start_offset), su</Item>
+      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_utf16">((CharType *)m_storage.m_buffer + m_start_offset), su</Item>
       <Item Name="[Text]" Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; is_utf16">(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), su</Item>
-      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_utf32">(m_storage.m_buffer + m_start_offset), s32</Item>
+      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_utf32">((CharType *)m_storage.m_buffer + m_start_offset), s32</Item>
       <Item Name="[Text]" Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; is_utf32">(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), s32</Item>
-      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_wide">(m_storage.m_buffer + m_start_offset), su</Item>
+      <Item Name="[Text]" Condition="use_inline_storage == false || m_storage.m_is_dynamic == true &amp;&amp; is_wide">((CharType *)m_storage.m_buffer + m_start_offset), su</Item>
       <Item Name="[Text]" Condition="use_inline_storage == true &amp;&amp; m_storage.m_is_dynamic == false &amp;&amp; is_wide">(((CharType *)&amp;m_storage.m_inline_storage.data[0]) + m_start_offset), su</Item>
 
       <Item Name="[Type]">string_type</Item>
@@ -78,7 +78,7 @@
         <Exec Condition="m_buckets.use_inline_storage == false">bucket_ptr = ((hyperion::containers::detail::HashBucket&lt;$T1,$T2&gt; *) m_buckets.m_storage.m_buffer)</Exec>
 
         <Exec Condition="m_buckets.use_inline_storage == true &amp;&amp; m_buckets.m_storage.m_is_dynamic == false">bucket_ptr = ((hyperion::containers::detail::HashBucket&lt;$T1,$T2&gt; *)&amp;m_buckets.m_storage.m_inline_storage.data[0] + m_buckets.m_start_offset)</Exec>
-        <Exec Condition="m_buckets.use_inline_storage == false || m_buckets.m_storage.m_is_dynamic == true">bucket_ptr = (hyperion::containers::detail::HashBucket&lt;$T1,$T2&gt; *)(m_buckets.m_storage.m_buffer + m_buckets.m_start_offset)</Exec>
+        <Exec Condition="m_buckets.use_inline_storage == false || m_buckets.m_storage.m_is_dynamic == true">bucket_ptr = ((hyperion::containers::detail::HashBucket&lt;$T1,$T2&gt; *)m_buckets.m_storage.m_buffer + m_buckets.m_start_offset)</Exec>
 
         <Loop>
           <Break Condition="bucket_index == (m_buckets.m_size - m_buckets.m_start_offset)" />
@@ -128,7 +128,7 @@
   </Type>
 
   <Type Name="hyperion::utilities::detail::VariantBase&lt;*,*&gt;">
-    <DisplayString>{{ TypeID={m_current_type_id} }}</DisplayString>
+    <DisplayString>{{ Index={m_current_index} }}</DisplayString>
     <Expand>
       <Item Name="[Data]">m_storage.data_buffer</Item>
     </Expand>
@@ -167,7 +167,9 @@
 
     <Expand>
       <!--<Item Name="[Data]">(0)</Item>-->
-      <ExpandedItem Condition="index != 0">($T1 *)(&amp;(s_container-&gt;m_data.m_values[index - 1]))</ExpandedItem>
+
+      <!-- FIXME objectcontainer now uses linkedlist internally -->
+      <ExpandedItem Condition="index != 0">($T1 *)(&amp;(((hyperion::ObjectContainer&lt;$T1&gt; *)s_container)-&gt;m_data.m_values[index - 1]))</ExpandedItem>
       <ExpandedItem Condition="index == 0">($T1 *)0</ExpandedItem>
     </Expand>
   </Type>
@@ -189,7 +191,7 @@
         <Exec Condition="g_name_registry-&gt;m_name_map.m_buckets.use_inline_storage == false">bucket_ptr = ((hyperion::containers::detail::HashBucket&lt;unsigned __int64,hyperion::containers::detail::String&lt;1&gt; &gt; *) &amp;(g_name_registry-&gt;m_name_map.m_buckets.m_storage.m_buffer))</Exec>
 
         <Exec Condition="g_name_registry-&gt;m_name_map.m_buckets.use_inline_storage == true &amp;&amp; g_name_registry-&gt;m_name_map.m_buckets.m_storage.m_is_dynamic == false">bucket_ptr = ((hyperion::containers::detail::HashBucket&lt;unsigned __int64,hyperion::containers::detail::String&lt;1&gt; &gt; *)&amp;g_name_registry-&gt;m_name_map.m_buckets.m_storage.m_inline_storage.data[0] + g_name_registry-&gt;m_name_map.m_buckets.m_start_offset)</Exec>
-        <Exec Condition="g_name_registry-&gt;m_name_map.m_buckets.use_inline_storage == false || g_name_registry-&gt;m_name_map.m_buckets.m_storage.m_is_dynamic == true">bucket_ptr = (hyperion::containers::detail::HashBucket&lt;unsigned __int64,hyperion::containers::detail::String&lt;1&gt; &gt; *)(g_name_registry-&gt;m_name_map.m_buckets.m_storage.m_buffer + g_name_registry-&gt;m_name_map.m_buckets.m_start_offset)</Exec>
+        <Exec Condition="g_name_registry-&gt;m_name_map.m_buckets.use_inline_storage == false || g_name_registry-&gt;m_name_map.m_buckets.m_storage.m_is_dynamic == true">bucket_ptr = ((hyperion::containers::detail::HashBucket&lt;unsigned __int64,hyperion::containers::detail::String&lt;1&gt; &gt; *)g_name_registry-&gt;m_name_map.m_buckets.m_storage.m_buffer + g_name_registry-&gt;m_name_map.m_buckets.m_start_offset)</Exec>
 
         <Loop>
           <Break Condition="found == true || bucket_index == (g_name_registry-&gt;m_name_map.m_buckets.m_size - g_name_registry-&gt;m_name_map.m_buckets.m_start_offset)" />
@@ -204,7 +206,7 @@
                   <Item Name="StringValue">(char*)&amp;(current_head-&gt;pair.second.m_storage.m_inline_storage.data + current_head-&gt;pair.second.m_start_offset)[0],sb</Item>
                 </If>
                 <If Condition="current_head-&gt;pair.second.use_inline_storage == false || current_head-&gt;pair.second.m_storage.m_is_dynamic == true">
-                  <Item Name="StringValue">(char*)&amp;(current_head-&gt;pair.second.m_storage.m_buffer + current_head-&gt;pair.second.m_start_offset)[0],sb</Item>
+                  <Item Name="StringValue">&amp;((char*)current_head-&gt;pair.second.m_storage.m_buffer + current_head-&gt;pair.second.m_start_offset)[0],sb</Item>
                 </If>
                 <Exec>found = true</Exec>
               </If>
@@ -224,14 +226,14 @@
   </Type>
 
   <Type Name="hyperion::renderer::RenderObjectHandle_Strong&lt;*,*&gt;">
-    <DisplayString>{{ ID={index} Strong={_container->m_data.m_values[index - 1].ref_count_strong.m_value} Weak={_container->m_data.m_values[index - 1].ref_count_weak.m_value} }}</DisplayString>
+    <DisplayString>{{ ID={index} Strong={s_container->m_data.m_values[index - 1].ref_count_strong.m_value} Weak={s_container->m_data.m_values[index - 1].ref_count_weak.m_value} }}</DisplayString>
 
     <Expand>
-      <Item Name="[Strong]">(_container->m_data.m_values[index - 1].ref_count_strong.m_value)</Item>
-      <Item Name="[Weak]">_container->m_data.m_values[index - 1].ref_count_weak.m_value</Item>
+      <Item Name="[Strong]">(s_container->m_data.m_values[index - 1].ref_count_strong.m_value)</Item>
+      <Item Name="[Weak]">s_container->m_data.m_values[index - 1].ref_count_weak.m_value</Item>
       <!--<Item Name="[Name]">_container->m_debug_names.m_values[index]</Item>-->
 
-      <ExpandedItem>($T1 *)(&amp;(_container->m_data.m_values[index - 1].storage))</ExpandedItem>
+      <ExpandedItem>($T1 *)(&amp;(s_container->m_data.m_values[index - 1].storage))</ExpandedItem>
     </Expand>
   </Type>
 

res/Shaders.ini

@@ -4,7 +4,7 @@ frag = DeferredIndirect.frag
 vert = Deferred.vert
 
 [DeferredDirect]
-permute = LIGHT_TYPE(DIRECTIONAL POINT SPOT AREA_RECT), SSR_ENABLED, REFLECTION_PROBE_ENABLED, ENV_GRID_ENABLED, RT_REFLECTIONS_ENABLED, RT_GI_ENABLED, HBIL_ENABLED, HBAO_EABLED, LIGHT_RAYS_ENABLED
+permute = LIGHT_TYPE(DIRECTIONAL POINT SPOT AREA_RECT)
 frag = DeferredDirect.frag
 vert = Deferred.vert
 

res/data/config/app.json

@@ -1,22 +1,22 @@
 {
   "rendering": {
     "ssr": {
-      "enabled": false,
       "quality": "low",
       "roughness_scattering": true,
+      "enabled": false,
       "cone_tracing": true
     },
     "rt": {
       "reflections": {
         "enabled": false
       },
       "path_tracer": {
-        "enabled": false
+        "enabled": true
       },
       "gi": {
         "enabled": false
       },
-      "enabled": false
+      "enabled": true
     },
     "taa": {
       "enabled": true
@@ -45,5 +45,10 @@
   "app": {
     "name": "HyperionEditor",
     "args": "-ResX=1920 -ResY=1080"
+  },
+  "lightmapper": {
+    "ideal_triangles_per_job": 4096,
+    "gpu": true,
+    "threads": 16
   }
 }

res/data/dotnet/runtimeconfig.json

@@ -1,6 +1,6 @@
 {
   "runtimeOptions": {
-    "additionalProbingPaths": ["../res/data/dotnet/lib", "."],
+    "additionalProbingPaths": ["..\\..\\..\\res\\data\\dotnet\\lib", "."],
     "tfm": "net8.0",
     "framework": {
       "name": "Microsoft.NETCore.App",

res/scripts/src/Hyperion/Editor/UI/EditorMain.cs

@@ -0,0 +1,163 @@
+
+using System;
+using System.IO;
+using Hyperion;
+
+namespace FooBar
+{
+    // temp
+    class TestDataSource : UIDataSource
+    {
+
+    }
+
+    public class TestEditorTask : LongRunningEditorTask
+    {
+        public TestEditorTask()
+        {
+        }
+
+        public override void Cancel()
+        {
+            Logger.Log(LogType.Info, "Cancel task");
+        }
+
+        public override bool IsCompleted()
+        {
+            return false;
+        }
+
+        public override void Process()
+        {
+            Logger.Log(LogType.Info, "Process task! testing");
+        }
+    }
+
+    public class EditorMain : UIEventHandler
+    {
+        public override void Init(Entity entity)
+        {
+            base.Init(entity);
+        }
+
+        public UIEventHandlerResult SimulateClicked()
+        {
+            // Test: Force GC
+            GC.Collect();
+
+            World world = Scene.GetWorld();
+
+            if (world.GetGameState().Mode == GameStateMode.Simulating)
+            {
+                Logger.Log(LogType.Info, "Stop simulation");
+
+                world.StopSimulating();
+                return UIEventHandlerResult.Ok;
+            }
+
+            Logger.Log(LogType.Info, "Start simulation");
+
+            world.StartSimulating();
+
+            var editorSubsystem = World.GetSubsystem<EditorSubsystem>();
+
+            if (editorSubsystem == null)
+            {
+                Logger.Log(LogType.Error, "EditorSubsystem not found");
+
+                return UIEventHandlerResult.Error;
+            }
+
+            editorSubsystem.AddTask(new TestEditorTask());
+
+            return UIEventHandlerResult.Ok;
+        }
+
+        public UIEventHandlerResult UndoClicked()
+        {
+            Logger.Log(LogType.Info, "Undo clicked");
+
+            var editorSubsystem = World.GetSubsystem<EditorSubsystem>();
+
+            if (editorSubsystem == null)
+            {
+                Logger.Log(LogType.Error, "EditorSubsystem not found");
+
+                return UIEventHandlerResult.Error;
+            }
+
+            if (!editorSubsystem.GetActionStack().CanUndo())
+            {
+                Logger.Log(LogType.Info, "Cannot undo, stack is empty");
+
+                return UIEventHandlerResult.Ok;
+            }
+
+            editorSubsystem.GetActionStack().Undo();
+
+            return UIEventHandlerResult.Ok;
+        }
+
+        public UIEventHandlerResult RedoClicked()
+        {
+            Logger.Log(LogType.Info, "Redo clicked");
+
+            var editorSubsystem = World.GetSubsystem<EditorSubsystem>();
+
+            if (editorSubsystem == null)
+            {
+                Logger.Log(LogType.Error, "EditorSubsystem not found");
+
+                return UIEventHandlerResult.Error;
+            }
+
+            if (!editorSubsystem.GetActionStack().CanRedo())
+            {
+                Logger.Log(LogType.Info, "Cannot redo, stack is empty");
+
+                return UIEventHandlerResult.Ok;
+            }
+
+            editorSubsystem.GetActionStack().Redo();
+
+            return UIEventHandlerResult.Ok;
+        }
+
+        public UIEventHandlerResult AddNodeClicked()
+        {
+            var editorSubsystem = World.GetSubsystem<EditorSubsystem>();
+
+            if (editorSubsystem == null)
+            {
+                Logger.Log(LogType.Error, "EditorSubsystem not found");
+
+                return UIEventHandlerResult.Ok;
+            }
+
+            var node = new Node();
+            node.SetName("New Node");
+
+            editorSubsystem.GetActionStack().Push(new EditorAction(
+                new Name("AddNewNode"),
+                () =>
+                {
+                    editorSubsystem.GetScene().GetRoot().AddChild(node);
+                    editorSubsystem.SetFocusedNode(node);
+                },
+                () =>
+                {
+                    node.Remove();
+
+                    if (editorSubsystem.GetFocusedNode() == node)
+                    {
+                        editorSubsystem.SetFocusedNode(null);
+                    }
+                }
+            ));
+
+            // @TODO Focus on node in scene view
+
+            return UIEventHandlerResult.Ok;
+        }
+    }
+}