falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dim manager test 2

Browse Source
This commit is contained in:
Tnze
2022-05-22 14:46:07 +08:00
parent 562836ac5e
commit a5dd70d1ea
6 changed files with 183 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/internal/bvh/bound.go
View File

@ -56,4 +56,4 @@ func (s Sphere[I, V]) Union(other Sphere[I, V]) Sphere[I, V] {
R: d + s.R + other.R,
}
}
func (s Sphere[I, V]) Surface() I { return I(2 * math.Pi * s.R) }
func (s Sphere[I, V]) Surface() I { return 2 * math.Pi * s.R }

39
server/internal/bvh/bvh.go
View File

@ -10,7 +10,7 @@ type Node[I constraints.Float, B interface {
Union(B) B
Surface() I
}, V any] struct {
box B
Box B
Value V
parent *Node[I, B, V]
children [2]*Node[I, B, V]
@ -35,17 +35,14 @@ func (n *Node[I, B, V]) findChildPointer(child *Node[I, B, V]) **Node[I, B, V] {
panic("unreachable, please make sure the 'not' is the n's child")
}
func (n *Node[I, B, V]) each(test func(bound B) bool, foreach func(v V)) {
func (n *Node[I, B, V]) each(test func(bound B) bool, foreach func(n *Node[I, B, V]) bool) bool {
if n == nil {
return
return true
}
if n.isLeaf {
if test(n.box) {
foreach(n.Value)
}
return !test(n.Box) || foreach(n)
} else {
n.children[0].each(test, foreach)
n.children[1].each(test, foreach)
return n.children[0].each(test, foreach) && n.children[1].each(test, foreach)
}
}
@ -58,7 +55,7 @@ type Tree[I constraints.Float, B interface {
func (t *Tree[I, B, V]) Insert(leaf B, value V) (n *Node[I, B, V]) {
n = &Node[I, B, V]{
box: leaf,
Box: leaf,
Value: value,
parent: nil,
children: [2]*Node[I, B, V]{nil, nil},
@ -71,7 +68,7 @@ func (t *Tree[I, B, V]) Insert(leaf B, value V) (n *Node[I, B, V]) {
// Stage 1: find the best sibling for the new leaf
sibling := t.root
bestCost := t.root.box.Union(leaf).Surface()
bestCost := t.root.Box.Union(leaf).Surface()
parentTo := &t.root // the parent's children pointer which point to the sibling
var queue searchHeap[I, Node[I, B, V]]
@ -81,8 +78,8 @@ func (t *Tree[I, B, V]) Insert(leaf B, value V) (n *Node[I, B, V]) {
for queue.Len() > 0 {
p := heap.Pop(&queue).(searchItem[I, Node[I, B, V]])
// determine if node p has the best cost
mergeSurface := p.pointer.box.Union(leaf).Surface()
deltaCost := mergeSurface - p.pointer.box.Surface()
mergeSurface := p.pointer.Box.Union(leaf).Surface()
deltaCost := mergeSurface - p.pointer.Box.Surface()
cost := p.inheritedCost + mergeSurface
if cost <= bestCost {
bestCost = cost
@ -107,7 +104,7 @@ func (t *Tree[I, B, V]) Insert(leaf B, value V) (n *Node[I, B, V]) {
// Stage 2: create a new parent
*parentTo = &Node[I, B, V]{
box: sibling.box.Union(leaf), // we will calculate in Stage3
Box: sibling.Box.Union(leaf), // we will calculate in Stage3
parent: sibling.parent,
children: [2]*Node[I, B, V]{sibling, n},
isLeaf: false,
@ -117,7 +114,7 @@ func (t *Tree[I, B, V]) Insert(leaf B, value V) (n *Node[I, B, V]) {
// Stage 3: walk back up the tree refitting AABBs
for p := *parentTo; p != nil; p = p.parent {
p.box = p.children[0].box.Union(p.children[1].box)
p.Box = p.children[0].Box.Union(p.children[1].Box)
t.rotate(p)
}
return
@ -140,7 +137,7 @@ func (t *Tree[I, B, V]) Delete(n *Node[I, B, V]) interface{} {
*p = sibling
sibling.parent = grand
for p := sibling.parent; p.parent != nil; p = p.parent {
p.box = p.children[0].box.Union(p.children[1].box)
p.Box = p.children[0].Box.Union(p.children[1].Box)
t.rotate(p)
}
}
@ -153,23 +150,23 @@ func (t *Tree[I, B, V]) rotate(n *Node[I, B, V]) {
}
// trying to swap n's sibling and children
sibling := n.parent.findAnotherChild(n)
current := n.box.Surface()
if n.children[1].box.Union(sibling.box).Surface() < current {
current := n.Box.Surface()
if n.children[1].Box.Union(sibling.Box).Surface() < current {
// swap n.children[0] and sibling
t1 := [2]*Node[I, B, V]{n, n.children[0]}
t2 := [2]*Node[I, B, V]{sibling, n.children[1]}
n.parent.children, n.children, n.children[0].parent, sibling.parent = t1, t2, n.parent, n
n.box = n.children[0].box.Union(n.children[1].box)
} else if n.children[0].box.Union(sibling.box).Surface() < current {
n.Box = n.children[0].Box.Union(n.children[1].Box)
} else if n.children[0].Box.Union(sibling.Box).Surface() < current {
// swap n.children[1] and sibling
t1 := [2]*Node[I, B, V]{n, n.children[1]}
t2 := [2]*Node[I, B, V]{sibling, n.children[0]}
n.parent.children, n.children, n.children[1].parent, sibling.parent = t1, t2, n.parent, n
n.box = n.children[0].box.Union(n.children[1].box)
n.Box = n.children[0].Box.Union(n.children[1].Box)
}
}
func (t *Tree[I, B, V]) Find(test func(bound B) bool, foreach func(v V)) {
func (t *Tree[I, B, V]) Find(test func(bound B) bool, foreach func(n *Node[I, B, V]) bool) {
t.root.each(test, foreach)
}

12
server/internal/bvh/bvh_test.go
View File

@ -23,8 +23,9 @@ func TestTree2_Insert(t *testing.T) {
// visualize
t.Log(bvh)
}
bvh.Find(TouchPoint[Vec2[float64], AABB[float64, Vec2[float64]]](Vec2[float64]{0.5, 0.5}), func(v int) {
t.Logf("find! %v", v)
bvh.Find(TouchPoint[Vec2[float64], AABB[float64, Vec2[float64]]](Vec2[float64]{0.5, 0.5}), func(n *Node[float64, AABB[float64, Vec2[float64]], int]) bool {
t.Logf("find! %v", n.Value)
return true
})
}
@ -46,8 +47,9 @@ func TestTree2_Find_vec(t *testing.T) {
}
find := func(test func(bound AABBVec2d) bool) []int {
var result []int
bvh.Find(test, func(i int) {
result = append(result, i)
bvh.Find(test, func(n *Node[float64, AABBVec2d, int]) bool {
result = append(result, n.Value)
return true
})
return result
}
@ -108,7 +110,7 @@ func BenchmarkTree2_Find_random(b *testing.B) {
b.ResetTimer()
for _, v := range poses {
bvh.Find(TouchPoint[Vec2d, AABBVec2d](v), func(v any) {})
bvh.Find(TouchPoint[Vec2d, AABBVec2d](v), func(n *Node[float64, AABBVec2d, any]) bool { return true })
}
}