Merge remote-tracking branch 'refs/remotes/origin/CURA-11622_conan_v2…

…' into CURA-11622_conan_v2
Ultimaker · Nov 26, 2024 · df9d4f9 · df9d4f9
2 parents 8d7b864 + e28ba74
commit df9d4f9
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 21 deletions.
diff --git a/conandata.yml b/conandata.yml
@@ -1 +1 @@
-version: 0.2.1
+version: 0.3.0
diff --git a/conanfile.py b/conanfile.py
@@ -114,7 +114,7 @@ def generate(self):
         if is_msvc(self):
             tc.variables["USE_MSVC_RUNTIME_LIBRARY_DLL"] = not is_msvc_static_runtime(self)
         tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
-        tc.variables["GRPC_PROTOS"] = ";".join([str(p).replace("\\", "/") for p in Path(self.source_path).rglob("*.proto")])
+        tc.variables["GRPC_PROTOS"] = ";".join([str(p).replace("\\", "/") for p in Path(self.source_folder).rglob("*.proto")])
         tc.generate()
 
         tc = CMakeDeps(self)

diff --git a/cura/plugins/slots/comb/v0/comb.proto b/cura/plugins/slots/comb/v0/comb.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
 
 package cura.plugins.slots.comb.v0;
 
-import "cura/plugins/v0/polygons.proto";
 import "cura/plugins/v0/toolpaths.proto";
+import "cura/plugins/v0/point2d.proto";
 
 service CombModifyService {
   rpc Call(CallRequest) returns (CallResponse) {}
@@ -17,4 +17,4 @@ message CallRequest {
 
 message CallResponse {
   cura.plugins.v0.TravelPath travel = 1;
-}
+}
diff --git a/cura/plugins/v0/mesh.proto b/cura/plugins/v0/mesh.proto
@@ -2,11 +2,7 @@ syntax = "proto3";
 
 package cura.plugins.v0;
 
-message Point3D {
-  float x = 1;
-  float y = 2;
-  float z = 3;
-}
+import "cura/plugins/v0/point3d.proto";
 
 message Triangle {
   Point3D p1 = 1;
@@ -16,4 +12,4 @@ message Triangle {
 
 message Mesh {
   repeated Triangle triangles = 2;
-}
+}
diff --git a/cura/plugins/v0/point2d.proto b/cura/plugins/v0/point2d.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+package cura.plugins.v0;
+
+message Point2D {
+  sint64 x = 1;
+  sint64 y = 2;
+}
diff --git a/cura/plugins/v0/point3d.proto b/cura/plugins/v0/point3d.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package cura.plugins.v0;
+
+message Point3D {
+  sint64 x = 1;
+  sint64 y = 2;
+  sint64 z = 3;
+}
diff --git a/cura/plugins/v0/polygons.proto b/cura/plugins/v0/polygons.proto
@@ -2,25 +2,22 @@ syntax = "proto3";
 
 package cura.plugins.v0;
 
-message Point2D {
-  sint64 x = 1;
-  sint64 y = 2;
-}
+import "cura/plugins/v0/point3d.proto";
 
 message OpenPath {
-  repeated Point2D path = 1;
+  repeated Point3D path = 1;
 }
 
 message OpenPaths {
   repeated OpenPath paths = 1;
 }
 
 message ClosedPath {
-  repeated Point2D path = 1;
+  repeated Point3D path = 1;
 }
 
 message FilledPath {
-  repeated Point2D path = 1;
+  repeated Point3D path = 1;
 }
 
 message Polygon {
@@ -51,4 +48,4 @@ message HolePolyTreeNode {
 message ClosedPolyTreeNode {
   OpenPath outline = 1;
   PolyTreeRoot children = 2;
-}
+}
diff --git a/cura/plugins/v0/toolpaths.proto b/cura/plugins/v0/toolpaths.proto
@@ -2,14 +2,14 @@ syntax = "proto3";
 
 package cura.plugins.v0;
 
-import "cura/plugins/v0/polygons.proto";
+import "cura/plugins/v0/point3d.proto";
 
 message TravelPath {
-  repeated Point2D points = 1;
+  repeated Point3D points = 1;
 }
 
 message ExtrusionJunction {
-  Point2D point = 1;
+  Point3D point = 1;
   uint32 width = 2;
 }