Merge branch 'dev'

tooll3 · Nov 27, 2023 · 745af23 · 745af23
2 parents 66b8643 + c598e9d
commit 745af23
Show file tree

Hide file tree

Showing 223 changed files with 9,599 additions and 1,166 deletions.
diff --git a/.Variations/32e18957-3812-4f64-8663-18454518d005.var b/.Variations/32e18957-3812-4f64-8663-18454518d005.var
@@ -0,0 +1,83 @@
+{
+  "Id": "32e18957-3812-4f64-8663-18454518d005",
+  "Variations": [
+    {
+      "Id": "c4fd4b5f-5d80-445b-bdc1-630d40135162",
+      "IsPreset": true,
+      "ActivationIndex": 1,
+      "Title": "Decal",
+      "PosOnCanvas": {
+        "X": 327.17477,
+        "Y": -165.5575
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "6f4184f1-6017-4bcc-ac1f-5ea4862bfb0c": {
+            "X": 0.14,
+            "Y": 0.15
+          },
+          "5b8ff5d7-e4d6-4631-8f0a-afb8086383e7": 0.5,
+          "6a786aa9-edf4-4363-9e34-0ddc7e763f0b": 22.0,
+          "43eb4d4e-2bb5-4c97-a5dd-91539b8258cd": 3
+        }
+      }
+    },
+    {
+      "Id": "eab0122b-852d-4a90-9109-ad5cfe2b239f",
+      "IsPreset": true,
+      "ActivationIndex": 2,
+      "Title": "Moquette",
+      "PosOnCanvas": {
+        "X": 150.63937,
+        "Y": -164.66591
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "5b8ff5d7-e4d6-4631-8f0a-afb8086383e7": 0.25,
+          "6a786aa9-edf4-4363-9e34-0ddc7e763f0b": 0.0,
+          "c31a95a9-2cfb-4eea-8006-97f883d11847": true,
+          "43eb4d4e-2bb5-4c97-a5dd-91539b8258cd": 0
+        }
+      }
+    },
+    {
+      "Id": "8b7edead-5008-46a6-9317-a71452440906",
+      "IsPreset": true,
+      "ActivationIndex": 3,
+      "Title": "MirrorSeamlessPattern",
+      "PosOnCanvas": {
+        "X": 149.0762,
+        "Y": -61.27054
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "5b8ff5d7-e4d6-4631-8f0a-afb8086383e7": 0.25,
+          "6a786aa9-edf4-4363-9e34-0ddc7e763f0b": 0.0,
+          "c31a95a9-2cfb-4eea-8006-97f883d11847": true,
+          "43eb4d4e-2bb5-4c97-a5dd-91539b8258cd": 1
+        }
+      }
+    },
+    {
+      "Id": "28865b49-c7a1-4964-9e48-76aca3019881",
+      "IsPreset": true,
+      "ActivationIndex": 4,
+      "Title": "InterstellarBookshelf",
+      "PosOnCanvas": {
+        "X": 329.72058,
+        "Y": -61.27054
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "6f4184f1-6017-4bcc-ac1f-5ea4862bfb0c": {
+            "X": -0.125,
+            "Y": -0.125
+          },
+          "5b8ff5d7-e4d6-4631-8f0a-afb8086383e7": 0.25,
+          "c31a95a9-2cfb-4eea-8006-97f883d11847": true,
+          "43eb4d4e-2bb5-4c97-a5dd-91539b8258cd": 4
+        }
+      }
+    }
+  ]
+}
diff --git a/.Variations/55411442-d538-48bf-ab78-b8c24c85aa46.var b/.Variations/55411442-d538-48bf-ab78-b8c24c85aa46.var
@@ -130,6 +130,21 @@
           "090c56b2-bbed-447e-baa1-5993b4e12ddc": 0.0
         }
       }
+    },
+    {
+      "Id": "ce4cf2cd-3220-412a-a846-e69383e39b1d",
+      "IsPreset": true,
+      "ActivationIndex": 6,
+      "Title": "Default",
+      "PosOnCanvas": {
+        "X": 0.0,
+        "Y": 93.0
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "090c56b2-bbed-447e-baa1-5993b4e12ddc": 0.1
+        }
+      }
     }
   ]
 }
