From 862ffeeaa05e5124ac11e82548a1608ad989139a Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Sat, 17 Aug 2024 15:54:20 -0700 Subject: [PATCH] WIP adding directory structure --- CMakeLists.txt | 5 ++- kraken/CMakeLists.txt | 36 +++++++++---------- kraken/KRAmbientZone.h | 2 +- kraken/KRAudioManager.h | 2 +- kraken/KRAudioSample.h | 2 +- kraken/KRAudioSource.h | 2 +- kraken/KRBone.h | 2 +- kraken/KRContext.cpp | 2 +- kraken/KRContext.h | 10 +++--- kraken/KRLODGroup.h | 2 +- kraken/KRLODSet.h | 2 +- kraken/KRLight.h | 2 +- kraken/KRLocator.h | 2 +- kraken/KRMesh.h | 2 +- kraken/KRMeshManager.h | 2 +- kraken/KRNode.h | 2 +- kraken/KRReverbZone.h | 2 +- kraken/KRSceneManager.h | 2 +- kraken/KRShader.h | 2 +- kraken/KRShaderManager.cpp | 2 +- kraken/KRShaderManager.h | 2 +- kraken/KRSprite.h | 2 +- kraken/KRTexture.h | 2 +- kraken/KRTextureManager.h | 2 +- kraken/KRUnknown.h | 2 +- kraken/KRUnknownManager.h | 2 +- kraken/kraken.cpp | 2 +- kraken/{ => resources}/KRResource+blend.cpp | 0 kraken/{ => resources}/KRResource+blend.h | 0 kraken/{ => resources}/KRResource+fbx.cpp | 0 kraken/{ => resources}/KRResource+obj.cpp | 0 kraken/{ => resources}/KRResource.cpp | 2 +- kraken/{ => resources}/KRResource.h | 0 kraken/{ => resources}/KRResourceManager.cpp | 0 kraken/{ => resources}/KRResourceManager.h | 0 .../{ => resources/animation}/KRAnimation.cpp | 2 +- .../{ => resources/animation}/KRAnimation.h | 2 +- .../animation}/KRAnimationAttribute.cpp | 2 +- .../animation}/KRAnimationAttribute.h | 2 +- .../animation}/KRAnimationLayer.cpp | 0 .../animation}/KRAnimationLayer.h | 0 .../animation}/KRAnimationManager.cpp | 0 .../animation}/KRAnimationManager.h | 2 +- .../animation_curve}/KRAnimationCurve.cpp | 0 .../animation_curve}/KRAnimationCurve.h | 2 +- .../KRAnimationCurveManager.cpp | 0 .../KRAnimationCurveManager.h | 2 +- kraken/{ => resources/bundle}/KRBundle.cpp | 0 kraken/{ => resources/bundle}/KRBundle.h | 2 +- .../bundle}/KRBundleManager.cpp | 0 .../{ => resources/bundle}/KRBundleManager.h | 2 +- .../{ => resources/material}/KRMaterial.cpp | 0 kraken/{ => resources/material}/KRMaterial.h | 2 +- .../material}/KRMaterialManager.cpp | 0 .../material}/KRMaterialManager.h | 2 +- kraken/{ => resources/source}/KRSource.cpp | 0 kraken/{ => resources/source}/KRSource.h | 2 +- .../source}/KRSourceManager.cpp | 0 .../{ => resources/source}/KRSourceManager.h | 4 +-- 59 files changed, 66 insertions(+), 63 deletions(-) rename kraken/{ => resources}/KRResource+blend.cpp (100%) rename kraken/{ => resources}/KRResource+blend.h (100%) rename kraken/{ => resources}/KRResource+fbx.cpp (100%) rename kraken/{ => resources}/KRResource+obj.cpp (100%) rename kraken/{ => resources}/KRResource.cpp (98%) rename kraken/{ => resources}/KRResource.h (100%) rename kraken/{ => resources}/KRResourceManager.cpp (100%) rename kraken/{ => resources}/KRResourceManager.h (100%) rename kraken/{ => resources/animation}/KRAnimation.cpp (99%) rename kraken/{ => resources/animation}/KRAnimation.h (98%) rename kraken/{ => resources/animation}/KRAnimationAttribute.cpp (99%) rename kraken/{ => resources/animation}/KRAnimationAttribute.h (97%) rename kraken/{ => resources/animation}/KRAnimationLayer.cpp (100%) rename kraken/{ => resources/animation}/KRAnimationLayer.h (100%) rename kraken/{ => resources/animation}/KRAnimationManager.cpp (100%) rename kraken/{ => resources/animation}/KRAnimationManager.h (98%) rename kraken/{ => resources/animation_curve}/KRAnimationCurve.cpp (100%) rename kraken/{ => resources/animation_curve}/KRAnimationCurve.h (98%) rename kraken/{ => resources/animation_curve}/KRAnimationCurveManager.cpp (100%) rename kraken/{ => resources/animation_curve}/KRAnimationCurveManager.h (98%) rename kraken/{ => resources/bundle}/KRBundle.cpp (100%) rename kraken/{ => resources/bundle}/KRBundle.h (98%) rename kraken/{ => resources/bundle}/KRBundleManager.cpp (100%) rename kraken/{ => resources/bundle}/KRBundleManager.h (98%) rename kraken/{ => resources/material}/KRMaterial.cpp (100%) rename kraken/{ => resources/material}/KRMaterial.h (99%) rename kraken/{ => resources/material}/KRMaterialManager.cpp (100%) rename kraken/{ => resources/material}/KRMaterialManager.h (98%) rename kraken/{ => resources/source}/KRSource.cpp (100%) rename kraken/{ => resources/source}/KRSource.h (95%) rename kraken/{ => resources/source}/KRSourceManager.cpp (100%) rename kraken/{ => resources/source}/KRSourceManager.h (94%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 682e12d..5404a7b 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/kraken/CMakeLists.txt b/kraken/CMakeLists.txt index ff4d771..ea20cbf 100644 --- a/kraken/CMakeLists.txt +++ b/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) diff --git a/kraken/KRAmbientZone.h b/kraken/KRAmbientZone.h index 9408421..71acc7e 100755 --- a/kraken/KRAmbientZone.h +++ b/kraken/KRAmbientZone.h @@ -31,7 +31,7 @@ #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" #include "KRTexture.h" diff --git a/kraken/KRAudioManager.h b/kraken/KRAudioManager.h index 988187c..ffd9479 100755 --- a/kraken/KRAudioManager.h +++ b/kraken/KRAudioManager.h @@ -33,7 +33,7 @@ #include "KREngine-common.h" -#include "KRResourceManager.h" +#include "resources/KRResourceManager.h" #include "KRContextObject.h" #include "block.h" diff --git a/kraken/KRAudioSample.h b/kraken/KRAudioSample.h index eb4fb91..827b4d8 100755 --- a/kraken/KRAudioSample.h +++ b/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; diff --git a/kraken/KRAudioSource.h b/kraken/KRAudioSource.h index e7e5fd6..964ad4c 100755 --- a/kraken/KRAudioSource.h +++ b/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" diff --git a/kraken/KRBone.h b/kraken/KRBone.h index 65a11f6..4170f03 100755 --- a/kraken/KRBone.h +++ b/kraken/KRBone.h @@ -31,7 +31,7 @@ #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" #include "KRTexture.h" diff --git a/kraken/KRContext.cpp b/kraken/KRContext.cpp index 436c568..03c7dbe 100755 --- a/kraken/KRContext.cpp +++ b/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" diff --git a/kraken/KRContext.h b/kraken/KRContext.h index 0b16467..15e6c09 100755 --- a/kraken/KRContext.h +++ b/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" diff --git a/kraken/KRLODGroup.h b/kraken/KRLODGroup.h index fca78de..c2f8614 100755 --- a/kraken/KRLODGroup.h +++ b/kraken/KRLODGroup.h @@ -31,7 +31,7 @@ #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" class KRLODGroup : public KRNode diff --git a/kraken/KRLODSet.h b/kraken/KRLODSet.h index a5880d6..3298d5f 100755 --- a/kraken/KRLODSet.h +++ b/kraken/KRLODSet.h @@ -31,7 +31,7 @@ #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" class KRLODGroup; diff --git a/kraken/KRLight.h b/kraken/KRLight.h index 883cd75..d74c930 100755 --- a/kraken/KRLight.h +++ b/kraken/KRLight.h @@ -30,7 +30,7 @@ // #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" #include "KRTexture.h" diff --git a/kraken/KRLocator.h b/kraken/KRLocator.h index 43e6349..0294136 100755 --- a/kraken/KRLocator.h +++ b/kraken/KRLocator.h @@ -31,7 +31,7 @@ #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" #include "KRTexture.h" diff --git a/kraken/KRMesh.h b/kraken/KRMesh.h index fcf3b57..6e9cb5a 100755 --- a/kraken/KRMesh.h +++ b/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" diff --git a/kraken/KRMeshManager.h b/kraken/KRMeshManager.h index 91a3d5f..a59e757 100755 --- a/kraken/KRMeshManager.h +++ b/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" diff --git a/kraken/KRNode.h b/kraken/KRNode.h index 327b44d..6175f32 100755 --- a/kraken/KRNode.h +++ b/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" diff --git a/kraken/KRReverbZone.h b/kraken/KRReverbZone.h index 62388c9..94e6d03 100755 --- a/kraken/KRReverbZone.h +++ b/kraken/KRReverbZone.h @@ -31,7 +31,7 @@ #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" #include "KRTexture.h" diff --git a/kraken/KRSceneManager.h b/kraken/KRSceneManager.h index 4c9e1ad..06d8486 100755 --- a/kraken/KRSceneManager.h +++ b/kraken/KRSceneManager.h @@ -33,7 +33,7 @@ #include "KREngine-common.h" -#include "KRResourceManager.h" +#include "resources/KRResourceManager.h" #include "KRContextObject.h" #include "block.h" diff --git a/kraken/KRShader.h b/kraken/KRShader.h index 81e4086..5f4d595 100644 --- a/kraken/KRShader.h +++ b/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 diff --git a/kraken/KRShaderManager.cpp b/kraken/KRShaderManager.cpp index 6bb4cfd..f707aea 100644 --- a/kraken/KRShaderManager.cpp +++ b/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" diff --git a/kraken/KRShaderManager.h b/kraken/KRShaderManager.h index 864a91e..241f3df 100644 --- a/kraken/KRShaderManager.h +++ b/kraken/KRShaderManager.h @@ -33,7 +33,7 @@ #include "KREngine-common.h" -#include "KRResourceManager.h" +#include "resources/KRResourceManager.h" #include "KRShader.h" #include "KRContextObject.h" diff --git a/kraken/KRSprite.h b/kraken/KRSprite.h index d1d892b..2319366 100755 --- a/kraken/KRSprite.h +++ b/kraken/KRSprite.h @@ -31,7 +31,7 @@ #pragma once -#include "KRResource.h" +#include "resources/KRResource.h" #include "KRNode.h" #include "KRTexture.h" diff --git a/kraken/KRTexture.h b/kraken/KRTexture.h index be5d3d0..072e711 100755 --- a/kraken/KRTexture.h +++ b/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; diff --git a/kraken/KRTextureManager.h b/kraken/KRTextureManager.h index 5726fc0..9ce1d2a 100755 --- a/kraken/KRTextureManager.h +++ b/kraken/KRTextureManager.h @@ -33,7 +33,7 @@ #include "KREngine-common.h" -#include "KRResourceManager.h" +#include "resources/KRResourceManager.h" #include "KRTexture.h" #include "KRContextObject.h" diff --git a/kraken/KRUnknown.h b/kraken/KRUnknown.h index aac0289..ad437b2 100755 --- a/kraken/KRUnknown.h +++ b/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 { diff --git a/kraken/KRUnknownManager.h b/kraken/KRUnknownManager.h index 49500e0..d0260f4 100755 --- a/kraken/KRUnknownManager.h +++ b/kraken/KRUnknownManager.h @@ -33,7 +33,7 @@ #include "KREngine-common.h" -#include "KRResourceManager.h" +#include "resources/KRResourceManager.h" #include "KRUnknown.h" #include "KRContextObject.h" diff --git a/kraken/kraken.cpp b/kraken/kraken.cpp index d1c3671..ce9cc00 100644 --- a/kraken/kraken.cpp +++ b/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" diff --git a/kraken/KRResource+blend.cpp b/kraken/resources/KRResource+blend.cpp similarity index 100% rename from kraken/KRResource+blend.cpp rename to kraken/resources/KRResource+blend.cpp diff --git a/kraken/KRResource+blend.h b/kraken/resources/KRResource+blend.h similarity index 100% rename from kraken/KRResource+blend.h rename to kraken/resources/KRResource+blend.h diff --git a/kraken/KRResource+fbx.cpp b/kraken/resources/KRResource+fbx.cpp similarity index 100% rename from kraken/KRResource+fbx.cpp rename to kraken/resources/KRResource+fbx.cpp diff --git a/kraken/KRResource+obj.cpp b/kraken/resources/KRResource+obj.cpp similarity index 100% rename from kraken/KRResource+obj.cpp rename to kraken/resources/KRResource+obj.cpp diff --git a/kraken/KRResource.cpp b/kraken/resources/KRResource.cpp similarity index 98% rename from kraken/KRResource.cpp rename to kraken/resources/KRResource.cpp index d2091d3..a1dc81d 100755 --- a/kraken/KRResource.cpp +++ b/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; diff --git a/kraken/KRResource.h b/kraken/resources/KRResource.h similarity index 100% rename from kraken/KRResource.h rename to kraken/resources/KRResource.h diff --git a/kraken/KRResourceManager.cpp b/kraken/resources/KRResourceManager.cpp similarity index 100% rename from kraken/KRResourceManager.cpp rename to kraken/resources/KRResourceManager.cpp diff --git a/kraken/KRResourceManager.h b/kraken/resources/KRResourceManager.h similarity index 100% rename from kraken/KRResourceManager.h rename to kraken/resources/KRResourceManager.h diff --git a/kraken/KRAnimation.cpp b/kraken/resources/animation/KRAnimation.cpp similarity index 99% rename from kraken/KRAnimation.cpp rename to kraken/resources/animation/KRAnimation.cpp index 3a9e3f9..65360f4 100755 --- a/kraken/KRAnimation.cpp +++ b/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; diff --git a/kraken/KRAnimation.h b/kraken/resources/animation/KRAnimation.h similarity index 98% rename from kraken/KRAnimation.h rename to kraken/resources/animation/KRAnimation.h index 94b61a5..47f4c94 100755 --- a/kraken/KRAnimation.h +++ b/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" diff --git a/kraken/KRAnimationAttribute.cpp b/kraken/resources/animation/KRAnimationAttribute.cpp similarity index 99% rename from kraken/KRAnimationAttribute.cpp rename to kraken/resources/animation/KRAnimationAttribute.cpp index 36b7d61..2ce48ca 100755 --- a/kraken/KRAnimationAttribute.cpp +++ b/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) diff --git a/kraken/KRAnimationAttribute.h b/kraken/resources/animation/KRAnimationAttribute.h similarity index 97% rename from kraken/KRAnimationAttribute.h rename to kraken/resources/animation/KRAnimationAttribute.h index 12fd2aa..086372e 100755 --- a/kraken/KRAnimationAttribute.h +++ b/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 { diff --git a/kraken/KRAnimationLayer.cpp b/kraken/resources/animation/KRAnimationLayer.cpp similarity index 100% rename from kraken/KRAnimationLayer.cpp rename to kraken/resources/animation/KRAnimationLayer.cpp diff --git a/kraken/KRAnimationLayer.h b/kraken/resources/animation/KRAnimationLayer.h similarity index 100% rename from kraken/KRAnimationLayer.h rename to kraken/resources/animation/KRAnimationLayer.h diff --git a/kraken/KRAnimationManager.cpp b/kraken/resources/animation/KRAnimationManager.cpp similarity index 100% rename from kraken/KRAnimationManager.cpp rename to kraken/resources/animation/KRAnimationManager.cpp diff --git a/kraken/KRAnimationManager.h b/kraken/resources/animation/KRAnimationManager.h similarity index 98% rename from kraken/KRAnimationManager.h rename to kraken/resources/animation/KRAnimationManager.h index 5879465..869bc2b 100755 --- a/kraken/KRAnimationManager.h +++ b/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" diff --git a/kraken/KRAnimationCurve.cpp b/kraken/resources/animation_curve/KRAnimationCurve.cpp similarity index 100% rename from kraken/KRAnimationCurve.cpp rename to kraken/resources/animation_curve/KRAnimationCurve.cpp diff --git a/kraken/KRAnimationCurve.h b/kraken/resources/animation_curve/KRAnimationCurve.h similarity index 98% rename from kraken/KRAnimationCurve.h rename to kraken/resources/animation_curve/KRAnimationCurve.h index dd511f3..4c46955 100755 --- a/kraken/KRAnimationCurve.h +++ b/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 { diff --git a/kraken/KRAnimationCurveManager.cpp b/kraken/resources/animation_curve/KRAnimationCurveManager.cpp similarity index 100% rename from kraken/KRAnimationCurveManager.cpp rename to kraken/resources/animation_curve/KRAnimationCurveManager.cpp diff --git a/kraken/KRAnimationCurveManager.h b/kraken/resources/animation_curve/KRAnimationCurveManager.h similarity index 98% rename from kraken/KRAnimationCurveManager.h rename to kraken/resources/animation_curve/KRAnimationCurveManager.h index e665f3b..3668626 100755 --- a/kraken/KRAnimationCurveManager.h +++ b/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" diff --git a/kraken/KRBundle.cpp b/kraken/resources/bundle/KRBundle.cpp similarity index 100% rename from kraken/KRBundle.cpp rename to kraken/resources/bundle/KRBundle.cpp diff --git a/kraken/KRBundle.h b/kraken/resources/bundle/KRBundle.h similarity index 98% rename from kraken/KRBundle.h rename to kraken/resources/bundle/KRBundle.h index 79adbed..2d9b77c 100755 --- a/kraken/KRBundle.h +++ b/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 diff --git a/kraken/KRBundleManager.cpp b/kraken/resources/bundle/KRBundleManager.cpp similarity index 100% rename from kraken/KRBundleManager.cpp rename to kraken/resources/bundle/KRBundleManager.cpp diff --git a/kraken/KRBundleManager.h b/kraken/resources/bundle/KRBundleManager.h similarity index 98% rename from kraken/KRBundleManager.h rename to kraken/resources/bundle/KRBundleManager.h index 90b8e29..ac3aed3 100755 --- a/kraken/KRBundleManager.h +++ b/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" diff --git a/kraken/KRMaterial.cpp b/kraken/resources/material/KRMaterial.cpp similarity index 100% rename from kraken/KRMaterial.cpp rename to kraken/resources/material/KRMaterial.cpp diff --git a/kraken/KRMaterial.h b/kraken/resources/material/KRMaterial.h similarity index 99% rename from kraken/KRMaterial.h rename to kraken/resources/material/KRMaterial.h index d5df75c..af09894 100755 --- a/kraken/KRMaterial.h +++ b/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" diff --git a/kraken/KRMaterialManager.cpp b/kraken/resources/material/KRMaterialManager.cpp similarity index 100% rename from kraken/KRMaterialManager.cpp rename to kraken/resources/material/KRMaterialManager.cpp diff --git a/kraken/KRMaterialManager.h b/kraken/resources/material/KRMaterialManager.h similarity index 98% rename from kraken/KRMaterialManager.h rename to kraken/resources/material/KRMaterialManager.h index 0e9262b..18d7a89 100755 --- a/kraken/KRMaterialManager.h +++ b/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" diff --git a/kraken/KRSource.cpp b/kraken/resources/source/KRSource.cpp similarity index 100% rename from kraken/KRSource.cpp rename to kraken/resources/source/KRSource.cpp diff --git a/kraken/KRSource.h b/kraken/resources/source/KRSource.h similarity index 95% rename from kraken/KRSource.h rename to kraken/resources/source/KRSource.h index b028cef..0531f20 100644 --- a/kraken/KRSource.h +++ b/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 { diff --git a/kraken/KRSourceManager.cpp b/kraken/resources/source/KRSourceManager.cpp similarity index 100% rename from kraken/KRSourceManager.cpp rename to kraken/resources/source/KRSourceManager.cpp diff --git a/kraken/KRSourceManager.h b/kraken/resources/source/KRSourceManager.h similarity index 94% rename from kraken/KRSourceManager.h rename to kraken/resources/source/KRSourceManager.h index 8ce1cfd..e874e4e 100644 --- a/kraken/KRSourceManager.h +++ b/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"