Pārlūkot izejas kodu

split up collision and physics

Daniel Salvadori 7 gadi atpakaļ
vecāks
revīzija
e3081d4d45

+ 15 - 0
experimental/collision/collision.go

@@ -0,0 +1,15 @@
+// Copyright 2016 The G3N Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package collision implements collision related algorithms and data structures.
+package collision
+
+import "github.com/g3n/engine/geometry"
+
+// TODO collision checking function dependent on collision shapes
+
+func CheckConvex(g1, g2 *geometry.Geometry) bool {
+
+	return true
+}

+ 0 - 1
experimental/physics/collision/contact.go

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package collision implements collision related algorithms and data structures.
 package collision
 
 import "github.com/g3n/engine/math32"

+ 0 - 1
experimental/physics/collision/matrix.go

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package collision implements collision related algorithms and data structures.
 package collision
 
 // Matrix is a triangular collision matrix indicating which pairs of bodies are colliding.

+ 0 - 1
experimental/physics/collision/matrix_test.go

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package collision implements collision related algorithms and data structures.
 package collision
 
 import "testing"

experimental/physics/shape/box.go → experimental/collision/shape/box.go


experimental/physics/shape/capsule.go → experimental/collision/shape/capsule.go


experimental/physics/shape/cylinder.go → experimental/collision/shape/cone.go


+ 1 - 1
experimental/physics/shape/convexhull.go

@@ -7,7 +7,7 @@ package shape
 import (
 	"github.com/g3n/engine/geometry"
 	"github.com/g3n/engine/math32"
-	"github.com/g3n/engine/experimental/physics/collision"
+	"github.com/g3n/engine/experimental/collision"
 )
 
 // ConvexHull is a convex triangle-based geometry used for collision detection and contact resolution.

experimental/physics/shape/heightfield.go → experimental/collision/shape/cylinder.go


+ 6 - 0
experimental/collision/shape/heightfield.go

@@ -0,0 +1,6 @@
+// Copyright 2016 The G3N Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package shape
+

experimental/physics/shape/plane.go → experimental/collision/shape/plane.go


experimental/physics/shape/shape.go → experimental/collision/shape/shape.go


experimental/physics/shape/sphere.go → experimental/collision/shape/sphere.go


+ 1 - 1
experimental/physics/debug.go

@@ -12,7 +12,7 @@ import (
 	"github.com/g3n/engine/gls"
 	"github.com/g3n/engine/graphic"
 	"github.com/g3n/engine/material"
-	"github.com/g3n/engine/experimental/physics/collision"
+	"github.com/g3n/engine/experimental/collision"
 )
 
 // This file contains helpful infrastructure for debugging physics

+ 1 - 1
experimental/physics/narrowphase.go

@@ -8,7 +8,7 @@ import (
 	"github.com/g3n/engine/experimental/physics/object"
 	"github.com/g3n/engine/experimental/physics/equation"
 	"github.com/g3n/engine/math32"
-	"github.com/g3n/engine/experimental/physics/shape"
+	"github.com/g3n/engine/experimental/collision/shape"
 )
 
 // Narrowphase

+ 1 - 1
experimental/physics/object/body.go

@@ -8,7 +8,7 @@ import (
 	"github.com/g3n/engine/graphic"
 	"github.com/g3n/engine/math32"
 	"github.com/g3n/engine/material"
-	"github.com/g3n/engine/experimental/physics/shape"
+	"github.com/g3n/engine/experimental/collision/shape"
 )
 
 // Body represents a physics-driven body.

+ 2 - 2
experimental/physics/simulation.go

@@ -8,11 +8,11 @@ import (
 	"github.com/g3n/engine/experimental/physics/equation"
 	"github.com/g3n/engine/experimental/physics/solver"
 	"github.com/g3n/engine/experimental/physics/constraint"
-	"github.com/g3n/engine/experimental/physics/collision"
+	"github.com/g3n/engine/experimental/collision"
 	"github.com/g3n/engine/math32"
 	"github.com/g3n/engine/experimental/physics/object"
 	"github.com/g3n/engine/core"
-	"github.com/g3n/engine/experimental/physics/shape"
+	"github.com/g3n/engine/experimental/collision/shape"
 )
 
 // Simulation represents a physics simulation.