WIP adding directory structure

CMakeLists.txt

@@ -220,7 +220,6 @@ add_source_and_header(3rdparty/forsyth/forsyth)
 source_group("3rd Party/Forsyth" FILES 3rdparty/forsyth/forsyth.h 3rdparty/forsyth/forsyth.cpp)
 
 source_group("Public Headers", FILES ${KRAKEN_PUBLIC_HEADERS})
-# source_group("Private Headers", FILES ${KRAKEN_PRIVATE_HEADERS})
 
 add_library(kraken STATIC ${SRCS} ${KRAKEN_PUBLIC_HEADERS} ${KRAKEN_PRIVATE_HEADERS})
 TARGET_LINK_LIBRARIES( kraken ${EXTRA_LIBS} )
@@ -233,6 +232,8 @@ PROPERTIES
   OUTPUT_NAME kraken_static
 )
 
+target_include_directories(kraken PRIVATE "kraken")
+
 add_library(kraken_dynamic SHARED ${SRCS} ${KRAKEN_PUBLIC_HEADERS} ${KRAKEN_PRIVATE_HEADERS})
 TARGET_LINK_LIBRARIES( kraken_dynamic ${EXTRA_LIBS} )
 SET_TARGET_PROPERTIES(
@@ -244,6 +245,8 @@ PROPERTIES
   OUTPUT_NAME kraken
 )
 
