Implement AABB::GetRandomPoint methods

include/J3ML/Geometry/AABB.h

@@ -3,12 +3,12 @@
 #include <J3ML/LinearAlgebra.h>
 #include <J3ML/Geometry/Common.h>
 #include <J3ML/Geometry/Shape.h>
-
-// TODO: Fix circular include between AABB and OBB
+#include "J3ML/Algorithm/RNG.h"
 
 namespace J3ML::Geometry
 {
     using namespace J3ML::LinearAlgebra;
+    using J3ML::Algorithm::RNG;
     // A 3D axis-aligned bounding box
     // This data structure can be used to represent coarse bounds of objects, in situations where detailed triangle-level
     // computations can be avoided. In physics systems, bounding boxes are used as an efficient early-out test for geometry
@@ -91,10 +91,7 @@ namespace J3ML::Geometry
         float GetVolume() const;
         float GetSurfaceArea() const;
         Vector3 GetClosestPoint(const Vector3& point) const;
-        Vector3 GetRandomPointInside();
-        Vector3 GetRandomPointOnSurface();
-        Vector3 GetRandomPointOnEdge();
-        Vector3 GetRandomCornerPoint();
+
         AABB Translated(const Vector3& offset) const;
         AABB TransformAABB(const Matrix3x3& transform);
         AABB TransformAABB(const Matrix4x4& transform);
@@ -132,7 +129,10 @@ namespace J3ML::Geometry
 
         void SetFrom(const Sphere &s);
 
-        Vector3 GetRandomPointInside() const;
+        Vector3 GetRandomPointInside(RNG& rng) const;
+        Vector3 GetRandomPointOnSurface(RNG& rng) const;
+        Vector3 GetRandomPointOnEdge(RNG& rng) const;
+        Vector3 GetRandomCornerPoint(RNG& rng) const;
 
         void SetNegativeInfinity();
 

include/J3ML/LinearAlgebra/Vector3.h

@@ -38,7 +38,7 @@ public:
     static void Orthonormalize(Vector3& a, Vector3& b);
 
     Vector3 Abs() const;
-
+    static Vector3 Abs(const Vector3& rhs);
 
     /// Returns the DirectionVector for a given angle.
     static Vector3 Direction(const Vector3 &rhs) ;

src/J3ML/Geometry/AABB.cpp

@@ -11,6 +11,7 @@
 #include <J3ML/Geometry/Ray.h>
 #include <J3ML/Geometry/TriangleMesh.h>
 #include <J3ML/Geometry/Polyhedron.h>
+#include <J3ML/Algorithm/RNG.h>
 
 namespace J3ML::Geometry {
 
@@ -189,18 +190,23 @@ namespace J3ML::Geometry {
 
     void AABB::SetFromCenterAndSize(const Vector3& center, const Vector3& size)
     {
-
+        Vector3 halfSize = 0.5f * size;
+        minPoint = center - halfSize;
+        maxPoint = center + halfSize;
     }
 
 
     void AABB::SetFrom(const OBB& obb)
     {
-
+        Vector3 halfSize = Vector3::Abs(obb.axis[0] * obb.r[0]) + Vector3::Abs(obb.axis[1]*obb.r[1]) + Vector3::Abs(obb.axis[2]*obb.r[2]);
+        SetFromCenterAndSize(obb.pos, 2.f*halfSize);
     }
 
     void AABB::SetFrom(const Sphere& s)
     {
-
+        Vector3 d = Vector3(s.Radius, s.Radius, s.Radius);
+        minPoint = s.Position - d;
+        maxPoint = s.Position + d;
     }
 
     void AABB::SetFrom(const Vector3 *pointArray, int numPoints) {
@@ -212,8 +218,12 @@ namespace J3ML::Geometry {
             Enclose(pointArray[i]);
     }
 
-    Vector3 AABB::GetRandomPointInside() const {
+    Vector3 AABB::GetRandomPointInside(J3ML::Algorithm::RNG &rng) const {
+        float f1 = rng.Float();
+        float f2 = rng.Float();
+        float f3 = rng.Float();
 
+        return PointInside(f1, f2, f3);
     }
 
     void AABB::SetNegativeInfinity() {
@@ -405,4 +415,21 @@ namespace J3ML::Geometry {
 
     Vector3 AABB::AnyPointFast() const { return minPoint;}
 
+    Vector3 AABB::GetRandomPointOnSurface(RNG &rng) const {
+        int i = rng.Int(0, 5);
+        float f1 = rng.Float();
+        float f2 = rng.Float();
+        return FacePoint(i, f1, f2);
+    }
+
+    Vector3 AABB::GetRandomPointOnEdge(RNG &rng) const {
+        int i = rng.Int(0, 11);
+        float f = rng.Float();
+        return PointOnEdge(i, f);
+    }
+
+    Vector3 AABB::GetRandomCornerPoint(RNG &rng) const {
+        return CornerPoint(rng.Int(0, 7));
+    }
+
 }

src/J3ML/LinearAlgebra/Vector3.cpp

@@ -405,5 +405,9 @@ namespace J3ML::LinearAlgebra {
         };
     }
 
+    Vector3 Vector3::Abs(const Vector3 &rhs) {
+        return rhs.Abs();
+    }
+
 
 }