Cleanup

2021-10-19 13:14:52 +01:00
parent d46de1ca80
commit 9e9d2b5def
15 changed files with 71 additions and 122 deletions
@@ -8,6 +8,7 @@ import Geometry
 --import Geometry.Data
 import Geometry.Vector3D
 import Shape
+import Quaternion

 import Data.List
 import Data.Maybe
@@ -133,9 +134,11 @@ robotArm = undefined

 pipePP :: Float -> Point3 -> Point3 -> Shape
 pipePP w a b = prismPoly
-    (map ((+.+.+ a) . addZ 0) $ polyCirc 4 w)
-    (map ((+.+.+ b) . addZ 0) $ polyCirc 4 w)
-
+    (map ((+.+.+ a) . rotateToZ z1 . addZ 0) $ polyCirc 4 w)
+    (map ((+.+.+ b) . rotateToZ z1 . addZ 0) $ polyCirc 4 w)
+  where
+    z1 = b -.-.- a
+    
 tankTopPipe :: Shape
 tankTopPipe = colorSH orange $ 
    upperPrismPoly 31 (polyCirc 4 20)