Merge pull request #11 from yuki-koyama/update-libraries

Update external libraries

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "external/bigg"]
 	path = external/bigg
-	url = https://github.com/JoshuaBrookover/bigg.git
+	url = https://github.com/Josh4428/bigg.git
 [submodule "external/tinyobjloader"]
 	path = external/tinyobjloader
-	url = https://github.com/syoyo/tinyobjloader.git
+	url = https://github.com/tinyobjloader/tinyobjloader.git
 [submodule "external/rand-util"]
 	path = external/rand-util
 	url = https://github.com/yuki-koyama/rand-util.git

CMakeLists.txt

@@ -24,6 +24,12 @@ set(GLFW_VULKAN_STATIC      OFF CACHE INTERNAL "" FORCE)
 set(LIB_SUFFIX              ""  CACHE INTERNAL "" FORCE)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/bigg)
 
+# Note: This was necessary to avoid a run-time error on macOS/OpenGL. Without
+# this option, the NSOpenGLViewContext's setView method was called from a
+# wrong (?) thread during bgfx::init and then the app crashes. This needs to be
+# investigated further.
+target_compile_definitions(bgfx PUBLIC BGFX_CONFIG_MULTITHREADED=0)
+
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/rand-util)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/string-util)

README.md

@@ -15,8 +15,8 @@ This library, named `bigger`, is a prototype-oriented middleware library for 3D
 
 ## Dependencies
 
-- bigg <https://github.com/JoshuaBrookover/bigg> [Unlicense]
-  - bgfx.cmake <https://github.com/JoshuaBrookover/bgfx.cmake> [CC0 1.0 Universal]
+- bigg <https://github.com/Josh4428/bigg> [Unlicense]
+  - bgfx.cmake <https://github.com/widberg/bgfx.cmake> [CC0 1.0 Universal]
     - bgfx <https://github.com/bkaradzic/bgfx> [BSD 2-Clause]
     - bimg <https://github.com/bkaradzic/bimg> [BSD 2-Clause]
     - bx <https://github.com/bkaradzic/bx> [BSD 2-Clause]
@@ -25,7 +25,7 @@ This library, named `bigger`, is a prototype-oriented middleware library for 3D
   - GLM <https://github.com/g-truc/glm> [MIT]
 - random-util <https://github.com/yuki-koyama/rand-util> [MIT]
 - string-util <https://github.com/yuki-koyama/string-util> [MIT]
-- tinyobjloader <https://github.com/syoyo/tinyobjloader> [MIT]
+- tinyobjloader <https://github.com/tinyobjloader/tinyobjloader/> [MIT]
 
 ## Main Classes
 

examples/cubes/main.cpp

@@ -5,7 +5,7 @@
 #include <bigger/materials/blinnphong-material.hpp>
 #include <bigger/primitives/cube-primitive.hpp>
 #include <glm/glm.hpp>
-#include <glm/ext.hpp>
+#include <glm/ext/matrix_transform.hpp>
 
 class CubeObject;
 
