Refactor & Readme

README.md

@@ -0,0 +1,15 @@
+## Collage
+#### [![License: Unlicense](https://img.shields.io/badge/license-Unlicense-blue.svg)](http://unlicense.org/)
+
+Another model loader for Linux & Windows.
+
+### Supported Formats
+- Wavefront OBJ
+- Animated Wavefront OBJ
+- Collada (maybe)
+- FBX
+
+### Building The Demo
+```bash
+git clone https://git.redacted.cc/Redacted/Collage.git && cd Collage && mkdir build && cd build && cmake .. && make -j8
+```

include/Collage/collage.h

@@ -0,0 +1,2 @@
+#pragma once
+#include <Collage/types/model.h>

include/Collage/types/animation.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <vector>
-#include <types/bone.h>
+#include <Collage/types/bone.h>
 
 struct KeyFrame {
     uint index;

include/Collage/types/keyFrame.h

@@ -0,0 +1,2 @@
+#pragma once
+#include <Collage/types/bone.h>

include/Collage/types/model.h

@@ -5,7 +5,7 @@
 #include <J3ML/LinearAlgebra.h>
 #include <J3ML/LinearAlgebra/Vector3.h>
 #include<J3ML/Geometry.h>
-#include <types/textureInfo.h>
+#include <Collage/types/textureInfo.h>
 
 typedef Vector3 Vertex;
 

include/collage.h

@@ -1,2 +0,0 @@
-#pragma once
-#include <types/model.h>

include/types/keyFrame.h

@@ -1,2 +0,0 @@
-#pragma once
-#include <types/bone.h>

src/obj.cpp

@@ -1,9 +1,8 @@
 #include <iostream>
-#include <types/model.h>
+#include <Collage/types/model.h>
 
 void Model::loadOBJ(const std::string& filename) {
     std::ifstream file(filename);
-    //if (!file.is_open())
     std::vector<Vector3> positions;
     std::vector<Vector2> uvs;
     TextureInformation tInfo = {};
@@ -35,7 +34,6 @@ void Model::loadOBJ(const std::string& filename) {
                 Vector2 textureCoordinate;
                 vertex = positions[vertexIndex[i]];
                 textureCoordinate = uvs[texCoordIndex[i]];
-
                 vertices.push_back(vertex);
                 tInfo.textureCoordinates.push_back(textureCoordinate);
                 indices.push_back(static_cast<unsigned int>(indices.size()));
@@ -44,19 +42,4 @@ void Model::loadOBJ(const std::string& filename) {
     }
     textureInfo.push_back(tInfo);
     file.close();
-};
+};
-
-// map face of model to positions and texture coords
-void Model::mapFaces(const FaceIndices& facedata, const std::vector<Vector3>& positions, const std::vector<Vector2>& uvs) {
-    std::vector<Vector2> textureCoordinates;
-    for (int i = 0; i < 3; ++i) {
-        Vector3 vertex;
-        //Vector2 textureCoordinate;
-        vertex = positions[facedata.vertexIndex[i]];
-        //textureCoordinate = uvs[facedata.texCoordIndex[i]];
-        vertices.push_back(vertex);
-        indices.push_back(static_cast<unsigned int>(indices.size()));
-        //textureCoordinates.push_back(textureCoordinate);
-    }
-    textureInfo.push_back({"", textureCoordinates});
-}

src/types/animation.cpp

@@ -1,2 +1,2 @@
-#include <types/animation.h>
+#include <Collage/types/animation.h>
-#include <types/keyFrame.h>
+#include <Collage/types/keyFrame.h>

src/types/bone.cpp

@@ -1,4 +1,4 @@
-#include <types/bone.h>
+#include <Collage/types/bone.h>
 
 const Matrix4x4& Bone::getMatrix() {
     return matrix;

src/types/boneMap.cpp

@@ -1,4 +1,4 @@
-#include <types/bone.h>
+#include <Collage/types/bone.h>
 struct BoneMap {
     std::vector<Bone> bones;
 };

src/types/model.cpp

@@ -1,4 +1,4 @@
-#include <types/model.h>
+#include <Collage/types/model.h>
 
 void Model::load(const std::string& file) {
     if (file.ends_with(".obj"))