- Dev: utils.h moved to a more general place

Author: AEspinosaDev

CMakeLists.txt

@@ -55,7 +55,7 @@ target_link_libraries(ImGuiFileDialog PUBLIC imgui )
 
 # Setup sources
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/add_module_files.cmake)
-set(ENGINE_SOURCES "")
+set(ENGINE_SOURCES "src/utils.cpp")
 set(ENGINE_HEADERS "")
 add_module_files(core ENGINE_SOURCES ENGINE_HEADERS)
 add_module_files(graphics ENGINE_SOURCES ENGINE_HEADERS)

include/engine/common.h

@@ -32,7 +32,10 @@
 #include <backends/imgui_impl_vulkan.h>
 #include <cstdlib>
 #include <fstream>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtx/hash.hpp>
 #include <imgui.h>
 #include <iostream>
 #include <map>

include/engine/graphics/device.h

@@ -10,6 +10,7 @@
 #define CONTEXT_H
 
 #include <engine/common.h>
+#include <engine/utils.h>
 
 #include <engine/graphics/accel.h>
 #include <engine/graphics/command_buffer.h>
@@ -20,7 +21,6 @@
 #include <engine/graphics/swapchain.h>
 #include <engine/graphics/utilities/bootstrap.h>
 #include <engine/graphics/utilities/initializers.h>
-#include <engine/graphics/utilities/utils.h>
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
 

include/engine/graphics/utilities/bootstrap.h

@@ -9,7 +9,7 @@
 #ifndef BOOTSTRAP_H
 #define BOOTSTRAP_H
 
-#include <engine/graphics/utilities/utils.h>
+#include <engine/utils.h>
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
 

include/engine/graphics/vao.h

@@ -9,8 +9,8 @@
 #ifndef VAO_H
 #define VAO_H
 
+#include <engine/utils.h>
 #include <engine/graphics/buffer.h>
-#include <engine/graphics/utilities/utils.h>
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
 

include/engine/systems/renderers/renderer.h

@@ -57,7 +57,7 @@ class BaseRenderer
     std::vector<Core::BasePass*> m_passes;
 
     /*Automatic deletion queue*/
-    Graphics::Utils::DeletionQueue m_deletionQueue;
+    Utils::DeletionQueue m_deletionQueue;
 
     /*Query*/
     uint32_t m_currentFrame       = 0;

include/engine/tools/loaders.h

@@ -34,6 +34,11 @@ void load_OBJ(Core::Mesh* const mesh,
               bool              importMaterials   = false,
               bool              calculateTangents = false,
               bool              overrideGeometry  = false);
