发版0.5

.clang-format

@@ -34,14 +34,14 @@ BreakInheritanceList: BeforeColon
 CompactNamespaces: false
 ContinuationIndentWidth: 8
 IndentCaseLabels: true
-IndentPPDirectives: None
+IndentPPDirectives: BeforeHash
 IndentWidth: 4
 KeepEmptyLinesAtTheStartOfBlocks: true
 MaxEmptyLinesToKeep: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
-PointerAlignment: Right
-ReflowComments: false
+PointerAlignment: Left
+ReflowComments: true
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false

.clang-tidy

@@ -63,8 +63,8 @@ Checks: >
   performance-unnecessary-copy-initialization,
   performance-unnecessary-value-param,
   portability-simd-intrinsics,
+
   readability-braces-around-statements,
-  readability-identifier-length,
   readability-magic-numbers,
   readability-named-parameter,
   readability-redundant-declaration,
@@ -218,43 +218,24 @@ Checks: >
 WarningsAsErrors: "*"
 
 CheckOptions:
-  - key: readability-identifier-naming.NamespaceCase
-    value: lower_case
-  - key: readability-identifier-naming.ClassCase
-    value: CamelCase
-  - key: readability-identifier-naming.StructCase
-    value: CamelCase
-  - key: readability-identifier-naming.TemplateParameterCase
-    value: CamelCase
-  - key: readability-identifier-naming.FunctionCase
-    value: aNy_CasE
-  - key: readability-identifier-naming.VariableCase
-    value: lower_case
-  - key: readability-identifier-naming.ClassMemberCase
-    value: lower_case
-  - key: readability-identifier-naming.ClassMemberPrefix
-    value: _
-  - key: readability-identifier-naming.ClassMethodCase
-    value: camelBack
-  - key: readability-identifier-naming.EnumConstantCase
-    value: UPPER_CASE
-  - key: readability-identifier-naming.ConstexprVariableCase
-    value: UPPER_CASE
-  - key: readability-identifier-naming.GlobalConstantCase
-    value: UPPER_CASE
-  - key: readability-identifier-naming.MemberConstantCase
-    value: CamelCase
-  - key: readability-identifier-naming.MemberConstantPrefix
-    value: k
-  - key: readability-identifier-naming.StaticConstantCase
-    value: CamelCase
-  - key: readability-identifier-naming.StaticConstantPrefix
-    value: k
-  - key: readability-function-cognitive-complexity.IgnoreMacros
-    value: 1
-  - key: readability-identifier-naming.TypedefCase
-    value: CamelCase
-  - key: readability-identifier-naming.UnionCase
-    value: CamelCase
-  - key: readability-identifier-naming.UsingCase
-    value: CamelCase
+  readability-identifier-naming.NamespaceCase: lower_case
+  readability-identifier-naming.ClassCase: CamelCase
+  readability-identifier-naming.StructCase: CamelCase
+  readability-identifier-naming.TemplateParameterCase: CamelCase
+  readability-identifier-naming.FunctionCase: aNy_CasE
+  readability-identifier-naming.VariableCase: lower_case
+  readability-identifier-naming.ClassMemberCase: lower_case
+  readability-identifier-naming.PrivateMemberPrefix: _
+  readability-identifier-naming.ClassMethodCase: camelBack
+  readability-identifier-naming.EnumConstantCase: UPPER_CASE
+  readability-identifier-naming.ConstexprVariableCase: UPPER_CASE
+  readability-identifier-naming.GlobalConstantCase: UPPER_CASE
+  readability-identifier-naming.MemberConstantCase: lower_case
+  readability-identifier-naming.MemberConstantPrefix: k
+  readability-identifier-naming.StaticConstantCase: lower_case
+  readability-identifier-naming.StaticConstantPrefix: k
+  readability-function-cognitive-complexity.IgnoreMacros: true
+  readability-identifier-naming.TypedefCase: CamelCase
+  readability-identifier-naming.UnionCase: CamelCase
+  readability-identifier-naming.UsingCase: CamelCase
+  misc-non-private-member-variables-in-classes: IgnorePublicMemberVariables

.gitattributes

