GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 14:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into CURA-12069-Move_machine_nozzle_head_distance

Browse Source
This commit is contained in:
HellAholic 2024-08-05 14:04:17 +02:00 committed by GitHub
commit 6d62935b57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conandata.yml
View File

@ -1,17 +1,17 @@
version: "5.8.0-beta.1" version: "5.8.0"
requirements: requirements:
- "cura_resources/5.8.0-beta.1" - "cura_resources/5.8.0"
- "uranium/5.8.0-beta.1" - "uranium/5.8.0"
- "curaengine/5.8.0-beta.1" - "curaengine/5.8.0"
- "cura_binary_data/5.8.0-beta.1" - "cura_binary_data/5.8.0"
- "fdm_materials/5.8.0-beta.1" - "fdm_materials/5.8.0"
- "curaengine_plugin_gradual_flow/0.1.0-beta.4" - "curaengine_plugin_gradual_flow/0.1.0-beta.4"
- "dulcificum/0.2.1" - "dulcificum/0.2.1"
- "pysavitar/5.3.0" - "pysavitar/5.3.0"
- "pynest2d/5.3.0" - "pynest2d/5.3.0"
- "native_cad_plugin/2.0.0" - "native_cad_plugin/2.0.0"
requirements_internal: requirements_internal:
- "fdm_materials/5.8.0-beta.1" - "fdm_materials/5.8.0"
- "cura_private_data/(latest)@internal/testing" - "cura_private_data/(latest)@internal/testing"
urls: urls:
default: default:

16
plugins/3MFWriter/ThreeMFWriter.py
View File

@ -114,22 +114,24 @@ class ThreeMFWriter(MeshWriter):
mesh_data = um_node.getMeshData() mesh_data = um_node.getMeshData()
node_matrix = um_node.getLocalTransformation()
node_matrix.preMultiply(transformation)
if center_mesh: if center_mesh:
node_matrix = Matrix() center_matrix = Matrix()
# compensate for original center position, if object(s) is/are not around its zero position # compensate for original center position, if object(s) is/are not around its zero position
if mesh_data is not None: if mesh_data is not None:
extents = mesh_data.getExtents() extents = mesh_data.getExtents()
if extents is not None: if extents is not None:
# We use a different coordinate space while writing, so flip Z and Y # We use a different coordinate space while writing, so flip Z and Y
center_vector = Vector(extents.center.x, extents.center.y, extents.center.z) center_vector = Vector(-extents.center.x, -extents.center.y, -extents.center.z)
node_matrix.setByTranslation(center_vector) center_matrix.setByTranslation(center_vector)
node_matrix.multiply(um_node.getLocalTransformation()) node_matrix.preMultiply(center_matrix)
else:
node_matrix = um_node.getLocalTransformation()
matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix)
savitar_node.setTransformation(matrix_string) savitar_node.setTransformation(matrix_string)
if mesh_data is not None: if mesh_data is not None:
savitar_node.getMeshData().setVerticesFromBytes(mesh_data.getVerticesAsByteArray()) savitar_node.getMeshData().setVerticesFromBytes(mesh_data.getVerticesAsByteArray())
indices_array = mesh_data.getIndicesAsByteArray() indices_array = mesh_data.getIndicesAsByteArray()

2
resources/conandata.yml
View File

@ -1 +1 @@
version: "5.8.0-beta.1" version: "5.8.0"

18
resources/definitions/creality_crm4.def.json Normal file
View File

@ -0,0 +1,18 @@
{
"version": 2,
"name": "Creality CR-M4",
"inherits": "creality_base",
"metadata":
{
"visible": true,
"quality_definition": "creality_base"
},
"overrides":
{
"gantry_height": { "value": 35 },
"machine_depth": { "default_value": 450 },
"machine_height": { "default_value": 470 },
"machine_name": { "default_value": "Creality CR-M4" },
"machine_width": { "default_value": 450 }
}
}