diff --git a/.Variations/a2ea3af5-d78b-46b4-84db-09d31f042798.var b/.Variations/a2ea3af5-d78b-46b4-84db-09d31f042798.var
@@ -0,0 +1,64 @@
+{
+  "Id": "a2ea3af5-d78b-46b4-84db-09d31f042798",
+  "Variations": [
+    {
+      "Id": "72bf4736-2ae5-4ae2-8a97-2395f43f926d",
+      "IsPreset": true,
+      "ActivationIndex": 2,
+      "Title": "Test",
+      "PosOnCanvas": {
+        "X": 326.0,
+        "Y": 0.0
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "73ba7691-784f-4706-8a88-9305f723c4cc": 13.082,
+          "ffcdb058-5131-4146-8deb-a3102349e1c3": 0.194,
+          "1e6d0245-b5d4-45a5-8dac-6d905837060d": 1.0,
+          "4ed2a94d-ea7b-4fc5-8b3b-2ced9542b763": 180.0,
+          "54ecb0e0-6fc0-4441-b26b-b820e95475a0": 0.0015,
+          "c027bc94-4ef8-4828-8df5-d30abbd31cbc": -0.89,
+          "5264cbf8-13f6-4dfe-a82d-4f0904973488": false,
+          "4232af30-de5f-4fd6-af92-d704e26f6850": {
+            "X": 0.54,
+            "Y": 0.82
+          },
+          "0eeae01b-80d6-4267-bdf5-a6df2533ffe9": {
+            "X": 0.85,
+            "Y": 0.12
+          }
+        }
+      }
+    },
+    {
+      "Id": "f1cde690-68aa-4c00-bab7-23d8c6f1f66d",
+      "IsPreset": true,
+      "ActivationIndex": 2,
+      "Title": "Anotherone",
+      "PosOnCanvas": {
+        "X": 163.0,
+        "Y": 0.0
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "73ba7691-784f-4706-8a88-9305f723c4cc": 6.1,
+          "ffcdb058-5131-4146-8deb-a3102349e1c3": -0.12,
+          "c364b443-300e-4323-b0cc-f615649995a5": 1.1,
+          "4ed2a94d-ea7b-4fc5-8b3b-2ced9542b763": -70.0,
+          "c0174be3-4a8c-4b06-a75d-e8c686b072af": 0.0,
+          "c027bc94-4ef8-4828-8df5-d30abbd31cbc": 0.0,
+          "5264cbf8-13f6-4dfe-a82d-4f0904973488": false,
+          "4232af30-de5f-4fd6-af92-d704e26f6850": {
+            "X": 0.7,
+            "Y": 0.56
+          },
+          "0eeae01b-80d6-4267-bdf5-a6df2533ffe9": {
+            "X": 0.06,
+            "Y": 0.19
+          },
+          "c7f25ad5-1907-4851-8057-7c73f82da1be": 0.73
+        }
+      }
+    }
+  ]
+}
diff --git a/.Variations/ed0bc47a-31ef-400b-b4e4-5552a859b309.var b/.Variations/ed0bc47a-31ef-400b-b4e4-5552a859b309.var
@@ -0,0 +1,39 @@
+{
+  "Id": "ed0bc47a-31ef-400b-b4e4-5552a859b309",
+  "Variations": [
+    {
+      "Id": "edf6107b-fe5b-4c4a-a541-5c13044bf9b8",
+      "IsPreset": true,
+      "ActivationIndex": 1,
+      "Title": "BouncyBunch",
+      "PosOnCanvas": {
+        "X": 163.0,
+        "Y": 0.0
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "0724bf0c-8f97-44de-bf42-6a89b89f1632": 10.0,
+          "d0036a34-d7e4-4542-b231-5d1b687b0028": 0.8,
+          "91966b2c-342a-420a-bad1-cbcf4d6af1ae": 0.75
+        }
+      }
+    },
+    {
+      "Id": "b84a2efc-379b-4b7b-b2b8-b17a207e8554",
+      "IsPreset": true,
+      "ActivationIndex": 2,
+      "Title": "Collision For Small Points",
+      "PosOnCanvas": {
+        "X": 326.0,
+        "Y": 0.0
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "0724bf0c-8f97-44de-bf42-6a89b89f1632": 1.0,
+          "d0036a34-d7e4-4542-b231-5d1b687b0028": 0.8,
+          "91966b2c-342a-420a-bad1-cbcf4d6af1ae": 0.0024
+        }
+      }
+    }
+  ]
+}
diff --git a/.Variations/fbe1a703-f372-4236-9f20-5d0b69183843.var b/.Variations/fbe1a703-f372-4236-9f20-5d0b69183843.var
@@ -0,0 +1,25 @@
+{
+  "Id": "fbe1a703-f372-4236-9f20-5d0b69183843",
+  "Variations": [
+    {
+      "Id": "ffb0ae9f-3108-4733-8a66-916731aa5824",
+      "IsPreset": true,
+      "ActivationIndex": 1,
+      "Title": "Bouncy Floor",
+      "PosOnCanvas": {
+        "X": 163.0,
+        "Y": 0.0
+      },
+      "ParameterSetsForChildIds": {
+        "00000000-0000-0000-0000-000000000000": {
+          "60eb8c10-93fa-487b-9eda-1767b485bb21": 0.38,
+          "86c81e40-79e8-4699-a7fe-581f0b09d266": 2,
+          "ceb7008d-c536-4d87-b3f8-d5ba9fe29eed": 0.9,
+          "3b975bd9-b8aa-4a41-97fc-ccd3b5e89e63": 0.1,
+          "7c6f58e7-27fc-4271-adef-248cffe5a8b7": 2.0,
+          "2ab85ac3-819d-4e3e-891a-7f27af627fdf": false
+        }
+      }
+    }
+  ]
+}
diff --git a/.gitignore b/.gitignore
@@ -299,3 +299,4 @@ Resources/user/still/proj-worksforeverybody/_shared
 Resources/user/pixtur/research/Overlay/230620_16_9_BG_prototyp.png
 Resources/user/pixtur/projects/proj-vj-barn
 Screenshots