@@ -1,3 +1,2 @@
-**/3rdparty/glad/** linguist-vendored
 **/3rdparty/imgui/** linguist-vendored
 **/3rdparty/stb/** linguist-vendored

.github/workflows/linter.yaml

@@ -1,12 +1,14 @@
-name: Lint Cpp
+name: Format and Lint Cpp
 
 on:
   pull_request:
+    branches-ignore:
+      - main
     paths:
       - "engine/**"
 
 jobs:
-  foramt:
+  format:
     name: Clang Format
     runs-on: ubuntu-latest
     steps:
@@ -17,7 +19,7 @@ jobs:
       - uses: DoozyX/clang-format-lint-action@v0.16.1
         with:
           source: './engine'
-          exclude: './engine/assets ./engine/shaders'
+          exclude: './engine/assets ./engine/shaders *font'
           extensions: 'hpp,cpp,inl'
           clangFormatVersion: 16
           inplace: True
@@ -27,11 +29,4 @@ jobs:
           author_email: robot@example.com
           message: 'Committing clang-format changes'
         env:
-          GITHUB_TOKEN: ${{ secrets.TAIXU_GITHUB_TOKEN }}
-
-  lint:
-    name: Clang Tidy
-    needs: foramt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
+          GITHUB_TOKEN: ${{ secrets.TAIXU_GITHUB_TOKEN }}

.gitignore

@@ -3,10 +3,8 @@
 3rdparty/vcpkg
 3rdparty/vcpkg_installed
 build
-generated
-bin
-.idea/*
-engine/runtime/core/base/path.hpp
+.idea
+.cpm_cache
 
 # Created by https://www.toptal.com/developers/gitignore/api/cmake,visualstudio,visualstudiocode,c++,c,jetbrains,clion
 # Edit at https://www.toptal.com/developers/gitignore?templates=cmake,visualstudio,visualstudiocode,c++,c,jetbrains,clion
@@ -59,77 +57,6 @@ _deps
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff
-
-# AWS User-specific
-
-# Generated files
-
-# Sensitive or high-churn files
-
-# Gradle
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-
-# Mongo Explorer plugin
-
-# File-based project format
-
-# IntelliJ
-
-# mpeltonen/sbt-idea plugin
-
-# JIRA plugin
-
-# Cursive Clojure plugin
-
-# SonarLint plugin
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-
-# Editor-based Rest Client
-
-# Android studio 3.1+ serialized cache file
-
-### JetBrains Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-# https://plugins.jetbrains.com/plugin/7973-sonarlint
-
-# SonarQube Plugin
-# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
-
-# Markdown Navigator plugin
-# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
-
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-
-# Azure Toolkit for IntelliJ plugin
-# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
-
 ### VisualStudioCode ###
 .vscode/*
 !.vscode/settings.json

.vscode/settings.json

@@ -7,100 +7,37 @@
         "**/build": true,
         "**/3rdparty": true
     },
