WIP adding directory structure

kraken/CMakeLists.txt

@@ -6,7 +6,6 @@ set(KRAKEN_PRIVATE_HEADERS "${KRAKEN_PRIVATE_HEADERS}" PARENT_SCOPE)
 # Private Implementation
 add_sources(kraken.cpp)
 add_private_headers(KREngine-common.h)
-add_source_and_header(KRAmbientZone)
 add_sources(resources/KRResource+blend.cpp)
 # add_source(resources/KRResource+fbx.cpp) # TODO - Locate FBX SDK dependencies
 add_sources(resources/KRResource+obj.cpp)
@@ -32,6 +31,8 @@ add_source_and_header(resources/mesh/KRMeshQuad)
 add_source_and_header(resources/mesh/KRMeshSphere)
 add_source_and_header(resources/scene/KRScene)
 add_source_and_header(resources/scene/KRSceneManager)
+add_source_and_header(resources/shader/KRShader)
+add_source_and_header(resources/shader/KRShaderManager)
 add_source_and_header(resources/source/KRSource)
 add_source_and_header(resources/source/KRSourceManager)
 add_source_and_header(resources/texture/KRTexture)
@@ -45,12 +46,26 @@ add_source_and_header(resources/texture/KRTexturePVR)
 add_source_and_header(resources/texture/KRTextureTGA)
 add_source_and_header(resources/unknown/KRUnknown)
 add_source_and_header(resources/unknown/KRUnknownManager)
+add_source_and_header(nodes/KRAmbientZone)
+add_source_and_header(nodes/KRAudioSource)
+add_source_and_header(nodes/KRBone)
+add_source_and_header(nodes/KRCamera)
+add_source_and_header(nodes/KRCollider)
+add_source_and_header(nodes/KRDirectionalLight)
+add_source_and_header(nodes/KRLight)
+add_source_and_header(nodes/KRLocator)
+add_source_and_header(nodes/KRLODGroup)
+add_source_and_header(nodes/KRLODSet)
+add_source_and_header(nodes/KRModel)
+add_source_and_header(nodes/KRNode)
+add_source_and_header(nodes/KRParticleSystem)
+add_source_and_header(nodes/KRParticleSystemNewtonian)
+add_source_and_header(nodes/KRPointLight)
+add_source_and_header(nodes/KRReverbZone)
+add_source_and_header(nodes/KRSpotLight)
+add_source_and_header(nodes/KRSprite)
 add_source_and_header(KRAudioBuffer)
-add_source_and_header(KRAudioSource)
 add_source_and_header(KRBehavior)
-add_source_and_header(KRBone)
-add_source_and_header(KRCamera)
-add_source_and_header(KRCollider)
 add_source_and_header(KRContext)
 add_source_and_header(KRUniformBuffer)
 add_source_and_header(KRUniformBufferManager)
@@ -62,30 +77,15 @@ add_source_and_header(KRSurfaceManager)
 add_source_and_header(KRStreamerThread)
 add_source_and_header(KRSwapchain)
 add_source_and_header(KRContextObject)
-add_source_and_header(KRDirectionalLight)
 add_source_and_header(KRHelpers)
-add_source_and_header(KRLight)
-add_source_and_header(KRLocator)
-add_source_and_header(KRLODGroup)
-add_source_and_header(KRLODSet)
-add_source_and_header(KRModel)
-add_source_and_header(KRNode)
 add_source_and_header(KROctree)
 add_source_and_header(KROctreeNode)
-add_source_and_header(KRParticleSystem)
-add_source_and_header(KRParticleSystemNewtonian)
-add_source_and_header(KRPointLight)
 add_source_and_header(KRPresentationThread)
 add_source_and_header(KRRenderGraph)
 add_source_and_header(KRRenderGraphBlackFrame)
 add_source_and_header(KRRenderSettings)
-add_source_and_header(KRReverbZone)
-add_source_and_header(KRShader)
-add_source_and_header(KRShaderManager)
 add_source_and_header(KRPipeline)
 add_source_and_header(KRPipelineManager)
 add_source_and_header(KRSampler)
 add_source_and_header(KRSamplerManager)
-add_source_and_header(KRSpotLight)
-add_source_and_header(KRSprite)
 add_source_and_header(KRViewport)

kraken/KRBehavior.cpp

