Migrate to use go-database libs

downflux · Jan 6, 2023 · 8134f3d · 8134f3d
1 parent d546378
commit 8134f3d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 413 deletions.
diff --git a/collider/collider.go b/collider/collider.go
@@ -6,11 +6,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/downflux/go-collider/internal/collider"
 	"github.com/downflux/go-collider/internal/kinematics"
 	"github.com/downflux/go-database/agent"
 	"github.com/downflux/go-database/database"
 	"github.com/downflux/go-database/feature"
+	"github.com/downflux/go-database/filters"
 	"github.com/downflux/go-database/projectile"
 	"github.com/downflux/go-geometry/2d/vector"
 	"github.com/downflux/go-geometry/2d/vector/polar"
@@ -83,8 +83,12 @@ func (c *C) generate(d time.Duration) ([]am, []pm) {
 					v.Copy(a.TargetVelocity())
 
 					aabb := a.AABB()
-					ns := c.db.QueryAgents(aabb, func(b agent.RO) bool { return collider.IsSquishableColliding(a, b) })
-					fs := c.db.QueryFeatures(aabb, func(f feature.RO) bool { return collider.IsCollidingFeature(a, f) })
+					ns := c.db.QueryAgents(aabb, func(b agent.RO) bool {
+						return filters.AgentIsCollidingNotSquishable(a, b)
+					})
+					fs := c.db.QueryFeatures(aabb, func(f feature.RO) bool {
+						return filters.AgentIsCollidingWithFeature(a, f)
+					})
 
 					for _, f := range fs {
 						kinematics.SetFeatureCollisionVelocity(a, f, v)

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/downflux/go-bvh v1.0.0
-	github.com/downflux/go-database v0.3.3
+	github.com/downflux/go-database v0.3.5
 	github.com/downflux/go-geometry v0.15.4
 	github.com/google/go-cmp v0.5.9
 )

diff --git a/go.sum b/go.sum
@@ -16,6 +16,10 @@ github.com/downflux/go-database v0.3.2 h1:LnXY4hRmdeH9oIjTschW9Z+MxGUFGOu5Sz+lX+
 github.com/downflux/go-database v0.3.2/go.mod h1:GgparhC7kkqx5VPbyFjE8/zA7o2F/E8P8SR/GwXNs+s=
 github.com/downflux/go-database v0.3.3 h1:VJis0vWeEbJ0MN/f/kowD0+RSyDajqVh3T2JbZjR0RU=
 github.com/downflux/go-database v0.3.3/go.mod h1:GgparhC7kkqx5VPbyFjE8/zA7o2F/E8P8SR/GwXNs+s=
+github.com/downflux/go-database v0.3.4 h1:MU0JwgdkK7lCTG7GGohBLOcCmErU6vh/Gyf+pZyTPY8=
+github.com/downflux/go-database v0.3.4/go.mod h1:GgparhC7kkqx5VPbyFjE8/zA7o2F/E8P8SR/GwXNs+s=
+github.com/downflux/go-database v0.3.5 h1:36TZFOI2vbHhGJGRe9MFtpmOco+OEA45glTyArVpzLc=
+github.com/downflux/go-database v0.3.5/go.mod h1:GgparhC7kkqx5VPbyFjE8/zA7o2F/E8P8SR/GwXNs+s=
 github.com/downflux/go-geometry v0.15.2 h1:opm0LgH8p6xIt9od3ZcDxf5HSHP/GOj937s5fUwI1cs=
 github.com/downflux/go-geometry v0.15.2/go.mod h1:ZJcto0QwYRdoIbi5G4mh5y6v2xUS+d++/cANaO1F9+8=
 github.com/downflux/go-geometry v0.15.3 h1:Kwr2tiozUQF/Q47pCZDRaPS+MPrV6KsC87Gm0J7p15w=

diff --git a/internal/collider/collider.go b/internal/collider/collider.go
diff --git a/internal/collider/collider_test.go b/internal/collider/collider_test.go
diff --git a/internal/geometry/hyperrectangle/hyperrectangle.go b/internal/geometry/hyperrectangle/hyperrectangle.go