From ab8c621a0048157de9d6a05b0f41367906dcd5d3 Mon Sep 17 00:00:00 2001 From: tzdwindows 7 <3076584115@qq.com> Date: Sat, 15 Nov 2025 10:21:03 +0800 Subject: [PATCH] refactor(buffer): rename namespace from Buffer to Vivid2D::Render::Buffer - Updated namespace in BufferBuilder.cpp - Updated namespace in BufferBuilder.h - Updated namespace in BufferUploader.cpp - Updated namespace in BufferUploader.h - Updated namespace in Tesselator.cpp - Updated namespace in Tesselator.h chore(project): add new source files and update preprocessor definitions - Added GLM_ENABLE_EXPERIMENTAL and _CRT_SECURE_NO_WARNINGS to preprocessor definitions - Included new header files: AnimationParameter.h, Mesh2D.h, ModelPart.h, BoundingBox.h, VertexList.h - Included new source files: AnimationParameter.cpp, Mesh2D.cpp, ModelPart.cpp, BoundingBox.cpp, VertexList.cpp - Added MultiSelectionBoxRenderer.h and MultiSelectionBoxRenderer.cpp - Added Texture.h and Texture.cpp - Added Vertex.h and Vertex.cpp - Updated project filters for new files --- Vivid2DRenderer/Vivid2DRenderer.vcxproj | 18 ++++++- .../Vivid2DRenderer.vcxproj.filters | 48 +++++++++++++++++++ .../systems/buffer/BufferBuilder.cpp | 2 +- .../systems/buffer/BufferBuilder.h | 2 +- .../systems/buffer/BufferUploader.cpp | 2 +- .../systems/buffer/BufferUploader.h | 2 +- Vivid2DRenderer/systems/buffer/Tesselator.cpp | 2 +- Vivid2DRenderer/systems/buffer/Tesselator.h | 2 +- 8 files changed, 71 insertions(+), 7 deletions(-) diff --git a/Vivid2DRenderer/Vivid2DRenderer.vcxproj b/Vivid2DRenderer/Vivid2DRenderer.vcxproj index d61cdf7..21c648d 100644 --- a/Vivid2DRenderer/Vivid2DRenderer.vcxproj +++ b/Vivid2DRenderer/Vivid2DRenderer.vcxproj @@ -125,7 +125,7 @@ true true true - NDEBUG;VIVID2DRENDERER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + NDEBUG;VIVID2DRENDERER_EXPORTS;_WINDOWS;_USRDLL;GLM_ENABLE_EXPERIMENTAL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h @@ -174,10 +174,16 @@ endlocal + + + + + + @@ -187,8 +193,15 @@ endlocal + + + + + + + @@ -198,6 +211,7 @@ endlocal Create Create + @@ -205,6 +219,8 @@ endlocal + + diff --git a/Vivid2DRenderer/Vivid2DRenderer.vcxproj.filters b/Vivid2DRenderer/Vivid2DRenderer.vcxproj.filters index 20a379b..3ccf8be 100644 --- a/Vivid2DRenderer/Vivid2DRenderer.vcxproj.filters +++ b/Vivid2DRenderer/Vivid2DRenderer.vcxproj.filters @@ -54,6 +54,30 @@ 头文件 + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + @@ -89,5 +113,29 @@ 源文件 + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + \ No newline at end of file diff --git a/Vivid2DRenderer/systems/buffer/BufferBuilder.cpp b/Vivid2DRenderer/systems/buffer/BufferBuilder.cpp index faf6f3e..66328d6 100644 --- a/Vivid2DRenderer/systems/buffer/BufferBuilder.cpp +++ b/Vivid2DRenderer/systems/buffer/BufferBuilder.cpp @@ -6,7 +6,7 @@ #include #include -namespace Buffer { +namespace Vivid2D::Render::Buffer { // ========================================================== // RenderState ʵ diff --git a/Vivid2DRenderer/systems/buffer/BufferBuilder.h b/Vivid2DRenderer/systems/buffer/BufferBuilder.h index edbed12..8f135f0 100644 --- a/Vivid2DRenderer/systems/buffer/BufferBuilder.h +++ b/Vivid2DRenderer/systems/buffer/BufferBuilder.h @@ -9,7 +9,7 @@ // ЩͷļĿд #include "../../systems/RenderSystem.h" -namespace Buffer { +namespace Vivid2D::Render::Buffer { /** * @brief Ⱦ״̬ṹ diff --git a/Vivid2DRenderer/systems/buffer/BufferUploader.cpp b/Vivid2DRenderer/systems/buffer/BufferUploader.cpp index c761a77..65f8d3c 100644 --- a/Vivid2DRenderer/systems/buffer/BufferUploader.cpp +++ b/Vivid2DRenderer/systems/buffer/BufferUploader.cpp @@ -6,7 +6,7 @@ #include #include -namespace Buffer { +namespace Vivid2D::Render::Buffer { void BufferUploader::applyRenderState(const RenderState& state) { if (state.textureId != 0) { diff --git a/Vivid2DRenderer/systems/buffer/BufferUploader.h b/Vivid2DRenderer/systems/buffer/BufferUploader.h index bd2b790..f437ce4 100644 --- a/Vivid2DRenderer/systems/buffer/BufferUploader.h +++ b/Vivid2DRenderer/systems/buffer/BufferUploader.h @@ -3,7 +3,7 @@ #include "BufferBuilder.h" #include "../../systems/RenderSystem.h" -namespace Buffer { +namespace Vivid2D::Render::Buffer { /** * @brief ϴӦȾ״̬ VAO ִлơ diff --git a/Vivid2DRenderer/systems/buffer/Tesselator.cpp b/Vivid2DRenderer/systems/buffer/Tesselator.cpp index 1ba6aca..6b8e4e8 100644 --- a/Vivid2DRenderer/systems/buffer/Tesselator.cpp +++ b/Vivid2DRenderer/systems/buffer/Tesselator.cpp @@ -4,7 +4,7 @@ #include "BufferBuilder.h" #include "BufferUploader.h" -namespace Buffer { +namespace Vivid2D::Render::Buffer { Tesselator::Tesselator(int bufferSize) { // ʼ BufferBuilderײ this->builder = std::make_unique(bufferSize); diff --git a/Vivid2DRenderer/systems/buffer/Tesselator.h b/Vivid2DRenderer/systems/buffer/Tesselator.h index 61a9ddd..ef43856 100644 --- a/Vivid2DRenderer/systems/buffer/Tesselator.h +++ b/Vivid2DRenderer/systems/buffer/Tesselator.h @@ -65,7 +65,7 @@ * // ʱϴɣGPU ϵ VAO/VBO Դѱͷš * */ -namespace Buffer { +namespace Vivid2D::Render::Buffer { class BufferBuilder;