Working on gltf loading and debug gui for gltf assets

.gitignore

@@ -1,6 +1,8 @@
 .*.swp
 
 build/*
+cmake-build-debug/**
+cmake-build-release/**
 tags
 
 3rdparty/glfw/docs/**

data/models/Cube/Cube.gltf

@@ -0,0 +1,193 @@
+{
+   "accessors" : [
+      {
+         "bufferView" : 0,
+         "byteOffset" : 0,
+         "componentType" : 5123,
+         "count" : 36,
+         "max" : [
+            35
+         ],
+         "min" : [
+            0
+         ],
+         "type" : "SCALAR"
+      },
+      {
+         "bufferView" : 1,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000,
+            1.000001
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC3"
+      },
+      {
+         "bufferView" : 2,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000,
+            1.000000
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC3"
+      },
+      {
+         "bufferView" : 3,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            -0.000000,
+            -0.000000,
+            1.000000
+         ],
+         "min" : [
+            0.000000,
+            -0.000000,
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC4"
+      },
+      {
+         "bufferView" : 4,
+         "byteOffset" : 0,
+         "componentType" : 5126,
+         "count" : 36,
+         "max" : [
+            1.000000,
+            1.000000
+         ],
+         "min" : [
+            -1.000000,
+            -1.000000
+         ],
+         "type" : "VEC2"
+      }
+   ],
+   "asset" : {
+      "generator" : "VKTS glTF 2.0 exporter",
+      "version" : "2.0"
+   },
+   "bufferViews" : [
+      {
+         "buffer" : 0,
+         "byteLength" : 72,
+         "byteOffset" : 0,
+         "target" : 34963
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 432,
+         "byteOffset" : 72,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 432,
+         "byteOffset" : 504,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 576,
+         "byteOffset" : 936,
+         "target" : 34962
+      },
+      {
+         "buffer" : 0,
+         "byteLength" : 288,
+         "byteOffset" : 1512,
+         "target" : 34962
+      }
+   ],
+   "buffers" : [
+      {
+         "byteLength" : 1800,
+         "uri" : "Cube.bin"
+      }
+   ],
+   "images" : [
+      {
+         "uri" : "Cube_BaseColor.png"
+      },
+      {
+         "uri" : "Cube_MetallicRoughness.png"
+      }
+   ],
+   "materials" : [
+      {
+         "name" : "Cube",
+         "pbrMetallicRoughness" : {
+            "baseColorTexture" : {
+               "index" : 0
+            },
+            "metallicRoughnessTexture" : {
+               "index" : 1
+            }
+         }
+      }
+   ],
+   "meshes" : [
+      {
+         "name" : "Cube",
+         "primitives" : [
+            {
+               "attributes" : {
+                  "NORMAL" : 2,
+                  "POSITION" : 1,
+                  "TANGENT" : 3,
+                  "TEXCOORD_0" : 4
+               },
+               "indices" : 0,
+               "material" : 0,
+               "mode" : 4
+            }
+         ]
+      }
+   ],
+   "nodes" : [
+      {
+         "mesh" : 0,
+         "name" : "Cube"
+      }
+   ],
+   "samplers" : [
+      {}
+   ],
+   "scene" : 0,
+   "scenes" : [
+      {
+         "nodes" : [
+            0
+         ]
+      }
+   ],
+   "textures" : [
+      {
+         "sampler" : 0,
+         "source" : 0
+      },
+      {
+         "sampler" : 0,
+         "source" : 1
+      }
+   ]
+}

data/models/Cube/README.md

@@ -0,0 +1,4 @@
+License: Donated by Norbert Nopper for glTF testing.
+
+https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/Cube
+

data/models/RiggedFigure/README.md

@@ -0,0 +1,8 @@
+# Rigged Figure
+## Screenshot
+
+![screenshot](screenshot/screenshot.gif)
+
+## License Information
+
+Donated by [Cesium](http://cesiumjs.org/) for glTF testing.

src/modules/RenderModule.cc

@@ -10,9 +10,6 @@
 
 using namespace SimpleMath::GL;
 
-typedef tinygltf::Model Model;
-typedef tinygltf::TinyGLTF GLTFLoader;
-
 struct Renderer;
 
 float moving_factor = 1.0f;
@@ -64,8 +61,7 @@ VertexArrayMesh gXZPlaneMesh;
 VertexArrayMesh gUnitCubeMesh;
 VertexArrayMesh gScreenQuad;
 
-Model gModel;
-GLTFLoader gLoader;
+AssetFile gAssetFile;
 
 //
 // Module
@@ -147,7 +143,7 @@ static void module_unload(struct module_state *state, void* write_serializer) {
 static bool module_step(struct module_state *state, float dt) {
 	int width, height;
 	assert (gWindow != nullptr);
-	state->renderer->RenderGui();
+	state->renderer->DrawGui();
 	state->renderer->RenderGl();
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
@@ -396,13 +392,8 @@ void Renderer::Initialize(int width, int height) {
 	mLight.mShadowMapTarget.mLinearizeDepthProgram.RegisterFileModification();
 
 	// Model
-	std::string model_file = "data/models/Cube/Cube.gltf";
-	std::string err;
-	bool result = gLoader.LoadASCIIFromFile(&gModel, &err, model_file.c_str());
-	if (!err.empty()) {
-		gLog("Error loading model '%s': %s", model_file.c_str(), err.c_str());
-	} else {
-		gLog("Successfully loaded model '%s'", model_file.c_str());
+	if (!gAssetFile.Load("data/models/RiggedFigure/glTF/RiggedFigure.gltf")) {
+		assert(false);
 	}
 }
 
@@ -569,7 +560,7 @@ void Renderer::RenderScene(RenderProgram &program, const Camera& camera) {
 	gXZPlaneMesh.Draw(GL_TRIANGLES);
 }
 
-void Renderer::RenderGui() {
+void Renderer::DrawGui() {
 	if (ImGui::BeginDock("Scene")) {
 		ImGui::Checkbox("Draw Depth", &mSettings->DrawDepth);
 
@@ -615,5 +606,10 @@ void Renderer::RenderGui() {
 				);
 	}
 	ImGui::EndDock();
+
+	if (ImGui::BeginDock("Asset")) {
+		gAssetFile.DrawGui();
+	}
+	ImGui::EndDock();
 }
 

src/modules/RenderModule.h

@@ -83,5 +83,5 @@ struct Renderer {
 	void Shutdown();
 	void RenderGl();
 	void RenderScene(RenderProgram &program, const Camera& camera);
-	void RenderGui();
+	void DrawGui();
 };

src/modules/RenderUtils.cc

@@ -15,6 +15,10 @@
 using namespace SimpleMath;
 using namespace SimpleMath::GL;
 
+typedef tinygltf::TinyGLTF GLTFLoader;
+
+static GLTFLoader gLoader;
+
 //
 // Camera
 //
@@ -501,6 +505,7 @@ void Texture::MakeGrid(const int& size, const Vector3f &c1, const Vector3f &c2)
 bool Texture::Load(const char* filename, int num_components) {
 //	unsigned char* rgb = stbi_load(filename, &mWidth, &mHeight, num_components);
 	assert(false);
+	return false;
 }
 
 VertexArray::~VertexArray() {
@@ -698,3 +703,62 @@ void VertexArrayMesh::Draw(GLenum mode) {
 	}
 
 }
+
+//
+// AssetFile
+//
+bool AssetFile::Load(const char* filename) {
+	mFilename = filename;
+	std::string err;
+	bool result = gLoader.LoadASCIIFromFile(&mGLTFModel, &err, mFilename.c_str());
+	if (!err.empty()) {
+		gLog("Error loading model '%s': %s", mFilename.c_str(), err.c_str());
+	} else {
+		gLog("Successfully loaded model '%s'", mFilename.c_str());
+	}
+	
+	return result;
+}
+
+void AssetFile::DrawNodeGui(const tinygltf::Node& node) {
+	for (int i = 0, n = node.children.size(); i < n; ++i) {
+		const int child_node_id = node.children[i];
+		const tinygltf::Node& child_node = mGLTFModel.nodes[child_node_id];
+		ImGui::PushID("childnode");
+		ImGui::PushID("i");
+		if (ImGui::TreeNode((void*)(intptr_t)child_node_id, "[%d] %s", child_node_id, child_node.name.c_str())) {
+			DrawNodeGui(child_node);
+			ImGui::TreePop();
+		}
+		ImGui::PopID();
+		ImGui::PopID();
+	}
+}
+
+void AssetFile::DrawGui() {
+	ImGui::Text("File: %s", mFilename.c_str());
+	if (ImGui::TreeNode("Meshes")) {
+		for (int i = 0, n = mGLTFModel.meshes.size(); i < n; ++i) {
+			const tinygltf::Mesh& mesh = mGLTFModel.meshes[i];
+			ImGui::PushID("mesh");
+			if (ImGui::TreeNode((void*)(intptr_t)i, "[%d] %s", i, mesh.name.c_str())) {
+				ImGui::TreePop();
+			}
+			ImGui::PopID();
+		}
+		ImGui::TreePop();
+	}
+
+	if (ImGui::TreeNode("Nodes")) {
+		for (int i = 0, n = mGLTFModel.nodes.size(); i < n; ++i) {
+			const tinygltf::Node& node = mGLTFModel.nodes[i];
+			ImGui::PushID("node");
+			if (ImGui::TreeNode((void*)(intptr_t)i, "[%d] %s", i, node.name.c_str())) {
+				DrawNodeGui(node);
+				ImGui::TreePop();
+			}
+			ImGui::PopID();	
+		}
+		ImGui::TreePop();
+	}
+}

src/modules/RenderUtils.h

@@ -415,6 +415,15 @@ struct VertexArrayMesh {
 	void Draw(GLenum mode);
 };
 
+struct AssetFile {
+	std::string mFilename;
+	tinygltf::Model mGLTFModel;
+
+	bool Load(const char* filename);
+	void DrawNodeGui(const tinygltf::Node& node);
+	void DrawGui();
+};
+
 struct RenderCommand {
 	typedef enum {
 		EnableShadowPass = 1