Skip to content

Commit

Permalink
Remove ts-rs bug workaround since it was fixed in 10.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtran
jtran committed Jan 7, 2025
1 parent d87e394 commit de89e60
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 72 deletions.
77 changes: 11 additions & 66 deletions modeling-cmds/src/def_enum.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,7 @@ define_modeling_cmd_enum! {
)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct StartPath {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct StartPath {}

/// Move the path's "pen".
/// If you're in sketch mode, these coordinates are in the local coordinate system,
Expand Down Expand Up @@ -275,12 +270,7 @@ define_modeling_cmd_enum! {
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct DefaultCameraGetSettings {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct DefaultCameraGetSettings {}

/// Change what the default camera is looking at.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
Expand Down Expand Up @@ -562,12 +552,7 @@ define_modeling_cmd_enum! {
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct SceneClearAll {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct SceneClearAll {}

/// Replaces current selection with these entities (by UUID).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
Expand Down Expand Up @@ -938,23 +923,13 @@ define_modeling_cmd_enum! {
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct SketchModeDisable {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct SketchModeDisable {}

/// Get the plane for sketch mode.
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct GetSketchModePlane {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct GetSketchModePlane {}

/// Get the plane for sketch mode.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
Expand Down Expand Up @@ -994,25 +969,15 @@ define_modeling_cmd_enum! {
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct EnableDryRun {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct EnableDryRun {}

/// Sets whether or not changes to the scene or its objects will be done as a "dry run"
/// In a dry run, successful commands won't actually change the model.
/// This is useful for catching errors before actually making the change.
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct DisableDryRun {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct DisableDryRun {}

/// Set the background color of the scene.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
Expand Down Expand Up @@ -1350,12 +1315,7 @@ define_modeling_cmd_enum! {
)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct DefaultCameraSetOrthographic {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct DefaultCameraSetOrthographic {}

/// Use perspective projection.
#[derive(
Expand Down Expand Up @@ -1442,36 +1402,21 @@ define_modeling_cmd_enum! {
#[derive(Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, Serialize, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct SelectClear {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct SelectClear {}

/// Find all IDs of selected entities
#[derive(Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, Serialize, ModelingCmdVariant)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct SelectGet {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct SelectGet {}

/// Get the number of objects in the scene
#[derive(
Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, Serialize, ModelingCmdVariant,
)]
#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub struct GetNumObjects {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
}
pub struct GetNumObjects {}

/// Make a new path by offsetting an object by a given distance.
/// The new path's ID will be the ID of this command.
Expand Down
7 changes: 1 addition & 6 deletions modeling-cmds/src/shared.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,7 @@ pub struct AnnotationTextOptions {
#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
pub enum DistanceType {
/// Euclidean Distance.
Euclidean {
#[cfg(feature = "ts-rs")]
/// Work around issue with ts-rs not allowing tag on an empty variant.
#[serde(default, skip)]
_fix_ts_rs: (),
},
Euclidean {},
/// The distance between objects along the specified axis
OnAxis {
/// Global axis
Expand Down

0 comments on commit de89e60

Please sign in to comment.