From 77b75311e67d156c97cd19346508cb8caeeab20e Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Sat, 17 Aug 2024 23:41:58 -0700 Subject: [PATCH] WIP adding directory structure --- kraken/CMakeLists.txt | 22 +++++++++---------- kraken/KRAmbientZone.h | 1 - kraken/KRAudioSource.h | 1 - kraken/KRBone.h | 1 - kraken/KRCamera.h | 2 +- kraken/KRCollider.h | 1 - kraken/KRContext.h | 4 ++-- kraken/KRLight.h | 2 +- kraken/KRLocator.h | 1 - kraken/KRModel.h | 2 +- kraken/KRParticleSystemNewtonian.cpp | 1 - kraken/KRReverbZone.h | 2 +- kraken/KRSprite.h | 2 +- kraken/resources/KRResource+blend.cpp | 2 +- kraken/resources/material/KRMaterial.cpp | 2 +- kraken/resources/material/KRMaterial.h | 4 ++-- kraken/resources/material/KRMaterialManager.h | 2 +- kraken/{ => resources/scene}/KRScene.cpp | 0 kraken/{ => resources/scene}/KRScene.h | 0 .../{ => resources/scene}/KRSceneManager.cpp | 0 kraken/{ => resources/scene}/KRSceneManager.h | 0 kraken/{ => resources/texture}/KRTexture.cpp | 0 kraken/{ => resources/texture}/KRTexture.h | 0 .../{ => resources/texture}/KRTexture2D.cpp | 0 kraken/{ => resources/texture}/KRTexture2D.h | 0 .../texture}/KRTextureAnimated.cpp | 0 .../texture}/KRTextureAnimated.h | 0 .../{ => resources/texture}/KRTextureCube.cpp | 0 .../{ => resources/texture}/KRTextureCube.h | 0 .../{ => resources/texture}/KRTextureKTX.cpp | 0 kraken/{ => resources/texture}/KRTextureKTX.h | 0 .../{ => resources/texture}/KRTextureKTX2.cpp | 0 .../{ => resources/texture}/KRTextureKTX2.h | 0 .../texture}/KRTextureManager.cpp | 0 .../texture}/KRTextureManager.h | 0 .../{ => resources/texture}/KRTexturePVR.cpp | 0 kraken/{ => resources/texture}/KRTexturePVR.h | 0 .../{ => resources/texture}/KRTextureTGA.cpp | 0 kraken/{ => resources/texture}/KRTextureTGA.h | 0 39 files changed, 23 insertions(+), 29 deletions(-) rename kraken/{ => resources/scene}/KRScene.cpp (100%) rename kraken/{ => resources/scene}/KRScene.h (100%) rename kraken/{ => resources/scene}/KRSceneManager.cpp (100%) rename kraken/{ => resources/scene}/KRSceneManager.h (100%) rename kraken/{ => resources/texture}/KRTexture.cpp (100%) rename kraken/{ => resources/texture}/KRTexture.h (100%) rename kraken/{ => resources/texture}/KRTexture2D.cpp (100%) rename kraken/{ => resources/texture}/KRTexture2D.h (100%) rename kraken/{ => resources/texture}/KRTextureAnimated.cpp (100%) rename kraken/{ => resources/texture}/KRTextureAnimated.h (100%) rename kraken/{ => resources/texture}/KRTextureCube.cpp (100%) rename kraken/{ => resources/texture}/KRTextureCube.h (100%) rename kraken/{ => resources/texture}/KRTextureKTX.cpp (100%) rename kraken/{ => resources/texture}/KRTextureKTX.h (100%) rename kraken/{ => resources/texture}/KRTextureKTX2.cpp (100%) rename kraken/{ => resources/texture}/KRTextureKTX2.h (100%) rename kraken/{ => resources/texture}/KRTextureManager.cpp (100%) rename kraken/{ => resources/texture}/KRTextureManager.h (100%) rename kraken/{ => resources/texture}/KRTexturePVR.cpp (100%) rename kraken/{ => resources/texture}/KRTexturePVR.h (100%) rename kraken/{ => resources/texture}/KRTextureTGA.cpp (100%) rename kraken/{ => resources/texture}/KRTextureTGA.h (100%) diff --git a/kraken/CMakeLists.txt b/kraken/CMakeLists.txt index 06a9bfa..c910cb2 100644 --- a/kraken/CMakeLists.txt +++ b/kraken/CMakeLists.txt @@ -30,8 +30,19 @@ add_source_and_header(resources/mesh/KRMeshCube) add_source_and_header(resources/mesh/KRMeshManager) 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/source/KRSource) add_source_and_header(resources/source/KRSourceManager) +add_source_and_header(resources/texture/KRTexture) +add_source_and_header(resources/texture/KRTexture2D) +add_source_and_header(resources/texture/KRTextureAnimated) +add_source_and_header(resources/texture/KRTextureCube) +add_source_and_header(resources/texture/KRTextureKTX) +add_source_and_header(resources/texture/KRTextureKTX2) +add_source_and_header(resources/texture/KRTextureManager) +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(KRAudioBuffer) @@ -69,8 +80,6 @@ add_source_and_header(KRRenderGraph) add_source_and_header(KRRenderGraphBlackFrame) add_source_and_header(KRRenderSettings) 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(KRPipeline) @@ -79,13 +88,4 @@ add_source_and_header(KRSampler) add_source_and_header(KRSamplerManager) add_source_and_header(KRSpotLight) add_source_and_header(KRSprite) -add_source_and_header(KRTexture) -add_source_and_header(KRTexture2D) -add_source_and_header(KRTextureAnimated) -add_source_and_header(KRTextureCube) -add_source_and_header(KRTextureKTX) -add_source_and_header(KRTextureKTX2) -add_source_and_header(KRTextureManager) -add_source_and_header(KRTexturePVR) -add_source_and_header(KRTextureTGA) add_source_and_header(KRViewport) diff --git a/kraken/KRAmbientZone.h b/kraken/KRAmbientZone.h index 71acc7e..62bebf8 100755 --- a/kraken/KRAmbientZone.h +++ b/kraken/KRAmbientZone.h @@ -33,7 +33,6 @@ #include "resources/KRResource.h" #include "KRNode.h" -#include "KRTexture.h" class KRAmbientZone : public KRNode { diff --git a/kraken/KRAudioSource.h b/kraken/KRAudioSource.h index 964ad4c..2c86e58 100755 --- a/kraken/KRAudioSource.h +++ b/kraken/KRAudioSource.h @@ -34,7 +34,6 @@ #include "KREngine-common.h" #include "resources/KRResource.h" #include "KRNode.h" -#include "KRTexture.h" class KRAudioSample; class KRAudioBuffer; diff --git a/kraken/KRBone.h b/kraken/KRBone.h index 4170f03..bb573a1 100755 --- a/kraken/KRBone.h +++ b/kraken/KRBone.h @@ -33,7 +33,6 @@ #include "resources/KRResource.h" #include "KRNode.h" -#include "KRTexture.h" class RenderInfo; diff --git a/kraken/KRCamera.h b/kraken/KRCamera.h index 3a603e3..7b14472 100755 --- a/kraken/KRCamera.h +++ b/kraken/KRCamera.h @@ -35,7 +35,7 @@ #include "KRPipeline.h" #include "KRContextObject.h" -#include "KRTexture.h" +#include "resources/texture/KRTexture.h" #include "KRContext.h" #include "KRViewport.h" #include "KRRenderSettings.h" diff --git a/kraken/KRCollider.h b/kraken/KRCollider.h index 64fb2db..2b27ef3 100755 --- a/kraken/KRCollider.h +++ b/kraken/KRCollider.h @@ -44,7 +44,6 @@ #include "KRNode.h" #include "KRContext.h" #include "resources/mesh/KRMesh.h" -#include "KRTexture.h" class KRCollider : public KRNode { diff --git a/kraken/KRContext.h b/kraken/KRContext.h index f44d4af..0802a44 100755 --- a/kraken/KRContext.h +++ b/kraken/KRContext.h @@ -33,8 +33,8 @@ #include "KREngine-common.h" #include "resources/bundle/KRBundleManager.h" -#include "KRSceneManager.h" -#include "KRTextureManager.h" +#include "resources/scene/KRSceneManager.h" +#include "resources/texture/KRTextureManager.h" #include "resources/material/KRMaterialManager.h" #include "KRPipelineManager.h" #include "KRSamplerManager.h" diff --git a/kraken/KRLight.h b/kraken/KRLight.h index d74c930..4d2128a 100755 --- a/kraken/KRLight.h +++ b/kraken/KRLight.h @@ -32,7 +32,7 @@ #include "resources/KRResource.h" #include "KRNode.h" -#include "KRTexture.h" +#include "resources/texture/KRTexture.h" static const float KRLIGHT_MIN_INFLUENCE = 0.15f; // 0.05f diff --git a/kraken/KRLocator.h b/kraken/KRLocator.h index 0294136..57585cc 100755 --- a/kraken/KRLocator.h +++ b/kraken/KRLocator.h @@ -33,7 +33,6 @@ #include "resources/KRResource.h" #include "KRNode.h" -#include "KRTexture.h" class KRLocator : public KRNode { diff --git a/kraken/KRModel.h b/kraken/KRModel.h index 211b002..dd85d37 100755 --- a/kraken/KRModel.h +++ b/kraken/KRModel.h @@ -40,7 +40,7 @@ #include "KRNode.h" #include "KRContext.h" #include "resources/mesh/KRMesh.h" -#include "KRTexture.h" +#include "resources/texture/KRTexture.h" #include "KRBone.h" class KRModel : public KRNode diff --git a/kraken/KRParticleSystemNewtonian.cpp b/kraken/KRParticleSystemNewtonian.cpp index 7ba269d..d0947b0 100755 --- a/kraken/KRParticleSystemNewtonian.cpp +++ b/kraken/KRParticleSystemNewtonian.cpp @@ -32,7 +32,6 @@ #include "KREngine-common.h" #include "KRParticleSystemNewtonian.h" -#include "KRTexture.h" #include "KRContext.h" #include "KRRenderPass.h" diff --git a/kraken/KRReverbZone.h b/kraken/KRReverbZone.h index 94e6d03..ebdfaf0 100755 --- a/kraken/KRReverbZone.h +++ b/kraken/KRReverbZone.h @@ -33,7 +33,7 @@ #include "resources/KRResource.h" #include "KRNode.h" -#include "KRTexture.h" +#include "resources/texture/KRTexture.h" class KRReverbZone : public KRNode { diff --git a/kraken/KRSprite.h b/kraken/KRSprite.h index 2319366..87959e9 100755 --- a/kraken/KRSprite.h +++ b/kraken/KRSprite.h @@ -33,7 +33,7 @@ #include "resources/KRResource.h" #include "KRNode.h" -#include "KRTexture.h" +#include "resources/texture/KRTexture.h" class KRSprite : public KRNode { diff --git a/kraken/resources/KRResource+blend.cpp b/kraken/resources/KRResource+blend.cpp index 51af7e6..eb65042 100755 --- a/kraken/resources/KRResource+blend.cpp +++ b/kraken/resources/KRResource+blend.cpp @@ -32,7 +32,7 @@ #include "KREngine-common.h" #include "KRResource.h" -#include "KRScene.h" +#include "scene/KRScene.h" #include "KRResource+blend.h" #include "mimir.h" diff --git a/kraken/resources/material/KRMaterial.cpp b/kraken/resources/material/KRMaterial.cpp index b05d90e..1192544 100755 --- a/kraken/resources/material/KRMaterial.cpp +++ b/kraken/resources/material/KRMaterial.cpp @@ -32,7 +32,7 @@ #include "KREngine-common.h" #include "KRMaterial.h" -#include "KRTextureManager.h" +#include "resources/texture/KRTextureManager.h" #include "KRRenderPass.h" #include "KRContext.h" diff --git a/kraken/resources/material/KRMaterial.h b/kraken/resources/material/KRMaterial.h index af09894..5149013 100755 --- a/kraken/resources/material/KRMaterial.h +++ b/kraken/resources/material/KRMaterial.h @@ -35,12 +35,12 @@ #include "KREngine-common.h" -#include "KRTexture.h" +#include "resources/texture/KRTexture.h" #include "KRPipelineManager.h" #include "KRPipeline.h" #include "KRCamera.h" #include "resources/KRResource.h" -#include "KRScene.h" +#include "resources/scene/KRScene.h" #include "KRBone.h" enum class CullMode : __uint32_t; diff --git a/kraken/resources/material/KRMaterialManager.h b/kraken/resources/material/KRMaterialManager.h index 18d7a89..19c81e3 100755 --- a/kraken/resources/material/KRMaterialManager.h +++ b/kraken/resources/material/KRMaterialManager.h @@ -36,7 +36,7 @@ #include "resources/KRResourceManager.h" #include "KRMaterial.h" -#include "KRTextureManager.h" +#include "resources/texture/KRTextureManager.h" #include "KRMaterialManager.h" class KRMaterial; diff --git a/kraken/KRScene.cpp b/kraken/resources/scene/KRScene.cpp similarity index 100% rename from kraken/KRScene.cpp rename to kraken/resources/scene/KRScene.cpp diff --git a/kraken/KRScene.h b/kraken/resources/scene/KRScene.h similarity index 100% rename from kraken/KRScene.h rename to kraken/resources/scene/KRScene.h diff --git a/kraken/KRSceneManager.cpp b/kraken/resources/scene/KRSceneManager.cpp similarity index 100% rename from kraken/KRSceneManager.cpp rename to kraken/resources/scene/KRSceneManager.cpp diff --git a/kraken/KRSceneManager.h b/kraken/resources/scene/KRSceneManager.h similarity index 100% rename from kraken/KRSceneManager.h rename to kraken/resources/scene/KRSceneManager.h diff --git a/kraken/KRTexture.cpp b/kraken/resources/texture/KRTexture.cpp similarity index 100% rename from kraken/KRTexture.cpp rename to kraken/resources/texture/KRTexture.cpp diff --git a/kraken/KRTexture.h b/kraken/resources/texture/KRTexture.h similarity index 100% rename from kraken/KRTexture.h rename to kraken/resources/texture/KRTexture.h diff --git a/kraken/KRTexture2D.cpp b/kraken/resources/texture/KRTexture2D.cpp similarity index 100% rename from kraken/KRTexture2D.cpp rename to kraken/resources/texture/KRTexture2D.cpp diff --git a/kraken/KRTexture2D.h b/kraken/resources/texture/KRTexture2D.h similarity index 100% rename from kraken/KRTexture2D.h rename to kraken/resources/texture/KRTexture2D.h diff --git a/kraken/KRTextureAnimated.cpp b/kraken/resources/texture/KRTextureAnimated.cpp similarity index 100% rename from kraken/KRTextureAnimated.cpp rename to kraken/resources/texture/KRTextureAnimated.cpp diff --git a/kraken/KRTextureAnimated.h b/kraken/resources/texture/KRTextureAnimated.h similarity index 100% rename from kraken/KRTextureAnimated.h rename to kraken/resources/texture/KRTextureAnimated.h diff --git a/kraken/KRTextureCube.cpp b/kraken/resources/texture/KRTextureCube.cpp similarity index 100% rename from kraken/KRTextureCube.cpp rename to kraken/resources/texture/KRTextureCube.cpp diff --git a/kraken/KRTextureCube.h b/kraken/resources/texture/KRTextureCube.h similarity index 100% rename from kraken/KRTextureCube.h rename to kraken/resources/texture/KRTextureCube.h diff --git a/kraken/KRTextureKTX.cpp b/kraken/resources/texture/KRTextureKTX.cpp similarity index 100% rename from kraken/KRTextureKTX.cpp rename to kraken/resources/texture/KRTextureKTX.cpp diff --git a/kraken/KRTextureKTX.h b/kraken/resources/texture/KRTextureKTX.h similarity index 100% rename from kraken/KRTextureKTX.h rename to kraken/resources/texture/KRTextureKTX.h diff --git a/kraken/KRTextureKTX2.cpp b/kraken/resources/texture/KRTextureKTX2.cpp similarity index 100% rename from kraken/KRTextureKTX2.cpp rename to kraken/resources/texture/KRTextureKTX2.cpp diff --git a/kraken/KRTextureKTX2.h b/kraken/resources/texture/KRTextureKTX2.h similarity index 100% rename from kraken/KRTextureKTX2.h rename to kraken/resources/texture/KRTextureKTX2.h diff --git a/kraken/KRTextureManager.cpp b/kraken/resources/texture/KRTextureManager.cpp similarity index 100% rename from kraken/KRTextureManager.cpp rename to kraken/resources/texture/KRTextureManager.cpp diff --git a/kraken/KRTextureManager.h b/kraken/resources/texture/KRTextureManager.h similarity index 100% rename from kraken/KRTextureManager.h rename to kraken/resources/texture/KRTextureManager.h diff --git a/kraken/KRTexturePVR.cpp b/kraken/resources/texture/KRTexturePVR.cpp similarity index 100% rename from kraken/KRTexturePVR.cpp rename to kraken/resources/texture/KRTexturePVR.cpp diff --git a/kraken/KRTexturePVR.h b/kraken/resources/texture/KRTexturePVR.h similarity index 100% rename from kraken/KRTexturePVR.h rename to kraken/resources/texture/KRTexturePVR.h diff --git a/kraken/KRTextureTGA.cpp b/kraken/resources/texture/KRTextureTGA.cpp similarity index 100% rename from kraken/KRTextureTGA.cpp rename to kraken/resources/texture/KRTextureTGA.cpp diff --git a/kraken/KRTextureTGA.h b/kraken/resources/texture/KRTextureTGA.h similarity index 100% rename from kraken/KRTextureTGA.h rename to kraken/resources/texture/KRTextureTGA.h