Minor cleanup, changes and improvements

Author: voldien

CMakeLists.txt

@@ -160,10 +160,6 @@ ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Samples/Irradiance)
 
 ############## Work In Progress ####################
 ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Samples/InfiniteWorld)
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Samples/RayTracing)
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Samples/Sort)
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Samples/CirclePacking)
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Samples/SubGroup)
 
 ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/Samples/WindCoeff)
 
@@ -251,3 +247,6 @@ ADD_CUSTOM_COMMAND(
 # All shader files.
 FILE(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/Shaders ${CMAKE_CURRENT_BINARY_DIR}/Shaders SYMBOLIC)
 FILE(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/asset ${CMAKE_CURRENT_BINARY_DIR}/asset SYMBOLIC)
+
+# Install Shaders.
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Shaders DESTINATION bin)

Common/GLSampleWindow.cpp

@@ -212,6 +212,11 @@ class SampleSettingComponent : public GLUIComponent<GLSampleWindow> {
 		ImGui::EndDisabled();
 
 		/*	List all builtin post processing.	*/
+		bool usePostProcessing = this->getRefSample().getIsPostProcessingEnabled();
+		if (ImGui::Checkbox("Use Post Processing", &usePostProcessing)) {
+			this->getRefSample().setPostProcessingEnabled(usePostProcessing);
+		}
+		
 		if (this->getRefSample().getPostProcessingManager() && ImGui::CollapsingHeader("Post Processing")) {
 
 			ImGui::BeginGroup();
@@ -459,7 +464,7 @@ void GLSampleWindow::renderUI() {
 
 	/*	Make sure all commands are flush before resizing.	*/
 	if (this->preWidth != this->width() || this->preHeight != this->height()) {
-		
+
 		/*	Finish all commands before starting resizing buffers and etc.	*/
 		glFinish();
 
@@ -528,7 +533,7 @@ void GLSampleWindow::renderUI() {
 		}
 
 		/*	*/
-		if (this->postprocessingManager) {
+		if (this->postprocessingManager && this->postProcessingEnabled) {
 
 			const std::string postStage = "Post Processing";
 			glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 1, postStage.size(), postStage.data());

Common/GLSampleWindow.h

@@ -139,6 +139,9 @@ class FVDECLSPEC GLSampleWindow : public nekomimi::MIMIWindow {
 	unsigned int getDefaultFramebuffer() const noexcept;
 	glsample::FrameBuffer *getDefaultFrameBufferObj() { return this->defaultFramebuffer.get(); }
 	const glsample::FrameBuffer *getDefaultFrameBufferObj() const noexcept { return this->defaultFramebuffer.get(); }
+
+	bool getIsPostProcessingEnabled() const noexcept { return this->postProcessingEnabled; }
+	void setPostProcessingEnabled(bool enabled) noexcept { this->postProcessingEnabled = enabled; }
 	glsample::PostProcessingManager *getPostProcessingManager() const noexcept {
 		return this->postprocessingManager.get();
 	}
@@ -152,8 +155,9 @@ class FVDECLSPEC GLSampleWindow : public nekomimi::MIMIWindow {
 	}
 
 	// TODO: relocate
-	static void blitFrameBufferAttacments(const glsample::FrameBuffer* targetFrameBuffer, const glsample::FrameBuffer *framebufferAttachments, const unsigned int width, const int height,
-								glm::vec4 rectNormalized, int mode = 0) {
+	static void blitFrameBufferAttacments(const glsample::FrameBuffer *targetFrameBuffer,
+										  const glsample::FrameBuffer *framebufferAttachments, const unsigned int width,
+										  const int height, glm::vec4 rectNormalized, int mode = 0) {
 
 		/*	Blit image targets to screen.	*/
 		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, targetFrameBuffer->framebuffer);
@@ -224,6 +228,7 @@ class FVDECLSPEC GLSampleWindow : public nekomimi::MIMIWindow {
 
 	std::shared_ptr<fragcore::IFileSystem> filesystem; /*	*/
 
+	bool postProcessingEnabled = true;
 	std::shared_ptr<glsample::PostProcessingManager> postprocessingManager = nullptr;
 	std::shared_ptr<glsample::ColorSpaceConverter> colorSpace;
 

Common/Importer/ImageImport.cpp

@@ -47,7 +47,7 @@ unsigned int TextureImporter::loadImage2DRaw(const Image &image, const ColorSpac
 
 	/*	*/
 	const size_t power_of_2 = std::floor(std::log(Math::max(image.width(), image.height())) / std::log(2));
-	const size_t max_mipmap = Math::clamp<size_t>(power_of_2 - 4, 0, std::numeric_limits<size_t>::max());
+	const size_t max_mipmap = Math::clamp<size_t>(power_of_2 - 2, 0, std::numeric_limits<size_t>::max());
 
 	/*	*/
 	GLuint currentPBO = this->pbos[current_pbo++];

Common/Importer/ModelImporter.cpp

@@ -318,6 +318,7 @@ void ModelImporter::initNodeRoot(const aiNode *ai_node, NodeObject *parent) {
 
 		if (parent) {
 			pobject->parent = parent;
+			// parent->childrens.addChild(ITree<node_object_t *> *pchild)
 		} else {
 			pobject->parent = nullptr;
 		}

Common/Importer/ModelImporter.h

@@ -14,7 +14,7 @@
  * all copies or substantial portions of the Software.
  */
 #pragma once
-#include "DataStructure/PoolAllocator.h"
+#include "DataStructure/ITree.h"
 #include "DataStructure/StackAllactor.h"
 #include "FragDef.h"
 #include "Math3D/LinAlg.h"
@@ -135,6 +135,7 @@ using MaterialObject = struct material_object_t : public AssetObject {
 };
 
 using NodeObject = struct node_object_t : public AssetObject {
+
 	/*	*/
 	glm::vec3 localPosition;
 	glm::quat localRotation;
@@ -151,6 +152,7 @@ using NodeObject = struct node_object_t : public AssetObject {
 	std::vector<unsigned int> materialIndex;
 
 	struct node_object_t *parent = nullptr;
+	fragcore::ITree<struct node_object_t *> childrens;
 };
 
 using MeshData = struct mesh_data_t : public AssetObject {
@@ -228,6 +230,7 @@ using TextureAssetObject = struct alignas(32) texture_asset_object_t {
 	char *data = nullptr;
 };
 
+// TOOD: relocate.
 using KeyFrame = struct alignas(16) key_frame_t {
 	float time;		  /*	*/
 	float value;	  /*	*/

Common/PostProcessing/PostProcessingManager.h

@@ -21,9 +21,7 @@
 namespace glsample {
 
 	class PostProcessing;
-	/**
-	 * @brief
-	 *
+	/*
 	 */
 	class FVDECLSPEC PostProcessingManager : public fragcore::Object {
 	  public:
@@ -41,6 +39,7 @@ namespace glsample {
 		void render(glsample::FrameBuffer *framebuffer,
 					const std::initializer_list<std::tuple<const GBuffer, unsigned int>> &render_targets);
 
+
 		void populateCommonData() {}
 		void swapPostProcessing(int a, int b);
 

Common/Scene/Node.cpp

@@ -1,16 +1,29 @@
 #include "Node.h"
+#include <glm/ext/quaternion_common.hpp>
+#include <glm/fwd.hpp>
+#include <glm/gtx/quaternion.hpp>
 
 using namespace glsample;
 
-void Node::setPosition(const glm::vec3 &position) noexcept {}
-glm::vec3 Node::getPosition() noexcept { return {}; }
+void Node::setPosition(const glm::vec3 &position) noexcept {
+	const glm::vec3 position_offset = position - this->getPosition();
+	for (int x = 0; x < this->getNumChildren(); x++) {
+
+		Node *node = dynamic_cast<Node *>(this->getChild(x));
+		node->setPosition(node->getPosition() + position);
+	}
+	TransformGLM::setPosition(position);
+}
+glm::vec3 Node::getPosition() noexcept { return TransformGLM::getPosition(); }
 const glm::vec3 &Node::getPosition() const noexcept { return TransformGLM::getPosition(); }
 
-void Node::setScale(const glm::vec3 &scale) noexcept {}
-glm::vec3 Node::getScale() const noexcept { return {}; }
+void Node::setScale(const glm::vec3 &scale) noexcept { TransformGLM::setPosition(scale); }
+glm::vec3 Node::getScale() const noexcept { return TransformGLM::getScale(); }
 
 const glm::quat &Node::getRotation() const noexcept { return TransformGLM::getRotation(); }
-void Node::setRotation(const glm::quat &quat) noexcept {}
+void Node::setRotation(const glm::quat &quat) noexcept { TransformGLM::setRotation(quat); }
+
+Node *Node::parent() const noexcept { return dynamic_cast<Node *>(this->getParent()); }
 
 glm::mat4 Node::getViewMatrix() const noexcept { return glm::translate(glm::mat4(1), -this->getPosition()); }
 glm::mat4 Node::getRotationMatrix() const noexcept {
@@ -19,6 +32,39 @@ glm::mat4 Node::getRotationMatrix() const noexcept {
 }
 glm::mat4 Node::getViewTranslationMatrix() const noexcept { return glm::translate(glm::mat4(1), -this->getPosition()); }
 
-glm::vec3 Node::getLocalPosition() const noexcept { return {}; }
-glm::vec3 Node::getLocalScale() const noexcept { return {}; }
-glm::quat Node::getLocalRotation() const noexcept { return {}; }
+void Node::setLocalPosition(const glm::vec3 &localPosition) noexcept {
+	Node *parent = this->parent();
+
+	const glm::vec3 global_position = parent ? parent->getPosition() : glm::vec3(0);
+	this->setPosition(global_position + localPosition);
+}
+void Node::setLocalScale(const glm::vec3 &localScale) noexcept {
+	Node *parent = this->parent();
+
+	const glm::vec3 global_scale = parent ? parent->getScale() : glm::vec3(0);
+	this->setScale(global_scale + localScale);
+}
+void Node::setLocalRotation(const glm::quat &localRotation) noexcept {
+	Node *parent = this->parent();
+
+	const glm::quat global_rotation = parent ? parent->getRotation() : glm::quat();
+	this->setRotation(global_rotation * localRotation);
+}
+
+glm::vec3 Node::getLocalPosition() const noexcept {
+	Node *parent = this->parent();
+	glm::vec3 parent_position = parent ? parent->getPosition() : glm::vec3(0);
+	return parent_position - this->getPosition();
+}
+glm::vec3 Node::getLocalScale() const noexcept {
+	Node *parent = this->parent();
+	glm::vec3 parent_position = parent ? parent->getScale() : glm::vec3(0);
+	return parent_position - this->getScale();
+}
+glm::quat Node::getLocalRotation() const noexcept {
+	Node *parent = this->parent();
+	glm::quat parent_rotation = parent ? parent->getRotation() : glm::quat();
+
+	// TODO: fix
+	return parent_rotation * glm::inverse(getRotation());
+}

Common/Scene/Node.h

@@ -17,21 +17,19 @@
 
 #include "Core/Object.h"
 #include "DataStructure/ITree.h"
-#include "Importer/ModelImporter.h"
 #include "Transform.h"
 
 namespace glsample {
 
+	enum class NodeType { Node, Frustum, Camera, Renderer, Light, MaxNodeTypes };
+
 	/**
 	 * @brief
 	 *
 	 */
-	class FVDECLSPEC Node : public glsample::TransformGLM,
-							public fragcore::ITree<Node>,
-							public fragcore::Object {
+	class FVDECLSPEC Node : public glsample::TransformGLM, public fragcore::ITree<Node>, public fragcore::Object {
 	  public:
 		Node() = default;
-		Node(const NodeObject *node);
 		~Node() override = default;
 
 	  public:
@@ -46,11 +44,16 @@ namespace glsample {
 		void setRotation(const glm::quat &quat) noexcept;
 
 		/*	*/
+		Node *parent() const noexcept;
 
 		glm::vec3 getLocalPosition() const noexcept;
 		glm::vec3 getLocalScale() const noexcept;
 		glm::quat getLocalRotation() const noexcept;
 
+		void setLocalPosition(const glm::vec3 &localPosition) noexcept;
+		void setLocalScale(const glm::vec3 &localScale) noexcept;
+		void setLocalRotation(const glm::quat &localRotation) noexcept;
+
 		glm::mat4 getViewMatrix() const noexcept;
 		glm::mat4 getRotationMatrix() const noexcept;
 		glm::mat4 getViewTranslationMatrix() const noexcept;
@@ -64,8 +67,8 @@ namespace glsample {
 		std::vector<unsigned int> materialIndex;
 
 		/*	*/
-		 glm::mat4 modelGlobalTransform;
-		 glm::mat4 modelLocalTransform;
+		glm::mat4 modelGlobalTransform{};
+		glm::mat4 modelLocalTransform{};
 	};
 
 } // namespace glsample

Common/Scene/Renderer.h

@@ -19,6 +19,8 @@
 namespace glsample {
 	class Renderer : public Node {
 	  public:
+		/*	*/
+		fragcore::Bound bound{};
 		/*	Geometry and material.	*/
 		std::vector<unsigned int> geometryObjectIndex;
 		std::vector<unsigned int> materialIndex;