From c5eeb012d2a68d63ef16843e7e50d7a6d309ce3b Mon Sep 17 00:00:00 2001 From: kixell Date: Tue, 4 Jun 2024 09:13:38 -0500 Subject: [PATCH 1/6] CR-M4 Added profile for Creality CR-M4 --- resources/definitions/creality_crm4.def.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 resources/definitions/creality_crm4.def.json diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json new file mode 100644 index 0000000000..c3af9f8e07 --- /dev/null +++ b/resources/definitions/creality_crm4.def.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "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_width": { "default_value": 450 }, + "machine_height": { "default_value": 470 }, + "machine_name": { "default_value": "Creality CR-M4" } + } +} \ No newline at end of file From 57f004de0841d8b01b6d35cc2e35ad0cce2f422e Mon Sep 17 00:00:00 2001 From: kixell Date: Tue, 4 Jun 2024 09:14:47 -0500 Subject: [PATCH 2/6] Update creality_crm4.def.json --- resources/definitions/creality_crm4.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json index c3af9f8e07..12396a99b3 100644 --- a/resources/definitions/creality_crm4.def.json +++ b/resources/definitions/creality_crm4.def.json @@ -11,8 +11,8 @@ { "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 450 }, - "machine_width": { "default_value": 450 }, - "machine_height": { "default_value": 470 }, + "machine_width": { "default_value": 450 }, + "machine_height": { "default_value": 470 }, "machine_name": { "default_value": "Creality CR-M4" } } -} \ No newline at end of file +} From be4d4d404f67c202808b04880ae61dc6ba170d3d Mon Sep 17 00:00:00 2001 From: nilsiism <32297855+nilsiism@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:47:21 +0200 Subject: [PATCH 3/6] Fix transformation The transformation from UM to savitar in the 3MFWriter does not invert the transformation in the 3MFReader. This usually doesn't cause any problems as the center mesh extension is zero and the resulting matrix the identity. However if the extent is not zero the final transformation is incorrect. --- plugins/3MFWriter/ThreeMFWriter.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 5a9fa487fc..a3eb43ca32 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -114,22 +114,24 @@ class ThreeMFWriter(MeshWriter): mesh_data = um_node.getMeshData() + node_matrix = um_node.getLocalTransformation() + node_matrix.preMultiply(transformation) + if center_mesh: - node_matrix = Matrix() + center_matrix = Matrix() # compensate for original center position, if object(s) is/are not around its zero position if mesh_data is not None: extents = mesh_data.getExtents() if extents is not None: # 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) - node_matrix.setByTranslation(center_vector) - node_matrix.multiply(um_node.getLocalTransformation()) - else: - node_matrix = um_node.getLocalTransformation() + center_vector = Vector(-extents.center.x, -extents.center.y, -extents.center.z) + center_matrix.setByTranslation(center_vector) + node_matrix.preMultiply(center_matrix) - matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) + matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix) savitar_node.setTransformation(matrix_string) + if mesh_data is not None: savitar_node.getMeshData().setVerticesFromBytes(mesh_data.getVerticesAsByteArray()) indices_array = mesh_data.getIndicesAsByteArray() From 400266affb24e12afc3ab1544162ca557de840dc Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 1 Aug 2024 08:02:55 +0000 Subject: [PATCH 4/6] Set conan package version 5.8.0 --- conandata.yml | 14 +++++++------- resources/conandata.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index 2eb76d7468..83bfd935a0 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ -version: "5.8.0-beta.1" +version: "5.8.0" requirements: - - "cura_resources/5.8.0-beta.1" - - "uranium/5.8.0-beta.1" - - "curaengine/5.8.0-beta.1" - - "cura_binary_data/5.8.0-beta.1" - - "fdm_materials/5.8.0-beta.1" + - "cura_resources/5.8.0" + - "uranium/5.8.0" + - "curaengine/5.8.0" + - "cura_binary_data/5.8.0" + - "fdm_materials/5.8.0" - "curaengine_plugin_gradual_flow/0.1.0-beta.4" - "dulcificum/0.2.1" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - "native_cad_plugin/2.0.0" requirements_internal: - - "fdm_materials/5.8.0-beta.1" + - "fdm_materials/5.8.0" - "cura_private_data/(latest)@internal/testing" urls: default: diff --git a/resources/conandata.yml b/resources/conandata.yml index 09d9e10d65..d43b7d4dd2 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.8.0-beta.1" +version: "5.8.0" From f6f9e7a5b3222a16f2552ca6b40bf91ad5f74428 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 5 Aug 2024 13:56:18 +0200 Subject: [PATCH 5/6] Fix version number for CR-M4 --- resources/definitions/creality_crm4.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json index 12396a99b3..2ea7579ad4 100644 --- a/resources/definitions/creality_crm4.def.json +++ b/resources/definitions/creality_crm4.def.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "Creality CR-M4", "inherits": "creality_base", "metadata": From 2638f78dd28446a766b8962cb22f6e994a3a4313 Mon Sep 17 00:00:00 2001 From: nallath Date: Mon, 5 Aug 2024 11:57:30 +0000 Subject: [PATCH 6/6] Applied printer-linter format --- resources/definitions/creality_crm4.def.json | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/definitions/creality_crm4.def.json b/resources/definitions/creality_crm4.def.json index 2ea7579ad4..89ab3ed04c 100644 --- a/resources/definitions/creality_crm4.def.json +++ b/resources/definitions/creality_crm4.def.json @@ -1,18 +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_width": { "default_value": 450 }, - "machine_height": { "default_value": 470 }, - "machine_name": { "default_value": "Creality CR-M4" } - } -} +{ + "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 } + } +} \ No newline at end of file