Skip to content

Commit 1d9a2ac

Browse files
haraldsteinlechnerharaldsteinlechner
committed
activated OpcViewer for testing annotation performance
1 parent 716f36b commit 1d9a2ac

File tree

2 files changed

+57
-56
lines changed

2 files changed

+57
-56
lines changed

‎src/OpcViewer/Program.fs

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type Kind = Scene | Annotations | Solarsystem
1111
[<EntryPoint>]
1212
let main argv =
1313

14-
let kind = Scene
14+
let kind = Annotations
1515

1616
let shaler =
1717
{
@@ -93,7 +93,7 @@ let main argv =
9393
preTransform = Trafo3d.Identity
9494
patchHierarchies =
9595
Seq.delay (fun _ ->
96-
System.IO.Directory.GetDirectories(@"I:\OPC\Shaler_OPCs_2019\Shaler_Navcam")
96+
System.IO.Directory.GetDirectories(@"C:\pro3ddata\Shaler_OPCs_2019\Shaler_Navcam")
9797
|> Seq.collect System.IO.Directory.GetDirectories
9898
)
9999
boundingBox = Box3d.Parse("[[-2490137.664354247, 2285874.562728135, -271408.476700304], [-2490136.248131170, 2285875.658034266, -271406.605430601]]")
@@ -103,37 +103,37 @@ let main argv =
103103
lodDecider = DefaultMetrics.mars2
104104
}
105105

106-
let scene =
107-
{
108-
useCompressedTextures = true
109-
preTransform = Trafo3d.Identity
110-
patchHierarchies =
111-
Seq.delay (fun _ ->
112-
System.IO.Directory.GetDirectories(@"F:\pro3d\data\20200220_DinosaurQuarry2")
113-
|> Seq.collect System.IO.Directory.GetDirectories
114-
)
115-
boundingBox = Box3d.Parse("[[-15.699694740, 4.338130733, -0.514935397], [-4.960646670, 36.914955133, 5.004174588]]")
116-
near = 0.1
117-
far = 10000.0
118-
speed = 5.0
119-
lodDecider = DefaultMetrics.mars2
120-
}
106+
//let scene =
107+
// {
108+
// useCompressedTextures = true
109+
// preTransform = Trafo3d.Identity
110+
// patchHierarchies =
111+
// Seq.delay (fun _ ->
112+
// System.IO.Directory.GetDirectories(@"F:\pro3d\data\20200220_DinosaurQuarry2")
113+
// |> Seq.collect System.IO.Directory.GetDirectories
114+
// )
115+
// boundingBox = Box3d.Parse("[[-15.699694740, 4.338130733, -0.514935397], [-4.960646670, 36.914955133, 5.004174588]]")
116+
// near = 0.1
117+
// far = 10000.0
118+
// speed = 5.0
119+
// lodDecider = DefaultMetrics.mars2
120+
// }
121121

122-
let scene =
123-
{
124-
useCompressedTextures = true
125-
preTransform = Trafo3d.Identity
126-
patchHierarchies =
127-
Seq.delay (fun _ ->
128-
System.IO.Directory.GetDirectories(@"F:\pro3d\data\20200220_DinosaurQuarry2")
129-
|> Seq.collect System.IO.Directory.GetDirectories
130-
)
131-
boundingBox = Box3d.Parse("[[-15.699694740, 4.338130733, -0.514935397], [-4.960646670, 36.914955133, 5.004174588]]")
132-
near = 0.1
133-
far = 10000.0
134-
speed = 5.0
135-
lodDecider = DefaultMetrics.mars2
136-
}
122+
//let scene =
123+
// {
124+
// useCompressedTextures = true
125+
// preTransform = Trafo3d.Identity
126+
// patchHierarchies =
127+
// Seq.delay (fun _ ->
128+
// System.IO.Directory.GetDirectories(@"F:\pro3d\data\20200220_DinosaurQuarry2")
129+
// |> Seq.collect System.IO.Directory.GetDirectories
130+
// )
131+
// boundingBox = Box3d.Parse("[[-15.699694740, 4.338130733, -0.514935397], [-4.960646670, 36.914955133, 5.004174588]]")
132+
// near = 0.1
133+
// far = 10000.0
134+
// speed = 5.0
135+
// lodDecider = DefaultMetrics.mars2
136+
// }
137137

138138
//let scene =
139139
// {
@@ -149,20 +149,20 @@ let main argv =
149149
// lodDecider = DefaultMetrics.mars2
150150
// }
151151