@@ -58,7 +58,7 @@ class CubeObject final : public bigger::SceneObject
     {
         // Update transform
         const float t = m_app->m_time;
-        m_rotate_matrix = glm::rotate(t, glm::vec3(m_x, m_y, 1.0f));
+        m_rotate_matrix = glm::rotate(glm::mat4(1.0), t, glm::vec3(m_x, m_y, 1.0f));
 
         // Update visibility
         m_is_visible = std::max(std::abs(m_x), std::abs(m_y)) <= m_app->m_massive_level;
@@ -108,8 +108,8 @@ void CubesApp::initialize(int argc, char** argv)
         {
             auto cube_object = std::make_shared<CubeObject>(this, x, y, m_cube_material, m_cube_primitive);
 
-            cube_object->m_translate_matrix = glm::translate(glm::vec3(x, y, 0.0f));
-            cube_object->m_scale_matrix = glm::scale(glm::vec3(std::pow(3.0f, - 0.5f)));
+            cube_object->m_translate_matrix = glm::translate(glm::mat4(1.0), glm::vec3(x, y, 0.0f));
+            cube_object->m_scale_matrix = glm::scale(glm::mat4(1.0), glm::vec3(std::pow(3.0f, - 0.5f)));
 
             addSceneObject(cube_object);
         }

examples/mesh/main.cpp

@@ -6,7 +6,7 @@
 #include <bigger/materials/blinnphong-material.hpp>
 #include <bigger/primitives/mesh-primitive.hpp>
 #include <glm/glm.hpp>
-#include <glm/ext.hpp>
+#include <glm/ext/matrix_transform.hpp>
 
 class MeshObject;
 
@@ -52,7 +52,7 @@ class MeshObject final : public bigger::SceneObject
     {
         // Update transform
         const float t = m_app->m_time;
-        m_rotate_matrix = glm::rotate(t, glm::vec3(0.0f, 1.0f, 0.0f));
+        m_rotate_matrix = glm::rotate(glm::mat4(1.0f), t, glm::vec3(0.0f, 1.0f, 0.0f));
     }
 
     void draw(const glm::mat4& parent_transform_matrix = glm::mat4(1.0f)) override

include/bigger/primitive.hpp

@@ -13,14 +13,14 @@ namespace bigger
         glm::vec3 position;
         glm::vec3 normal;
 
-        static bgfx::VertexDecl getVertexDecl()
+        static bgfx::VertexLayout getVertexLayout()
         {
-            bgfx::VertexDecl vertex_decl;
-            vertex_decl.begin()
+            bgfx::VertexLayout vertex_layout;
+            vertex_layout.begin()
             .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float)
             .add(bgfx::Attrib::Normal, 3, bgfx::AttribType::Float)
             .end();
-            return vertex_decl;
+            return vertex_layout;
         }
     };
 
@@ -56,8 +56,8 @@ namespace bigger
             assert(!m_vertices.empty());
             assert(!m_triangle_list.empty());
 
-            const bgfx::VertexDecl vertex_decl = PositionNormalVertex::getVertexDecl();
-            m_vertex_buffer_handle = bgfx::createVertexBuffer(bgfx::makeRef(m_vertices.data(), sizeof(PositionNormalVertex) * m_vertices.size()), vertex_decl);
+            const bgfx::VertexLayout vertex_layout = PositionNormalVertex::getVertexLayout();
+            m_vertex_buffer_handle = bgfx::createVertexBuffer(bgfx::makeRef(m_vertices.data(), sizeof(PositionNormalVertex) * m_vertices.size()), vertex_layout);
             m_index_buffer_handle = bgfx::createIndexBuffer(bgfx::makeRef(m_triangle_list.data(), sizeof(uint16_t) * m_triangle_list.size()));
 
             m_is_initialized = true;

include/bigger/screen-shot-callback.hpp

@@ -12,7 +12,7 @@ namespace bigger
         enum class ImageType { Png, Tga };
 
         virtual ~ScreenShotCallback() {}
-        virtual void fatal(bgfx::Fatal::Enum, const char*) override {}
+        virtual void fatal(const char*, uint16_t, bgfx::Fatal::Enum, const char*) override {}
         virtual void traceVargs(const char*, uint16_t, const char*, va_list) override {}
         virtual void profilerBegin(const char*, uint32_t, const char*, uint16_t) override {}
         virtual void profilerBeginLiteral(const char*, uint32_t, const char*, uint16_t) override {}

src/dynamic-mesh-primitive.cpp

@@ -14,8 +14,8 @@ void bigger::DynamicMeshPrimitive::initializePrimitive()
     assert(!m_vertices.empty());
     assert(!m_triangle_list.empty());
 
-    const bgfx::VertexDecl vertex_decl = PositionNormalVertex::getVertexDecl();
-    m_dynamic_vertex_buffer_handle = bgfx::createDynamicVertexBuffer(bgfx::makeRef(m_vertices.data(), sizeof(PositionNormalVertex) * m_vertices.size()), vertex_decl);
+    const bgfx::VertexLayout vertex_layout = PositionNormalVertex::getVertexLayout();
+    m_dynamic_vertex_buffer_handle = bgfx::createDynamicVertexBuffer(bgfx::makeRef(m_vertices.data(), sizeof(PositionNormalVertex) * m_vertices.size()), vertex_layout);
     m_index_buffer_handle = bgfx::createIndexBuffer(bgfx::makeRef(m_triangle_list.data(), sizeof(uint16_t) * m_triangle_list.size()));
 
     m_is_initialized = true;