+void load_OBJ2(Core::Mesh* const mesh,
+              const std::string fileName,
+              bool              importMaterials   = false,
+              bool              calculateTangents = false,
+              bool              overrideGeometry  = false);
 
 void load_PLY(Core::Mesh* const mesh,
               const std::string fileName,

include/engine/graphics/utilities/utils.h include/engine/utils.hinclude/engine/graphics/utilities/utils.h renamed to include/engine/utils.h

@@ -12,21 +12,13 @@
 #include <chrono>
 #include <deque>
 #include <engine/common.h>
-#include <engine/graphics/utilities/initializers.h>
 #include <functional>
 
-#define GLM_ENABLE_EXPERIMENTAL
-#include <glm/gtx/hash.hpp>
-
 VULKAN_ENGINE_NAMESPACE_BEGIN
 
-namespace Graphics {
-
 namespace Utils {
 
 
-
-
 struct DeletionQueue {
     std::deque<std::function<void()>> deletors;
 
@@ -61,12 +53,12 @@ class ManualTimer
     }
 };
 
-struct memory_buffer : public std::streambuf {
+struct MemoryBuffer : public std::streambuf {
     char*  p_start{nullptr};
     char*  p_end{nullptr};
     size_t size;
 
-    memory_buffer(char const* first_elem, size_t size)
+    MemoryBuffer(char const* first_elem, size_t size)
         : p_start(const_cast<char*>(first_elem))
         , p_end(p_start + size)
         , size(size) {
@@ -86,9 +78,9 @@ struct memory_buffer : public std::streambuf {
     }
 };
 
-struct memory_stream : virtual memory_buffer, public std::istream {
-    memory_stream(char const* first_elem, size_t size)
-        : memory_buffer(first_elem, size)
+struct MemoryStream : virtual MemoryBuffer, public std::istream {
+    MemoryStream(char const* first_elem, size_t size)
+        : MemoryBuffer(first_elem, size)
         , std::istream(static_cast<std::streambuf*>(this)) {
     }
 };
@@ -115,11 +107,10 @@ inline std::vector<uint8_t> read_file_binary(const std::string& pathToFile) {
     return fileBufferBytes;
 }
 
-
 Vec3 get_tangent_gram_smidt(Vec3& p1, Vec3& p2, Vec3& p3, glm::vec2& uv1, glm::vec2& uv2, glm::vec2& uv3, Vec3 normal);
 
 }; // namespace Utils
-} // namespace Graphics
+
 
 VULKAN_ENGINE_NAMESPACE_END
 

src/core/geometries/geometry.cpp

@@ -145,7 +145,7 @@ void Geometry::compute_tangents_gram_smidt(std::vector<Graphics::Vertex>& vertic
             size_t i1 = indices[i + 1];
             size_t i2 = indices[i + 2];
 
-            Vec3 tangent = Graphics::Utils::get_tangent_gram_smidt(vertices[i0].pos,
+            Vec3 tangent = Utils::get_tangent_gram_smidt(vertices[i0].pos,
                                                                    vertices[i1].pos,
                                                                    vertices[i2].pos,
                                                                    vertices[i0].texCoord,
@@ -160,7 +160,7 @@ void Geometry::compute_tangents_gram_smidt(std::vector<Graphics::Vertex>& vertic
     else
         for (size_t i = 0; i < vertices.size(); i += 3)
         {
-            Vec3 tangent = Graphics::Utils::get_tangent_gram_smidt(vertices[i].pos,
+            Vec3 tangent = Utils::get_tangent_gram_smidt(vertices[i].pos,
                                                                    vertices[i + 1].pos,
                                                                    vertices[i + 2].pos,
                                                                    vertices[i].texCoord,

src/tools/loaders.cpp

@@ -148,6 +148,87 @@ void VKFW::Tools::Loaders::load_OBJ(Core::Mesh* const mesh,
     return;
 }
 
+void VKFW::Tools::Loaders::load_OBJ2(Core::Mesh* const mesh,
+                                     const std::string fileName,
+                                     bool              importMaterials,
+                                     bool              calculateTangents,
+                                     bool              overrideGeometry) {
+
+    // Preparing output
+    tinyobj::attrib_t                attrib;
+    std::vector<tinyobj::shape_t>    shapes;
+    std::vector<tinyobj::material_t> materials;
+    std::string                      warn;
+    std::string                      err;
+
+    tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, fileName.c_str(), importMaterials ? nullptr : nullptr);
+
+    // Check for errors
+    if (!warn.empty())
+    {
+        DEBUG_LOG("WARN: " + warn);
+    }
+    if (!err.empty())
+    {
+        ERR_LOG(err);
+        DEBUG_LOG("ERROR: Couldn't load mesh");
+        return;
+    }
+
+    std::vector<Graphics::Vertex>           vertices;
+    std::vector<uint32_t>                   indices;
+    std::unordered_map<glm::vec3, uint32_t> unique_vertices;
+
+    for (const auto& shape : shapes)
+    {
+        for (const auto& index : shape.mesh.indices)
+        {
+            Graphics::Vertex vertex;
+            if (index.vertex_index >= 0)
+            {
+
+                vertex.pos   = {attrib.vertices[3 * index.vertex_index + 0],
+                                attrib.vertices[3 * index.vertex_index + 1],
+                                attrib.vertices[3 * index.vertex_index + 2]};
+                vertex.color = {attrib.colors[3 * index.vertex_index + 0],
+                                attrib.colors[3 * index.vertex_index + 1],
+                                attrib.colors[3 * index.vertex_index + 2]};
+            }
+            if (index.normal_index >= 0)
+            {
+                vertex.normal = {attrib.normals[3 * index.normal_index + 0],
+                                 attrib.normals[3 * index.normal_index + 1],
+                                 attrib.normals[3 * index.normal_index + 2]};
+            }
+
+            vertex.tangent = {0.0, 0.0, 0.0};
+
+            if (index.texcoord_index >= 0)
+            {
+                vertex.texCoord = {
+                    attrib.texcoords[2 * index.texcoord_index + 0], attrib.texcoords[2 * index.texcoord_index + 1]};
+            }
+            
+
+            if (unique_vertices.count(vertex.pos) == 0)
+            {
+                unique_vertices[vertex.pos] = static_cast<uint32_t>(vertices.size());
+                vertices.push_back(vertex);
+            }
+
+            indices.push_back(unique_vertices[vertex.pos]);
+        }
+    }
+    if (calculateTangents)
+    {
+        Core::Geometry::compute_tangents_gram_smidt(vertices, indices);
+    }
+
+    Core::Geometry* g = new Core::Geometry();
+    g->fill(vertices, indices);
+    mesh->push_geometry(g);
+    mesh->set_file_route(fileName);
+}
 void VKFW::Tools::Loaders::load_PLY(Core::Mesh* const mesh,
                                     const std::string fileName,
                                     bool              preload,
@@ -163,8 +244,8 @@ void VKFW::Tools::Loaders::load_PLY(Core::Mesh* const mesh,
         // stream is a net win for parsing speed, about 40% faster.
         if (preload)
         {
-            byte_buffer = Graphics::Utils::read_file_binary(fileName);
-            file_stream.reset(new Graphics::Utils::memory_stream((char*)byte_buffer.data(), byte_buffer.size()));
+            byte_buffer = Utils::read_file_binary(fileName);
+            file_stream.reset(new Utils::MemoryStream((char*)byte_buffer.data(), byte_buffer.size()));
         } else
         {
             file_stream.reset(new std::ifstream(fileName, std::ios::binary));
@@ -271,7 +352,7 @@ void VKFW::Tools::Loaders::load_PLY(Core::Mesh* const mesh,
             if (verbose)
                 std::cerr << "tinyply exception: " << e.what() << std::endl;
         }
-        Graphics::Utils::ManualTimer readTimer;
+        Utils::ManualTimer readTimer;
 
         readTimer.start();
         file.read(*file_stream);