+target_include_directories(kraken_dynamic PRIVATE "kraken")
+
 install(TARGETS kraken
         RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/bin/win
         PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/include

kraken/CMakeLists.txt

@@ -7,20 +7,20 @@ set(KRAKEN_PRIVATE_HEADERS "${KRAKEN_PRIVATE_HEADERS}" PARENT_SCOPE)
 add_sources(kraken.cpp)
 add_private_headers(KREngine-common.h)
 add_source_and_header(KRAmbientZone)
-add_source_and_header(KRAnimation)
-add_source_and_header(KRAnimationAttribute)
-add_source_and_header(KRAnimationCurve)
-add_source_and_header(KRAnimationCurveManager)
-add_source_and_header(KRAnimationLayer)
-add_source_and_header(KRAnimationManager)
+add_source_and_header(resources/animation/KRAnimation)
+add_source_and_header(resources/animation/KRAnimationAttribute)
+add_source_and_header(resources/animation/KRAnimationLayer)
+add_source_and_header(resources/animation/KRAnimationManager)
+add_source_and_header(resources/animation_curve/KRAnimationCurve)
+add_source_and_header(resources/animation_curve/KRAnimationCurveManager)
 add_source_and_header(KRAudioBuffer)
 add_source_and_header(KRAudioManager)
 add_source_and_header(KRAudioSample)
 add_source_and_header(KRAudioSource)
 add_source_and_header(KRBehavior)
 add_source_and_header(KRBone)
-add_source_and_header(KRBundle)
-add_source_and_header(KRBundleManager)
+add_source_and_header(resources/bundle/KRBundle)
+add_source_and_header(resources/bundle/KRBundleManager)
 add_source_and_header(KRCamera)
 add_source_and_header(KRCollider)
 add_source_and_header(KRContext)
@@ -40,8 +40,8 @@ add_source_and_header(KRLight)
 add_source_and_header(KRLocator)
 add_source_and_header(KRLODGroup)
 add_source_and_header(KRLODSet)
-add_source_and_header(KRMaterial)
-add_source_and_header(KRMaterialManager)
+add_source_and_header(resources/material/KRMaterial)
+add_source_and_header(resources/material/KRMaterialManager)
 add_source_and_header(KRMesh)
 add_source_and_header(KRMeshCube)
 add_source_and_header(KRMeshManager)
@@ -58,19 +58,19 @@ add_source_and_header(KRPresentationThread)
 add_source_and_header(KRRenderGraph)
 add_source_and_header(KRRenderGraphBlackFrame)
 add_source_and_header(KRRenderSettings)
-add_sources(KRResource+blend.cpp)
-# add_source(KRResource+fbx.cpp) # TODO - Locate FBX SDK dependencies
-add_sources(KRResource+obj.cpp)
-add_private_headers(KRResource.h)
-add_source_and_header(KRResource)
-add_source_and_header(KRResourceManager)
+add_sources(resources/KRResource+blend.cpp)
+# add_source(resources/KRResource+fbx.cpp) # TODO - Locate FBX SDK dependencies
+add_sources(resources/KRResource+obj.cpp)
+add_private_headers(resources/KRResource.h)
+add_source_and_header(resources/KRResource)
+add_source_and_header(resources/KRResourceManager)
 add_source_and_header(KRReverbZone)
 add_source_and_header(KRScene)
 add_source_and_header(KRSceneManager)
 add_source_and_header(KRShader)
 add_source_and_header(KRShaderManager)
-add_source_and_header(KRSource)
-add_source_and_header(KRSourceManager)
+add_source_and_header(resources/source/KRSource)
+add_source_and_header(resources/source/KRSourceManager)
 add_source_and_header(KRPipeline)
 add_source_and_header(KRPipelineManager)
 add_source_and_header(KRSampler)

kraken/KRAmbientZone.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 #include "KRTexture.h"
 

kraken/KRAudioManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KRContextObject.h"
 #include "block.h"

kraken/KRAudioSample.h

@@ -34,7 +34,7 @@
 #include "KREngine-common.h"
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 
 class KRAudioBuffer;
 

kraken/KRAudioSource.h

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "KREngine-common.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 #include "KRTexture.h"
 

kraken/KRBone.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 #include "KRTexture.h"
 

kraken/KRContext.cpp

@@ -37,7 +37,7 @@
 #include "KRCamera.h"
 #include "KRAudioManager.h"
 #include "KRAudioSample.h"
-#include "KRBundle.h"
+#include "resources/bundle/KRBundle.h"
 #include "KRPresentationThread.h"
 #include "KRStreamerThread.h"
 

kraken/KRContext.h

@@ -32,18 +32,18 @@
 #pragma once
 
 #include "KREngine-common.h"
-#include "KRBundleManager.h"
+#include "resources/bundle/KRBundleManager.h"
 #include "KRSceneManager.h"
 #include "KRTextureManager.h"
-#include "KRMaterialManager.h"
+#include "resources/material/KRMaterialManager.h"
 #include "KRPipelineManager.h"
 #include "KRSamplerManager.h"
 #include "KRMeshManager.h"
-#include "KRAnimationManager.h"
-#include "KRAnimationCurveManager.h"
+#include "resources/animation/KRAnimationManager.h"
+#include "resources/animation_curve/KRAnimationCurveManager.h"
 #include "KRUnknownManager.h"
 #include "KRShaderManager.h"
-#include "KRSourceManager.h"
+#include "resources/source/KRSourceManager.h"
 #include "KRSurfaceManager.h"
 #include "KRUniformBufferManager.h"
 #include "KRDeviceManager.h"

kraken/KRLODGroup.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 
 class KRLODGroup : public KRNode

kraken/KRLODSet.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 
 class KRLODGroup;

kraken/KRLight.h

@@ -30,7 +30,7 @@
 //
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 #include "KRTexture.h"
 

kraken/KRLocator.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 #include "KRTexture.h"
 

kraken/KRMesh.h

@@ -50,7 +50,7 @@ using namespace kraken;
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
-#include "KRMaterialManager.h"
+#include "resources/material/KRMaterialManager.h"
 #include "KRCamera.h"
 #include "KRViewport.h"
 

kraken/KRMeshManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 #include "KRContextObject.h"
 #include "block.h"
 #include "KRNode.h"

kraken/KRNode.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRViewport.h"
 #include "KROctreeNode.h"
 #include "KRBehavior.h"

kraken/KRReverbZone.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 #include "KRTexture.h"
 

kraken/KRSceneManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 #include "KRContextObject.h"
 #include "block.h"
 

kraken/KRShader.h

@@ -34,7 +34,7 @@
 #include "KREngine-common.h"
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "spirv_reflect.h"
 
 enum class ShaderStage : uint8_t

kraken/KRShaderManager.cpp

@@ -32,7 +32,7 @@
 #include "KRShaderManager.h"
 #include "KREngine-common.h"
 #include "KRContext.h"
-#include "KRSourceManager.h"
+#include "resources/source/KRSourceManager.h"
 #include "KRUnknownManager.h"
 #include "KRUnknown.h"
 

kraken/KRShaderManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KRShader.h"
 #include "KRContextObject.h"

kraken/KRSprite.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRNode.h"
 #include "KRTexture.h"
 

kraken/KRTexture.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 #include "KRContextObject.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 
 namespace mimir {
   class Block;

kraken/KRTextureManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KRTexture.h"
 #include "KRContextObject.h"

kraken/KRUnknown.h

@@ -34,7 +34,7 @@
 #include "KREngine-common.h"
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 
 class KRUnknown : public KRResource
 {

kraken/KRUnknownManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KRUnknown.h"
 #include "KRContextObject.h"

kraken/kraken.cpp

@@ -32,7 +32,7 @@
 #include "public/kraken.h"
 
 #include "KRContext.h"
-#include "KRBundle.h"
+#include "resources/bundle/KRBundle.h"
 #include "hydra.h"
 #include "KRLODSet.h"
 #include "KRLODGroup.h"

kraken/resources/KRResource.cpp

@@ -31,7 +31,7 @@
 
 #include "KREngine-common.h"
 #include "KRResource.h"
-#include "KRBundle.h"
+#include "resources/bundle/KRBundle.h"
 #include "KRContext.h"
 
 using namespace mimir;

kraken/resources/animation/KRAnimation.cpp

@@ -32,7 +32,7 @@
 #include "KRAnimationManager.h"
 #include "KRContext.h"
 #include "KRNode.h"
-#include "KRAnimationCurve.h"
+#include "resources/animation_curve/KRAnimationCurve.h"
 #include "KREngine-common.h"
 
 using namespace mimir;

kraken/resources/animation/KRAnimation.h

@@ -34,7 +34,7 @@
 #include "KREngine-common.h"
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRAnimationLayer.h"
 
 

kraken/resources/animation/KRAnimationAttribute.cpp

@@ -32,7 +32,7 @@
 #include "KRAnimationAttribute.h"
 #include "KRContext.h"
 #include "KRAnimationManager.h"
-#include "KRAnimationCurveManager.h"
+#include "resources/animation_curve/KRAnimationCurveManager.h"
 
 
 KRAnimationAttribute::KRAnimationAttribute(KRContext& context) : KRContextObject(context)

kraken/resources/animation/KRAnimationAttribute.h

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

kraken/resources/animation/KRAnimationManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KRAnimation.h"
 #include "KRContextObject.h"

kraken/resources/animation_curve/KRAnimationCurve.h

@@ -34,7 +34,7 @@
 #include "KREngine-common.h"
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 
 class KRAnimationCurve : public KRResource
 {

kraken/resources/animation_curve/KRAnimationCurveManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KRAnimationCurve.h"
 #include "KRContextObject.h"

kraken/resources/bundle/KRBundle.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "KREngine-common.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "block.h"
 
 class KRBundle : public KRResource

kraken/resources/bundle/KRBundleManager.h

@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KREngine-common.h"
 #include "KRContextObject.h"

kraken/resources/material/KRMaterial.h

@@ -39,7 +39,7 @@
 #include "KRPipelineManager.h"
 #include "KRPipeline.h"
 #include "KRCamera.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 #include "KRScene.h"
 #include "KRBone.h"
 

kraken/resources/material/KRMaterialManager.h

@@ -33,7 +33,7 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
+#include "resources/KRResourceManager.h"
 
 #include "KRMaterial.h"
 #include "KRTextureManager.h"

kraken/resources/source/KRSource.h

@@ -34,7 +34,7 @@
 #include "KREngine-common.h"
 #include "KRContextObject.h"
 #include "block.h"
-#include "KRResource.h"
+#include "resources/KRResource.h"
 
 class KRSource : public KRResource
 {

kraken/resources/source/KRSourceManager.h

@@ -33,8 +33,8 @@
 
 #include "KREngine-common.h"
 
-#include "KRResourceManager.h"
-#include "KRSource.h"
+#include "resources/KRResourceManager.h"
+#include "resources/source/KRSource.h"
 #include "KRContextObject.h"
 #include "block.h"