gfx, geom, and math: Projection, Camera, and Viewport functions (with bonus Matrix math and Segment/Ray)

CMakeLists.txt

@@ -103,6 +103,8 @@ add_library(sead OBJECT
   include/gfx/seadDrawContext.h
   include/gfx/seadDrawLockContext.h
   include/gfx/seadFrameBuffer.h
+  include/gfx/seadGraphics.h
+  include/gfx/seadViewport.h
   include/gfx/seadPrimitiveRenderer.h
   include/gfx/seadPrimitiveRendererUtil.h
   include/gfx/seadProjection.h
@@ -112,6 +114,8 @@ add_library(sead OBJECT
   modules/src/gfx/seadColor.cpp
   modules/src/gfx/seadDrawLockContext.cpp
   modules/src/gfx/seadFrameBuffer.cpp
+  modules/src/gfx/seadGraphics.cpp
+  modules/src/gfx/seadViewport.cpp
   # modules/src/gfx/seadPrimitiveRenderer.cpp
   # modules/src/gfx/seadPrimitiveRendererUtil.cpp
   modules/src/gfx/seadProjection.cpp
@@ -155,6 +159,8 @@ add_library(sead OBJECT
   modules/src/math/seadQuat.cpp
   modules/src/math/seadVector.cpp
 
+  include/geom/seadLine.h
+
   include/mc/seadCoreInfo.h
   include/mc/seadJob.h
   include/mc/seadJobQueue.h

include/geom/seadLine.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#include <math/seadVector.h>
+
+namespace sead
+{
+
+template <typename T>
+class Segment
+{
+public:
+    Segment() = default;
+    Segment(const T& p0, const T& p1) : mP0(p0), mP1(p1) {}
+
+    const T& getPos0() const { return mP0; }
+    void setPos0(const T& p0) { mP0 = p0; }
+
+    const T& getPos1() const { return mP1; }
+    void setPos1(const T& p1) { mP1 = p1; }
+
+private:
+    T mP0 = T::zero;
+    T mP1 = T::ex;
+};
+
+using Segment2f = Segment<Vector2f>;
+using Segment3f = Segment<Vector3f>;
+
+#ifdef cafe
+static_assert(sizeof(Segment2f) == 0x10, "sead::Segment<T> size mismatch");
+static_assert(sizeof(Segment3f) == 0x18, "sead::Segment<T> size mismatch");
+#endif  // cafe
+
+template <typename T>
+class Ray
+{
+public:
+    Ray() = default;
+    Ray(const T& p, const T& d) : mP(p), mD(d) {}
+
+    const T& getPos() const { return mP; }
+    void setPos(const T& p) { mP = p; }
+
+    const T& getDir() const { return mD; }
+    void setDir(const T& d) { mD = d; }
+
+private:
+    T mP;
+    T mD;
+};
+
+using Ray2f = Ray<Vector2f>;
+using Ray3f = Ray<Vector3f>;
+
+}  // namespace sead

include/gfx/seadCamera.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <geom/seadLine.h>
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
 #include <prim/seadRuntimeTypeInfo.h>
@@ -9,8 +10,6 @@ namespace sead
 class OrthoProjection;
 class Projection;
 class Viewport;
-template <typename T>
-class Ray;
 
 class Camera
 {
@@ -32,7 +31,7 @@ class Camera
 
     void projectByMatrix(Vector2f* dst, const Vector3f& world_pos, const Projection& projection,
                          const Viewport& viewport) const;
-    void unprojectRayByMatrix(Ray<Vector3f>* dst, const Vector3f& camera_pos) const;
+    void unprojectRayByMatrix(Ray3f* dst, const Vector3f& camera_pos) const;
 
     Matrix34f& getMatrix() { return mMatrix; }
     const Matrix34f& getMatrix() const { return mMatrix; }
@@ -59,14 +58,18 @@ class LookAtCamera : public Camera
 
     void setPos(const Vector3f& pos) { mPos = pos; }
     void setAt(const Vector3f& at) { mAt = at; }
-    void setUp(const Vector3f& up) { mUp = up; }
+    void setUp(const Vector3f& up)
+    {
+        mUp = up;
+        mUp.normalize();
+    }
+    void normalizeUp() {}
 
-    void normalizeUp() { mUp.normalize(); }
     void addPos(const Vector3f& pos) { mPos += pos; }
     void addAt(const Vector3f& at) { mAt += at; }
 
 private:
-    Vector3f mPos = {0.0f, 0.0f, 10.0f};
+    Vector3f mPos = {0.0f, 0.0f, 1.0f};
     Vector3f mAt = {0.0f, 0.0f, 0.0f};
     Vector3f mUp = {0.0f, 1.0f, 0.0f};
 };
@@ -75,6 +78,7 @@ class DirectCamera : public Camera
 {
     SEAD_RTTI_OVERRIDE(DirectCamera, Camera)
 public:
+    DirectCamera() = default;
     ~DirectCamera() override;
 
     void doUpdateMatrix(Matrix34f* dst) const override;

include/gfx/seadGraphics.h

@@ -71,6 +71,14 @@ class Graphics : public IDisposer
     virtual void setPolygonOffsetEnableImpl(bool, bool, bool) = 0;
 
     static Graphics* instance() { return sInstance; }
+
+    static DevicePosture getDefaultDevicePosture() { return sDefaultDevicePosture; }
+    static f32 getDefaultDeviceZScale() { return sDefaultDeviceZScale; }
+    static f32 getDefaultDeviceZOffset() { return sDefaultDeviceZOffset; }
+
+    void setViewportRealPosition(f32 x, f32 y, f32 w, f32 h) { setViewportImpl(x, y, w, h); }
+    void setScissorRealPosition(f32 x, f32 y, f32 w, f32 h) { setScissorImpl(x, y, w, h); }
+
     static DevicePosture sDefaultDevicePosture;
     static f32 sDefaultDeviceZScale;
     static f32 sDefaultDeviceZOffset;