Fixed always adding a new node to AABBTree when updating a node.

This commit is contained in:
2019-02-25 12:51:26 -06:00
parent 97818c8a33
commit 0d7210b3f7
4 changed files with 14 additions and 12 deletions

View File

@@ -28,9 +28,9 @@ class IMICFPS
@physics_manager.update
# binding.irb
p @aabb_tree
# p @aabb_tree
collisions.each do |ent, list|
puts "#{ent.class} -> [#{list.map{|e| e.class}.join(', ')}]"
# puts "#{ent.class} -> [#{list.map{|e| e.class}.join(', ')}]"
end
end

View File

@@ -79,13 +79,6 @@ class IMICFPS
glMatrixMode(GL_MODELVIEW) # The modelview matrix is where object information is stored.
glLoadIdentity
# if $debug && @entity
# glBegin(GL_LINES)
# glColor3f(1,0,0)
# glVertex3f(@x, @y, @z)
# glVertex3f(@entity.x, @entity.y, @entity.z)
# glEnd
# end
end
def update

View File

@@ -1,7 +1,8 @@
class IMICFPS
class AABBTree
class AABBNode
attr_accessor :bounding_box, :parent, :object, :a, :b
attr_accessor :bounding_box, :parent, :object
attr_reader :a, :b
def initialize(parent:, object:, bounding_box:)
@parent = parent
@object = object
@@ -11,6 +12,16 @@ class IMICFPS
@b = nil
end
def a=(leaf)
@a = leaf
@a.parent = self
end
def b=(leaf)
@b = leaf
@b.parent = self
end
def leaf?
@object
end

View File

@@ -32,7 +32,6 @@ class IMICFPS
def update(object, bounding_box)
leaf = remove(object)
leaf.bounding_box = bounding_box
@objects[object] = leaf
insert_leaf(leaf)
end
@@ -50,7 +49,6 @@ class IMICFPS
def remove(object)
leaf = @objects.delete(object)
@root = @root.remove_subtree(leaf) if leaf
@root.parent = nil
return leaf
end