Update dep, minor code improvement and changes

Author: voldien

Common/CMakeLists.txt

@@ -12,15 +12,15 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
 INCLUDE(libcxxopts)
 
 ADD_LIBRARY(glCommon SHARED ${SOURCE_OPENGL_COMMON_FILES} ${HEADER_OPENGL_COMMON_FILES})
-TARGET_LINK_LIBRARIES(glCommon PUBLIC fragcore nekomimi-window fragcore-rgl fragcore-shader-compiler cxxopts fragcore-geometry-util fragcore-window-sdl fragcore-imageloader glew fragcore-scheduler-tasksch ${OPENGL_LIBRARIES} ${SDL2_LINK_LIBRARIES} assimp)
+TARGET_LINK_LIBRARIES(glCommon PUBLIC fragcore nekomimi-window fragcore-rgl fragcore-shader-compiler cxxopts fragcore-geometry-util fragcore-window-sdl2 fragcore-imageloader glew fragcore-scheduler-tasksch ${OPENGL_LIBRARIES} ${SDL2_LINK_LIBRARIES} assimp)
 
 IF(JEMALLOC_LIBRARIES)
 	TARGET_LINK_LIBRARIES(glCommon PUBLIC ${JEMALLOC_LIBRARIES})
 ENDIF()
 
 # OpenGL dependies headers.
 TARGET_INCLUDE_DIRECTORIES(glCommon PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_SOURCE_DIR}/extern )
-ADD_DEPENDENCIES(glCommon fragcore nekomimi-window fragcore-rgl fragcore-shader-compiler fragcore-geometry-util fragcore-window-sdl cxxopts fragcore-imageloader fragcore-scheduler-tasksch glew)
+ADD_DEPENDENCIES(glCommon fragcore nekomimi-window fragcore-rgl fragcore-shader-compiler fragcore-geometry-util fragcore-window-sdl2 cxxopts fragcore-imageloader fragcore-scheduler-tasksch glew)
 
 TARGET_COMPILE_DEFINITIONS(glCommon PRIVATE FLYTHROUGH_CAMERA_IMPLEMENTATION=1)
 
@@ -34,6 +34,5 @@ IF(OpenMP_FOUND AND OpenMP_CXX_FOUND)
 ENDIF()
 
 ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Importer)
-#ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Scene)
 
-INSTALL(TARGETS glCommon fragcore nekomimi-window fragcore-rgl fragcore-shader-compiler cxxopts fragcore-geometry-util fragcore-window-sdl fragcore-imageloader glew fragcore-scheduler-tasksch DESTINATION lib)
+INSTALL(TARGETS glCommon fragcore nekomimi-window fragcore-rgl fragcore-shader-compiler cxxopts fragcore-geometry-util fragcore-window-sdl2 fragcore-imageloader glew fragcore-scheduler-tasksch DESTINATION lib)

Common/GLDataStructure.h

@@ -1,8 +1,22 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2025 Valdemar Lindberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
 #pragma once
 #include "Math3D/LinAlg.h"
 #include "RenderDesc.h"
-#include "SampleHelper.h"
-#include "Scene/CameraController.h"
+#include "Scene/Camera.h"
 #include "Scene/RenderQueue.h"
 #include <glm/fwd.hpp>
 #include <glm/matrix.hpp>
