Compare commits

..

8 Commits

Author SHA1 Message Date
oguzhankoral 7921ab1f36 Add direct shape option to components back 2023-12-07 21:22:04 +03:00
oguzhankoral 3f793dc9db Exclude definitions from conversion escape
- Previously we were using definition mappings only for direct shape conversions but now they can live in instances
2023-12-07 21:19:02 +03:00
oguzhankoral 7b3f2e47bb Pass group selection info if only group selected 2023-12-07 16:09:12 +03:00
oguzhankoral 1a4e3b5a44 Implement family instance mapping 2023-12-07 16:03:02 +03:00
oguzhankoral ed0e1bf249 Set hard coded categories just once and source families when source set/updated 2023-12-07 16:02:37 +03:00
oguzhankoral 5e9566c1d6 Adjust available mapping methods according to selection 2023-12-07 16:01:51 +03:00
oguzhankoral 24ec910735 Filter family types for 'Family Instance' 2023-12-07 16:01:13 +03:00
oguzhankoral e4c53f536d Implement New Revit Family option 2023-12-05 23:05:38 +03:00
3 changed files with 7 additions and 38 deletions
@@ -15,7 +15,7 @@ module SpeckleConnector
DICTIONARY = SketchupModel::Dictionary
# rubocop:disable Metrics/ParameterLists
def initialize(family:, type:, level:, units:, base_point:, rotation:, application_id: nil)
def initialize(family:, type:, level:, units:, base_point:, application_id: nil)
super(
speckle_type: SPECKLE_TYPE,
total_children_count: 0,
@@ -27,7 +27,6 @@ module SpeckleConnector
self[:level] = level
self[:units] = units
self[:basePoint] = base_point
self[:rotation] = rotation
end
# rubocop:enable Metrics/ParameterLists
end
@@ -136,11 +136,8 @@ module SpeckleConnector
type: type,
level: level,
units: units,
base_point: SpeckleObjects::Geometry::Point.from_vertex(
component_instance.definition.insertion_point.transform(transformation),
units
),
rotation: calculate_rotation(transformation.to_a),
base_point: SpeckleObjects::Geometry::Point
.from_vertex(component_instance.bounds.min.transform(transformation), units),
application_id: component_instance.persistent_id.to_s
)
end
@@ -271,26 +268,6 @@ module SpeckleConnector
instance_transform = instance.transformation
instance.transform!(instance_transform * transform.inverse * instance_transform.inverse)
end
def self.calculate_rotation(matrix)
# Ensure the matrix is a flat array with 16 elements
unless matrix.is_a?(Array) && matrix.size == 16
raise ArgumentError, 'Matrix must be an array with 16 elements'
end
# Extract the elements of the 2x2 rotation sub-matrix
cos_theta = matrix[0] # First column, first row
sin_theta = matrix[1] # Second column, first row
# Calculate the rotation angle in radians
theta = Math.atan2(sin_theta, cos_theta)
# Ensure the angle is between -π and π
theta -= 2 * Math::PI while theta > Math::PI
theta += 2 * Math::PI while theta < -Math::PI
theta
end
end
end
end
+4 -11
View File
@@ -617,16 +617,14 @@ export default {
}
if (this.selectedMethod){
if (this.selectedFamily === null || this.selectedFamily === undefined){
if (this.inputFamilies[0]){
this.selectedFamily = this.inputFamilies[0]
}
this.selectedFamily = this.inputFamilies[0]
}
if (this.selectedLevel === null || this.selectedLevel === undefined){
if (this.levels[0]){
this.selectedLevel = this.levels[0].name
}
this.selectedLevel = this.levels[0].name
}
}
console.log(this.selectedFamily, "selectedFamily after")
console.log(this.selectedLevel, "selectedLevel after")
},
hideOptionalMappingInputs(){
this.categorySelectionActive = false
@@ -715,11 +713,6 @@ export default {
}
this.selectedMethod = this.lastSelectedEntity['definition']['schema']['method']
this.selectedCategory = this.lastSelectedEntity['definition']['schema']['category']
this.selectedFamily = this.lastSelectedEntity['definition']['schema']['family']
this.getFamiliesFromSelectedMethod()
this.getTypesFromSelectedFamily()
this.selectedFamilyType = this.lastSelectedEntity['definition']['schema']['family_type']
this.selectedLevel = this.lastSelectedEntity['definition']['schema']['level']
this.updateMappingInputs()
}
}