Fixup from merge

Author: timoore

Cesium3DTilesSelection/src/TilesetJsonLoader.cpp

@@ -772,27 +772,11 @@ TileLoadResult parseExternalTilesetInWorkerThread(
     const std::shared_ptr<CesiumAsync::IAssetAccessor>& pAssetAccessor,
     std::shared_ptr<CesiumAsync::IAssetRequest>&& pCompletedRequest,
     ExternalContentInitializer&& externalContentInitializer,
-    const CesiumGeospatial::Ellipsoid& ellipsoid) {
+    const CesiumGeospatial::Ellipsoid& ellipsoid,
+    rapidjson::Document& tilesetJson) {
   // create external tileset
-  const CesiumAsync::IAssetResponse* pResponse = pCompletedRequest->response();
-  const auto& responseData = pResponse->data();
   const auto& tileUrl = pCompletedRequest->url();
 
-  rapidjson::Document tilesetJson;
-  tilesetJson.Parse(
-      reinterpret_cast<const char*>(responseData.data()),
-      responseData.size());
-  if (tilesetJson.HasParseError()) {
-    SPDLOG_LOGGER_ERROR(
-        pLogger,
-        "Error when parsing tileset JSON, error code {} at byte offset {}",
-        tilesetJson.GetParseError(),
-        tilesetJson.GetErrorOffset());
-    return TileLoadResult::createFailedResult(
-        pAssetAccessor,
-        std::move(pCompletedRequest));
-  }
-
   // Save the parsed external tileset into custom data.
   // We will propagate it back to tile later in the main
   // thread
@@ -873,23 +857,11 @@ TileLoadResult parseJsonContentInWorkerThread(
   if (const auto typeIt = tilesetJson.FindMember("type");
       typeIt != tilesetJson.MemberEnd()) {
     auto geoJson = CesiumVectorData::GeoJsonDocument::fromGeoJson(tilesetJson);
-    if (!geoJson.value.has_value() || geoJson.errors.hasErrors()) {
+    if (!geoJson.value.has_value() || geoJson.errors.hasErrors() || translateToGltf) {
       return TileLoadResult::createFailedResult(
           pAssetAccessor,
           std::move(pCompletedRequest));
-    } else if (!translateToGltf) {
-      return TileLoadResult{
-        std::move(*geoJson.value),
-        upAxis,
-        std::nullopt,
-        std::nullopt,
-        std::nullopt,
-        pAssetAccessor,
-        std::move(pCompletedRequest),
-        {},
-        TileLoadResultState::Success,
-        ellipsoid};
-    } else {
+    }  else {
       CesiumVectorData::GltfConverter geoJsonCoverter;
       CesiumVectorData::ConverterResult converterResult = geoJsonCoverter(*geoJson.value);
       return TileLoadResult{
@@ -913,8 +885,9 @@ TileLoadResult parseJsonContentInWorkerThread(
         pAssetAccessor,
         std::move(pCompletedRequest),
         std::move(externalContentInitializer),
-        tilesetJson,
-        ellipsoid);
+        ellipsoid,
+        tilesetJson
+);
   }
 }
 } // namespace

CesiumVectorData/src/GltfConverter.cpp

@@ -138,6 +138,7 @@ void gatherLines(const GeoJsonDocument& geoJson, Model& model, const glm::dmat4&
     model.meshes.back().primitives.emplace_back();
     model.meshes.back().primitives.back().attributes["POSITION"] = accessorIndex;
     model.meshes.back().primitives.back().mode = MeshPrimitive::Mode::LINE_STRIP;
+    model.meshes.back().primitives.back().material = 0;
   }
   multiLineItr = root.allOfType<GeoJsonMultiLineString>().begin();
   while (multiLineItr != root.allOfType<GeoJsonMultiLineString>().end()) {
@@ -153,6 +154,7 @@ void gatherLines(const GeoJsonDocument& geoJson, Model& model, const glm::dmat4&
       model.meshes.back().primitives.emplace_back();
       model.meshes.back().primitives.back().attributes["POSITION"] = accessorIndex;
       model.meshes.back().primitives.back().mode = MeshPrimitive::Mode::LINE_STRIP;
+      model.meshes.back().primitives.back().material = 0;
     }
   }
   model.nodes.emplace_back();
@@ -285,6 +287,7 @@ void gatherPolygons(const GeoJsonDocument& geoJson, Model& model, const glm::dma
   model.meshes.back().primitives.back().attributes["POSITION"] = accessorIndex;
   model.meshes.back().primitives.back().indices = indexAccessorIndex;
   model.meshes.back().primitives.back().mode = MeshPrimitive::Mode::TRIANGLES;
+  model.meshes.back().primitives.back().material = 0;
 
   model.nodes.emplace_back();
   model.nodes.back().mesh = meshIndex;
@@ -300,6 +303,13 @@ ConverterResult GltfConverter::operator()(const GeoJsonDocument& geoJson) {
   glm::dmat4 enuToFixedFrame = GlobeTransforms::eastNorthUpToFixedFrame(
       Ellipsoid::WGS84.cartographicToCartesian(Cartographic::fromDegrees(centroid.x, centroid.y, centroid.z)));
   result.model.emplace();
+  result.model->asset.version = "2.0";
+  CesiumGltf::Material& material = result.model->materials.emplace_back();
+  CesiumGltf::MaterialPBRMetallicRoughness& pbr =
+      material.pbrMetallicRoughness.emplace();
+  pbr.metallicFactor = 0.0;
+  pbr.roughnessFactor = 1.0;
+
   gatherLines(geoJson, *result.model, enuToFixedFrame);
   gatherPolygons(geoJson, *result.model, enuToFixedFrame);
   return result;