Skip to content

Commit

Permalink
🚨 ヘルパーアトリビュートの位置を変更
Browse files Browse the repository at this point in the history
  • Loading branch information
azishio committed Jul 20, 2024
1 parent 633b50c commit dac7a22
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 16 deletions.
1 change: 0 additions & 1 deletion src/asset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};

/// Metadata about the entire tileset.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct Asset {
/// The 3D Tiles version. The version defines the JSON schema for the tileset JSON and the base set of tile formats.
pub version: String,
Expand Down
2 changes: 1 addition & 1 deletion src/content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize};
use crate::{BoundingVolume, MetadataEntity};

/// Metadata about the tile's content and a link to the content.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Content {
/// An optional bounding volume that tightly encloses tile content. tile.boundingVolume provides spatial coherence and tile.content.boundingVolume enables tight view frustum culling. When this is omitted, tile.boundingVolume is used.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/property_table/property_table_property.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ impl Default for OffsetType {


/// An array of binary property values. This represents one column of a property table, and contains one value of a certain property for each metadata entity.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct PropertyTableProperty {
/// The index of the buffer view containing property values. The data type of property values is determined by the property definition: When `type` is `BOOLEAN` values are packed into a bitstream. When `type` is `STRING` values are stored as byte sequences and decoded as UTF-8 strings. When `type` is `SCALAR`, `VECN`, or `MATN` the values are stored as the provided `componentType` and the buffer view `byteOffset` shall be aligned to a multiple of the `componentType` size. When `type` is `ENUM` values are stored as the enum's `valueType` and the buffer view `byteOffset` shall be aligned to a multiple of the `valueType` size. Each enum value in the array shall match one of the allowed values in the enum definition. `arrayOffsets` is required for variable-length arrays and `stringOffsets` is required for strings (for variable-length arrays of strings, both are required).
pub values: i32,
Expand Down
2 changes: 1 addition & 1 deletion src/schema/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use serde::{Deserialize, Serialize};
use crate::ClassProperty;

/// A class containing a set of properties.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Class {
/// The name of the class, e.g. for display purposes.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/schema/class_property.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ pub enum ComponentType {


/// A single property of a metadata class.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct ClassProperty {
/// The name of the property, e.g. for display purposes.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/schema/enum_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ pub enum ValueType {


/// An object defining the values of an enum.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Enum {
/// The name of the enum, e.g. for display purposes.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/statistics/statistics_class_property.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ pub enum Occurrences {


/// Statistics about property values.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct StatisticsClassProperty {
/// The minimum property value occurring in the tileset. Only applicable to `SCALAR`, `VECN`, and `MATN` types. This is the minimum of all property values, after the transforms based on the `normalized`, `offset`, and `scale` properties have been applied.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
3 changes: 1 addition & 2 deletions src/styling/pnts_style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};

use crate::{StyleConditions, StyleNumberExpression};


/// A `number expression` or `conditions` property which determines the size of the points in pixels.
#[derive(Serialize, Deserialize, Debug, Clone)]
pub enum PointSize {
Expand All @@ -18,8 +17,8 @@ impl Default for PointSize {


/// A 3D Tiles style with additional properties for Point Clouds.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct PntsStyle {
/// A `number expression` or `conditions` property which determines the size of the points in pixels.
pub point_size: PointSize,
Expand Down
2 changes: 1 addition & 1 deletion src/subtree/availability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ pub enum Constant {


/// An object describing the availability of a set of elements.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Availability {
/// Index of a buffer view that indicates whether each element is available. The bitstream conforms to the boolean array encoding described in the 3D Metadata specification. If an element is available, its bit is 1, and if it is unavailable, its bit is 0.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/subtree/buffer.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use serde::{Deserialize, Serialize};

/// A buffer is a binary blob. It is either the binary chunk of the subtree file, or an external buffer referenced by a URI.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Buffer {
/// The URI (or IRI) of the file that contains the binary buffer data. Relative paths are relative to the file containing the buffer JSON. `uri` is required when using the JSON subtree format and not required when using the binary subtree format - when omitted the buffer refers to the binary chunk of the subtree file. Data URIs are not allowed.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/subtree/buffer_view.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use serde::{Deserialize, Serialize};

/// A contiguous subset of a buffer
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct BufferView {
/// The index of the buffer.
pub buffer: i32,
Expand Down
2 changes: 1 addition & 1 deletion src/subtree/subtree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize};
use crate::{Availability, Buffer, BufferView, MetadataEntity, PropertyTable};

/// An object describing the availability of tiles and content in a subtree, as well as availability of children subtrees. May also store metadata for available tiles and content.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Subtree {
/// An array of buffers.
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/tile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ impl Default for Transform {


/// A tile in a 3D Tiles tileset.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Tile {
/// The bounding volume that encloses the tile.
pub bounding_volume: BoundingVolume,
Expand Down
2 changes: 1 addition & 1 deletion src/tile_implicit_tiling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ pub enum SubdivisionScheme {


/// This object allows a tile to be implicitly subdivided. Tile and content availability and metadata is stored in subtrees which are referenced externally.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct TileImplicittiling {
/// A string describing the subdivision scheme used within the tileset.
pub subdivision_scheme: SubdivisionScheme,
Expand Down
2 changes: 1 addition & 1 deletion src/tileset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use serde::{Deserialize, Serialize};
use crate::{Asset, Group, MetadataEntity, Properties, Schema, Statistics, Tile};

/// A 3D Tiles tileset.
#[serde(rename_all = "camelCase")]
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Tileset {
/// Metadata about the entire tileset.
pub asset: Asset,
Expand Down

0 comments on commit dac7a22

Please sign in to comment.