Migrate to latest J3ML and ReWindow
All checks were successful
Run ReCI Build Test / Explore-Gitea-Actions (push) Successful in 1m36s

This commit is contained in:
2024-08-05 18:31:13 -04:00
parent 2a1085df2d
commit 166db43f2e
6 changed files with 12 additions and 12 deletions

View File

@@ -22,12 +22,12 @@ CPMAddPackage(
CPMAddPackage(
NAME J3ML
URL https://git.redacted.cc/josh/j3ml/archive/Release-2.2.zip
URL https://git.redacted.cc/josh/j3ml/archive/Release-2.4.zip
)
CPMAddPackage(
NAME ReWindow
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-3.zip
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-10.zip
)
CPMAddPackage(

View File

@@ -2,7 +2,7 @@
#include <vector>
#include <filesystem>
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra.hpp>
#include <filesystem>
#include <iostream>

View File

@@ -21,12 +21,12 @@
#include <JGL/enums.h>
#include <JGL/FontCache.h>
#include <JGL/Font.h>
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra/Vector2.h>
#include <J3ML/LinearAlgebra/Vector3.h>
#include <J3ML/Geometry/Sphere.h>
#include <J3ML/Geometry/Capsule.h>
#include <J3ML/Geometry/TriangleMesh.h>
#include <J3ML/LinearAlgebra.hpp>
#include <J3ML/LinearAlgebra/Vector2.hpp>
#include <J3ML/LinearAlgebra/Vector3.hpp>
#include <J3ML/Geometry/Sphere.hpp>
#include <J3ML/Geometry/Capsule.hpp>
#include <J3ML/Geometry/TriangleMesh.hpp>
/// OpenGL Wrapper for rendering 2D graphics primitives in both a 2D and 3D context

View File

@@ -1,6 +1,6 @@
#pragma once
#include <ReTexture/Texture.h>
#include <J3ML/LinearAlgebra.h>
#include <J3ML/LinearAlgebra.hpp>
#include <Color3.hpp>
#include <Color4.hpp>
#include <glad/glad.h>

View File

@@ -2,7 +2,7 @@
#include <JGL/JGL.h>
#include <rewindow/types/window.h>
#include <Colors.hpp>
#include <J3ML/LinearAlgebra/Vector2.h>
#include <J3ML/LinearAlgebra/Vector2.hpp>
#include <JGL/Font.h>
#include <jlog/jlog.hpp>
#include <ReTexture/Texture.h>

View File

@@ -6,7 +6,7 @@
#include <glad/glad.h>
#include <Color3.hpp>
#include <jlog/jlog.hpp>
#include "J3ML/Algorithm/Bezier.h"
#include <J3ML/Algorithm/Bezier.hpp>
GLfloat oldColor[4] = {0, 0, 0, 1};
GLfloat baseColor[4] = {1, 1, 1, 1};