fixes #6054

[simantics/3d.git] / org.simantics.opencascade / src / org / simantics / opencascade / OccTriangulator.java

diff --git a/org.simantics.opencascade/src/org/simantics/opencascade/OccTriangulator.java b/org.simantics.opencascade/src/org/simantics/opencascade/OccTriangulator.java
index 9cbf71a9c970721f3cda0b470d88bfe6846d4596..3cc0ff4dd5af0bbbca829a300b890ee8b9a90415 100644 (file)
--- a/org.simantics.opencascade/src/org/simantics/opencascade/OccTriangulator.java
+++ b/org.simantics.opencascade/src/org/simantics/opencascade/OccTriangulator.java
@@ -114,6 +114,18 @@ public class OccTriangulator {
         return tds;\r
     }\r
     \r
+\r
+    public static TopoDS_Shape makeTorus(double[] pointStruct, double[] dirStruct, double[] dirStruct2, double r1, double r2) {\r
+        double[] axe = new double[9];\r
+        System.arraycopy(pointStruct, 0, axe, 0, 3);\r
+        System.arraycopy(dirStruct, 0, axe, 3, 3);\r
+        System.arraycopy(dirStruct2, 0, axe, 6, 3);\r
+        BRepPrimAPI_MakeTorus torus = new BRepPrimAPI_MakeTorus(axe, r1, r2);\r
+        org.jcae.opencascade.jni.TopoDS_Shape tds = torus.shape();\r
+        torus.delete();\r
+        return tds;\r
+    }\r
+    \r
     public static TopoDS_Shape makeTorus(double[] pointStruct, double[] dirStruct, double r1, double r2, double angle1, double angle2, double angle) {\r
         double[] axe = new double[6];\r
         System.arraycopy(pointStruct, 0, axe, 0, 3);\r
@@ -123,6 +135,17 @@ public class OccTriangulator {
         torus.delete();\r
         return tds;\r
     }\r
+    \r
+    public static TopoDS_Shape makeTorus(double[] pointStruct, double[] dirStruct, double[] dirStruct2,  double r1, double r2, double angle1, double angle2, double angle) {\r
+        double[] axe = new double[9];\r
+        System.arraycopy(pointStruct, 0, axe, 0, 3);\r
+        System.arraycopy(dirStruct, 0, axe, 3, 3);\r
+        System.arraycopy(dirStruct2, 0, axe, 6, 3);\r
+        BRepPrimAPI_MakeTorus torus = new BRepPrimAPI_MakeTorus(axe, r1, r2,angle1,angle2,angle);\r
+        org.jcae.opencascade.jni.TopoDS_Shape tds = torus.shape();\r
+        torus.delete();\r
+        return tds;\r
+    }\r
 \r
     public static TopoDS_Shape makeSphere(double x, double y, double z, double radius) {\r
         double[] c = new double[] { x, y, z };\r