@@ -30,7 +30,7 @@
 //
 
 #include "KRBehavior.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
 
 KRBehaviorFactoryFunctionMap m_factoryFunctions;
 

kraken/KRContext.cpp

@@ -34,7 +34,7 @@
 #include "mimir.h"
 
 #include "KRContext.h"
-#include "KRCamera.h"
+#include "nodes/KRCamera.h"
 #include "resources/audio/KRAudioManager.h"
 #include "resources/audio/KRAudioSample.h"
 #include "resources/bundle/KRBundle.h"

kraken/KRContext.h

@@ -42,7 +42,7 @@
 #include "resources/animation/KRAnimationManager.h"
 #include "resources/animation_curve/KRAnimationCurveManager.h"
 #include "resources/unknown/KRUnknownManager.h"
-#include "KRShaderManager.h"
+#include "resources/shader/KRShaderManager.h"
 #include "resources/source/KRSourceManager.h"
 #include "KRSurfaceManager.h"
 #include "KRUniformBufferManager.h"

kraken/KROctree.cpp

@@ -31,8 +31,8 @@
 
 #include "public/kraken.h"
 #include "KROctree.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
-#include "KRCollider.h"
+#include "nodes/KRCollider.h"
 
 using namespace hydra;
 

kraken/KROctreeNode.cpp

@@ -30,8 +30,8 @@
 //
 
 #include "KROctreeNode.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
-#include "KRCollider.h"
+#include "nodes/KRCollider.h"
 
 using namespace hydra;
 

kraken/KRPipeline.cpp

@@ -31,10 +31,10 @@
 
 #include "KRPipeline.h"
 #include "assert.h"
-#include "KRLight.h"
+#include "nodes/KRLight.h"
-#include "KRDirectionalLight.h"
+#include "nodes/KRDirectionalLight.h"
-#include "KRSpotLight.h"
+#include "nodes/KRSpotLight.h"
-#include "KRPointLight.h"
+#include "nodes/KRPointLight.h"
 #include "KRContext.h"
 #include "KRRenderPass.h"
 

kraken/KRPipeline.h

@@ -33,11 +33,11 @@
 #pragma once
 
 #include "KREngine-common.h"
-#include "KRCamera.h"
+#include "nodes/KRCamera.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
 #include "KRViewport.h"
 #include "resources/mesh/KRMesh.h"
-#include "KRShader.h"
+#include "resources/shader/KRShader.h"
 
 class KRSampler;
 class KRShader;

kraken/KRPipelineManager.cpp

@@ -32,10 +32,10 @@
 #include "KREngine-common.h"
 
 #include "KRPipelineManager.h"
-#include "KRLight.h"
+#include "nodes/KRLight.h"
-#include "KRDirectionalLight.h"
+#include "nodes/KRDirectionalLight.h"
-#include "KRSpotLight.h"
+#include "nodes/KRSpotLight.h"
-#include "KRPointLight.h"
+#include "nodes/KRPointLight.h"
 #include "KRSwapchain.h"
 #include "KRRenderPass.h"
 

kraken/KRPipelineManager.h

@@ -33,9 +33,9 @@
 
 #include "KREngine-common.h"
 
-#include "KRCamera.h"
+#include "nodes/KRCamera.h"
 #include "block.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
 #include "KRSurface.h"
 #include "resources/mesh/KRMesh.h"
 

kraken/kraken.cpp

@@ -34,19 +34,19 @@
 #include "KRContext.h"
 #include "resources/bundle/KRBundle.h"
 #include "hydra.h"
-#include "KRLODSet.h"
+#include "nodes/KRLODSet.h"
-#include "KRLODGroup.h"
+#include "nodes/KRLODGroup.h"
-#include "KRPointLight.h"
+#include "nodes/KRPointLight.h"
-#include "KRDirectionalLight.h"
+#include "nodes/KRDirectionalLight.h"
-#include "KRSpotLight.h"
+#include "nodes/KRSpotLight.h"
-#include "KRSprite.h"
+#include "nodes/KRSprite.h"
-#include "KRModel.h"
+#include "nodes/KRModel.h"
-#include "KRCollider.h"
+#include "nodes/KRCollider.h"
-#include "KRBone.h"
+#include "nodes/KRBone.h"
-#include "KRLocator.h"
+#include "nodes/KRLocator.h"
-#include "KRAudioSource.h"
+#include "nodes/KRAudioSource.h"
-#include "KRAmbientZone.h"
+#include "nodes/KRAmbientZone.h"
-#include "KRReverbZone.h"
+#include "nodes/KRReverbZone.h"
 
 using namespace kraken;
 

