From a641c563816f5e9a86ee904739dc85f7bab3e6a8 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sun, 18 May 2025 02:15:33 +0800 Subject: [PATCH] renamed to Mesh.h/.cpp from VKRenderable.h/.cpp --- example/Vulkan/Atmosphere.cpp | 2 +- example/Vulkan/Cubemap.cpp | 2 +- example/Vulkan/DeferredRender.cpp | 2 +- example/Vulkan/EquirectangularMap.cpp | 2 +- example/Vulkan/InlineGeometryScene.cpp | 2 +- inc/hgl/component/StaticMeshComponent.h | 2 +- inc/hgl/graph/{VKRenderable.h => Mesh.h} | 0 inc/hgl/graph/VKCommandBuffer.h | 2 +- inc/hgl/graph/VKRenderResource.h | 2 +- src/SceneGraph/CMakeLists.txt | 14 +++++++------- .../Vulkan/{VKRenderable.cpp => Mesh.cpp} | 2 +- src/SceneGraph/Vulkan/VKCommandBufferRender.cpp | 2 +- src/SceneGraph/Vulkan/VKRenderResource.cpp | 2 +- src/SceneGraph/render/MaterialRenderList.cpp | 2 +- src/SceneGraph/render/RenderAssignBuffer.cpp | 2 +- src/SceneGraph/render/RenderList.cpp | 2 +- src/SceneGraph/scene/SceneNode.cpp | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) rename inc/hgl/graph/{VKRenderable.h => Mesh.h} (100%) rename src/SceneGraph/Vulkan/{VKRenderable.cpp => Mesh.cpp} (98%) diff --git a/example/Vulkan/Atmosphere.cpp b/example/Vulkan/Atmosphere.cpp index 1cf3dcec..2309c6eb 100644 --- a/example/Vulkan/Atmosphere.cpp +++ b/example/Vulkan/Atmosphere.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include using namespace hgl; diff --git a/example/Vulkan/Cubemap.cpp b/example/Vulkan/Cubemap.cpp index cf6bd086..b8161eae 100644 --- a/example/Vulkan/Cubemap.cpp +++ b/example/Vulkan/Cubemap.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/example/Vulkan/DeferredRender.cpp b/example/Vulkan/DeferredRender.cpp index a7bdf501..9b17e221 100644 --- a/example/Vulkan/DeferredRender.cpp +++ b/example/Vulkan/DeferredRender.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/example/Vulkan/EquirectangularMap.cpp b/example/Vulkan/EquirectangularMap.cpp index fa83b7a7..d7ad3dc3 100644 --- a/example/Vulkan/EquirectangularMap.cpp +++ b/example/Vulkan/EquirectangularMap.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/example/Vulkan/InlineGeometryScene.cpp b/example/Vulkan/InlineGeometryScene.cpp index 4190c3cc..6c8fb564 100644 --- a/example/Vulkan/InlineGeometryScene.cpp +++ b/example/Vulkan/InlineGeometryScene.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/inc/hgl/component/StaticMeshComponent.h b/inc/hgl/component/StaticMeshComponent.h index 97d82c49..966760ec 100644 --- a/inc/hgl/component/StaticMeshComponent.h +++ b/inc/hgl/component/StaticMeshComponent.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include COMPONENT_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/VKRenderable.h b/inc/hgl/graph/Mesh.h similarity index 100% rename from inc/hgl/graph/VKRenderable.h rename to inc/hgl/graph/Mesh.h diff --git a/inc/hgl/graph/VKCommandBuffer.h b/inc/hgl/graph/VKCommandBuffer.h index 7833fde7..50085ec0 100644 --- a/inc/hgl/graph/VKCommandBuffer.h +++ b/inc/hgl/graph/VKCommandBuffer.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include VK_NAMESPACE_BEGIN class VulkanCmdBuffer diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h index e010b244..75e105aa 100644 --- a/inc/hgl/graph/VKRenderResource.h +++ b/inc/hgl/graph/VKRenderResource.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index e31b4174..6f755a26 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -23,7 +23,9 @@ SET(SG_PRIMITIVE_SOURCE ${SG_INCLUDE_PATH}/VKPrimitive.h SOURCE_GROUP("Primitive" FILES ${SG_PRIMITIVE_SOURCE}) SET(TILE_SOURCE ${SG_INCLUDE_PATH}/TileData.h - TileData.cpp) + TileData.cpp + Vulkan/VKTileData.cpp + Vulkan/VKTileFont.cpp) SOURCE_GROUP("Tile" FILES ${TILE_SOURCE}) @@ -282,12 +284,10 @@ SET(VK_CMD_BUFFER_SOURCE ${SG_INCLUDE_PATH}/VKCommandBuffer.h SOURCE_GROUP("Vulkan\\Command Buffer" FILES ${VK_CMD_BUFFER_SOURCE}) -SET(VK_RENDERABLE_SOURCE ${SG_INCLUDE_PATH}/VKRenderable.h - Vulkan/VKRenderable.cpp - Vulkan/VKTileData.cpp - Vulkan/VKTileFont.cpp) +SET(VK_MESH_SOURCE ${SG_INCLUDE_PATH}/Mesh.h + Vulkan/Mesh.cpp) -SOURCE_GROUP("Vulkan\\Mesh" FILES ${VK_RENDERABLE_SOURCE}) +SOURCE_GROUP("Vulkan\\Mesh" FILES ${VK_MESH_SOURCE}) set(COMPONENT_INCLUDE_PATH ${ROOT_INCLUDE_PATH}/hgl/component) @@ -361,7 +361,7 @@ SET(VULKAN_RENDER_SOURCE ${VK_RR_SOURCE} ${VK_RENDER_TARGET_SOURCE} #${VK_RENDER_CONTEXT_SOURCE} ${VK_CMD_BUFFER_SOURCE} - ${VK_RENDERABLE_SOURCE} + ${VK_MESH_SOURCE} ${VK_RENDER_DEVICE_SOURCE}) add_cm_library(ULRE.SceneGraph "ULRE" ${SCENE_GRAPH_FILES} diff --git a/src/SceneGraph/Vulkan/VKRenderable.cpp b/src/SceneGraph/Vulkan/Mesh.cpp similarity index 98% rename from src/SceneGraph/Vulkan/VKRenderable.cpp rename to src/SceneGraph/Vulkan/Mesh.cpp index 28b7b6cb..4d0d826d 100644 --- a/src/SceneGraph/Vulkan/VKRenderable.cpp +++ b/src/SceneGraph/Vulkan/Mesh.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp index 50e04530..06e95dd0 100644 --- a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp +++ b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/SceneGraph/Vulkan/VKRenderResource.cpp b/src/SceneGraph/Vulkan/VKRenderResource.cpp index 36e17a4c..9527cef5 100644 --- a/src/SceneGraph/Vulkan/VKRenderResource.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResource.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/src/SceneGraph/render/MaterialRenderList.cpp b/src/SceneGraph/render/MaterialRenderList.cpp index f4b27a92..9a7cd227 100644 --- a/src/SceneGraph/render/MaterialRenderList.cpp +++ b/src/SceneGraph/render/MaterialRenderList.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/src/SceneGraph/render/RenderAssignBuffer.cpp b/src/SceneGraph/render/RenderAssignBuffer.cpp index 55eb839e..397cbe93 100644 --- a/src/SceneGraph/render/RenderAssignBuffer.cpp +++ b/src/SceneGraph/render/RenderAssignBuffer.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/SceneGraph/render/RenderList.cpp b/src/SceneGraph/render/RenderList.cpp index 090c6ca2..39cdc370 100644 --- a/src/SceneGraph/render/RenderList.cpp +++ b/src/SceneGraph/render/RenderList.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace hgl { diff --git a/src/SceneGraph/scene/SceneNode.cpp b/src/SceneGraph/scene/SceneNode.cpp index aa6f1985..82b9eb5f 100644 --- a/src/SceneGraph/scene/SceneNode.cpp +++ b/src/SceneGraph/scene/SceneNode.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace hgl { namespace graph