Skip to content

Commit

Permalink
changed PoolGeometry from record to class to avoid conflicts with Ada…
Browse files Browse the repository at this point in the history
…ptiveGeometry
  • Loading branch information
luithefirst committed Sep 25, 2024
1 parent 279f77c commit 88b5065
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions src/Aardvark.SceneGraph/Pools/ManagedPool.fs
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ type AdaptiveGeometry =
InstanceAttributes : Map<Symbol, IAdaptiveValue>
}

[<ReferenceEquality; NoComparison>]
type PooledGeometry =
{
FaceVertexCount : int
VertexCount : int
Indices : voption<BufferView>
VertexAttributes : SymbolDict<BufferView>
InstanceAttributes : SymbolDict<IAdaptiveValue>
}
/// NOTE: temporary data structure to avoid conflicts and will be reworked in 5.6 (probably become record)
[<NoComparison>]
type PooledGeometry (faceVertexCount : int, vertexCount : int, indices : voption<BufferView>, vertexAttributes : SymbolDict<BufferView>, instanceAttributes : SymbolDict<IAdaptiveValue>) =
member x.FaceVertexCount = faceVertexCount
member x.VertexCount = vertexCount
member x.Indices = indices
member x.VertexAttributes = vertexAttributes
member x.InstanceAttributes = instanceAttributes

type GeometrySignature =
{
Expand All @@ -53,7 +52,7 @@ module GeometrySignature =
[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
module AdaptiveGeometry =

let ofIndexedGeometry (instanceAttributes : list<Symbol * IAdaptiveValue>) (ig : IndexedGeometry) : AdaptiveGeometry =
let ofIndexedGeometry (instanceAttributes : list<Symbol * IAdaptiveValue>) (ig : IndexedGeometry) =
let anyAtt = (ig.IndexedAttributes |> Seq.head).Value

let faceVertexCount, index =
Expand Down

0 comments on commit 88b5065

Please sign in to comment.