Temp

CesiumGS · Aug 27, 2024 · 817a913 · 817a913
1 parent 30795c1
commit 817a913
Show file tree

Hide file tree

Showing 51 changed files with 456 additions and 339 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -0,0 +1,8 @@
+---
+Checks: "*,-llvmlibc-implementation-in-namespace,-llvmlibc-restrict-system-libc-headers,-modernize-use-trailing-return-type,-modernize-pass-by-value,-readability-identifier-length,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-llvmlibc-callee-namespace,-hicpp-avoid-c-arrays,-cppcoreguidelines-avoid-c-arrays,-modernize-avoid-c-arrays,-cppcoreguidelines-pro-bounds-constant-array-index,-google-readability-casting,-misc-const-correctness, -google-default-arguments,-fuchsia-default-arguments-declarations,-fuchsia-default-arguments-calls,-hicpp-use-emplace,-modernize-use-emplace,-modernize-return-braced-init-list,-google-build-using-namespace,-readability-function-cognitive-complexity,-google-readability-todo,-altera-unroll-loops,-altera-id-dependent-backward-branch,-bugprone-easily-swappable-parameters,-fuchsia-statically-constructed-objects,-cppcoreguidelines-avoid-do-while,-cppcoreguidelines-pro-type-reinterpret-cast,-performance-enum-size,-fuchsia-overloaded-operator"
+WarningsAsErrors: "*"
+FormatStyle: none
+CheckOptions:
+  -key: readability-implicit-bool-conversion.AllowPointerConditions
+  value: true
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,122 +1,125 @@
 {
-    "files.associations": {
-      "variant": "cpp",
-      "cmath": "cpp",
-      "xutility": "cpp",
-      "random": "cpp",
-      "optional": "cpp",
-      "type_traits": "cpp",
-      "algorithm": "cpp",
-      "array": "cpp",
-      "atomic": "cpp",
-      "cctype": "cpp",
-      "chrono": "cpp",
-      "cinttypes": "cpp",
-      "clocale": "cpp",
-      "concepts": "cpp",
-      "condition_variable": "cpp",
-      "cstdarg": "cpp",
-      "cstddef": "cpp",
-      "cstdint": "cpp",
-      "cstdio": "cpp",
-      "cstdlib": "cpp",
-      "cstring": "cpp",
-      "ctime": "cpp",
-      "cwchar": "cpp",
-      "deque": "cpp",
-      "exception": "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",
-      "memory": "cpp",
-      "mutex": "cpp",
-      "new": "cpp",
-      "numeric": "cpp",
-      "ostream": "cpp",
-      "queue": "cpp",
-      "ratio": "cpp",
-      "regex": "cpp",
-      "set": "cpp",
-      "sstream": "cpp",
-      "stack": "cpp",
-      "stdexcept": "cpp",
-      "streambuf": "cpp",
-      "string": "cpp",
-      "system_error": "cpp",
-      "thread": "cpp",
-      "tuple": "cpp",
-      "typeinfo": "cpp",
-      "unordered_map": "cpp",
-      "unordered_set": "cpp",
-      "utility": "cpp",
-      "valarray": "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",
-      "pointers": "cpp",
-      "gsl_util": "cpp",
-      "span": "cpp",
-      "string_span": "cpp",
-      "gsl_algorithm": "cpp",
-      "gsl_byte": "cpp",
-      "span_ext": "cpp",
-      "multi_span": "cpp",
-      "bit": "cpp",
-      "*.tcc": "cpp",
-      "bitset": "cpp",
-      "cwctype": "cpp",
-      "memory_resource": "cpp",
-      "string_view": "cpp",
-      "shared_mutex": "cpp",
-      "gsl_assert": "cpp",
-      "compare": "cpp",
-      "resumable": "cpp",
-      "codecvt": "cpp",
-      "ranges": "cpp",
-      "scoped_allocator": "cpp",
-      "typeindex": "cpp",
-      "any": "cpp",
-      "csignal": "cpp",
-      "filesystem": "cpp",
-      "stop_token": "cpp",
-      "xmemory0": "cpp",
-      "charconv": "cpp",
-      "format": "cpp",
-      "coroutine": "cpp",
-      "*.idl": "cpp",
-      "assert": "cpp",
-      "cfenv": "cpp",
-      "ktxint.h": "c",
-      "texture.h": "c",
-      "gl_format.h": "c",
-      "complex": "cpp",
-      "expected": "cpp"
-    },
-    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
-    "cmake.configureOnOpen": true
-}
+  "files.associations": {
+    "variant": "cpp",
+    "cmath": "cpp",
+    "xutility": "cpp",
+    "random": "cpp",
+    "optional": "cpp",
+    "type_traits": "cpp",
+    "algorithm": "cpp",
+    "array": "cpp",
+    "atomic": "cpp",
+    "cctype": "cpp",
+    "chrono": "cpp",
+    "cinttypes": "cpp",
+    "clocale": "cpp",
+    "concepts": "cpp",
+    "condition_variable": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "deque": "cpp",
+    "exception": "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",
+    "memory": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numeric": "cpp",
+    "ostream": "cpp",
+    "queue": "cpp",
+    "ratio": "cpp",
+    "regex": "cpp",
+    "set": "cpp",
+    "sstream": "cpp",
+    "stack": "cpp",
+    "stdexcept": "cpp",
+    "streambuf": "cpp",
+    "string": "cpp",
+    "system_error": "cpp",
+    "thread": "cpp",
+    "tuple": "cpp",
+    "typeinfo": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "utility": "cpp",
+    "valarray": "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",
+    "pointers": "cpp",
+    "gsl_util": "cpp",
+    "span": "cpp",
+    "string_span": "cpp",
+    "gsl_algorithm": "cpp",
+    "gsl_byte": "cpp",
+    "span_ext": "cpp",
+    "multi_span": "cpp",
+    "bit": "cpp",
+    "*.tcc": "cpp",
+    "bitset": "cpp",
+    "cwctype": "cpp",
+    "memory_resource": "cpp",
+    "string_view": "cpp",
+    "shared_mutex": "cpp",
+    "gsl_assert": "cpp",
+    "compare": "cpp",
+    "resumable": "cpp",
+    "codecvt": "cpp",
+    "ranges": "cpp",
+    "scoped_allocator": "cpp",
+    "typeindex": "cpp",
+    "any": "cpp",
+    "csignal": "cpp",
+    "filesystem": "cpp",
+    "stop_token": "cpp",
+    "xmemory0": "cpp",
+    "charconv": "cpp",
+    "format": "cpp",
+    "coroutine": "cpp",
+    "*.idl": "cpp",
+    "assert": "cpp",
+    "cfenv": "cpp",
+    "ktxint.h": "c",
+    "texture.h": "c",
+    "gl_format.h": "c",
+    "complex": "cpp",
+    "expected": "cpp",
+    "numbers": "cpp",
+    "semaphore": "cpp",
+    "*.ipp": "cpp"
+  },
+  "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
+  "cmake.configureOnOpen": true
+}
diff --git a/Cesium3DTiles/CMakeLists.txt b/Cesium3DTiles/CMakeLists.txt
@@ -42,11 +42,10 @@ target_sources(
 
 target_include_directories(
     Cesium3DTiles
-    SYSTEM PUBLIC
+    PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/include
         ${CMAKE_CURRENT_LIST_DIR}/generated/include
     PRIVATE
-        ${CESIUM_NATIVE_RAPIDJSON_INCLUDE_DIR}
         ${CMAKE_CURRENT_LIST_DIR}/src
         ${CMAKE_CURRENT_LIST_DIR}/generated/src
 )

diff --git a/Cesium3DTilesReader/CMakeLists.txt b/Cesium3DTilesReader/CMakeLists.txt
@@ -43,7 +43,7 @@ target_sources(
 
 target_include_directories(
     Cesium3DTilesReader
-    SYSTEM PUBLIC
+    PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/include
         ${CMAKE_CURRENT_LIST_DIR}/generated/include
     PRIVATE

diff --git a/Cesium3DTilesSelection/CMakeLists.txt b/Cesium3DTilesSelection/CMakeLists.txt
@@ -31,10 +31,7 @@ target_sources(
 
 target_include_directories(
     Cesium3DTilesSelection
-    SYSTEM PUBLIC
-        ${CESIUM_NATIVE_RAPIDJSON_INCLUDE_DIR}
-        ${CESIUM_NATIVE_DRACO_INCLUDE_DIR}
-        ${CESIUM_NATIVE_LIBMORTON_INCUDE_DIR}
+    PUBLIC
         ${CMAKE_BINARY_DIR}
         ${CMAKE_CURRENT_LIST_DIR}/include
     PRIVATE

diff --git a/Cesium3DTilesSelection/src/TileContentLoadInfo.cpp b/Cesium3DTilesSelection/src/TileContentLoadInfo.cpp
@@ -1,6 +1,14 @@
 #include "TileContentLoadInfo.h"
 
+#include <Cesium3DTilesSelection/IPrepareRendererResources.h>
 #include <Cesium3DTilesSelection/TilesetContentLoader.h>
+#include <Cesium3DTilesSelection/TilesetOptions.h>
+#include <CesiumAsync/AsyncSystem.h>
+#include <CesiumAsync/IAssetAccessor.h>
+
+#include <spdlog/logger.h>
+
+#include <memory>
 
 namespace Cesium3DTilesSelection {
 TileContentLoadInfo::TileContentLoadInfo(

diff --git a/Cesium3DTilesSelection/src/TileID.cpp b/Cesium3DTilesSelection/src/TileID.cpp
@@ -1,5 +1,8 @@
 #include "Cesium3DTilesSelection/TileID.h"
 
+#include <CesiumGeometry/OctreeTileID.h>
+#include <CesiumGeometry/QuadtreeTileID.h>
+
 #include <string>
 #include <variant>
 

diff --git a/Cesium3DTilesWriter/CMakeLists.txt b/Cesium3DTilesWriter/CMakeLists.txt
@@ -43,7 +43,7 @@ target_sources(
 
 target_include_directories(
     Cesium3DTilesWriter
-    SYSTEM PUBLIC
+    PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/include
         ${CMAKE_CURRENT_LIST_DIR}/generated/include
     PRIVATE

diff --git a/CesiumAsync/CMakeLists.txt b/CesiumAsync/CMakeLists.txt
@@ -30,8 +30,7 @@ target_sources(
 
 target_include_directories(
     CesiumAsync
-    SYSTEM PUBLIC
-        ${CESIUM_NATIVE_RAPIDJSON_INCLUDE_DIR}
+    PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/include
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src/