Merge branch 'Dev'

Author: Pjbomb2

README.md

@@ -3,7 +3,7 @@
 ![](/.Images/Yanus1.png)
 ### A passion projects that has been going on for a while with the goal of bringing at least interactive path-tracing to everyone in unity, regardless of their hardware
 # Discord Server: https://discord.gg/4Yh7AZuhcD
-## Demo:  https://drive.google.com/file/d/1sb_zRycX23AlC3QQ9LfqrtEZzBj47Z-Y/view?usp=sharing
+## Demo:  https://drive.google.com/file/d/1moYUEW5wUuqavgsFLSbgZLzVnMvBjBnl/view?usp=sharing
 
 
 
@@ -68,6 +68,10 @@ for bringing bindless textures to unity!
 ### If you like what I do and want to support me or this project, Please consider becoming a Github Sponsor or a Patron at patreon.com/Pjbomb2!  This allows me to keep this free for everyone!
 ### You can contact me easiest through my discord server(above) or my [twitter](https://x.com/Pjbomb2) with bugs, ideas, or thoughts on the project!
 
+## First Install Note
+<ul>
+  <li>After you first install TrueTrace, you will need to restart the unity project this one time, so that the bindless plugin can initialize properly.</li>
+</ul>
 
 ## Adding new objects
 ### Automatic methods

TrueTrace.unitypackage

@@ -19,7 +19,7 @@ MonoBehaviour:
   UseRussianRoulette: 1
   UseNEE: 1
   DoTLASUpdates: 1
-  Accumulate: 1
+  Accumulate: 0
   PPBloom: 0
   BloomStrength: 0.5
   PPDoF: 0
@@ -31,11 +31,11 @@ MonoBehaviour:
   PPToneMap: 1
   PPTAA: 0
   RenderScale: 1
-  DenoiserMethod: 1
+  DenoiserMethod: 0
   UpscalerMethod: 0
   UseReSTIRGITemporal: 1
   UseReSTIRGISpatial: 1
-  UseReSTIRGI: 0
+  UseReSTIRGI: 1
   ReSTIRGITemporalMCap: 4
   DoReSTIRGIConnectionValidation: 1
   Exposure: 50
@@ -108,3 +108,4 @@ MonoBehaviour:
   PhotonGuidingRatio: 0.15
   PhotonGuidingPerLightGuidingResolution: 128
   PhotonGuidingTotalPhotonsPerFrame: 2000000
+  RadCacheToggle: 0

TrueTrace/DemoScene.asset

@@ -12853,9 +12853,9 @@ MonoBehaviour:
         Pad1: 0
       left: 2
       isLeaf: 0
+    NodeCount: 0
     SGTree: []
     PrimCount: 768
-    FinalIndices: 
     MaxDepth: 12
     ParentList: []
     ZeroBound:
@@ -12972,7 +12972,7 @@ MonoBehaviour:
   LightBLASCopyKernel: 8
   CompactedMeshData: 0
   InstanceReferences: 0
-  NeedsToUpdate: 0
+  NeedsToUpdate: 1
   FailureCount: 0
   TotalTriangles: 0
   IsSkinnedGroup: 0
@@ -38148,7 +38148,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e9c10216ea5531c4d82893474778943b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  EnableDebugTexture: 0
+  EnableDebugTexture: 1
   EnableDebugTexturePrev: 0
   LocalTTSettingsName: DemoSceneMain
   HDRPorURPRenderInScene: 0
@@ -38216,6 +38216,7 @@ MonoBehaviour:
   IsFocusing: 0
   IsFocusingDelta: 0
   AGXCustomTex: {fileID: 0}
+  RaycastSelectedIndex: -1
   _currentSample: 0
   CurrentHorizonalPatch: {x: 0, y: 0}
   FramesSinceStart2: 0
@@ -38266,12 +38267,11 @@ MonoBehaviour:
   RenderTransforms: []
   RenderQue: []
   BuildQue:
-  - {fileID: 499686671}
-  - {fileID: 1770588100}
-  - {fileID: 1931085300}
+  - {fileID: 0}
   AddQue: []
   RemoveQue: []
