One ExtensibleObject

CesiumGS · Oct 11, 2021 · 7dad700 · 7dad700
1 parent f6052fd
commit 7dad700
Show file tree

Hide file tree

Showing 64 changed files with 224 additions and 270 deletions.
diff --git a/Cesium3DTiles/include/Cesium3DTiles/Asset.h b/Cesium3DTiles/include/Cesium3DTiles/Asset.h
@@ -2,12 +2,15 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <optional>
 #include <string>
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTiles {
 /**
  * @brief Metadata about the entire tileset.

diff --git a/Cesium3DTiles/include/Cesium3DTiles/BoundingVolume.h b/Cesium3DTiles/include/Cesium3DTiles/BoundingVolume.h
@@ -2,11 +2,14 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <vector>
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTiles {
 /**
  * @brief A bounding volume that encloses a tile or its content. Exactly one

diff --git a/Cesium3DTiles/include/Cesium3DTiles/Content.h b/Cesium3DTiles/include/Cesium3DTiles/Content.h
@@ -3,12 +3,15 @@
 #pragma once
 
 #include "BoundingVolume.h"
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <optional>
 #include <string>
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTiles {
 /**
  * @brief Metadata about the tile's content and a link to the content.

diff --git a/Cesium3DTiles/include/Cesium3DTiles/ExtensibleObject.h b/Cesium3DTiles/include/Cesium3DTiles/ExtensibleObject.h
diff --git a/Cesium3DTiles/include/Cesium3DTiles/Properties.h b/Cesium3DTiles/include/Cesium3DTiles/Properties.h
@@ -2,9 +2,12 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
+using namespace CesiumUtility;
+
 namespace Cesium3DTiles {
 /**
  * @brief A dictionary object of metadata about per-feature properties.

diff --git a/Cesium3DTiles/include/Cesium3DTiles/Tile.h b/Cesium3DTiles/include/Cesium3DTiles/Tile.h
@@ -4,12 +4,15 @@
 
 #include "BoundingVolume.h"
 #include "Content.h"
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <optional>
 #include <vector>
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTiles {
 /**
  * @brief A tile in a 3D Tiles tileset.
@@ -57,7 +60,7 @@ struct CESIUM3DTILES_API Tile final : public ExtensibleObject {
    * Known values are defined in {@link Refine}.
    *
    */
-  std::optional<std::string> refine = Refine::ADD;
+  std::optional<std::string> refine;
 
   /**
    * @brief A floating-point 4x4 affine transformation matrix, stored in

diff --git a/Cesium3DTiles/include/Cesium3DTiles/Tileset.h b/Cesium3DTiles/include/Cesium3DTiles/Tileset.h
@@ -3,15 +3,18 @@
 #pragma once
 
 #include "Asset.h"
-#include "ExtensibleObject.h"
 #include "Library.h"
 #include "Properties.h"
 #include "Tile.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
 
+using namespace CesiumUtility;
+
 namespace Cesium3DTiles {
 /**
  * @brief A 3D Tiles tileset.

diff --git a/Cesium3DTiles/src/ExtensibleObject.cpp b/Cesium3DTiles/src/ExtensibleObject.cpp
diff --git a/CesiumGltf/include/CesiumGltf/AccessorSparse.h b/CesiumGltf/include/CesiumGltf/AccessorSparse.h
@@ -4,11 +4,14 @@
 
 #include "AccessorSparseIndices.h"
 #include "AccessorSparseValues.h"
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <cstdint>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief Sparse storage of accessor values that deviate from their

diff --git a/CesiumGltf/include/CesiumGltf/AccessorSparseIndices.h b/CesiumGltf/include/CesiumGltf/AccessorSparseIndices.h
@@ -2,11 +2,14 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <cstdint>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief An object pointing to a buffer view containing the indices of

diff --git a/CesiumGltf/include/CesiumGltf/AccessorSparseValues.h b/CesiumGltf/include/CesiumGltf/AccessorSparseValues.h
@@ -2,11 +2,14 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <cstdint>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief An object pointing to a buffer view containing the deviating accessor

diff --git a/CesiumGltf/include/CesiumGltf/AccessorSpec.h b/CesiumGltf/include/CesiumGltf/AccessorSpec.h
@@ -10,6 +10,8 @@
 #include <optional>
 #include <vector>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief A typed view into a buffer view that contains raw binary data.

diff --git a/CesiumGltf/include/CesiumGltf/Animation.h b/CesiumGltf/include/CesiumGltf/Animation.h
@@ -9,6 +9,8 @@
 
 #include <vector>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief A keyframe animation.

diff --git a/CesiumGltf/include/CesiumGltf/AnimationChannel.h b/CesiumGltf/include/CesiumGltf/AnimationChannel.h
@@ -3,11 +3,14 @@
 #pragma once
 
 #include "AnimationChannelTarget.h"
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <cstdint>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief An animation channel combines an animation sampler with a target

diff --git a/CesiumGltf/include/CesiumGltf/AnimationChannelTarget.h b/CesiumGltf/include/CesiumGltf/AnimationChannelTarget.h
@@ -2,11 +2,14 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <cstdint>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief The descriptor of the animated property.

diff --git a/CesiumGltf/include/CesiumGltf/AnimationSampler.h b/CesiumGltf/include/CesiumGltf/AnimationSampler.h
@@ -2,11 +2,14 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <cstdint>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief An animation sampler combines timestamps with a sequence of output

diff --git a/CesiumGltf/include/CesiumGltf/Asset.h b/CesiumGltf/include/CesiumGltf/Asset.h
@@ -2,12 +2,15 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
 #include <optional>
 #include <string>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief Metadata about the glTF asset.

diff --git a/CesiumGltf/include/CesiumGltf/BufferSpec.h b/CesiumGltf/include/CesiumGltf/BufferSpec.h
@@ -9,6 +9,8 @@
 #include <optional>
 #include <string>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief A buffer points to binary geometry, animation, or skins.

diff --git a/CesiumGltf/include/CesiumGltf/BufferView.h b/CesiumGltf/include/CesiumGltf/BufferView.h
@@ -8,6 +8,8 @@
 #include <cstdint>
 #include <optional>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief A view into a buffer generally representing a subset of the buffer.

diff --git a/CesiumGltf/include/CesiumGltf/Camera.h b/CesiumGltf/include/CesiumGltf/Camera.h
@@ -9,6 +9,8 @@
 
 #include <optional>
 
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief A camera's projection.  A node **MAY** reference a camera to apply a

diff --git a/CesiumGltf/include/CesiumGltf/CameraOrthographic.h b/CesiumGltf/include/CesiumGltf/CameraOrthographic.h
@@ -2,9 +2,12 @@
 // DO NOT EDIT THIS FILE!
 #pragma once
 
-#include "ExtensibleObject.h"
 #include "Library.h"
 
+#include <CesiumUtility/ExtensibleObject.h>
+
+using namespace CesiumUtility;
+
 namespace CesiumGltf {
 /**
  * @brief An orthographic camera containing properties to create an orthographic