kraken/resources/animation/KRAnimation.cpp

@@ -31,7 +31,7 @@
 #include "KRAnimation.h"
 #include "KRAnimationManager.h"
 #include "KRContext.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
 #include "resources/animation_curve/KRAnimationCurve.h"
 #include "KREngine-common.h"
 

kraken/resources/animation/KRAnimationAttribute.h

@@ -33,7 +33,7 @@
 
 #include "KRContextObject.h"
 #include "KREngine-common.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
 #include "resources/animation_curve/KRAnimationCurve.h"
 
 class KRAnimationAttribute : public KRContextObject

kraken/resources/audio/KRAudioManager.cpp

@@ -35,7 +35,7 @@
 #include "block.h"
 #include "KRAudioBuffer.h"
 #include "KRContext.h"
-#include "KRCollider.h"
+#include "nodes/KRCollider.h"
 #include "siren.h"
 
 using namespace mimir;

kraken/resources/audio/KRAudioManager.h

@@ -37,7 +37,7 @@
 
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRAudioSource.h"
+#include "nodes/KRAudioSource.h"
 #include "siren.h"
 
 const int KRENGINE_AUDIO_MAX_POOL_SIZE = 60; //32;

kraken/resources/material/KRMaterial.h

@@ -38,10 +38,10 @@
 #include "resources/texture/KRTexture.h"
 #include "KRPipelineManager.h"
 #include "KRPipeline.h"
-#include "KRCamera.h"
+#include "nodes/KRCamera.h"
 #include "resources/KRResource.h"
 #include "resources/scene/KRScene.h"
-#include "KRBone.h"
+#include "nodes/KRBone.h"
 
 enum class CullMode : __uint32_t;
 enum class ModelFormat : __uint8_t;

kraken/resources/mesh/KRMesh.h

@@ -34,7 +34,7 @@
 #include "KREngine-common.h"
 
 #include "KRContext.h"
-#include "KRBone.h"
+#include "nodes/KRBone.h"
 #include "KRMeshManager.h"
 
 #include "KREngine-common.h"
@@ -51,7 +51,7 @@ using namespace kraken;
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 #include "resources/material/KRMaterialManager.h"
-#include "KRCamera.h"
+#include "nodes/KRCamera.h"
 #include "KRViewport.h"
 
 class KRMaterial;

kraken/resources/mesh/KRMeshManager.h

@@ -36,7 +36,7 @@
 #include "resources/KRResourceManager.h"
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
 
 class KRContext;
 class KRMesh;

kraken/resources/scene/KRScene.cpp

@@ -31,13 +31,13 @@
 
 #include "KREngine-common.h"
 
-#include "KRLight.h"
+#include "nodes/KRLight.h"
 
 #include "KRScene.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
-#include "KRDirectionalLight.h"
+#include "nodes/KRDirectionalLight.h"
-#include "KRSpotLight.h"
+#include "nodes/KRSpotLight.h"
-#include "KRPointLight.h"
+#include "nodes/KRPointLight.h"
 #include "resources/audio/KRAudioManager.h"
 #include "KRRenderPass.h"
 

kraken/resources/scene/KRScene.h

@@ -33,14 +33,14 @@
 
 #include "KREngine-common.h"
 
-#include "KRModel.h"
+#include "nodes/KRModel.h"
 #include "resources/mesh/KRMesh.h"
-#include "KRCamera.h"
+#include "nodes/KRCamera.h"
 #include "resources/mesh/KRMeshManager.h"
-#include "KRNode.h"
+#include "nodes/KRNode.h"
-#include "KRLocator.h"
+#include "nodes/KRLocator.h"
-#include "KRAmbientZone.h"
+#include "nodes/KRAmbientZone.h"
-#include "KRReverbZone.h"
+#include "nodes/KRReverbZone.h"
 #include "KROctree.h"
 class KRModel;
 class KRLight;

kraken/resources/source/KRSourceManager.cpp

@@ -31,7 +31,7 @@
 
 #include "KRSourceManager.h"
 #include "KREngine-common.h"
-#include "KRShader.h"
+#include "resources/shader/KRShader.h"
 
 using namespace mimir;