Miuna/j3ml-fork
1
0
Fork 0
forked from josh/j3ml
Code Pull Requests Activity

Implement J3ML Namespace

Browse Source
This commit is contained in:
josh
2024-02-02 13:53:23 -05:00
parent d37b685df9
commit 9a5f12e505
45 changed files with 108 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/J3ML/Geometry.h
View File

@@ -3,9 +3,9 @@
#pragma once
namespace Geometry {
using Vector2 = LinearAlgebra::Vector2;
using Vector3 = LinearAlgebra::Vector3;
namespace J3ML::Geometry {
using Vector2 = J3ML::LinearAlgebra::Vector2;
using Vector3 = J3ML::LinearAlgebra::Vector3;
class LineSegment2D
{

2
include/J3ML/Geometry/AABB.h
View File

@@ -22,7 +22,7 @@
namespace Geometry
namespace J3ML::Geometry
{
using namespace LinearAlgebra;

2
include/J3ML/Geometry/AABB2D.h
View File

@@ -2,7 +2,7 @@
#include <J3ML/LinearAlgebra/Vector2.h>
namespace Geometry
namespace J3ML::Geometry
{
using LinearAlgebra::Vector2;
// CaveGame AABB

2
include/J3ML/Geometry/Capsule.h
View File

@@ -3,7 +3,7 @@
#include "LineSegment.h"
#include <J3ML/LinearAlgebra/Vector3.h>
namespace Geometry
namespace J3ML::Geometry
{
using namespace LinearAlgebra;
class Capsule

4
include/J3ML/Geometry/Frustum.h
View File

@@ -6,9 +6,11 @@
#include "Plane.h"
#include <J3ML/LinearAlgebra/CoordinateFrame.h>
namespace Geometry
namespace J3ML::Geometry
{
using J3ML::LinearAlgebra::CoordinateFrame;
enum class FrustumType
{
Invalid,

2
include/J3ML/Geometry/LineSegment.h
View File

@@ -2,7 +2,7 @@
#include <J3ML/LinearAlgebra/Vector3.h>
namespace Geometry
namespace J3ML::Geometry
{
using LinearAlgebra::Vector3;
class LineSegment

2
include/J3ML/Geometry/OBB.h
View File

@@ -5,7 +5,7 @@
#include <J3ML/Geometry/LineSegment.h>
#include <J3ML/Geometry/Polyhedron.h>
namespace Geometry {
namespace J3ML::Geometry {
class OBB
{
public:

19
include/J3ML/Geometry/Plane.h
View File

@@ -1,13 +1,18 @@
#pragma once
#include <J3ML/LinearAlgebra/Vector3.h>
using namespace LinearAlgebra;
class Plane
namespace J3ML::Geometry
{
public:
Vector3 Position;
Vector3 Normal;
float distance = 0.f;
using J3ML::LinearAlgebra::Vector3;
};
class Plane
{
public:
Vector3 Position;
Vector3 Normal;
float distance = 0.f;
};
}

2
include/J3ML/Geometry/Polygon.h
View File

@@ -1,6 +1,6 @@
#pragma once
namespace Geometry {
namespace J3ML::Geometry {
class Polygon {
};

2
include/J3ML/Geometry/Polyhedron.h
View File

@@ -1,6 +1,6 @@
#pragma once
namespace Geometry
namespace J3ML::Geometry
{
class Polyhedron {

2
include/J3ML/Geometry/QuadTree.h
View File

@@ -5,7 +5,7 @@
#include <J3ML/LinearAlgebra/Vector2.h>
#include "AABB2D.h"
namespace Geometry {
namespace J3ML::Geometry {
using LinearAlgebra::Vector2;

2
include/J3ML/Geometry/Ray.h
View File

@@ -6,7 +6,7 @@
#include <J3ML/LinearAlgebra/Vector3.h>
namespace Geometry
namespace J3ML::Geometry
{
using LinearAlgebra::Vector3;
class Ray

2
include/J3ML/Geometry/Sphere.h
View File

@@ -2,7 +2,7 @@
#include "J3ML/Geometry.h"
namespace Geometry
namespace J3ML::Geometry
{
class Sphere
{

2
include/J3ML/Geometry/Triangle.h
View File

@@ -1,6 +1,6 @@
#pragma once
namespace Geometry
namespace J3ML::Geometry
{
class Triangle
{

14
include/J3ML/Geometry/Triangle2D.h
View File

@@ -1,8 +1,10 @@
//
// Created by dawsh on 1/25/24.
//
#pragma once
#ifndef J3ML_TRIANGLE2D_H
#define J3ML_TRIANGLE2D_H
#endif //J3ML_TRIANGLE2D_H
namespace J3ML::Geometry
{
class Shape2D {};
class Triangle2D {
public:
};
}

2
include/J3ML/Geometry/TriangleMesh.h
View File

@@ -1,6 +1,6 @@
#pragma once
namespace Geometry
namespace J3ML::Geometry
{
class TriangleMesh
{

4
include/J3ML/LinearAlgebra.h
View File

@@ -6,7 +6,7 @@
#include <functional>
namespace Math
namespace J3ML::Math
{
const float Pi = M_PI;
inline float Radians(float degrees) { return degrees * (Pi/180.f); }
@@ -29,7 +29,7 @@ namespace Math
// Dawsh Linear Algebra Library - Everything you need for 3D math
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
class Vector2; // A type representing a position in a 2-dimensional coordinate space.
class Vector3; // A type representing a position in a 3-dimensional coordinate space.
class Vector4; // A type representing a position in a 4-dimensional coordinate space.

2
include/J3ML/LinearAlgebra/Angle2D.h
View File

@@ -2,7 +2,7 @@
#include <J3ML/LinearAlgebra.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
class Angle2D {
public:
float x;

2
include/J3ML/LinearAlgebra/AxisAngle.h
View File

@@ -3,7 +3,7 @@
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra/Vector3.h>
namespace LinearAlgebra
namespace J3ML::LinearAlgebra
{
/// Transitional datatype, not useful for internal representation of rotation

2
include/J3ML/LinearAlgebra/CoordinateFrame.h
View File

@@ -3,7 +3,7 @@
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra/Vector3.h>
namespace LinearAlgebra
namespace J3ML::LinearAlgebra
{
/// The CFrame is fundamentally 4 vectors (position, forward, right, up vector)
class CoordinateFrame

2
include/J3ML/LinearAlgebra/EulerAngle.h
View File

@@ -2,7 +2,7 @@
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra/Vector3.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
// Essential Reading:
// http://www.essentialmath.com/GDC2012/GDC2012_JMV_Rotations.pdf

2
include/J3ML/LinearAlgebra/Matrix2x2.h
View File

@@ -3,7 +3,7 @@
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra/Vector2.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
class Matrix2x2 {
public:
enum { Rows = 3 };

2
include/J3ML/LinearAlgebra/Matrix3x3.h
View File

@@ -5,7 +5,7 @@
#include <J3ML/LinearAlgebra/Vector3.h>
#include <J3ML/LinearAlgebra/Quaternion.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
/// A 3-by-3 matrix for linear transformations of 3D geometry.
/* This can represent any kind of linear transformations of 3D geometry, which include
* rotation, scale, shear, mirroring, and orthographic projection.

2
include/J3ML/LinearAlgebra/Matrix4x4.h
View File

@@ -3,7 +3,7 @@
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra/Quaternion.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
/// A 4-by-4 matrix for affine transformations and perspective projections of 3D geometry.
/* This matrix can represent the most generic form of transformations for 3D objects,

2
include/J3ML/LinearAlgebra/Quaternion.h
View File

@@ -6,7 +6,7 @@
#include <J3ML/LinearAlgebra/AxisAngle.h>
#include <J3ML/LinearAlgebra/Matrix3x3.h>
namespace LinearAlgebra
namespace J3ML::LinearAlgebra
{
class Quaternion : public Vector4 {
public:

2
include/J3ML/LinearAlgebra/Transform2D.h
View File

@@ -3,7 +3,7 @@
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra/Matrix3x3.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
class Transform2D {
protected:
Matrix3x3 transformation;

2
include/J3ML/LinearAlgebra/Vector2.h
View File

@@ -3,7 +3,7 @@
#include <J3ML/LinearAlgebra.h>
#include <cstddef>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
using namespace J3ML;

2
include/J3ML/LinearAlgebra/Vector3.h
View File

@@ -6,7 +6,7 @@
#include <J3ML/LinearAlgebra/Angle2D.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
// A 3D (x, y, z) ordered pair.
class Vector3 {

2
include/J3ML/LinearAlgebra/Vector4.h
View File

@@ -3,7 +3,7 @@
#include <J3ML/LinearAlgebra.h>
namespace LinearAlgebra {
namespace J3ML::LinearAlgebra {
class Vector4 {
public:
// Default Constructor