-    "files.associations": {
-        "memory": "cpp",
-        "algorithm": "cpp",
-        "any": "cpp",
-        "array": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "bitset": "cpp",
-        "cctype": "cpp",
-        "charconv": "cpp",
-        "chrono": "cpp",
-        "cinttypes": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "codecvt": "cpp",
-        "compare": "cpp",
-        "complex": "cpp",
-        "concepts": "cpp",
-        "condition_variable": "cpp",
-        "coroutine": "cpp",
-        "csignal": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "deque": "cpp",
-        "exception": "cpp",
-        "filesystem": "cpp",
-        "format": "cpp",
-        "forward_list": "cpp",
-        "fstream": "cpp",
-        "functional": "cpp",
-        "future": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "ios": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "iterator": "cpp",
-        "limits": "cpp",
-        "list": "cpp",
-        "locale": "cpp",
-        "map": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "ostream": "cpp",
-        "queue": "cpp",
-        "random": "cpp",
-        "ranges": "cpp",
-        "ratio": "cpp",
-        "regex": "cpp",
-        "set": "cpp",
-        "shared_mutex": "cpp",
-        "span": "cpp",
-        "sstream": "cpp",
-        "stack": "cpp",
-        "stdexcept": "cpp",
-        "stop_token": "cpp",
-        "streambuf": "cpp",
-        "string": "cpp",
-        "system_error": "cpp",
-        "thread": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "typeindex": "cpp",
-        "typeinfo": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "utility": "cpp",
-        "valarray": "cpp",
-        "variant": "cpp",
-        "vector": "cpp",
-        "xfacet": "cpp",
-        "xhash": "cpp",
-        "xiosbase": "cpp",
-        "xlocale": "cpp",
-        "xlocbuf": "cpp",
-        "xlocinfo": "cpp",
-        "xlocmes": "cpp",
-        "xlocmon": "cpp",
-        "xlocnum": "cpp",
-        "xloctime": "cpp",
-        "xmemory": "cpp",
-        "xstddef": "cpp",
-        "xstring": "cpp",
-        "xtr1common": "cpp",
-        "xtree": "cpp",
-        "xutility": "cpp"
-    }
+    "C_Cpp.errorSquiggles": "disabled",
+    "C_Cpp.intelliSenseEngineFallback": "disabled",
+    "C_Cpp.intelliSenseEngine": "disabled",
+    "clangd.onConfigChanged": "restart",
+    "clangd.arguments": [
+        // 全局补全(输入时弹出的建议将会提供 CMakeLists.txt 里配置的所有文件中可能的符号，会自动补充头文件)
+        "--all-scopes-completion",
+        // 建议风格：打包(重载函数只会给出一个建议）
+        // 相反可以设置为detailed
+        "--completion-style=bundled",
+        // 跨文件重命名变量
+        "--cross-file-rename",
+        // 允许补充头文件
+        "--header-insertion=never",
+        // 输入建议中，已包含头文件的项与还未包含头文件的项会以圆点加以区分
+        "--header-insertion-decorators",
+        // 在后台自动分析文件(基于 complie_commands，我们用CMake生成)
+        "--background-index",
+        // 启用 Clang-Tidy 以提供「静态检查」
+        "--clang-tidy",
+        // 同时开启的任务数量
+        "-j=16",
+        // pch优化的位置(memory 或 disk，选择memory会增加内存开销，但会提升性能) 推荐在板子上使用disk
+        "--pch-storage=memory",
+        // 启用这项时，补全函数时，将会给参数提供占位符，键入后按 Tab 可以切换到下一占位符，乃至函数末
+        "--function-arg-placeholders=false",
+        // compelie_commands.json 文件的目录位置(相对于工作区，由于 CMake 生成的该文件默认在 build 文件夹中，故设置为 build)
+        "--compile-commands-dir=build"
+    ],
+    "cmake.generator": "Ninja",
+    "cmake.configureSettings": {
+        "CMAKE_EXPORT_COMPILE_COMMANDS": 1,
+    },
 }

3rdparty/.gitignore

@@ -0,0 +1 @@
+!bin

3rdparty/FindAssimp.cmake

@@ -1,18 +1,12 @@
-if(APPLE)
-    # TODO: Delete this line after assimp group fix this issue: #4864 #3933
-    # Just for my mac
-    link_directories(/opt/homebrew/Cellar/minizip/1.2.13/lib)
-endif(APPLE)
-
 # assimp
 CPMAddPackage(
-    NAME assimp
-    GITHUB_REPOSITORY assimp/assimp
-    GIT_TAG v5.2.5
-    OPTIONS
-    "ASSIMP_WARNINGS_AS_ERRORS OFF"
-    "ASSIMP_BUILD_TESTS Off"
-    "ASSIMP_BUILD_EXAMPLES Off"
-    "ASSIMP_BUILD_DOCS Off"
-    "ASSIMP_INSTALL_PDB Off"
+        NAME assimp
+        GITHUB_REPOSITORY assimp/assimp
+        GIT_TAG 5d5496f1ad895297cede723b3c96b513263f82ed
+        OPTIONS
+        "ASSIMP_WARNINGS_AS_ERRORS OFF"
+        "ASSIMP_BUILD_TESTS Off"
+        "ASSIMP_BUILD_EXAMPLES Off"
+        "ASSIMP_BUILD_DOCS Off"
+        "ASSIMP_INSTALL_PDB Off"
 )