Merge pull request #148 from CesiumGS/use-std-byte

Use bytes for raw data

Cesium3DTiles/include/Cesium3DTiles/ExternalTilesetContent.h

@@ -8,6 +8,7 @@
 #include <gsl/span>
 #include <memory>
 #include <vector>
+#include <cstddef>
 #include <spdlog/fwd.h>
 
 namespace Cesium3DTiles {
@@ -47,7 +48,7 @@ namespace Cesium3DTiles {
             const glm::dmat4& tileTransform,
             TileRefine tileRefine,
             const std::string& url,
-            const gsl::span<const uint8_t>& data
+            const gsl::span<const std::byte>& data
         );
     };
 

Cesium3DTiles/include/Cesium3DTiles/GltfContent.h

@@ -10,6 +10,7 @@
 #include <glm/mat4x4.hpp>
 #include <gsl/span>
 #include <spdlog/fwd.h>
+#include <cstddef>
 
 namespace Cesium3DTiles {
 
@@ -42,7 +43,7 @@ namespace Cesium3DTiles {
         static std::unique_ptr<TileContentLoadResult> load(
             std::shared_ptr<spdlog::logger> pLogger,
             const std::string& url,
-            const gsl::span<const uint8_t>& data
+            const gsl::span<const std::byte>& data
         );
 
     public:

Cesium3DTiles/include/Cesium3DTiles/TileContentFactory.h

@@ -15,6 +15,7 @@
 #include <memory>
 #include <optional>
 #include <unordered_map>
+#include <cstddef>
 
 namespace Cesium3DTiles {
     class TileContent;
@@ -91,7 +92,7 @@ namespace Cesium3DTiles {
             const TileContentLoadInput& input);
 
     private:
-        static std::optional<std::string> getMagic(const gsl::span<const uint8_t>& data);
+        static std::optional<std::string> getMagic(const gsl::span<const std::byte>& data);
 
         static std::unordered_map<std::string, std::shared_ptr<TileContentLoader>> _loadersByMagic;
         static std::unordered_map<std::string, std::shared_ptr<TileContentLoader>> _loadersByContentType;

Cesium3DTiles/include/Cesium3DTiles/TileContentLoadInput.h

@@ -11,6 +11,7 @@
 #include <gsl/span>
 
 #include <memory>
+#include <cstddef>
 
 namespace Cesium3DTiles 
 {
@@ -63,7 +64,7 @@ namespace Cesium3DTiles
          */
         TileContentLoadInput(
             const std::shared_ptr<spdlog::logger> pLogger_,
-            const gsl::span<const uint8_t>& data_,
+            const gsl::span<const std::byte>& data_,
             const std::string& contentType_,
             const std::string& url_,
             const Tile& tile_
@@ -103,7 +104,7 @@ namespace Cesium3DTiles
          */
         TileContentLoadInput(
             const std::shared_ptr<spdlog::logger> pLogger_,
-            const gsl::span<const uint8_t>& data_,
+            const gsl::span<const std::byte>& data_,
             const std::string& contentType_,
             const std::string& url_,
             const TileContext& context_,
@@ -141,7 +142,7 @@ namespace Cesium3DTiles
          * does not succeed, it will try to determine the type based on the
          * `contentType` field.
          */
-        gsl::span<const uint8_t> data;
+        gsl::span<const std::byte> data;
 
         /**
          * @brief The content type. 

Cesium3DTiles/src/Batched3DModelContent.cpp

@@ -3,6 +3,7 @@
 #include "Cesium3DTiles/spdlog-cesium.h"
 #include <rapidjson/document.h>
 #include <stdexcept>
+#include <cstddef>
 
 namespace Cesium3DTiles {
 
@@ -41,7 +42,7 @@ namespace Cesium3DTiles {
 		void parseFeatureTableJsonData(
 			const std::shared_ptr<spdlog::logger>& pLogger,
 			CesiumGltf::Model& gltf,
-			const gsl::span<const uint8_t>& featureTableJsonData)
+			const gsl::span<const std::byte>& featureTableJsonData)
 		{
 			rapidjson::Document document;
 			document.Parse(reinterpret_cast<const char*>(featureTableJsonData.data()), featureTableJsonData.size());
@@ -80,7 +81,7 @@ namespace Cesium3DTiles {
     std::unique_ptr<TileContentLoadResult> Batched3DModelContent::load(
 		std::shared_ptr<spdlog::logger> pLogger,
 		const std::string& url,
-		const gsl::span<const uint8_t>& data
+		const gsl::span<const std::byte>& data
 	) {
 		// TODO: actually use the b3dm payload
 		if (data.size() < sizeof(B3dmHeader)) {
@@ -147,7 +148,7 @@ namespace Cesium3DTiles {
 			throw std::runtime_error("The B3DM is invalid because the start of the glTF model is after the end of the entire B3DM.");
 		}
 
-		gsl::span<const uint8_t> glbData = data.subspan(glbStart, glbEnd - glbStart);
+		gsl::span<const std::byte> glbData = data.subspan(glbStart, glbEnd - glbStart);
         std::unique_ptr<TileContentLoadResult> pResult = GltfContent::load(
 			pLogger,
 			url, 
@@ -156,7 +157,7 @@ namespace Cesium3DTiles {
 
 		if (pResult->model && header.featureTableJsonByteLength > 0) {
 			CesiumGltf::Model& gltf = pResult->model.value();
-			gsl::span<const uint8_t> featureTableJsonData = data.subspan(headerLength, header.featureTableJsonByteLength);
+			gsl::span<const std::byte> featureTableJsonData = data.subspan(headerLength, header.featureTableJsonByteLength);
 			parseFeatureTableJsonData(pLogger, gltf, featureTableJsonData);
 		}
 

Cesium3DTiles/src/Batched3DModelContent.h

@@ -8,6 +8,7 @@
 #include "Cesium3DTiles/TileContentLoader.h"
 #include <memory>
 #include <string>
+#include <cstddef>
 #include <spdlog/fwd.h>
 
 namespace Cesium3DTiles {
@@ -42,7 +43,7 @@ namespace Cesium3DTiles {
         static std::unique_ptr<TileContentLoadResult> load(
             std::shared_ptr<spdlog::logger> pLogger,
             const std::string& url,
-            const gsl::span<const uint8_t>& data
+            const gsl::span<const std::byte>& data
         );
     };
 

Cesium3DTiles/src/CompositeContent.cpp

@@ -4,6 +4,7 @@
 #include "Cesium3DTiles/TileContentFactory.h"
 #include <rapidjson/document.h>
 #include <stdexcept>
+#include <cstddef>
 
 namespace {
     #pragma pack(push, 1)
@@ -41,7 +42,7 @@ namespace Cesium3DTiles {
          * @param derivedData The data for the result.
          * @return The result.
          */
-        TileContentLoadInput derive(const TileContentLoadInput& input, const gsl::span<const uint8_t>& derivedData) {
+        TileContentLoadInput derive(const TileContentLoadInput& input, const gsl::span<const std::byte>& derivedData) {
             return TileContentLoadInput(
                 input.pLogger,
                 derivedData,
@@ -62,7 +63,7 @@ namespace Cesium3DTiles {
     std::unique_ptr<TileContentLoadResult> CompositeContent::load(
 		const TileContentLoadInput& input) {
         const std::shared_ptr<spdlog::logger>& pLogger = input.pLogger;
-        const gsl::span<const uint8_t>& data = input.data;
+        const gsl::span<const std::byte>& data = input.data;
         const std::string& url = input.url;
 
         if (data.size() < sizeof(CmptHeader)) {
@@ -102,7 +103,7 @@ namespace Cesium3DTiles {
                 break;
             }
 
-            gsl::span<const uint8_t> innerData(data.data() + pos, pInner->byteLength);
+            gsl::span<const std::byte> innerData(data.data() + pos, pInner->byteLength);
 
             std::unique_ptr<TileContentLoadResult> pInnerLoadResult = TileContentFactory::createContent(
                 derive(input, innerData)

Cesium3DTiles/src/ExternalTilesetContent.cpp

@@ -4,6 +4,7 @@
 #include "Cesium3DTiles/Tileset.h"
 #include "CesiumUtility/Uri.h"
 #include <rapidjson/document.h>
+#include <cstddef>
 
 namespace Cesium3DTiles {
 
@@ -18,7 +19,7 @@ namespace Cesium3DTiles {
         const glm::dmat4& tileTransform,
         TileRefine tileRefine,
         const std::string& url,
-        const gsl::span<const uint8_t>& data
+        const gsl::span<const std::byte>& data
     ) {
         std::unique_ptr<TileContentLoadResult> pResult = std::make_unique<TileContentLoadResult>();
 

Cesium3DTiles/src/GltfContent.cpp

@@ -17,7 +17,7 @@ namespace Cesium3DTiles {
 	/*static*/ std::unique_ptr<TileContentLoadResult> GltfContent::load(
 		std::shared_ptr<spdlog::logger> pLogger,
 		const std::string& url,
-		const gsl::span<const uint8_t>& data
+		const gsl::span<const std::byte>& data
 	) {
 		std::unique_ptr<TileContentLoadResult> pResult = std::make_unique<TileContentLoadResult>();