Merge pull request #482 from 3dgeo-heidelberg/alpha_swap_debug

Alpha swap debug
3dgeo-heidelberg · Dec 5, 2024 · d83a0de · d83a0de
2 parents 5c53c67 + 4766c77
commit d83a0de
Show file tree

Hide file tree

Showing 9 changed files with 1,178 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ BibTeX:
 | [![Example 9](img/example9_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/9-tls_livox_demo.ipynb)   | [![Example 10](img/example10_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/10-uls_toyblocks_livox.ipynb)            |
 | [![Example 11](img/example11_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/11-als_toyblock_multi_scanner_livox.ipynb)   | [![Example 12](img/example12_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/12-multi_scanner_puck.ipynb)            |
 | [![Example 13](img/example13_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/13-interpolated_trajectory.ipynb)   | [![Example 14](img/example14_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/14-urban_mls_dynamic.ipynb) |
-| [![Example 15](img/example15_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/15-tls_tree_dynamic.ipynb) |  |
+| [![Example 15](img/example15_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/15-tls_tree_dynamic.ipynb) | [![Example 16](img/example16_thumbnail.png)](https://nbviewer.org/github/3dgeo-heidelberg/helios/blob/dev/example_notebooks/16-dyn_geom_swap.ipynb) | |
 
 
 

diff --git a/data/surveys/demo/box_survey_interp.xml b/data/surveys/demo/box_survey_interp.xml
@@ -8,7 +8,7 @@
 				trajectory="data/trajectories/flyandrotate.trj"
 				tIndex="0" xIndex="4" yIndex="5" zIndex="6" rollIndex="1" pitchIndex="2" yawIndex="3"
 				slopeFilterThreshold="0.0" toRadians="true" syncGPSTime="true"
-				tStart="0" tEnd="5" teleportToStart="true"
+				tStart="0" tEnd="5"
 			/>  
 			<scannerSettings template="scaset" trajectoryTimeInterval_s="0.01"/>
         </leg>

diff --git a/data/surveys/dyn/als_dyn_geom_swap.xml b/data/surveys/dyn/als_dyn_geom_swap.xml
@@ -3,15 +3,15 @@
     <survey name="dyn_geom_swap_als" scene="data/scenes/dyn/dyn_geom_swap_scene.xml#dyn_geom_swap_scene" platform="data/platforms.xml#sr22" scanner="data/scanners_als.xml#leica_als50">
 		<leg>
             <platformSettings  x="100" y="100.0" z="400" onGround="false" movePerSec_m="5" />
-            <scannerSettings  active="true" pulseFreq_hz="83000" scanFreq_hz="70" scanAngle_deg="60" />
+            <scannerSettings  active="true" pulseFreq_hz="83000" scanFreq_hz="70" scanAngle_deg="60" trajectoryTimeInterval_s="0.01"/>
         </leg>
 		<leg>
             <platformSettings  x="-100" y="-100.0" z="400" onGround="false" movePerSec_m="5" />
             <scannerSettings  active="false" pulseFreq_hz="83000" scanFreq_hz="70" scanAngle_deg="60" />
         </leg>
 		<leg>
             <platformSettings  x="-100" y="100.0" z="400" onGround="false" movePerSec_m="5" />
-            <scannerSettings  active="true" pulseFreq_hz="83000" scanFreq_hz="70" scanAngle_deg="60" />
+            <scannerSettings  active="true" pulseFreq_hz="83000" scanFreq_hz="70" scanAngle_deg="60" trajectoryTimeInterval_s="0.01"/>
         </leg>
 		<leg>
             <platformSettings  x="100" y="-100.0" z="400" onGround="false" movePerSec_m="5" />

diff --git a/data/surveys/dyn/interp_dyn_geom_swap.xml b/data/surveys/dyn/interp_dyn_geom_swap.xml
@@ -9,7 +9,7 @@
 			<platformSettings 
 				trajectory="data/trajectories/swap_on_repeat_trajectory.txt"
 				tIndex="0" xIndex="1" yIndex="2" zIndex="3" rollIndex="4" pitchIndex="5" yawIndex="6"
-				tStart="0" teleportToStart="true" trajectory_separator="," interpolationDomain="position"
+				tStart="0" trajectory_separator="," interpolationDomain="position"
 			/>
             <scannerSettings  active="true" pulseFreq_hz="83000" scanFreq_hz="70" scanAngle_deg="60" trajectoryTimeInterval_s="0.033" />
         </leg>

diff --git a/example_notebooks/16-dyn_geom_swap.ipynb b/example_notebooks/16-dyn_geom_swap.ipynb
diff --git a/img/example16_thumbnail.png b/img/example16_thumbnail.png
diff --git a/img/example16_thumbnail.svg b/img/example16_thumbnail.svg
diff --git a/src/assetloading/XmlSceneLoader.cpp b/src/assetloading/XmlSceneLoader.cpp
@@ -214,6 +214,8 @@ AbstractGeometryFilter * XmlSceneLoader::loadFilter(
     }
     // ################### END Set up filter ##################
 
+    filter->setAssetsDir(assetsDir);
+
     return filter;
 }
 

diff --git a/src/main/LidarSim.h b/src/main/LidarSim.h
@@ -91,7 +91,7 @@ class LidarSim {
         size_t kdtJobs = 1,
         size_t kdtGeomJobs = 1,
         size_t sahLossNodes = 21,
-        bool legacyEnergyModel = false
+        bool legacyEnergyModel = true
     );
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -214,6 +214,8 @@ AbstractGeometryFilter * XmlSceneLoader::loadFilter( @@
         }
         // ################### END Set up filter ##################
+        filter->setAssetsDir(assetsDir);
         return filter;
     }
@@ Expand Down @@