Upgrade all deps to latest.

CMakeLists.txt

@@ -4,6 +4,7 @@ project(Re3D
         LANGUAGES CXX C
 )
 
+
 if (PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
     message(FATAL_ERROR "In-source builds are not allowed")
 endif()
@@ -24,14 +25,17 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 
 #TODO: Publish release
-CPMAddPackage(
-        NAME Event
-        URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
-)
+
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 
 CPMAddPackage(
         NAME ReWindow
-        URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.32.zip
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-1.zip
+)
+
+CPMAddPackage(
+        NAME Event
+        URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
 )
 
 #Temporarily removed due to SystemD requirement.
@@ -42,12 +46,12 @@ CPMAddPackage(
 
 CPMAddPackage(
         NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Release-7.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Release-2.1.zip
 )
 
 CPMAddPackage(
         NAME JGL
-        URL https://git.redacted.cc/josh/JGL/archive/Prerelease-13.zip
+        URL https://git.redacted.cc/josh/JGL/archive/Prerelease-14.zip
 )
 
 CPMAddPackage(
@@ -75,8 +79,15 @@ CPMAddPackage(
         URL https://git.redacted.cc/Redacted/Collage/archive/v0.4.zip
 )
 
+CPMAddPackage(
+        NAME jlog
+        URL https://git.redacted.cc/josh/jlog/archive/Prerelease-7.zip
+)
+
 include_directories(
         ${PROJECT_SOURCE_DIR}/include
+        ${jlog_SOURCE_DIR}/include
+        ${JGL_SOURCE_DIR}/include
         ${ReWindow_SOURCE_DIR}/include
         #${ReHardwareID_SOURCE_DIR}/include
         ${J3ML_SOURCE_DIR}/include
@@ -86,7 +97,6 @@ include_directories(
         ${archive_SOURCE_DIR}/include
         ${Collage_SOURCE_DIR}/include
         ${Event_SOURCE_DIR}/include
-        ${JGL_SOURCE_DIR}/include
 )
 
 add_library(Re3D SHARED ${SOURCES})
@@ -95,7 +105,7 @@ set_target_properties(Re3D PROPERTIES LINKER_LANGUAGE CXX)
 
 find_package(OpenGL REQUIRED)
 
-target_link_libraries(Re3D PUBLIC Event ReWindowLibrary ReTexture J3ML GL glad Collage JGL archive)
+target_link_libraries(Re3D PUBLIC Event ReWindowLibrary ReTexture J3ML GL glad Collage JGL archive jlog)
 
 include(src/demo/RuntimeTest/CMakeLists.txt)
 

src/demo/RuntimeTest/main.cpp

@@ -11,7 +11,7 @@ int main()
 {
     engine->window = new ReWindow::RWindow("Re3D Test Application", 1152, 864, RenderingAPI::OPENGL);
     engine->world = new(World);
-    engine->init();
+    Engine::init();
     engine->window->setVsyncEnabled(false);
     engine->window->setResizable(false);
     engine->world->setAmbientLightColor(1.0f, 1.0f, 1.0f);
@@ -42,7 +42,6 @@ int main()
     engine->renderLoop();
 }
 
-
 #ifdef WINDOWS_SMH
 extern "C" {
     int wmain(int argc, wchar_t* argv[]) {

src/engine/collision.cpp

@@ -113,10 +113,11 @@ VertexArray Collision::getDrawable(const Shape& collider) {
 
         if (s->Radius != 1.0f) //Scale
             for (auto& vertex : result.vertices)
-                vertex = Vector3::Normalize(vertex) * s->Radius;
+                vertex = Vector3::Normalized(vertex) * s->Radius;
 
         for (auto& v : result.vertices) //Translate
             v += s->Position;
         return result;
     }
+        return {};
 }

src/types/entity/camera.cpp

@@ -2,10 +2,10 @@
 #include <types/entity/camera.h>
 
 std::array<GLfloat, 16> lookAt(const Vector3& eye, const Vector3& center, const Vector3& up) {
-    Vector3 f = (center - eye).Normalize();
-    Vector3 upN = up.Normalize();
-    Vector3 s = f.Cross(upN).Normalize();
-    Vector3 u = s.Cross(f);
+    Vector3 f = Vector3::Normalized((center - eye));
+    Vector3 upN = Vector3::Normalized(up);
+    Vector3 s = Vector3::Normalized(f.Cross(upN));
+    Vector3 u = Vector3::Normalized(s.Cross(f));
 
     std::array<GLfloat, 16> result = {
             s.x,         u.x,         -f.x,        0.0f,