@@ -46,13 +60,13 @@ namespace glsample {
 	using GraphicShaderSettings = struct graphic_shader_settings_t {	 // Property Maybe ?
 		fragcore::BlendEqu blend_equ = fragcore::BlendEqu::NoEqu;		 /*	*/
 		fragcore::BlendFunc blend_color_func = fragcore::BlendFunc::One; /*	*/
-		CullingMode cullingMode = CullingMode::Back;
-		DepthFunc DepthFunc = DepthFunc::Less;
+		fragcore::CullingMode cullingMode = fragcore::CullingMode::Back;
+		fragcore::DepthFunc DepthFunc = fragcore::DepthFunc::Less;
 		bool DepthWrite{};
 		RenderQueue queue;
-		Primitive primitiveMode;
+		fragcore::Primitive primitiveMode;
 
-		FillMode fillMode;
+		fragcore::FillMode fillMode;
 
 		float clipping = 1;
 	};
@@ -133,28 +147,6 @@ namespace glsample {
 			return *this;
 		}
 
-		camera_instance_data_t &operator=(CameraController &camera) {
-			//*this = camera.as<Camera<float>>();
-
-			// TODO: reuse function above
-			this->near = camera.getNear();
-			this->far = camera.getFar();
-			this->proj = camera.getProjectionMatrix();
-			this->view = camera.getViewMatrix();
-
-			this->inverseProj = glm::inverse(this->proj);
-			this->position = glm::vec4(camera.getPosition(), 0);
-
-			this->viewDir = glm::vec4(camera.getLookDirection(), 0);
-
-			this->viewInv = glm::inverse(this->view);
-
-			this->viewRot = camera.getRotationMatrix();
-			this->viewProj = this->proj * this->view;
-			this->viewProjInv = glm::inverse(this->viewProj);
-			return *this;
-		}
-
 		/*	*/
 		float near = 0.15;
 		float far = 1000;

Common/GLSampleBase.h

@@ -21,7 +21,7 @@
 #include "cxxopts.hpp"
 #include <string>
 
-
+/*	*/
 class FVDECLSPEC GLSampleBase : public nekomimi::MIMIWindow {
   public:
 	GLSampleBase();

Common/GLUIComponent.cpp

@@ -126,7 +126,6 @@ void ImportHelper::loadModelBuffer(ModelImporter &modelLoader, std::vector<MeshO
 		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, tmp_ibo);
 		glBindBuffer(GL_ARRAY_BUFFER, tmp_vbo);
 
-		// TODO: based on conditions
 		/*	Vertex.	*/
 		glEnableVertexAttribArrayARB(AttributeMapping::Vertex);
 		glVertexAttribPointerARB(0, 3, GL_FLOAT, GL_FALSE, vertexStride,
@@ -258,7 +257,6 @@ void ImportHelper::loadTextures(ModelImporter &modelLoader, std::vector<TextureA
 				/*	Convert BumpMap to NormalMap*/
 				if (!materials.empty() && materials[0]->heightbumpIndex == texture_index) {
 
-					// TODO: use gpu to convert image.
 					image = std::move(ImageUtil::convert2NormalMap(image, 3.5f));
 					materials[0]->heightbumpIndex = -1;
 					materials[0]->normalIndex = texture_index;
@@ -309,7 +307,7 @@ void ImportHelper::loadTextures(ModelImporter &modelLoader, std::vector<TextureA
 	}
 
 	std::cout << "Start Transfering ImageData to GPU" << std::endl;
-	
+
 #pragma omp master
 	for (size_t texture_index = 0; texture_index < images.size(); texture_index++) {
 

Common/Importer/ImportHelper.cpp

@@ -285,16 +285,6 @@ void ModelImporter::initScene(const aiScene *scene) {
 		}
 	});
 
-	/*	*/
-	nodePool.resize(4096);
-
-	process_textures_thread.join();
-	process_light_camera_thread.join();
-
-	for (size_t i = 0; i < model_threads.size(); i++) {
-		model_threads[i].join();
-	}
-
 	std::thread process_material_thread([&]() {
 		/*	Require Texture Data has been loaded.	*/
 		if (scene->HasMaterials()) {
@@ -305,8 +295,29 @@ void ModelImporter::initScene(const aiScene *scene) {
 		}
 	});
 
+	size_t nrNodes = 0;
+	std::function<size_t(aiNode *)> calculateNumNodes;
 	/*	*/
-	this->nodeReferences.reserve(2048); // TODO: calculate.
+	calculateNumNodes = [&nrNodes, &calculateNumNodes](aiNode *currentNode) {
+		nrNodes++;
+		for (size_t i = 0; i < currentNode->mNumChildren; i++) {
+			calculateNumNodes(currentNode->mChildren[i]);
+		}
+		return nrNodes;
+	};
+	calculateNumNodes(scene->mRootNode);
+
+	process_textures_thread.join();
+	process_light_camera_thread.join();
+	process_material_thread.join();
+
+	for (size_t i = 0; i < model_threads.size(); i++) {
+		model_threads[i].join();
+	}
+
+	/*	*/
+	nodePool.resize(nrNodes);
+	this->nodeReferences.reserve(nrNodes);
 	this->initNodeRoot(scene->mRootNode, nullptr);
 
 	/*	*/
@@ -323,7 +334,6 @@ void ModelImporter::initScene(const aiScene *scene) {
 		}
 	});
 
-	process_material_thread.join();
 	process_bone_animation_thread.join();
 }
 
@@ -343,9 +353,8 @@ void ModelImporter::initNodeRoot(const aiNode *ai_node, NodeObject *parent) {
 		aiVector3f position, scale;
 		aiQuaternion rotation;
 
-		// TODO: fix pool for classes.
-		NodeObject *pobject = new NodeObject(); // nodePool.obtain();
-		//*pobject = NodeObject();
+		/*	Fetch node from pool.	*/
+		NodeObject *pobject = &nodePool[nrNodesInPool++];
 
 		/*	Assigned parent.	*/
 		if (parent) {

Common/Importer/ModelImporter.cpp

@@ -391,6 +391,7 @@ class FVDECLSPEC ModelImporter {
 
 	/*	Nodes.	*/
 	std::vector<NodeObject> nodePool;
+	size_t nrNodesInPool = 0;
 	std::vector<NodeObject *> nodeReferences;
 	std::map<std::string, NodeObject *> nodeByName;
 

Common/Importer/ModelImporter.h

@@ -118,15 +118,9 @@ glm::mat4 Node::getLocalViewMatrix() const noexcept {
 	return localView;
 }
 
-glm::mat4 Node::getRotationMatrix() const noexcept {
-	// glm::quat rotation = glm::quatLookAt(glm::normalize(this->forward()), glm::normalize(this->up()));
-	return glm::toMat4(this->getRotation());
-}
+glm::mat4 Node::getRotationMatrix() const noexcept { return glm::toMat4(this->getRotation()); }
 
-glm::mat4 Node::getLocalRotationMatrix() const noexcept {
-	// glm::quat rotation = glm::quatLookAt(glm::normalize(this->forward()), glm::normalize(this->up()));
-	return glm::toMat4(this->getLocalRotation());
-}
+glm::mat4 Node::getLocalRotationMatrix() const noexcept { return glm::toMat4(this->getLocalRotation()); }
 
 glm::mat4 Node::getViewTranslationMatrix() const noexcept { return glm::translate(glm::mat4(1), -this->getPosition()); }
 
@@ -176,9 +170,9 @@ glm::vec3 Node::getLocalScale() const noexcept {
 	}
 	return this->getScale();
 }
+
 glm::quat Node::getLocalRotation() const noexcept {
 	Node *parent = this->parent();
-	// TODO: fix and verify.
 	if (parent) {
 		return parent->getRotation() * glm::inverse(getRotation());
 	}

Common/Scene/Node.cpp

@@ -515,8 +515,8 @@ namespace glsample {
 				}
 			}
 
-			/*	*/
-			#pragma omp single
+/*	*/
+#pragma omp single
 			for (size_t i = 0; i < objects.size(); i++) {
 				this->visableNodes.insert(this->visableNodes.end(), objects[i].begin(), objects[i].end());
 			}
@@ -566,6 +566,9 @@ namespace glsample {
 
 		this->getRenderingSettings().skybox.render(*camera);
 
+		glActiveTexture(GL_TEXTURE0 + TextureTypeBinding::Reflection);
+		glBindTexture(GL_TEXTURE_2D, this->getRenderingSettings().skybox.getTexture());
+
 		/*	*/
 		this->render();
 
@@ -897,11 +900,6 @@ namespace glsample {
 		this->bindTexture(*material, TextureTypeBinding::Specular_Roughness);
 		this->bindTexture(*material, TextureTypeBinding::Metal);
 		// this->bindTexture(material, TextureType::Irradiance); //TODO: enable once material has been binded
-		// with irradiance texture
-		// this->bindTexture(*material, TextureTypeBinding::Reflection);
-
-		// glActiveTexture(GL_TEXTURE0 + TextureTypeBinding::Reflection);
-		// glBindTexture(GL_TEXTURE_2D, this->getRenderingSettings().skybox.getTexture()); // TODO: relocate
 
 		this->bindTexture(*material, TextureTypeBinding::DepthBuffer);
 	}

Common/Scene/Scene.cpp

@@ -32,7 +32,6 @@ namespace glsample {
 									  const std::vector<uint32_t> *geometry = nullptr,
 									  const std::vector<uint32_t> *tesselationc = nullptr,
 									  const std::vector<uint32_t> *tesselatione = nullptr);
-
 		static int loadGraphicProgram(const std::vector<char> *vertex, const std::vector<char> *fragment,
 									  const std::vector<char> *geometry = nullptr,
 									  const std::vector<char> *tesselationc = nullptr,