From 036650b17242a1578475ccf47d2f3533874069b6 Mon Sep 17 00:00:00 2001 From: wyc <1104749580@qq.com> Date: Wed, 29 Jul 2026 12:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .clang-format | 57 ---- .../triplets/x64-windows-static-md.cmake | 2 +- Graphviz/Project_Graphs.ps1.in | 6 +- Graphviz/Project_Graphs.sh.in | 244 +++++++++--------- Project.xml | 42 +++ register_project.cmake | 2 +- 6 files changed, 169 insertions(+), 184 deletions(-) delete mode 100644 .clang-format create mode 100644 Project.xml diff --git a/.clang-format b/.clang-format deleted file mode 100644 index ffec9d2..0000000 --- a/.clang-format +++ /dev/null @@ -1,57 +0,0 @@ -# Generated from CLion C/C++ Code Style settings ---- -Language: Cpp -BasedOnStyle: LLVM -AccessModifierOffset: -4 -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignOperands: false -AlignTrailingComments: false -AllowShortBlocksOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -AlwaysBreakTemplateDeclarations: Yes -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: false - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: true - BeforeElse: true - BeforeLambdaBody: false - BeforeWhile: true - SplitEmptyFunction: false - SplitEmptyRecord: false - SplitEmptyNamespace: false -BreakBeforeBraces: Custom -BreakConstructorInitializers: AfterColon -BreakConstructorInitializersBeforeComma: false -ColumnLimit: 120 -ConstructorInitializerAllOnOneLineOrOnePerLine: false -ContinuationIndentWidth: 0 -EmptyLineBeforeAccessModifier: Never -IncludeCategories: - - Regex: '^<.*' - Priority: 1 - - Regex: '^".*' - Priority: 2 - - Regex: '.*' - Priority: 3 -IncludeIsMainRegex: '([-_](test|unittest))?$' -IndentWidth: 4 -InsertNewlineAtEOF: true -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 0 -PointerAlignment: Left -SpaceInEmptyParentheses: false -SpacesInAngles: false -SpacesInConditionalStatement: false -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -TabWidth: 4 -... diff --git a/0_cmake_library/register/generated/vsg_cesium/triplets/x64-windows-static-md.cmake b/0_cmake_library/register/generated/vsg_cesium/triplets/x64-windows-static-md.cmake index 5bac0e4..c577f81 100644 --- a/0_cmake_library/register/generated/vsg_cesium/triplets/x64-windows-static-md.cmake +++ b/0_cmake_library/register/generated/vsg_cesium/triplets/x64-windows-static-md.cmake @@ -1,5 +1,5 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [[C:/Users/wyc/CLionProjects/ECAP_Server/third_party/build_infra/0_cmake_library/register/generated/vsg_cesium/current_compiler.cmake]]) +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [[D:/ae/proj/git/Radio/third_party/build_infra/0_cmake_library/register/generated/vsg_cesium/current_compiler.cmake]]) set(VCPKG_VISUAL_STUDIO_PATH [[C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise]]) diff --git a/Graphviz/Project_Graphs.ps1.in b/Graphviz/Project_Graphs.ps1.in index 6e028a2..e8cf76c 100644 --- a/Graphviz/Project_Graphs.ps1.in +++ b/Graphviz/Project_Graphs.ps1.in @@ -23,7 +23,7 @@ function Get-Root_Name([string]$root) { return 'CPP_Core' } if ($path -match '/YSGraphic_Core$') { - return 'YSGraphic_Core' + return 'Renderive' } return [System.IO.Path]::GetFileName($path) } @@ -200,8 +200,8 @@ function Get-Module_Key([string]$path, [int]$depth) { $base = 'module/radio' } elseif ($rootName -eq 'CPP_Core') { $base = 'third_party/CPP_Core/Core' - } elseif ($rootName -eq 'YSGraphic_Core') { - $base = 'third_party/Graphic_Core/YSGraphic_Core' + } elseif ($rootName -eq 'Renderive') { + $base = 'third_party/Graphic_Core/Renderive' } else { $base = $rootName } diff --git a/Graphviz/Project_Graphs.sh.in b/Graphviz/Project_Graphs.sh.in index 0863334..be0ad79 100644 --- a/Graphviz/Project_Graphs.sh.in +++ b/Graphviz/Project_Graphs.sh.in @@ -8,146 +8,146 @@ max_depth=@PSC_MAX_DEPTH@ collapse_threshold=@PSC_COLLAPSE_THRESHOLD@ mkdir -p "$output_dir" normalize_path() { - local path="$1" - if command -v realpath >/dev/null 2>&1; then - realpath -m "$path" | tr '\\' '/' - else - printf '%s\n' "$path" | tr '\\' '/' - fi + local path="$1" + if command -v realpath >/dev/null 2>&1; then + realpath -m "$path" | tr '\\' '/' + else + printf '%s\n' "$path" | tr '\\' '/' + fi } dot_text() { - printf '%s' "$1" | sed 's/\\/\\//g; s/"/\\"/g' + printf '%s' "$1" | sed 's/\\/\\//g; s/"/\\"/g' } root_name() { - local path - path=$(normalize_path "$1") - case "$path" in - */module/radio) printf 'radio' ;; - */CPP_Core/Core) printf 'CPP_Core' ;; - */YSGraphic_Core) printf 'YSGraphic_Core' ;; - *) basename "$path" ;; - esac + local path + path=$(normalize_path "$1") + case "$path" in + */module/radio) printf 'radio' ;; + */CPP_Core/Core) printf 'CPP_Core' ;; + */Renderive) printf 'Renderive' ;; + *) basename "$path" ;; + esac } write_header() { - local title="$1" - echo "digraph \"$title\" {" - echo 'rankdir=LR;' - echo 'splines=ortho;' - echo 'concentrate=true;' - echo 'forcelabels=true;' - echo "graph [fontname=\"Consolas\", label=\"$title\", labelloc=t, fontsize=18];" - echo 'node [shape=box, style="rounded,filled", fontname="Consolas", fontsize=10];' - echo 'edge [fontname="Consolas", fontsize=9];' + local title="$1" + echo "digraph \"$title\" {" + echo 'rankdir=LR;' + echo 'splines=ortho;' + echo 'concentrate=true;' + echo 'forcelabels=true;' + echo "graph [fontname=\"Consolas\", label=\"$title\", labelloc=t, fontsize=18];" + echo 'node [shape=box, style="rounded,filled", fontname="Consolas", fontsize=10];' + echo 'edge [fontname="Consolas", fontsize=9];' } write_legend() { - echo 'subgraph cluster_legend {' - echo 'label="legend";' - echo 'style="rounded,dashed";' - echo '"legend_module" [label="module/folder", fillcolor="#dbeafe"];' - echo '"legend_target" [label="cmake target", fillcolor="#dcfce7"];' - echo '"legend_buffer" [label="buffer/cache", fillcolor="#fef3c7"];' - echo '"legend_runtime" [label="runtime", fillcolor="#fee2e2"];' - echo '"legend_edge" [label="edge label = relation/count", fillcolor="#f8fafc"];' - echo '}' + echo 'subgraph cluster_legend {' + echo 'label="legend";' + echo 'style="rounded,dashed";' + echo '"legend_module" [label="module/folder", fillcolor="#dbeafe"];' + echo '"legend_target" [label="cmake target", fillcolor="#dcfce7"];' + echo '"legend_buffer" [label="buffer/cache", fillcolor="#fef3c7"];' + echo '"legend_runtime" [label="runtime", fillcolor="#fee2e2"];' + echo '"legend_edge" [label="edge label = relation/count", fillcolor="#f8fafc"];' + echo '}' } render_dot() { - local name="$1" - "$dot_exe" "-T$format" "$output_dir/$name.dot" -o "$output_dir/$name.$format" + local name="$1" + "$dot_exe" "-T$format" "$output_dir/$name.dot" -o "$output_dir/$name.$format" } write_graphviz_index() { - local items=(radio_directory_tree radio_module_dependency radio_cmake_targets radio_include_dependency radio_render_architecture) - { - echo 'Radio Graphviz