-  UpdateQue: []
+  UpdateQue:
+  - {fileID: 0}
   InstanceRenderQue: []
   InstanceUpdateQue: []
   InstanceRenderTransforms: []
@@ -47618,9 +47618,9 @@ MonoBehaviour:
         Pad1: 0
       left: 2
       isLeaf: 0
+    NodeCount: 0
     SGTree: []
     PrimCount: 4864
-    FinalIndices: 
     MaxDepth: 18
     ParentList: []
     ZeroBound:
@@ -47644,7 +47644,7 @@ MonoBehaviour:
       cosTheta_oe: 0
       left: 0
   ExistsInQue: 1
-  QueInProgress: 1
+  QueInProgress: 2
   RenderImposters: 0
   IsDeformable: 0
   Name: sponza
@@ -55315,11 +55315,11 @@ MonoBehaviour:
   ConstructKernel: 0
   RefitLayerKernel: 1
   UpdateGlobalBufferAABBKernel: 3
-  LightBLASRefitKernel: 6
-  LightBLASCopyKernel: 8
+  LightBLASRefitKernel: 5
+  LightBLASCopyKernel: 6
   CompactedMeshData: 0
   InstanceReferences: 0
-  NeedsToUpdate: 0
+  NeedsToUpdate: 1
   FailureCount: 0
   TotalTriangles: 0
   IsSkinnedGroup: 0
@@ -61809,9 +61809,9 @@ MonoBehaviour:
         Pad1: 0
       left: 0
       isLeaf: 0
+    NodeCount: 0
     SGTree: []
     PrimCount: 0
-    FinalIndices: 
     MaxDepth: 0
     ParentList: []
     ZeroBound:
@@ -61928,7 +61928,7 @@ MonoBehaviour:
   LightBLASCopyKernel: 8
   CompactedMeshData: 3
   InstanceReferences: 0
-  NeedsToUpdate: 0
+  NeedsToUpdate: 1
   FailureCount: 0
   TotalTriangles: 0
   IsSkinnedGroup: 0

TrueTrace/DemoScene.unity

