diff --git a/.xtherion.dat b/.xtherion.dat index dab182a..cc350bc 100644 --- a/.xtherion.dat +++ b/.xtherion.dat @@ -26,5 +26,5 @@ xth_cp_map_tree_insert map 1 255X1 p2 1 MC-Deroc_05-Extended-tot MC-Deroc_05-Ext xth_cp_map_tree_create xth_cp_comp_stat 652 8 set xth(th_exit_state) 2 -set xth(th_exit_number) 1747829254 +set xth(th_exit_number) 1747812644 diff --git a/Data/Deroc_04/Sources/Deroc (coordonnées GPS diff).csv b/Data/Deroc_04/Sources/Deroc (coordonnées GPS diff).csv new file mode 100644 index 0000000..bace534 --- /dev/null +++ b/Data/Deroc_04/Sources/Deroc (coordonnées GPS diff).csv @@ -0,0 +1,4 @@ +Name,Code,Easting,Northing,Elevation,Description,Longitude,Latitude,Ellipsoidal height,Origin,Easting RMS,Northing RMS,Elevation RMS,Lateral RMS,Antenna height,Antenna height units,Solution status,Correction type,Averaging start,Averaging end,Samples,PDOP,GDOP,Base easting,Base northing,Base elevation,Base longitude,Base latitude,Base ellipsoidal height,Baseline,Mount point,CS name,GPS Satellites,GLONASS Satellites,Galileo Satellites,BeiDou Satellites,QZSS Satellites +Entrée 1,,812693.915,6367244.259,175.955,,4.41493588,44.39515034,226.291,Global,0.016,0.011,0.024,0.020,2.134,m,FIX,RTK,2025-05-18 09:51:25.8 UTC+02:00,2025-05-18 09:51:36.8 UTC+02:00,56,1.6,1.9,819169.362,6387786.316,279.031,4.50112234,44.57896426,329.670,21546.779,NEAR,RGF93 / Lambert-93 + NGF-IGN69(RAF20) height,10,7,7,5,0 +Entrée 2,,812779.345,6367288.033,176.416,,4.41601811,44.39553053,226.752,Global,0.011,0.012,0.019,0.016,2.134,m,FIX,RTK,2025-05-18 10:15:02.6 UTC+02:00,2025-05-18 10:15:13.6 UTC+02:00,56,1.7,2.0,819169.362,6387786.316,279.031,4.50112234,44.57896426,329.670,21479.450,NEAR,RGF93 / Lambert-93 + NGF-IGN69(RAF20) height,7,8,6,3,0 +Entrée 3,,812923.475,6367350.603,180.286,,4.41784148,44.39607040,230.624,Global,0.014,0.018,0.023,0.022,2.134,m,FIX,RTK,2025-05-18 10:22:14.6 UTC+02:00,2025-05-18 10:22:25.6 UTC+02:00,56,2.3,2.9,819169.362,6387786.316,279.031,4.50112234,44.57896426,329.670,21377.089,NEAR,RGF93 / Lambert-93 + NGF-IGN69(RAF20) height,7,5,5,3,0 diff --git a/Data/Deroc_04/Sources/Grotte de Déroc.cav b/Data/Deroc_04/Sources/Grotte de Déroc.cav new file mode 100644 index 0000000..8d43f6d Binary files /dev/null and b/Data/Deroc_04/Sources/Grotte de Déroc.cav differ diff --git a/Data/Deroc_04/Sources/Test Topo boucle 2 - Grotte du Déroc.pdf b/Data/Deroc_04/Sources/Test Topo boucle 2 - Grotte du Déroc.pdf new file mode 100644 index 0000000..a509448 Binary files /dev/null and b/Data/Deroc_04/Sources/Test Topo boucle 2 - Grotte du Déroc.pdf differ diff --git a/Scan3D/Deroc_05-LQ.fbx b/Scan3D/Deroc_05-LQ.fbx new file mode 100644 index 0000000..29fd44c Binary files /dev/null and b/Scan3D/Deroc_05-LQ.fbx differ diff --git a/Scan3D/Deroc_05.fbx b/Scan3D/Deroc_05.fbx new file mode 100644 index 0000000..249f192 Binary files /dev/null and b/Scan3D/Deroc_05.fbx differ diff --git a/Scan3D/GrosFichiers - Benoît Urruty.zip b/Scan3D/GrosFichiers - Benoît Urruty.zip new file mode 100644 index 0000000..1713c80 Binary files /dev/null and b/Scan3D/GrosFichiers - Benoît Urruty.zip differ diff --git a/Scan3D/Matrice-distance.xlsx b/Scan3D/Matrice-distance.xlsx new file mode 100644 index 0000000..9e9c4d9 Binary files /dev/null and b/Scan3D/Matrice-distance.xlsx differ diff --git a/Scan3D/VertexColorLitShader.shader b/Scan3D/VertexColorLitShader.shader new file mode 100644 index 0000000..4183032 --- /dev/null +++ b/Scan3D/VertexColorLitShader.shader @@ -0,0 +1,49 @@ + +Shader "Shader Graphs/VertexColorLitShader" +{ + Properties + { + } + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 200 + + Pass + { + Name "ForwardLit" + Tags { "LightMode" = "UniversalForward" } + + HLSLPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + + struct Attributes + { + float4 positionOS : POSITION; + float4 color : COLOR; + }; + + struct Varyings + { + float4 positionHCS : SV_POSITION; + float4 color : COLOR; + }; + + Varyings vert (Attributes input) + { + Varyings output; + output.positionHCS = TransformObjectToHClip(input.positionOS.xyz); + output.color = input.color; + return output; + } + + half4 frag (Varyings input) : SV_Target + { + return input.color; + } + ENDHLSL + } + } +} diff --git a/therion.log b/therion.log index 3dd4ea9..385319f 100644 --- a/therion.log +++ b/therion.log @@ -112,7 +112,7 @@ average distortion: 1.01% writing Outputs/Deroc.kml ... done writing Outputs/Deroc-Surveys.html ... done writing xtherion file ... done -compilation time: 0 sec +compilation time: 1 sec ######################### loop errors ##########################