mirror of
https://github.com/psforever/PSF-LoginServer.git
synced 2026-03-04 13:00:25 +00:00
3966b0264d
* separating geometry classes * 2d geometry; retirement of the *3D suffix * makings of an early block map datastructure * entities in a zone - players, corpses, vehicles, deployables, ground clutter, and buildings - divided between sectors of the zone upon creation, management, or mounting; superfluous messages to keep track of blockmap state, for now * trait for entities to be added to the blockmap; internal entity data keeps track of current blockmap sector information; calls to add/remove/update functions changed * modified pieces of environment into an entities that can be added to a block map and have a countable bounding region; fixes for vehicle control seat occcupant collection; fix for squad individual callback references (original issue still remains?) * introduced the block map into various existijng game calculationa where target selection can be reduced by its probing * he_mines and jammer_mines now trigger if a valid target is detected at the initial point of deploy; they also trigger later, after a valid target has moved into the arming range of the mine * conversion of interactions with zone into a queued, periodic set of tasks * explosive deployable control -> mine deployable control * tests repaired and all tests working * mostly comments and documentation * amenities are now represented on the blockmap
220 lines
6.9 KiB
Scala
220 lines
6.9 KiB
Scala
// Copyright (c) 2021 PSForever
|
|
package objects
|
|
|
|
import net.psforever.objects.geometry.d3._
|
|
import net.psforever.types.Vector3
|
|
import org.specs2.mutable.Specification
|
|
|
|
class GeometryTest extends Specification {
|
|
"Point" should {
|
|
"construct (1)" in {
|
|
Point(1,2,3.5f)
|
|
ok
|
|
}
|
|
|
|
"construct (2)" in {
|
|
Point() mustEqual Point(0,0,0)
|
|
}
|
|
|
|
"construct (3)" in {
|
|
Point(Vector3(1,2,3)) mustEqual Point(1,2,3)
|
|
}
|
|
|
|
"be its own center point" in {
|
|
val obj = Point(1,2,3.5f)
|
|
obj.center mustEqual obj
|
|
}
|
|
|
|
"define its own exterior" in {
|
|
val obj = Point(1,2,3.5f)
|
|
obj.pointOnOutside(Vector3(1,0,0)) mustEqual obj
|
|
obj.pointOnOutside(Vector3(0,1,0)) mustEqual obj
|
|
obj.pointOnOutside(Vector3(0,0,1)) mustEqual obj
|
|
}
|
|
|
|
"convert to Vector3" in {
|
|
val obj = Point(1,2,3.5f)
|
|
obj.asVector3 mustEqual Vector3(1,2,3.5f)
|
|
}
|
|
}
|
|
|
|
"Ray" should {
|
|
"construct (1)" in {
|
|
Ray(Point(1,2,3.5f), Vector3(1,0,0))
|
|
ok
|
|
}
|
|
|
|
"construct (2)" in {
|
|
Ray(1,2,3.5f, Vector3(1,0,0)) mustEqual Ray(Point(1,2,3.5f), Vector3(1,0,0))
|
|
}
|
|
|
|
"construct (3)" in {
|
|
Ray(Vector3(1,2,3.5f), Vector3(1,0,0)) mustEqual Ray(Point(1,2,3.5f), Vector3(1,0,0))
|
|
}
|
|
|
|
"have a unit vector as its direction vector" in {
|
|
Ray(1,2,3.5f, Vector3(1,1,1)) must throwA[AssertionError]
|
|
}
|
|
|
|
"have its target point as the center point" in {
|
|
val obj = Ray(1,2,3.5f, Vector3(1,0,0))
|
|
obj.center mustEqual Point(1,2,3.5f)
|
|
}
|
|
}
|
|
|
|
"Line" should {
|
|
"construct (1)" in {
|
|
Line(Point(1,2,3.5f), Vector3(1,0,0))
|
|
ok
|
|
}
|
|
|
|
"construct (2)" in {
|
|
Line(1,2,3.5f, Vector3(1,0,0))
|
|
ok
|
|
}
|
|
|
|
"construct (3)" in {
|
|
Line(1,2,3.5f, 2,2,3.5f) mustEqual Line(1,2,3.5f, Vector3(1,0,0))
|
|
}
|
|
|
|
"have a unit vector as its direction vector" in {
|
|
Line(1,2,3.5f, Vector3(1,1,1)) must throwA[AssertionError]
|
|
}
|
|
|
|
"have its target point as the center point" in {
|
|
val obj = Line(1,2,3.5f, Vector3(1,0,0))
|
|
obj.center mustEqual Point(1,2,3.5f)
|
|
}
|
|
}
|
|
|
|
"Segment" should {
|
|
"construct (1)" in {
|
|
Segment(Point(1,2,3), Point(3,2,3))
|
|
ok
|
|
}
|
|
|
|
"construct (2)" in {
|
|
Segment(1,2,3, 3,2,3) mustEqual Segment(Point(1,2,3), Point(3,2,3))
|
|
ok
|
|
}
|
|
|
|
"construct (3)" in {
|
|
Segment(Point(1,2,3), Vector3(1,0,0)) mustEqual Segment(Point(1,2,3), Point(2,2,3))
|
|
}
|
|
|
|
"construct (4)" in {
|
|
Segment(1,2,3, Vector3(1,0,0)) mustEqual Segment(Point(1,2,3), Point(2,2,3))
|
|
}
|
|
|
|
"does not need to have unit vector as its direction vector" in {
|
|
val obj1 = Segment(1,2,3, Vector3(5,1,1))
|
|
val obj2 = Segment(Point(1,2,3), Point(6,3,4))
|
|
obj1 mustEqual obj2
|
|
obj1.d mustEqual obj2.d
|
|
}
|
|
|
|
"have a midway point between its two endpoints" in {
|
|
Segment(Point(1,2,3), Point(3,4,5)).center mustEqual Point(2,3,4)
|
|
}
|
|
}
|
|
|
|
"Sphere3D" should {
|
|
"construct (1)" in {
|
|
Sphere(Point(1,2,3), 3)
|
|
ok
|
|
}
|
|
|
|
"construct (2)" in {
|
|
Sphere(3) mustEqual Sphere(Point(0,0,0), 3)
|
|
ok
|
|
}
|
|
|
|
"construct (3)" in {
|
|
Sphere(1,2,3, 3) mustEqual Sphere(Point(1,2,3), 3)
|
|
}
|
|
|
|
"construct (4)" in {
|
|
Sphere(Vector3(1,2,3), 3) mustEqual Sphere(Point(1,2,3), 3)
|
|
}
|
|
|
|
"the center point is self-evident" in {
|
|
Sphere(Point(1,2,3), 3).center mustEqual Point(1,2,3)
|
|
}
|
|
|
|
"report the point on the outside depending on the requested direction" in {
|
|
val obj1 = Sphere(1,2,3, 3)
|
|
obj1.pointOnOutside(Vector3( 1, 0, 0)) mustEqual Point( 4, 2,3) //east
|
|
obj1.pointOnOutside(Vector3( 0, 1, 0)) mustEqual Point( 1, 5,3) //north
|
|
obj1.pointOnOutside(Vector3( 0, 0, 1)) mustEqual Point( 1, 2,6) //up
|
|
obj1.pointOnOutside(Vector3(-1, 0, 0)) mustEqual Point(-2, 2,3) //west
|
|
obj1.pointOnOutside(Vector3( 0,-1, 0)) mustEqual Point( 1,-1,3) //south
|
|
obj1.pointOnOutside(Vector3( 0, 0,-1)) mustEqual Point( 1, 2,0) //down
|
|
}
|
|
}
|
|
|
|
"Cylinder (normal)" should {
|
|
"construct (1)" in {
|
|
Cylinder(Point(1,2,3), Vector3(0,0,1), 2, 3)
|
|
ok
|
|
}
|
|
|
|
"construct (2)" in {
|
|
Cylinder(Point(1,2,3), 2, 3) mustEqual Cylinder(Point(1,2,3), Vector3(0,0,1), 2, 3)
|
|
}
|
|
|
|
"construct (3)" in {
|
|
Cylinder(Vector3(1,2,3), 2, 3) mustEqual Cylinder(Point(1,2,3), Vector3(0,0,1), 2, 3)
|
|
}
|
|
|
|
"construct (4)" in {
|
|
Cylinder(Vector3(1,2,3), Vector3(0,0,1), 2, 3) mustEqual Cylinder(Point(1,2,3), Vector3(0,0,1), 2, 3)
|
|
}
|
|
|
|
"report the center point as the center of the cylinder" in {
|
|
Cylinder(Point(1,2,3), 2, 3).center mustEqual Point(1,2,4.5f)
|
|
}
|
|
|
|
"the point on the outside is different depending on the requested direction" in {
|
|
val obj1 = Cylinder(Point(1,2,3), 2, 3)
|
|
obj1.pointOnOutside(Vector3( 1, 0, 0)) mustEqual Point( 3, 2, 4.5f) //east
|
|
obj1.pointOnOutside(Vector3( 0, 1, 0)) mustEqual Point( 1, 4, 4.5f) //north
|
|
obj1.pointOnOutside(Vector3( 0, 0, 1)) mustEqual Point( 1, 2, 6f) //up
|
|
obj1.pointOnOutside(Vector3(-1, 0, 0)) mustEqual Point(-1, 2, 4.5f) //west
|
|
obj1.pointOnOutside(Vector3( 0,-1, 0)) mustEqual Point( 1, 0, 4.5f) //south
|
|
obj1.pointOnOutside(Vector3( 0, 0,-1)) mustEqual Point( 1, 2, 3f) //down
|
|
}
|
|
}
|
|
|
|
"Cylinder (side tilt)" should {
|
|
"not require a specific direction to be relative up" in {
|
|
Cylinder(Point(1,2,3), Vector3(1,0,0), 2, 3)
|
|
ok
|
|
}
|
|
|
|
"require its specific relative up direction to be expressed as a unit vector" in {
|
|
Cylinder(Point(1,2,3), Vector3(4,0,0), 2, 3) must throwA[AssertionError]
|
|
}
|
|
|
|
"report the center point as the center of the cylinder, as if rotated about its base" in {
|
|
Cylinder(Point(1,2,3), Vector3(1,0,0), 2, 3).center mustEqual Point(2.5f, 2, 3)
|
|
}
|
|
|
|
"report the point on the outside as different depending on the requested direction and the relative up direction" in {
|
|
val obj1 = Cylinder(Point(1,2,3), Vector3(1,0,0), 2, 3)
|
|
obj1.pointOnOutside(Vector3( 1, 0, 0)) mustEqual Point(4, 2, 3) //east
|
|
obj1.pointOnOutside(Vector3( 0, 1, 0)) mustEqual Point(2.5f, 4, 3) //north
|
|
obj1.pointOnOutside(Vector3( 0, 0, 1)) mustEqual Point(2.5f, 2, 5) //up
|
|
obj1.pointOnOutside(Vector3(-1, 0, 0)) mustEqual Point(1, 2, 3) //west
|
|
obj1.pointOnOutside(Vector3( 0,-1, 0)) mustEqual Point(2.5f, 0, 3) //south
|
|
obj1.pointOnOutside(Vector3( 0, 0,-1)) mustEqual Point(2.5f, 2, 1) //down
|
|
|
|
val obj2 = Cylinder(Point(1,2,3), Vector3(0,0,1), 2, 3)
|
|
obj1.pointOnOutside(Vector3( 1, 0, 0)) mustNotEqual obj2.pointOnOutside(Vector3( 1, 0, 0))
|
|
obj1.pointOnOutside(Vector3( 0, 1, 0)) mustNotEqual obj2.pointOnOutside(Vector3( 1, 1, 0))
|
|
obj1.pointOnOutside(Vector3( 0, 0, 1)) mustNotEqual obj2.pointOnOutside(Vector3( 1, 0, 1))
|
|
obj1.pointOnOutside(Vector3(-1, 0, 0)) mustNotEqual obj2.pointOnOutside(Vector3(-1, 0, 0))
|
|
obj1.pointOnOutside(Vector3( 0,-1, 0)) mustNotEqual obj2.pointOnOutside(Vector3( 0,-1, 0))
|
|
obj1.pointOnOutside(Vector3( 0, 0,-1)) mustNotEqual obj2.pointOnOutside(Vector3( 0, 0,-1))
|
|
}
|
|
}
|
|
}
|