+Resources/user/pixtur/research/1000Images/images
diff --git a/Core/Model/SymbolData.cs b/Core/Model/SymbolData.cs
@@ -162,7 +162,8 @@ private static void SortAllSymbolSourceFiles()
             var symbol = SymbolRegistry.Entries.Values.SingleOrDefault(s => s.Name == classname);
             if (symbol == null)
             {
-                Log.Warning($"Skipping unregistered source file {sourceFilePath}");
+                // This happens when renaming symbols.
+                Log.Debug($"Skipping unregistered source file {sourceFilePath}");
                 continue;
             }
 

diff --git a/Core/Operator/Slots/InputSlot.cs b/Core/Operator/Slots/InputSlot.cs
@@ -49,6 +49,13 @@ public SymbolChild.Input Input
             }
         }
 
+        public T GetCurrentValue()
+        {
+            return IsConnected
+                       ? Value
+                       : TypedInputValue.Value;
+        }
+
         public void SetTypedInputValue(T newValue)
         {
             Input.IsDefault = false;

diff --git a/Core/Rendering/PrbDataTypes.cs b/Core/Rendering/PrbDataTypes.cs
@@ -83,8 +83,8 @@ private static void Init()
             _baseColorMapSrv = new ShaderResourceView(device, WhitePixelTexture);
             _emissiveColorMapSrv = new ShaderResourceView(device, WhitePixelTexture);
 
-            RsmoFallbackTexture = CreateFallBackTexture(new Vector4(1, 0, 1, 0));
-            _rsmoMapSrv = new ShaderResourceView(device, RsmoFallbackTexture);
+            RmoFallbackTexture = CreateFallBackTexture(new Vector4(0f, 0, 1, 0));
+            _rsmoMapSrv = new ShaderResourceView(device, RmoFallbackTexture);
 
             NormalFallbackTexture = CreateFallBackTexture(new Vector4(0.5f, 0.5f, 1, 0));
             _normalMapSrv = new ShaderResourceView(device, NormalFallbackTexture);
@@ -167,7 +167,7 @@ private static Texture2D LoadTexture(string imagePath)
         private static Buffer _defaultParameterBuffer = null;
 
         public static Texture2D WhitePixelTexture;
-        public static Texture2D RsmoFallbackTexture;
+        public static Texture2D RmoFallbackTexture;
         public static Texture2D NormalFallbackTexture;
         private static bool _wasInitialized;
     }

diff --git a/Core/Resource/ResourceFileWatcher.cs b/Core/Resource/ResourceFileWatcher.cs
@@ -49,7 +49,7 @@ public static void AddFileHook(string filepath, Action action)
                 AddWatcher(ResourceManager.ResourcesFolder, pattern);
             }
 
-            if (_resourceFileHooks.TryGetValue(filepath, out var hook))
+            if (ResourceFileHooks.TryGetValue(filepath, out var hook))
             {
                 hook.FileChangeAction -= action;
                 hook.FileChangeAction += action;
@@ -60,7 +60,7 @@ public static void AddFileHook(string filepath, Action action)
                                   {
                                       FileChangeAction = action
                                   };
-                _resourceFileHooks.Add(filepath,newHook);
+                ResourceFileHooks.Add(filepath,newHook);
             }
         }
 
@@ -93,7 +93,7 @@ public static void EnableOperatorFileWatcher()
         private static void FileChangedHandler(object sender, FileSystemEventArgs fileSystemEventArgs)
         {
             // Log.Info($"change for '{fileSystemEventArgs.Name}' due to '{fileSystemEventArgs.ChangeType}'.");
-            if (!_resourceFileHooks.TryGetValue(fileSystemEventArgs.FullPath, out var fileHook))
+            if (!ResourceFileHooks.TryGetValue(fileSystemEventArgs.FullPath, out var fileHook))
             {
                 //Log.Warning("Invalid FileResource?");
                 return;
@@ -140,7 +140,7 @@ private static void CsFileRenamedHandler(object sender, RenamedEventArgs renamed
         }
 
         private static FileSystemWatcher _csFileWatcher;
-        public static readonly Dictionary<string, ResourceFileHook> _resourceFileHooks = new();
+        public static readonly Dictionary<string, ResourceFileHook> ResourceFileHooks = new();
     }
 
     /// <summary>