From 08d98eefcbb2894510faee5328a5e70b3bf1e479 Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Sun, 18 Aug 2024 00:09:34 -0700 Subject: [PATCH] WIP adding directory structure --- kraken/CMakeLists.txt | 40 +++++++++---------- kraken/KRBehavior.cpp | 2 +- kraken/KRContext.cpp | 2 +- kraken/KRContext.h | 2 +- kraken/KROctree.cpp | 4 +- kraken/KROctreeNode.cpp | 4 +- kraken/KRPipeline.cpp | 8 ++-- kraken/KRPipeline.h | 6 +-- kraken/KRPipelineManager.cpp | 8 ++-- kraken/KRPipelineManager.h | 4 +- kraken/kraken.cpp | 26 ++++++------ kraken/{ => nodes}/KRAmbientZone.cpp | 0 kraken/{ => nodes}/KRAmbientZone.h | 0 kraken/{ => nodes}/KRAudioSource.cpp | 0 kraken/{ => nodes}/KRAudioSource.h | 0 kraken/{ => nodes}/KRBone.cpp | 0 kraken/{ => nodes}/KRBone.h | 0 kraken/{ => nodes}/KRCamera.cpp | 0 kraken/{ => nodes}/KRCamera.h | 0 kraken/{ => nodes}/KRCollider.cpp | 0 kraken/{ => nodes}/KRCollider.h | 0 kraken/{ => nodes}/KRDirectionalLight.cpp | 0 kraken/{ => nodes}/KRDirectionalLight.h | 0 kraken/{ => nodes}/KRLODGroup.cpp | 0 kraken/{ => nodes}/KRLODGroup.h | 0 kraken/{ => nodes}/KRLODSet.cpp | 0 kraken/{ => nodes}/KRLODSet.h | 0 kraken/{ => nodes}/KRLight.cpp | 0 kraken/{ => nodes}/KRLight.h | 0 kraken/{ => nodes}/KRLocator.cpp | 0 kraken/{ => nodes}/KRLocator.h | 0 kraken/{ => nodes}/KRModel.cpp | 0 kraken/{ => nodes}/KRModel.h | 0 kraken/{ => nodes}/KRNode.cpp | 0 kraken/{ => nodes}/KRNode.h | 0 kraken/{ => nodes}/KRParticleSystem.cpp | 0 kraken/{ => nodes}/KRParticleSystem.h | 0 .../{ => nodes}/KRParticleSystemNewtonian.cpp | 0 .../{ => nodes}/KRParticleSystemNewtonian.h | 0 kraken/{ => nodes}/KRPointLight.cpp | 0 kraken/{ => nodes}/KRPointLight.h | 0 kraken/{ => nodes}/KRReverbZone.cpp | 0 kraken/{ => nodes}/KRReverbZone.h | 0 kraken/{ => nodes}/KRSpotLight.cpp | 0 kraken/{ => nodes}/KRSpotLight.h | 0 kraken/{ => nodes}/KRSprite.cpp | 0 kraken/{ => nodes}/KRSprite.h | 0 kraken/resources/animation/KRAnimation.cpp | 2 +- .../animation/KRAnimationAttribute.h | 2 +- kraken/resources/audio/KRAudioManager.cpp | 2 +- kraken/resources/audio/KRAudioManager.h | 2 +- kraken/resources/material/KRMaterial.h | 4 +- kraken/resources/mesh/KRMesh.h | 4 +- kraken/resources/mesh/KRMeshManager.h | 2 +- kraken/resources/scene/KRScene.cpp | 10 ++--- kraken/resources/scene/KRScene.h | 12 +++--- kraken/{ => resources/shader}/KRShader.cpp | 0 kraken/{ => resources/shader}/KRShader.h | 0 .../shader}/KRShaderManager.cpp | 0 .../{ => resources/shader}/KRShaderManager.h | 0 kraken/resources/source/KRSourceManager.cpp | 2 +- 61 files changed, 74 insertions(+), 74 deletions(-) rename kraken/{ => nodes}/KRAmbientZone.cpp (100%) rename kraken/{ => nodes}/KRAmbientZone.h (100%) rename kraken/{ => nodes}/KRAudioSource.cpp (100%) rename kraken/{ => nodes}/KRAudioSource.h (100%) rename kraken/{ => nodes}/KRBone.cpp (100%) rename kraken/{ => nodes}/KRBone.h (100%) rename kraken/{ => nodes}/KRCamera.cpp (100%) rename kraken/{ => nodes}/KRCamera.h (100%) rename kraken/{ => nodes}/KRCollider.cpp (100%) rename kraken/{ => nodes}/KRCollider.h (100%) rename kraken/{ => nodes}/KRDirectionalLight.cpp (100%) rename kraken/{ => nodes}/KRDirectionalLight.h (100%) rename kraken/{ => nodes}/KRLODGroup.cpp (100%) rename kraken/{ => nodes}/KRLODGroup.h (100%) rename kraken/{ => nodes}/KRLODSet.cpp (100%) rename kraken/{ => nodes}/KRLODSet.h (100%) rename kraken/{ => nodes}/KRLight.cpp (100%) rename kraken/{ => nodes}/KRLight.h (100%) rename kraken/{ => nodes}/KRLocator.cpp (100%) rename kraken/{ => nodes}/KRLocator.h (100%) rename kraken/{ => nodes}/KRModel.cpp (100%) rename kraken/{ => nodes}/KRModel.h (100%) rename kraken/{ => nodes}/KRNode.cpp (100%) rename kraken/{ => nodes}/KRNode.h (100%) rename kraken/{ => nodes}/KRParticleSystem.cpp (100%) rename kraken/{ => nodes}/KRParticleSystem.h (100%) rename kraken/{ => nodes}/KRParticleSystemNewtonian.cpp (100%) rename kraken/{ => nodes}/KRParticleSystemNewtonian.h (100%) rename kraken/{ => nodes}/KRPointLight.cpp (100%) rename kraken/{ => nodes}/KRPointLight.h (100%) rename kraken/{ => nodes}/KRReverbZone.cpp (100%) rename kraken/{ => nodes}/KRReverbZone.h (100%) rename kraken/{ => nodes}/KRSpotLight.cpp (100%) rename kraken/{ => nodes}/KRSpotLight.h (100%) rename kraken/{ => nodes}/KRSprite.cpp (100%) rename kraken/{ => nodes}/KRSprite.h (100%) rename kraken/{ => resources/shader}/KRShader.cpp (100%) rename kraken/{ => resources/shader}/KRShader.h (100%) rename kraken/{ => resources/shader}/KRShaderManager.cpp (100%) rename kraken/{ => resources/shader}/KRShaderManager.h (100%) diff --git a/kraken/CMakeLists.txt b/kraken/CMakeLists.txt index c910cb2..1977c53 100644 --- a/kraken/CMakeLists.txt +++ b/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) diff --git a/kraken/KRBehavior.cpp b/kraken/KRBehavior.cpp index 102d6cc..3ce489e 100755 --- a/kraken/KRBehavior.cpp +++ b/kraken/KRBehavior.cpp @@ -30,7 +30,7 @@ // #include "KRBehavior.h" -#include "KRNode.h" +#include "nodes/KRNode.h" KRBehaviorFactoryFunctionMap m_factoryFunctions; diff --git a/kraken/KRContext.cpp b/kraken/KRContext.cpp index 09730ac..e8008e4 100755 --- a/kraken/KRContext.cpp +++ b/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" diff --git a/kraken/KRContext.h b/kraken/KRContext.h index 0802a44..166869f 100755 --- a/kraken/KRContext.h +++ b/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" diff --git a/kraken/KROctree.cpp b/kraken/KROctree.cpp index b1909c6..5952878 100755 --- a/kraken/KROctree.cpp +++ b/kraken/KROctree.cpp @@ -31,8 +31,8 @@ #include "public/kraken.h" #include "KROctree.h" -#include "KRNode.h" -#include "KRCollider.h" +#include "nodes/KRNode.h" +#include "nodes/KRCollider.h" using namespace hydra; diff --git a/kraken/KROctreeNode.cpp b/kraken/KROctreeNode.cpp index 6b34fff..c4d01f4 100755 --- a/kraken/KROctreeNode.cpp +++ b/kraken/KROctreeNode.cpp @@ -30,8 +30,8 @@ // #include "KROctreeNode.h" -#include "KRNode.h" -#include "KRCollider.h" +#include "nodes/KRNode.h" +#include "nodes/KRCollider.h" using namespace hydra; diff --git a/kraken/KRPipeline.cpp b/kraken/KRPipeline.cpp index 89e2be8..d559b22 100644 --- a/kraken/KRPipeline.cpp +++ b/kraken/KRPipeline.cpp @@ -31,10 +31,10 @@ #include "KRPipeline.h" #include "assert.h" -#include "KRLight.h" -#include "KRDirectionalLight.h" -#include "KRSpotLight.h" -#include "KRPointLight.h" +#include "nodes/KRLight.h" +#include "nodes/KRDirectionalLight.h" +#include "nodes/KRSpotLight.h" +#include "nodes/KRPointLight.h" #include "KRContext.h" #include "KRRenderPass.h" diff --git a/kraken/KRPipeline.h b/kraken/KRPipeline.h index 0625ff6..37ef87e 100644 --- a/kraken/KRPipeline.h +++ b/kraken/KRPipeline.h @@ -33,11 +33,11 @@ #pragma once #include "KREngine-common.h" -#include "KRCamera.h" -#include "KRNode.h" +#include "nodes/KRCamera.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; diff --git a/kraken/KRPipelineManager.cpp b/kraken/KRPipelineManager.cpp index fbc613b..0be8543 100644 --- a/kraken/KRPipelineManager.cpp +++ b/kraken/KRPipelineManager.cpp @@ -32,10 +32,10 @@ #include "KREngine-common.h" #include "KRPipelineManager.h" -#include "KRLight.h" -#include "KRDirectionalLight.h" -#include "KRSpotLight.h" -#include "KRPointLight.h" +#include "nodes/KRLight.h" +#include "nodes/KRDirectionalLight.h" +#include "nodes/KRSpotLight.h" +#include "nodes/KRPointLight.h" #include "KRSwapchain.h" #include "KRRenderPass.h" diff --git a/kraken/KRPipelineManager.h b/kraken/KRPipelineManager.h index ab41f5e..9908965 100644 --- a/kraken/KRPipelineManager.h +++ b/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" diff --git a/kraken/kraken.cpp b/kraken/kraken.cpp index ce9cc00..dda7d45 100644 --- a/kraken/kraken.cpp +++ b/kraken/kraken.cpp @@ -34,19 +34,19 @@ #include "KRContext.h" #include "resources/bundle/KRBundle.h" #include "hydra.h" -#include "KRLODSet.h" -#include "KRLODGroup.h" -#include "KRPointLight.h" -#include "KRDirectionalLight.h" -#include "KRSpotLight.h" -#include "KRSprite.h" -#include "KRModel.h" -#include "KRCollider.h" -#include "KRBone.h" -#include "KRLocator.h" -#include "KRAudioSource.h" -#include "KRAmbientZone.h" -#include "KRReverbZone.h" +#include "nodes/KRLODSet.h" +#include "nodes/KRLODGroup.h" +#include "nodes/KRPointLight.h" +#include "nodes/KRDirectionalLight.h" +#include "nodes/KRSpotLight.h" +#include "nodes/KRSprite.h" +#include "nodes/KRModel.h" +#include "nodes/KRCollider.h" +#include "nodes/KRBone.h" +#include "nodes/KRLocator.h" +#include "nodes/KRAudioSource.h" +#include "nodes/KRAmbientZone.h" +#include "nodes/KRReverbZone.h" using namespace kraken; diff --git a/kraken/KRAmbientZone.cpp b/kraken/nodes/KRAmbientZone.cpp similarity index 100% rename from kraken/KRAmbientZone.cpp rename to kraken/nodes/KRAmbientZone.cpp diff --git a/kraken/KRAmbientZone.h b/kraken/nodes/KRAmbientZone.h similarity index 100% rename from kraken/KRAmbientZone.h rename to kraken/nodes/KRAmbientZone.h diff --git a/kraken/KRAudioSource.cpp b/kraken/nodes/KRAudioSource.cpp similarity index 100% rename from kraken/KRAudioSource.cpp rename to kraken/nodes/KRAudioSource.cpp diff --git a/kraken/KRAudioSource.h b/kraken/nodes/KRAudioSource.h similarity index 100% rename from kraken/KRAudioSource.h rename to kraken/nodes/KRAudioSource.h diff --git a/kraken/KRBone.cpp b/kraken/nodes/KRBone.cpp similarity index 100% rename from kraken/KRBone.cpp rename to kraken/nodes/KRBone.cpp diff --git a/kraken/KRBone.h b/kraken/nodes/KRBone.h similarity index 100% rename from kraken/KRBone.h rename to kraken/nodes/KRBone.h diff --git a/kraken/KRCamera.cpp b/kraken/nodes/KRCamera.cpp similarity index 100% rename from kraken/KRCamera.cpp rename to kraken/nodes/KRCamera.cpp diff --git a/kraken/KRCamera.h b/kraken/nodes/KRCamera.h similarity index 100% rename from kraken/KRCamera.h rename to kraken/nodes/KRCamera.h diff --git a/kraken/KRCollider.cpp b/kraken/nodes/KRCollider.cpp similarity index 100% rename from kraken/KRCollider.cpp rename to kraken/nodes/KRCollider.cpp diff --git a/kraken/KRCollider.h b/kraken/nodes/KRCollider.h similarity index 100% rename from kraken/KRCollider.h rename to kraken/nodes/KRCollider.h diff --git a/kraken/KRDirectionalLight.cpp b/kraken/nodes/KRDirectionalLight.cpp similarity index 100% rename from kraken/KRDirectionalLight.cpp rename to kraken/nodes/KRDirectionalLight.cpp diff --git a/kraken/KRDirectionalLight.h b/kraken/nodes/KRDirectionalLight.h similarity index 100% rename from kraken/KRDirectionalLight.h rename to kraken/nodes/KRDirectionalLight.h diff --git a/kraken/KRLODGroup.cpp b/kraken/nodes/KRLODGroup.cpp similarity index 100% rename from kraken/KRLODGroup.cpp rename to kraken/nodes/KRLODGroup.cpp diff --git a/kraken/KRLODGroup.h b/kraken/nodes/KRLODGroup.h similarity index 100% rename from kraken/KRLODGroup.h rename to kraken/nodes/KRLODGroup.h diff --git a/kraken/KRLODSet.cpp b/kraken/nodes/KRLODSet.cpp similarity index 100% rename from kraken/KRLODSet.cpp rename to kraken/nodes/KRLODSet.cpp diff --git a/kraken/KRLODSet.h b/kraken/nodes/KRLODSet.h similarity index 100% rename from kraken/KRLODSet.h rename to kraken/nodes/KRLODSet.h diff --git a/kraken/KRLight.cpp b/kraken/nodes/KRLight.cpp similarity index 100% rename from kraken/KRLight.cpp rename to kraken/nodes/KRLight.cpp diff --git a/kraken/KRLight.h b/kraken/nodes/KRLight.h similarity index 100% rename from kraken/KRLight.h rename to kraken/nodes/KRLight.h diff --git a/kraken/KRLocator.cpp b/kraken/nodes/KRLocator.cpp similarity index 100% rename from kraken/KRLocator.cpp rename to kraken/nodes/KRLocator.cpp diff --git a/kraken/KRLocator.h b/kraken/nodes/KRLocator.h similarity index 100% rename from kraken/KRLocator.h rename to kraken/nodes/KRLocator.h diff --git a/kraken/KRModel.cpp b/kraken/nodes/KRModel.cpp similarity index 100% rename from kraken/KRModel.cpp rename to kraken/nodes/KRModel.cpp diff --git a/kraken/KRModel.h b/kraken/nodes/KRModel.h similarity index 100% rename from kraken/KRModel.h rename to kraken/nodes/KRModel.h diff --git a/kraken/KRNode.cpp b/kraken/nodes/KRNode.cpp similarity index 100% rename from kraken/KRNode.cpp rename to kraken/nodes/KRNode.cpp diff --git a/kraken/KRNode.h b/kraken/nodes/KRNode.h similarity index 100% rename from kraken/KRNode.h rename to kraken/nodes/KRNode.h diff --git a/kraken/KRParticleSystem.cpp b/kraken/nodes/KRParticleSystem.cpp similarity index 100% rename from kraken/KRParticleSystem.cpp rename to kraken/nodes/KRParticleSystem.cpp diff --git a/kraken/KRParticleSystem.h b/kraken/nodes/KRParticleSystem.h similarity index 100% rename from kraken/KRParticleSystem.h rename to kraken/nodes/KRParticleSystem.h diff --git a/kraken/KRParticleSystemNewtonian.cpp b/kraken/nodes/KRParticleSystemNewtonian.cpp similarity index 100% rename from kraken/KRParticleSystemNewtonian.cpp rename to kraken/nodes/KRParticleSystemNewtonian.cpp diff --git a/kraken/KRParticleSystemNewtonian.h b/kraken/nodes/KRParticleSystemNewtonian.h similarity index 100% rename from kraken/KRParticleSystemNewtonian.h rename to kraken/nodes/KRParticleSystemNewtonian.h diff --git a/kraken/KRPointLight.cpp b/kraken/nodes/KRPointLight.cpp similarity index 100% rename from kraken/KRPointLight.cpp rename to kraken/nodes/KRPointLight.cpp diff --git a/kraken/KRPointLight.h b/kraken/nodes/KRPointLight.h similarity index 100% rename from kraken/KRPointLight.h rename to kraken/nodes/KRPointLight.h diff --git a/kraken/KRReverbZone.cpp b/kraken/nodes/KRReverbZone.cpp similarity index 100% rename from kraken/KRReverbZone.cpp rename to kraken/nodes/KRReverbZone.cpp diff --git a/kraken/KRReverbZone.h b/kraken/nodes/KRReverbZone.h similarity index 100% rename from kraken/KRReverbZone.h rename to kraken/nodes/KRReverbZone.h diff --git a/kraken/KRSpotLight.cpp b/kraken/nodes/KRSpotLight.cpp similarity index 100% rename from kraken/KRSpotLight.cpp rename to kraken/nodes/KRSpotLight.cpp diff --git a/kraken/KRSpotLight.h b/kraken/nodes/KRSpotLight.h similarity index 100% rename from kraken/KRSpotLight.h rename to kraken/nodes/KRSpotLight.h diff --git a/kraken/KRSprite.cpp b/kraken/nodes/KRSprite.cpp similarity index 100% rename from kraken/KRSprite.cpp rename to kraken/nodes/KRSprite.cpp diff --git a/kraken/KRSprite.h b/kraken/nodes/KRSprite.h similarity index 100% rename from kraken/KRSprite.h rename to kraken/nodes/KRSprite.h diff --git a/kraken/resources/animation/KRAnimation.cpp b/kraken/resources/animation/KRAnimation.cpp index 65360f4..728ab55 100755 --- a/kraken/resources/animation/KRAnimation.cpp +++ b/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" diff --git a/kraken/resources/animation/KRAnimationAttribute.h b/kraken/resources/animation/KRAnimationAttribute.h index 086372e..66606b0 100755 --- a/kraken/resources/animation/KRAnimationAttribute.h +++ b/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 diff --git a/kraken/resources/audio/KRAudioManager.cpp b/kraken/resources/audio/KRAudioManager.cpp index f73b5f2..e0deae9 100755 --- a/kraken/resources/audio/KRAudioManager.cpp +++ b/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; diff --git a/kraken/resources/audio/KRAudioManager.h b/kraken/resources/audio/KRAudioManager.h index ffd9479..b220df7 100755 --- a/kraken/resources/audio/KRAudioManager.h +++ b/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; diff --git a/kraken/resources/material/KRMaterial.h b/kraken/resources/material/KRMaterial.h index 5149013..ea08ad9 100755 --- a/kraken/resources/material/KRMaterial.h +++ b/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; diff --git a/kraken/resources/mesh/KRMesh.h b/kraken/resources/mesh/KRMesh.h index 6e9cb5a..1b109e6 100755 --- a/kraken/resources/mesh/KRMesh.h +++ b/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; diff --git a/kraken/resources/mesh/KRMeshManager.h b/kraken/resources/mesh/KRMeshManager.h index a59e757..5d62854 100755 --- a/kraken/resources/mesh/KRMeshManager.h +++ b/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; diff --git a/kraken/resources/scene/KRScene.cpp b/kraken/resources/scene/KRScene.cpp index 66fbb84..1a814b4 100755 --- a/kraken/resources/scene/KRScene.cpp +++ b/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 "KRDirectionalLight.h" -#include "KRSpotLight.h" -#include "KRPointLight.h" +#include "nodes/KRNode.h" +#include "nodes/KRDirectionalLight.h" +#include "nodes/KRSpotLight.h" +#include "nodes/KRPointLight.h" #include "resources/audio/KRAudioManager.h" #include "KRRenderPass.h" diff --git a/kraken/resources/scene/KRScene.h b/kraken/resources/scene/KRScene.h index 787d42f..b859afb 100755 --- a/kraken/resources/scene/KRScene.h +++ b/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 "KRLocator.h" -#include "KRAmbientZone.h" -#include "KRReverbZone.h" +#include "nodes/KRNode.h" +#include "nodes/KRLocator.h" +#include "nodes/KRAmbientZone.h" +#include "nodes/KRReverbZone.h" #include "KROctree.h" class KRModel; class KRLight; diff --git a/kraken/KRShader.cpp b/kraken/resources/shader/KRShader.cpp similarity index 100% rename from kraken/KRShader.cpp rename to kraken/resources/shader/KRShader.cpp diff --git a/kraken/KRShader.h b/kraken/resources/shader/KRShader.h similarity index 100% rename from kraken/KRShader.h rename to kraken/resources/shader/KRShader.h diff --git a/kraken/KRShaderManager.cpp b/kraken/resources/shader/KRShaderManager.cpp similarity index 100% rename from kraken/KRShaderManager.cpp rename to kraken/resources/shader/KRShaderManager.cpp diff --git a/kraken/KRShaderManager.h b/kraken/resources/shader/KRShaderManager.h similarity index 100% rename from kraken/KRShaderManager.h rename to kraken/resources/shader/KRShaderManager.h diff --git a/kraken/resources/source/KRSourceManager.cpp b/kraken/resources/source/KRSourceManager.cpp index 30d09f5..a4a86fd 100644 --- a/kraken/resources/source/KRSourceManager.cpp +++ b/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;