diff options
| author | Matt Strapp <matt@mattstrapp.net> | 2021-09-20 18:15:14 -0500 |
|---|---|---|
| committer | Matt Strapp <matt@mattstrapp.net> | 2021-09-20 18:15:14 -0500 |
| commit | 342403a02f8063903d0f38327430721d4d0ae331 (patch) | |
| tree | 29d020a27bc16939c568dd4b29166566d1c0e658 /dev/MinGfx/src/gfxmath.cc | |
| parent | Fix parenthesis (diff) | |
| download | csci4611-submission-p1.0.tar csci4611-submission-p1.0.tar.gz csci4611-submission-p1.0.tar.bz2 csci4611-submission-p1.0.tar.lz csci4611-submission-p1.0.tar.xz csci4611-submission-p1.0.tar.zst csci4611-submission-p1.0.zip | |
do ass1submission-p1.0
Diffstat (limited to 'dev/MinGfx/src/gfxmath.cc')
| -rw-r--r-- | dev/MinGfx/src/gfxmath.cc | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/dev/MinGfx/src/gfxmath.cc b/dev/MinGfx/src/gfxmath.cc index 11180e6..20c9cc4 100644 --- a/dev/MinGfx/src/gfxmath.cc +++ b/dev/MinGfx/src/gfxmath.cc @@ -1,82 +1,82 @@ -/* - Copyright (c) 2017,2018 Regents of the University of Minnesota. - All Rights Reserved. - See corresponding header file for details. - */ - -#include "gfxmath.h" - -#define _USE_MATH_DEFINES -#include <math.h> -#include <algorithm> - -#include "ray.h" - - -namespace mingfx { - -const float GfxMath::PI = 3.14159265359f; -const float GfxMath::TWO_PI = 6.28318530718f; -const float GfxMath::HALF_PI = 1.57079632679f; - - -float GfxMath::Clamp(float x, float a, float b) { - return std::min(std::max(x, a), b); -} - -float GfxMath::ToRadians(float degrees) { - return degrees * GfxMath::PI / 180.0f; -} - -float GfxMath::ToDegrees(float radians) { - return radians * 180.0f / GfxMath::PI; -} - -Vector3 GfxMath::ToRadians(Vector3 degrees) { - return Vector3(ToRadians(degrees[0]), ToRadians(degrees[1]), ToRadians(degrees[2])); -} - -Vector3 GfxMath::ToDegrees(Vector3 radians) { - return Vector3(ToDegrees(radians[0]), ToDegrees(radians[1]), ToDegrees(radians[2])); -} - -float GfxMath::Lerp(float a, float b, float alpha) { - return (1.0f-alpha)*a + alpha*b; -} - -int GfxMath::iLerp(int a, int b, float alpha) { - return (int)std::round((1.0f-alpha)*(float)a + alpha*(float)b); -} - -Point3 GfxMath::ScreenToNearPlane(const Matrix4 &V, const Matrix4 &P, const Point2 &ndcPoint) { - Matrix4 filmPtToWorld = (P*V).Inverse(); - return filmPtToWorld * Point3(ndcPoint[0], ndcPoint[1], -1.0); -} - - -Point3 GfxMath::ScreenToWorld(const Matrix4 &V, const Matrix4 &P, const Point2 &ndcPoint, float zValue) { - Matrix4 filmPtToWorld = (P*V).Inverse(); - float zneg1topos1 = zValue*2.0f - 1.0f; - return filmPtToWorld * Point3(ndcPoint[0], ndcPoint[1], zneg1topos1); -} - - -Point3 GfxMath::ScreenToDepthPlane(const Matrix4 &V, const Matrix4 &P, const Point2 &ndcPoint, float planeDepth) { - Point3 pNear = ScreenToNearPlane(V, P, ndcPoint); - - Matrix4 camMat = V.Inverse(); - Point3 eye = camMat.ColumnToPoint3(3); - Vector3 look = -camMat.ColumnToVector3(2); - - Ray r(eye, pNear - eye); - - Point3 p3D; - float t; - if (!r.IntersectPlane(eye + planeDepth*look, -look, &t, &p3D)) { - std::cerr << "filmplane2D_to_plane3D() error -- no intersection found!" << std::endl; - } - return p3D; -} - - -} // end namespace +/*
+ Copyright (c) 2017,2018 Regents of the University of Minnesota.
+ All Rights Reserved.
+ See corresponding header file for details.
+ */
+
+#include "gfxmath.h"
+
+#define _USE_MATH_DEFINES
+#include <math.h>
+#include <algorithm>
+
+#include "ray.h"
+
+
+namespace mingfx {
+
+const float GfxMath::PI = 3.14159265359f;
+const float GfxMath::TWO_PI = 6.28318530718f;
+const float GfxMath::HALF_PI = 1.57079632679f;
+
+
+float GfxMath::Clamp(float x, float a, float b) {
+ return std::min(std::max(x, a), b);
+}
+
+float GfxMath::ToRadians(float degrees) {
+ return degrees * GfxMath::PI / 180.0f;
+}
+
+float GfxMath::ToDegrees(float radians) {
+ return radians * 180.0f / GfxMath::PI;
+}
+
+Vector3 GfxMath::ToRadians(Vector3 degrees) {
+ return Vector3(ToRadians(degrees[0]), ToRadians(degrees[1]), ToRadians(degrees[2]));
+}
+
+Vector3 GfxMath::ToDegrees(Vector3 radians) {
+ return Vector3(ToDegrees(radians[0]), ToDegrees(radians[1]), ToDegrees(radians[2]));
+}
+
+float GfxMath::Lerp(float a, float b, float alpha) {
+ return (1.0f-alpha)*a + alpha*b;
+}
+
+int GfxMath::iLerp(int a, int b, float alpha) {
+ return (int)std::round((1.0f-alpha)*(float)a + alpha*(float)b);
+}
+
+Point3 GfxMath::ScreenToNearPlane(const Matrix4 &V, const Matrix4 &P, const Point2 &ndcPoint) {
+ Matrix4 filmPtToWorld = (P*V).Inverse();
+ return filmPtToWorld * Point3(ndcPoint[0], ndcPoint[1], -1.0);
+}
+
+
+Point3 GfxMath::ScreenToWorld(const Matrix4 &V, const Matrix4 &P, const Point2 &ndcPoint, float zValue) {
+ Matrix4 filmPtToWorld = (P*V).Inverse();
+ float zneg1topos1 = zValue*2.0f - 1.0f;
+ return filmPtToWorld * Point3(ndcPoint[0], ndcPoint[1], zneg1topos1);
+}
+
+
+Point3 GfxMath::ScreenToDepthPlane(const Matrix4 &V, const Matrix4 &P, const Point2 &ndcPoint, float planeDepth) {
+ Point3 pNear = ScreenToNearPlane(V, P, ndcPoint);
+
+ Matrix4 camMat = V.Inverse();
+ Point3 eye = camMat.ColumnToPoint3(3);
+ Vector3 look = -camMat.ColumnToVector3(2);
+
+ Ray r(eye, pNear - eye);
+
+ Point3 p3D;
+ float t;
+ if (!r.IntersectPlane(eye + planeDepth*look, -look, &t, &p3D)) {
+ std::cerr << "filmplane2D_to_plane3D() error -- no intersection found!" << std::endl;
+ }
+ return p3D;
+}
+
+
+} // end namespace
|