Restructure

include/Redacted3D/engine/collision.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types/vertex.h>
+#include <Redacted3D/types/vertex.h>
 #include <J3ML/Geometry.h>
 
 using J3ML::Geometry::AABB;

include/Redacted3D/engine/engine.h

@@ -5,7 +5,7 @@
 #include <cstring>
 #include <iostream>
 #include <fstream>
-#include <engine/world.h>
+#include <Redacted3D/engine/world.h>
 #include <rewindow/types/window.h>
 
 enum class ENGINE_ERROR_CODE: u8 {

include/Redacted3D/engine/occlusion.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types/entity/camera.h>
+#include <Redacted3D/types/entity/camera.h>
 
 namespace Occlusion {
     bool frustumCull(Camera* camera, Entity* entity);

include/Redacted3D/engine/world.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types/vertex.h>
-#include <types/texture.h>
-#include <types/shader.h>
-#include <types/entity/entity.h>
+#include <Redacted3D/types/vertex.h>
+#include <Redacted3D/types/texture.h>
+#include <Redacted3D/types/shader.h>
+#include <Redacted3D/types/entity/entity.h>
 #include <J3ML/LinearAlgebra/Vector3.h>
 
 using J3ML::LinearAlgebra::Vector3;

include/Redacted3D/types/entity/camera.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <types/entity/moby.h>
-#include <engine/engine.h>
+#include <Redacted3D/types/entity/moby.h>
+#include <Redacted3D/engine/engine.h>
 #include <glad/glad.h>
 #include <J3ML/Geometry.h>
 

include/Redacted3D/types/entity/entity.h

@@ -1,10 +1,10 @@
 #pragma once
 #include <cstdint>
-#include <types/vertex.h>
-#include <types/texture.h>
+#include <Redacted3D/types/vertex.h>
+#include <Redacted3D/types/texture.h>
 #include <J3ML/LinearAlgebra/Matrix4x4.h>
 #include <J3ML/LinearAlgebra/Vector3.h>
-#include <engine/collision.h>
+#include <Redacted3D/engine/collision.h>
 #include <archive.h>
 
 using J3ML::LinearAlgebra::Matrix4x4;

include/Redacted3D/types/entity/moby.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types/entity/entity.h>
+#include <Redacted3D/types/entity/entity.h>
 
 ///A "Movable Object". Things that will move often are derived from this.
 class Moby : public Entity {

include/Redacted3D/types/entity/skybox.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types/vertex.h>
-#include <types/entity/moby.h>
+#include <Redacted3D/types/vertex.h>
+#include <Redacted3D/types/entity/moby.h>
 
 ///Simple skybox, A sphere with a texture on it where the center of the sphere is always the camera.
 class Skybox : public Moby {

src/demo/RuntimeTest/include/ball.h

@@ -3,7 +3,7 @@
 #include <iostream>
 #include <cmath>
 #include <cstdint>
-#include <types/entity/moby.h>
+#include <Redacted3D/types/entity/moby.h>
 
 class Ball : public Moby {
 public:

src/demo/RuntimeTest/include/cube.h

@@ -3,7 +3,7 @@
 #include <iostream>
 #include <cmath>
 #include <cstdint>
-#include <types/entity/moby.h>
+#include <Redacted3D/types/entity/moby.h>
 
 class Cube : public Moby {
 public:

src/demo/RuntimeTest/include/demoSky.h

@@ -1,4 +1,4 @@
-#include <types/entity/skybox.h>
+#include <Redacted3D/types/entity/skybox.h>
 #pragma once
 
 class DemoSkybox : public Skybox {

src/demo/RuntimeTest/include/freeCam.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types/entity/camera.h>
+#include <Redacted3D/types/entity/camera.h>
 
 class FreeCam : public Camera {
 public:

src/demo/RuntimeTest/main.cpp

@@ -1,5 +1,5 @@
 #include <thread>
-#include <engine/engine.h>
+#include <Redacted3D/engine/engine.h>
 #include <cube.h>
 #include <ball.h>
 #include <freeCam.h>
@@ -23,11 +23,11 @@ int main()
     camera->SetParent(engine->world);
     engine->world->setActiveCamera(camera);
 
-    auto* cube1 = new(Cube);
-    cube1->name = "cube1";
-    cube1->SetPos({-5, -2, 0});
-    cube1->velAngle = cube1->lAngle();
-    cube1->SetParent(engine->world);
+    auto* cube = new(Cube);
+    cube->name = "cube";
+    cube->SetPos({-5, -2, 0});
+    cube->velAngle = cube->lAngle();
+    cube->SetParent(engine->world);
 
     auto* ball = new(Ball);
     ball->name = "sphere";

src/demo/RuntimeTest/src/cube.cpp

@@ -1,5 +1,5 @@
 #include <cube.h>
-#include <engine/engine.h>
+#include <Redacted3D/engine/engine.h>
 #include <ball.h>
 
 void Cube::pre_render()  {

src/demo/RuntimeTest/src/demoSky.cpp

@@ -1,5 +1,5 @@
 #include <demoSky.h>
-#include <engine/engine.h>
+#include <Redacted3D/engine/engine.h>
 
 DemoSkybox::DemoSkybox() {
     name = "skybox";

src/engine/collision.cpp

@@ -1,4 +1,4 @@
-#include <engine/collision.h>
+#include <Redacted3D/engine/collision.h>
 
 VertexArray genIcosahedron(const Sphere* sphere) {
     const float phi = (1.0 + std::sqrt(5.0)) / 2.0;

src/engine/engine.cpp

@@ -1,8 +1,8 @@
 #include <sstream>
 #include <thread>
-#include <engine/engine.h>
-#include <engine/utils/instanceOf.h>
-#include <types/entity/camera.h>
+#include <Redacted3D/engine/engine.h>
+#include <Redacted3D/engine/utils/instanceOf.h>
+#include <Redacted3D/types/entity/camera.h>
 #include <JGL/JGL.h>
 #include <JGL/Colors.h>
 

src/engine/occlusion.cpp

@@ -1,5 +1,5 @@
-#include <engine/occlusion.h>
-#include <types/entity/entity.h>
+#include <Redacted3D/engine/occlusion.h>
+#include <Redacted3D/types/entity/entity.h>
 
 
 bool Occlusion::frustumCull(Camera* camera, Entity* entity) {

src/engine/world.cpp

@@ -1,5 +1,5 @@
-#include <engine/world.h>
-#include <types/entity/moby.h>
+#include <Redacted3D/engine/world.h>
+#include <Redacted3D/types/entity/moby.h>
 
 
 int DataModel::getEntityCount() const {

src/types/entity/camera.cpp

@@ -1,5 +1,5 @@
 #include <array>
-#include <types/entity/camera.h>
+#include <Redacted3D/types/entity/camera.h>
 
 std::array<GLfloat, 16> lookAt(const Vector3& eye, const Vector3& center, const Vector3& up) {
     Vector3 f = Vector3::Normalized((center - eye));

src/types/entity/entity.cpp

@@ -1,8 +1,8 @@
-#include <types/entity/entity.h>
-#include <engine/occlusion.h>
-#include <types/entity/camera.h>
-#include <engine/engine.h>
-#include <engine/utils/instanceOf.h>
+#include <Redacted3D/types/entity/entity.h>
+#include <Redacted3D/engine/occlusion.h>
+#include <Redacted3D/types/entity/camera.h>
+#include <Redacted3D/engine/engine.h>
+#include <Redacted3D/engine/utils/instanceOf.h>
 
 //inline LinearAlgebra::Vector3 Entity::GetPos() const
 //{ return LinearAlgebra::Vector3(coordinates[1]); }

src/types/entity/moby.cpp

@@ -1,5 +1,5 @@
-#include <types/entity/moby.h>
-#include <engine/engine.h>
+#include <Redacted3D/types/entity/moby.h>
+#include <Redacted3D/engine/engine.h>
 using namespace J3ML;
 
 void Moby::hMove(Vector3 a, float vel) {

src/types/entity/skybox.cpp

@@ -1,6 +1,7 @@
-#include <types/entity/skybox.h>
-#include <engine/engine.h>
-#include <types/entity/camera.h>
+#include <Redacted3D/types/entity/skybox.h>
+#include <Redacted3D/engine/engine.h>
+#include <Redacted3D/types/entity/camera.h>
+
 void Skybox::pre_render() {
     if (engine->world->getActiveCamera() != nullptr)
         position = engine->world->getActiveCamera()->GetPos();

src/types/shader.cpp

@@ -1,5 +1,5 @@
-#include <types/shader.h>
-#include <engine/engine.h>
+#include <Redacted3D/types/shader.h>
+#include <Redacted3D/engine/engine.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>

src/types/texture.cpp

@@ -1,6 +1,6 @@
-#include <types/texture.h>
+#include <Redacted3D/types/texture.h>
 #include <ReTexture/rTexture.h>
-#include <engine/engine.h>
+#include <Redacted3D/engine/engine.h>
 
 void Texture::load(Entity* entity, const std::string& file, bool storeOnTextureList) {
     auto* texture = new RTexture(file, {RTextureFlag::INVERT_Y});

src/types/vertexArray.cpp

@@ -1,6 +1,6 @@
-#include <engine/engine.h>
-#include <types/vertex.h>
-#include <engine/collision.h>
+#include <Redacted3D/engine/engine.h>
+#include <Redacted3D/types/vertex.h>
+#include <Redacted3D/engine/collision.h>
 #include <cmath>
 #include <Collage/types/model.h>
 void VertexArray::load (const std::string& filename) {