Radio Graphviz

' - } > "$output_dir/index.html" + local items=(radio_directory_tree radio_module_dependency radio_cmake_targets radio_include_dependency radio_render_architecture) + { + echo 'Radio Graphviz

Radio Graphviz

' + } >"$output_dir/index.html" } write_directory_tree() { - local dot="$output_dir/radio_directory_tree.dot" - { - write_header 'radio directory_tree' - for root in "${inputs[@]}"; do - [ -d "$root" ] || continue - local root_label - root_label=$(root_name "$root") - echo "subgraph \"cluster_$root_label\" {" - echo "label=\"$root_label\";" - echo 'style="rounded";' - find "$root" -maxdepth "$max_depth" -type d | while read -r dir; do - local rel name id files dirs parent parent_id - rel=${dir#"$root"} - rel=${rel#/} - name=$(basename "$dir") - [ -z "$rel" ] && name="$root_label" - id="$root_label${rel:+/$rel}" - files=$(find "$dir" -maxdepth 1 -type f \( -name '*.h' -o -name '*.hpp' -o -name '*.hh' -o -name '*.cpp' -o -name '*.cxx' -o -name '*.cc' \) | wc -l) - dirs=$(find "$dir" -maxdepth 1 -mindepth 1 -type d | wc -l) - echo "\"dir:$id\" [label=\"$(dot_text "$name")\\nfiles: $files\\ndirs: $dirs\", tooltip=\"$(dot_text "$id")\", fillcolor=\"#dbeafe\"];" - if [ -n "$rel" ]; then - parent=$(dirname "$rel") - if [ "$parent" = "." ]; then - parent_id="$root_label" - else - parent_id="$root_label/$parent" - fi - echo "\"dir:$parent_id\" -> \"dir:$id\" [xlabel=\"contains\"];" - fi - done - echo '}' - done - write_legend - echo '}' - } > "$dot" - render_dot 'radio_directory_tree' + local dot="$output_dir/radio_directory_tree.dot" + { + write_header 'radio directory_tree' + for root in "${inputs[@]}"; do + [ -d "$root" ] || continue + local root_label + root_label=$(root_name "$root") + echo "subgraph \"cluster_$root_label\" {" + echo "label=\"$root_label\";" + echo 'style="rounded";' + find "$root" -maxdepth "$max_depth" -type d | while read -r dir; do + local rel name id files dirs parent parent_id + rel=${dir#"$root"} + rel=${rel#/} + name=$(basename "$dir") + [ -z "$rel" ] && name="$root_label" + id="$root_label${rel:+/$rel}" + files=$(find "$dir" -maxdepth 1 -type f \( -name '*.h' -o -name '*.hpp' -o -name '*.hh' -o -name '*.cpp' -o -name '*.cxx' -o -name '*.cc' \) | wc -l) + dirs=$(find "$dir" -maxdepth 1 -mindepth 1 -type d | wc -l) + echo "\"dir:$id\" [label=\"$(dot_text "$name")\\nfiles: $files\\ndirs: $dirs\", tooltip=\"$(dot_text "$id")\", fillcolor=\"#dbeafe\"];" + if [ -n "$rel" ]; then + parent=$(dirname "$rel") + if [ "$parent" = "." ]; then + parent_id="$root_label" + else + parent_id="$root_label/$parent" + fi + echo "\"dir:$parent_id\" -> \"dir:$id\" [xlabel=\"contains\"];" + fi + done + echo '}' + done + write_legend + echo '}' + } >"$dot" + render_dot 'radio_directory_tree' } write_empty_dependency() { - local name="$1" - local title="$2" - { - write_header "$title" - echo '"module_dependency_note" [label="include dependency aggregation is generated by the PowerShell script on Windows", fillcolor="#dbeafe"];' - write_legend - echo '}' - } > "$output_dir/$name.dot" - render_dot "$name" + local name="$1" + local title="$2" + { + write_header "$title" + echo '"module_dependency_note" [label="include dependency aggregation is generated by the PowerShell script on Windows", fillcolor="#dbeafe"];' + write_legend + echo '}' + } >"$output_dir/$name.dot" + render_dot "$name" } write_render_architecture() { - { - write_header 'radio render_architecture' - echo '"Plot" [label="Plot", fillcolor="#dbeafe"];' - echo '"Renderable" [label="Renderable", fillcolor="#dbeafe"];' - echo '"Render_Data" [label="Render_Data", fillcolor="#dcfce7"];' - echo '"Render_State" [label="Render_State", fillcolor="#dcfce7"];' - echo '"Input_Data" [label="Input_Data", fillcolor="#dcfce7"];' - echo '"Render_Pipeline" [label="Render_Pipeline", fillcolor="#dcfce7"];' - echo '"State_Buffer" [label="State_Buffer[3]", fillcolor="#fef3c7"];' - echo '"Input_Buffer" [label="Input_Buffer[3]", fillcolor="#fef3c7"];' - echo '"Render_Cache" [label="Render_Cache", fillcolor="#fef3c7"];' - echo '"Color_Buffer" [label="Color_Buffer[3]", fillcolor="#fef3c7"];' - echo '"CPU_Render_Task" [label="CPU Render Task", fillcolor="#fee2e2"];' - echo '"Qt_paintEvent" [label="Qt paintEvent", fillcolor="#fee2e2"];' - echo '"Plot" -> "Renderable" [xlabel="owns/schedules"];' - echo '"Renderable" -> "Render_Data" [xlabel="owns"];' - echo '"Render_Data" -> "Render_State" [xlabel="state snapshot"];' - echo '"Render_Data" -> "Input_Data" [xlabel="input batch"];' - echo '"Render_Data" -> "Render_Cache" [xlabel="long-lived cache"];' - echo '"Renderable" -> "Render_Pipeline" [xlabel="submit/finish/publish"];' - echo '"Render_Pipeline" -> "State_Buffer" [xlabel="edit/ready/render"];' - echo '"Render_Pipeline" -> "Input_Buffer" [xlabel="write/ready/render"];' - echo '"Render_Pipeline" -> "CPU_Render_Task" [xlabel="dispatch"];' - echo '"CPU_Render_Task" -> "Color_Buffer" [xlabel="write render color"];' - echo '"Color_Buffer" -> "Qt_paintEvent" [xlabel="ready/front consume"];' - write_legend - echo '}' - } > "$output_dir/radio_render_architecture.dot" - render_dot 'radio_render_architecture' + { + write_header 'radio render_architecture' + echo '"Plot" [label="Plot", fillcolor="#dbeafe"];' + echo '"Renderable" [label="Renderable", fillcolor="#dbeafe"];' + echo '"Render_Data" [label="Render_Data", fillcolor="#dcfce7"];' + echo '"Render_State" [label="Render_State", fillcolor="#dcfce7"];' + echo '"Input_Data" [label="Input_Data", fillcolor="#dcfce7"];' + echo '"Render_Pipeline" [label="Render_Pipeline", fillcolor="#dcfce7"];' + echo '"State_Buffer" [label="State_Buffer[3]", fillcolor="#fef3c7"];' + echo '"Input_Buffer" [label="Input_Buffer[3]", fillcolor="#fef3c7"];' + echo '"Render_Cache" [label="Render_Cache", fillcolor="#fef3c7"];' + echo '"Color_Buffer" [label="Color_Buffer[3]", fillcolor="#fef3c7"];' + echo '"CPU_Render_Task" [label="CPU Render Task", fillcolor="#fee2e2"];' + echo '"Qt_paintEvent" [label="Qt paintEvent", fillcolor="#fee2e2"];' + echo '"Plot" -> "Renderable" [xlabel="owns/schedules"];' + echo '"Renderable" -> "Render_Data" [xlabel="owns"];' + echo '"Render_Data" -> "Render_State" [xlabel="state snapshot"];' + echo '"Render_Data" -> "Input_Data" [xlabel="input batch"];' + echo '"Render_Data" -> "Render_Cache" [xlabel="long-lived cache"];' + echo '"Renderable" -> "Render_Pipeline" [xlabel="submit/finish/publish"];' + echo '"Render_Pipeline" -> "State_Buffer" [xlabel="edit/ready/render"];' + echo '"Render_Pipeline" -> "Input_Buffer" [xlabel="write/ready/render"];' + echo '"Render_Pipeline" -> "CPU_Render_Task" [xlabel="dispatch"];' + echo '"CPU_Render_Task" -> "Color_Buffer" [xlabel="write render color"];' + echo '"Color_Buffer" -> "Qt_paintEvent" [xlabel="ready/front consume"];' + write_legend + echo '}' + } >"$output_dir/radio_render_architecture.dot" + render_dot 'radio_render_architecture' } write_directory_tree write_empty_dependency 'radio_module_dependency' 'radio module_dependency' diff --git a/Project.xml b/Project.xml new file mode 100644 index 0000000..b36b442 --- /dev/null +++ b/Project.xml @@ -0,0 +1,42 @@ + + \ No newline at end of file diff --git a/register_project.cmake b/register_project.cmake index e73d352..787b24b 100644 --- a/register_project.cmake +++ b/register_project.cmake @@ -41,7 +41,7 @@ if (CMAKE_HOST_WIN32) endif () if (1) - _load_core_proj(YSGraphic_Core) + _load_core_proj(Renderive) _load_sub_proj( YSGraphic