3D Tilesのglbファイルをgzipで圧縮した状態で表示するオプションを追加

nusamai-plateau/src/models/mod.rs

@@ -29,6 +29,7 @@ pub use tunnel::Tunnel;
 pub use vegetation::{PlantCover, SolitaryVegetationObject};
 pub use waterbody::WaterBody;
 
+#[allow(clippy::large_enum_variant)]
 #[citygml_property(name = "_:TopLevelFeatureProperty")]
 pub enum TopLevelCityObject {
     //

nusamai/src/sink/cesiumtiles/gltf.rs

@@ -2,6 +2,7 @@
 
 use ahash::{HashMap, HashSet};
 use byteorder::{ByteOrder, LittleEndian};
+use flate2::{write::GzEncoder, Compression};
 use indexmap::IndexSet;
 use nusamai_gltf_json::extensions::mesh::ext_mesh_features;
 
@@ -16,6 +17,7 @@
 
 pub type Primitives = HashMap<material::Material, PrimitiveInfo>;
 
+#[allow(clippy::too_many_arguments)]
 pub fn write_gltf_glb<W: Write>(
     feedback: &feedback::Feedback,
     writer: W,
@@ -24,6 +26,7 @@
     primitives: Primitives,
     num_features: usize,
     metadata_encoder: MetadataEncoder,
+    gzip_compress: bool,
 ) -> Result<(), PipelineError> {
     use nusamai_gltf_json::*;
 
@@ -281,12 +284,25 @@
         ..Default::default()
     };
 
-    // Write glb to the writer
-    nusamai_gltf::glb::Glb {
-        json: serde_json::to_vec(&gltf).unwrap().into(),
-        bin: Some(bin_content.into()),
+    if gzip_compress {
+        // Write glb to the writer with gzip compression
+        let mut encoder = GzEncoder::new(writer, Compression::default());
+
+        nusamai_gltf::glb::Glb {
+            json: serde_json::to_vec(&gltf).unwrap().into(),
+            bin: Some(bin_content.into()),
+        }
+        .to_writer_with_alignment(&mut encoder, 8)?;
+
+        encoder.finish()?;
+    } else {
+        // Write glb to the writer
+        nusamai_gltf::glb::Glb {
+            json: serde_json::to_vec(&gltf).unwrap().into(),
+            bin: Some(bin_content.into()),
+        }
+        .to_writer_with_alignment(writer, 8)?;
     }
-    .to_writer_with_alignment(writer, 8)?;
 
     Ok(())
 }

nusamai/src/sink/cesiumtiles/mod.rs

@@ -95,6 +95,15 @@ impl DataSinkProvider for CesiumTilesSinkProvider {
             },
         });
         params.define(limit_texture_resolution_parameter(false));
+        params.define(ParameterDefinition {
+            key: "gzip".into(),
+            entry: ParameterEntry {
+                description: "gzip compress".into(),
+                required: false,
+                parameter: ParameterType::Boolean(BooleanParameter { value: Some(false) }),
+                label: Some("gzipで圧縮する".into()),
+            },
+        });
 
         params
     }
@@ -112,12 +121,14 @@ impl DataSinkProvider for CesiumTilesSinkProvider {
         let max_z = get_parameter_value!(params, "max_z", Integer).unwrap() as u8;
         let limit_texture_resolution =
             *get_parameter_value!(params, "limit_texture_resolution", Boolean);
+        let gzip_compress = *get_parameter_value!(params, "gzip", Boolean);
         let transform_settings = self.transformer_options();
 
         Box::<CesiumTilesSink>::new(CesiumTilesSink {
             output_path: output_path.as_ref().unwrap().into(),
             transform_settings,
             limit_texture_resolution,
+            gzip_compress,
             min_z,
             max_z,
         })
@@ -128,6 +139,7 @@ struct CesiumTilesSink {
     output_path: PathBuf,
     transform_settings: TransformerRegistry,
     limit_texture_resolution: Option<bool>,
+    gzip_compress: Option<bool>,
     min_z: u8,
     max_z: u8,
 }
@@ -157,6 +169,7 @@ impl DataSink for CesiumTilesSink {
         let max_zoom = self.max_z;
 
         let limit_texture_resolution = self.limit_texture_resolution;
+        let gzip_compress = self.gzip_compress;
 
         // TODO: refactoring
 
@@ -205,6 +218,7 @@ impl DataSink for CesiumTilesSink {
                             tile_id_conv,
                             schema,
                             limit_texture_resolution,
+                            gzip_compress,
                         ) {
                             feedback.fatal_error(error);
                         }
@@ -327,6 +341,7 @@ fn tile_writing_stage(
     tile_id_conv: TileIdMethod,
     schema: &Schema,
     limit_texture_resolution: Option<bool>,
+    gzip_compress: Option<bool>,
 ) -> Result<()> {
     let ellipsoid = nusamai_projection::ellipsoid::wgs84();
     let contents: Arc<Mutex<Vec<TileContent>>> = Default::default();
@@ -707,6 +722,7 @@ fn tile_writing_stage(
                 primitives,
                 features.len(),
                 metadata_encoder,
+                gzip_compress.unwrap_or_default(),
             )?;
 
             Ok::<(), PipelineError>(())

nusamai/src/sink/option.rs

@@ -26,7 +26,7 @@ pub fn limit_texture_resolution_parameter(default_value: bool) -> ParameterDefin
             parameter: ParameterType::Boolean(BooleanParameter {
                 value: Some(default_value),
             }),
-            label: Some("距離(メートル)あたりのテクスチャの解像度を制限する".into()),
+            label: Some("距離あたりの解像度を制限する".into()),
         },
     }
 }