152-
let scene =
153-
{
154-
useCompressedTextures = true
155-
preTransform = Trafo3d.Identity
156-
patchHierarchies =
157-
Seq.delay (fun _ ->
158-
System.IO.Directory.GetDirectories(@"F:\pro3d\data\OpcMcz")
159-
)
160-
boundingBox = Box3d.Parse("[[699507.902347501, 3142696.785742886, 1072717.259930025], [699508.165976587, 3142697.102699531, 1072717.505653937]]")
161-
near = 0.1
162-
far = 10000.0
163-
speed = 5.0
164-
lodDecider = DefaultMetrics.mars2
165-
}
152+
//let scene =
153+
// {
154+
// useCompressedTextures = true
155+
// preTransform = Trafo3d.Identity
156+
// patchHierarchies =
157+
// Seq.delay (fun _ ->
158+
// System.IO.Directory.GetDirectories(@"F:\pro3d\data\OpcMcz")
159+
// )
160+
// boundingBox = Box3d.Parse("[[699507.902347501, 3142696.785742886, 1072717.259930025], [699508.165976587, 3142697.102699531, 1072717.505653937]]")
161+
// near = 0.1
162+
// far = 10000.0
163+
// speed = 5.0
164+
// lodDecider = DefaultMetrics.mars2
165+
// }
166166

167167
//let scene =
168168
// {
@@ -202,6 +202,7 @@ let main argv =
202202
//let annotations = @"F:\pro3d\data\OpcMcz\singleAnno.pro3d.ann"
203203
let annotations = @"F:\pro3d\data\OpcMcz\blub.pro3d.ann"
204204
let annotations = @"F:\pro3d\data\OpcMcz\notworking.pro3d.ann"
205+
let annotations = @"C:\pro3ddata\Shaler_OPCs_2019\Shaler_v2_Mastcam_w_Navcam_v18_merged_measurementsV2.pro3d.ann"
205206
//let annotations = @"F:\pro3d\data\OpcMcz\heavy.pro3d.ann"
206207
//let annotations = @"F:\pro3d\data\dimorphos\singleanno.pro3d.ann"
207208

‎src/PRo3D.Core/SequencedBookmarks/SequencedBookmarks-Model.g.fs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//6d8cd910-4dda-ff00-b5b9-3124d680763e
2-
//3c8b49e2-8409-5ae6-0249-2d61ef7d14b6
2+
//27fed84a-92a3-c0f8-2bf4-85ad9cadf2db
33
#nowarn "49" // upper case patterns
44
#nowarn "66" // upcast is unncecessary
55
#nowarn "1337" // internal types
@@ -12,11 +12,11 @@ open Adaptify
1212
open PRo3D.Core.SequencedBookmarks
1313
[<System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
1414
type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
15-
let mutable _cameraView_ = FSharp.Data.Adaptive.cval(value.cameraView)
16-
let mutable _name_ = FSharp.Data.Adaptive.cval(value.name)
17-
let mutable _key_ = FSharp.Data.Adaptive.cval(value.key)
1815
let mutable _path_ = FSharp.Data.Adaptive.cval(value.path)
16+
let mutable _key_ = FSharp.Data.Adaptive.cval(value.key)
17+
let mutable _cameraView_ = FSharp.Data.Adaptive.cval(value.cameraView)
1918
let mutable _filename_ = FSharp.Data.Adaptive.cval(value.filename)
19+
let mutable _name_ = FSharp.Data.Adaptive.cval(value.name)
2020
let _bookmark_ = PRo3D.Core.AdaptiveBookmark(value.bookmark)
2121
let _metadata_ = FSharp.Data.Adaptive.cval(value.metadata)
2222
let _frustumParameters_ = FSharp.Data.Adaptive.cval(value.frustumParameters)
@@ -41,11 +41,11 @@ type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
4141
if Microsoft.FSharp.Core.Operators.not((FSharp.Data.Adaptive.ShallowEqualityComparer<SequencedBookmarkModel>.ShallowEquals(value, __value))) then
4242
__value <- value
4343
__adaptive.MarkOutdated()
44-
_cameraView_.Value <- value.cameraView
45-
_name_.Value <- value.name
46-
_key_.Value <- value.key
4744
_path_.Value <- value.path
45+
_key_.Value <- value.key
46+
_cameraView_.Value <- value.cameraView
4847
_filename_.Value <- value.filename
48+
_name_.Value <- value.name
4949
_bookmark_.Update(value.bookmark)
5050
_metadata_.Value <- value.metadata
5151
_frustumParameters_.Value <- value.frustumParameters
@@ -56,11 +56,11 @@ type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
5656
_duration_.Update(value.duration)
5757
_observationInfo_.Update(value.observationInfo)
5858
member __.Current = __adaptive
59-
member __.cameraView = _cameraView_ :> FSharp.Data.Adaptive.aval<Aardvark.Rendering.CameraView>
60-
member __.name = _name_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
61-
member __.key = _key_ :> FSharp.Data.Adaptive.aval<System.Guid>
6259
member __.path = _path_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
60+
member __.key = _key_ :> FSharp.Data.Adaptive.aval<System.Guid>
61+
member __.cameraView = _cameraView_ :> FSharp.Data.Adaptive.aval<Aardvark.Rendering.CameraView>
6362
member __.filename = _filename_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
63+
member __.name = _name_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
6464
member __.version = __value.version
6565
member __.bookmark = _bookmark_
6666
member __.metadata = _metadata_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.option<Microsoft.FSharp.Core.string>>

0 commit comments

Comments
 (0)