fixed problem with objs not being rendered with batch rendering

pro3d-space · Jul 18, 2024 · af1b008 · af1b008
1 parent f372ac9
commit af1b008
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/PRODUCT_RELEASE_NOTES.md b/PRODUCT_RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+## 4.25.0-prerelease7
+- distance- and trianglefilter fix
+- fixed problem with sequenced bookmarks performance problem when a traverse is loaded
+- fixed obj not being rendered with batch rendering
+
 ## 4.24.0
 - streamlined up kdtree loading
 

diff --git a/src/PRo3D.Snapshots/Program.fs b/src/PRo3D.Snapshots/Program.fs
@@ -46,7 +46,7 @@ open FSharp.Data.Adaptive
 
 type EmbeddedRessource = EmbeddedRessource
 
-let viewerVersion       = "4.12.0-Snapshots"
+let viewerVersion       = "4.25.0-prerelease7-Snapshots"
 let catchDomainErrors   = false
 
 open System.IO

diff --git a/src/PRo3D.Snapshots/Properties/launchSettings.json b/src/PRo3D.Snapshots/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "PRo3D.Viewer": {
       "commandName": "Project",
-      "commandLineArgs": "--scn \"D:\\Data\\PRo3D\\sceneTestSSS.pro3d\" --asnap \"C:\\Users\\rnowak\\Desktop\\Pro3D\\PRo3D\\bin\\Debug\\net6.0\\images\\batchRendering.json\" --out \"C:\\Users\\rnowak\\Desktop\\Pro3D\\PRo3D\\bin\\Debug\\net6.0\\images\" --verbose"
+      "commandLineArgs": "--scn \"D:\\Data\\PRo3D\\Scenes\\objKillsSBookmarksTest.pro3d\" --asnap \"C:\\Users\\rnowak\\Desktop\\Pro3D\\PRo3D\\bin\\Debug\\net6.0\\images\\batchRendering.json\" --out \"C:\\Users\\rnowak\\Desktop\\Pro3D\\PRo3D\\bin\\Debug\\net6.0\\images\" --verbose"
     }
   }
 }
diff --git a/src/PRo3D.Viewer/Program.fs b/src/PRo3D.Viewer/Program.fs
@@ -55,7 +55,7 @@ type Result =
       result : string;
    }
 
-let viewerVersion       = "4.25.0-prerelease5"
+let viewerVersion       = "4.25.0-prerelease6"
 let catchDomainErrors   = false
 
 open System.IO

diff --git a/src/PRo3D.Viewer/Viewer/SnapshotSg.fs b/src/PRo3D.Viewer/Viewer/SnapshotSg.fs
@@ -130,22 +130,34 @@ module SnapshotSg =
                 fun x -> ( x 
                     |> AMap.map(fun guid surface ->              
                         let observationSystem = Gis.GisApp.getSpiceReferenceSystemAdaptive m.scene.gisApp guid
-                        viewSingleSurfaceSg 
-                            surface 
-                            m.scene.surfacesModel.surfaces.flat
-                            m.frustum 
-                            selected 
-                            surfacePicking
-                            surface.globalBB
-                            refSystem 
-                            observationSystem
-                            observerSystem
-                            m.footPrint
-                            vpVisible
-                            usehighlighting filterTexture
-                            allowFootprint
-                            false
-                            view
+                        let s = 
+                            viewSingleSurfaceSg 
+                                surface 
+                                m.scene.surfacesModel.surfaces.flat
+                                m.frustum 
+                                selected 
+                                surfacePicking
+                                surface.globalBB
+                                refSystem 
+                                observationSystem
+                                observerSystem
+                                m.footPrint
+                                vpVisible
+                                usehighlighting filterTexture
+                                allowFootprint
+                                false
+                                view
+                        match surface.isObj with
+                        | true -> 
+                            s 
+                            |> Sg.effect [
+                                objEffect
+                            ] 
+                        | false -> 
+                            s
+                            |> Sg.effect [surfaceEffect] 
+                            |> Sg.uniform "LoDColor" (AVal.constant C4b.Gray)
+                            |> Sg.uniform "LodVisEnabled" m.scene.config.lodColoring
                        )
                     |> AMap.toASet 
                     |> ASet.map snd                     
@@ -163,9 +175,6 @@ module SnapshotSg =
                         let sg = 
                             set 
                             |> Sg.set
-                            |> Sg.effect [surfaceEffect]
-                            |> Sg.uniform "LoDColor" (AVal.constant C4b.Gray)
-                            |> Sg.uniform "LodVisEnabled" m.scene.config.lodColoring //()
 
                         yield sg :> ISg 
                         let depthTested = 
@@ -233,7 +242,6 @@ module SnapshotSg =
             Sg.ofList[ds;annos;]
 
         let overlayed =
-            //let near = m.scene.config.nearPlane.value
 
             let refSystem =
                 Sg.view
@@ -244,7 +252,8 @@ module SnapshotSg =
                 |> Sg.map ReferenceSystemMessage  
 
             let exploreCenter =
-                Navigation.Sg.view m.navigation          
+                Navigation.Sg.view m.navigation
+                |> Sg.onOff m.scene.config.showExplorationPointGui     
 
             let homePosition =
                 Sg.viewHomePosition m.scene.surfacesModel
@@ -300,7 +309,7 @@ module SnapshotSg =
                 annotationTexts |> Sg.noEvents
                 heightValidation
                 scaleBarTexts
-                traverse
+                traverse                
             ] |> Sg.ofList // (correlationLogs |> Sg.map CorrelationPanelMessage); (finishedLogs |> Sg.map CorrelationPanelMessage)] |> Sg.ofList // (*;orientationCube*) //solText
 
         let heightValidationDiscs =