@@ -549,6 +549,17 @@ public void CopyFunction(RayTracingObject ThisOBJ, int SaveIndex) {
                 string FolderName = "COPYPASTEBUFFER";
                 string PresetName = "COPYPASTEBUFFER";
                 UnityEditor.AssetDatabase.Refresh();
+                if(RayMaster.LocalTTSettings.CurrentTargetFile == "") {
+                    string TempFilePath = TTPathFinder.GetMaterialPresetsPath();
+                    var info = new DirectoryInfo(TempFilePath);
+                    var fileInfo = info.GetFiles();
+                    for(int i = 0; i < fileInfo.Length; i++) {
+                        if(!fileInfo[i].Name.Contains(".xml.meta") && fileInfo[i].Name.Contains(".xml")) {
+                            RayMaster.LocalTTSettings.CurrentTargetFile = TempFilePath + fileInfo[i].Name;
+                            break;
+                        }
+                    }
+                }
                 using (var A = new StringReader(Resources.Load<TextAsset>("Utility/MaterialPresets/" + RayMaster.LocalTTSettings.CurrentTargetFile.Substring(RayMaster.LocalTTSettings.CurrentTargetFile.LastIndexOf("/") + 1).Replace(".xml", "")).text)) {
                     var serializer = new XmlSerializer(typeof(RayObjFolderMaster));
                     PresetMaster = serializer.Deserialize(A) as RayObjFolderMaster;
@@ -1109,7 +1120,7 @@ public override void OnInspectorGUI() {
                                 ConnectionSources.Add("Smoothness", GUILayoutUtility.GetLastRect()); // Store position
                                 ConnectionSourceNames.Add("Smoothness");
                                 Flag = CommonFunctions.SetFlagVar(Flag, CommonFunctions.Flags.InvertSmoothnessTexture, EditorGUILayout.ToggleLeft("Invert Roughness Tex", Flag.GetFlag(CommonFunctions.Flags.InvertSmoothnessTexture), GUILayout.MaxWidth(135)));
-                                Flag = CommonFunctions.SetFlagVar(Flag, CommonFunctions.Flags.ShadowCaster, EditorGUILayout.ToggleLeft("Casts Shadows", Flag.GetFlag(CommonFunctions.Flags.ShadowCaster), GUILayout.MaxWidth(135)));
+                                Flag = CommonFunctions.SetFlagVar(Flag, CommonFunctions.Flags.ShadowCaster, !EditorGUILayout.ToggleLeft("Casts Shadows", !Flag.GetFlag(CommonFunctions.Flags.ShadowCaster), GUILayout.MaxWidth(135)));
                                 Flag = CommonFunctions.SetFlagVar(Flag, CommonFunctions.Flags.UseVertexColors, EditorGUILayout.ToggleLeft("Vertex Colors", Flag.GetFlag(CommonFunctions.Flags.UseVertexColors), GUILayout.MaxWidth(135)));
                             EditorGUILayout.EndHorizontal();
                             EditorGUILayout.BeginHorizontal();

TrueTrace/Editor/PathTracerSettings.cs

@@ -3,7 +3,8 @@
     "rootNamespace": "",
     "references": [
         "GUID:ed514bd980ff3ea46904db26e115c21d",
-        "GUID:457756d89b35d2941b3e7b37b4ece6f1"
+        "GUID:457756d89b35d2941b3e7b37b4ece6f1",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

TrueTrace/Editor/RayTracingObjectEditor.cs

@@ -3,10 +3,11 @@ For more in depth/full details, go to the Readme on the Truetrace Github(at leas
 
 
 To get started:
-1. After importing the unity package, for a new scene you want to open the PathTracer tab on the top bar, and click "Arrange Hierarchy"
-2. After doing this, your scene should now be in the format required by the path tracer
-3. Now you can click "Build Aggregated BVH" to build the acceleration structure for all objects, and just wait for the "Remaining Objects" to turn green before entering play mode(this can be ignored if wanted)
-4. After that is done, you can just enter play mode and play as normal
+1. First, import the unity package.  After doing this you will need to restart unity this one time, so that the bindless plugin initialized properly.
+2. After restarting, for a new scene you want to open the PathTracer tab on the top bar, and click "Arrange Hierarchy"
+3. After doing this, your scene should now be in the format required by the path tracer
+4. Now you can click "Build Aggregated BVH" to build the acceleration structure for all objects, and just wait for the "Remaining Objects" to turn green before entering play mode(this can be ignored if wanted)
+5. After that is done, you can just enter play mode and play as normal
 
 
 Adding new objects
@@ -27,6 +28,16 @@ Adding new objects
 			Any parent gameobject of the RayTracingObjects(will group together all Skinned Children)
 	For default unity lights, you just add the "RayTracingLight" script to each one
 
+
+What to do if your scene is all white/textures dont load:
+This is due to truetrace not recognizing the shader used by your materials.  Thus, to fix this you will have to tell truetrace what each texture represents(I promise its not hard, and no there's no way to automate it).
+1. First, open up the truetrace settings menu and navigate to the "Material Pair Options" tab.
+2. You will see a slot at the top for a material.  Drag ANY material that uses the unrecognized shader into this slot(This will all only need to be done once per shader, NOT per material, but doing it with a material this way lets me display textures nicely).
+3. After this, you will see an output block with a lot of plugs. You dont need to fill these all out, only what you want truetrace to use.
+4. At the top left, there will be 3 buttons, one for adding texture nodes, one for adding color nodes, and one for adding float nodes.  Clicking these will spawn their respective node, and will serve as inputs to the Output node via the plugs.
+5. Simply drag the plugs from the input to the output, note that each output plug needs a unique input node(but these unique nodes can use the same texture/source, we just cant have a single input node directly point to 2 output plugs).
+6. After you have set up the plugs you want, just click "Apply Material Links" at the top, and rebuild the aggregated BVH to display the changes.
+
 General Use/Notes
 	DX12 is recommended, as it enables use of OIDN, Bindless texturing, RT Cores, and slightly higher performance
 	The camera you want to render from, you attach the RenderHandler script to(if you have a camera tagged MainCamera, this will be done automatically)