From 4a8826b256cf39d6edd208f90c503f0db4fd39d7 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Sat, 5 May 2018 19:23:24 +0200
Subject: [PATCH] collision check still not working

---
 src/Test.hs | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/Test.hs b/src/Test.hs
index 19fe507..19c2358 100644
--- a/src/Test.hs
+++ b/src/Test.hs
@@ -198,6 +198,21 @@ updateMap dt = do
       vel' <- E.get vel
       let npos@(V2 nr nc) = pos' + fmap (* (4 * dt)) vel'
           dpos@(V2 dpr dpc) = npos - pos'
+          len = sqrt (dpos `dot` dpos)
+          lll = Prelude.map (\i ->
+                  let lrow =
+                        [ (nr - (fromIntegral $ floor nr))
+                        , (nr - (fromIntegral $ floor nr)) + (dpr / len)
+                        ..
+                        ]
+                      lcol =
+                        [ (nc - (fromIntegral $ floor nc))
+                        , (nc - (fromIntegral $ floor nc)) + (dpc / len)
+                        ..
+                        ]
+                  in  (fromIntegral (floor (lrow !! i)), fromIntegral (floor (lcol !! i)))
+                  )
+                  [ 0 .. floor len]
           ent = defEntity'
             { pos = Set $ pos' + dpos * Prelude.foldl
               (\acc a -> let ret = checkBoundsCollision2 pos' npos dt acc a
@@ -216,17 +231,10 @@ updateMap dt = do
                           (maxr + dr, maxc + dc)
                         ) bs
                   )
-                [ (fromIntegral lrow, fromIntegral lcol) |
-                  lrow <-
-                    [  (min (0 :: Int) (floor (nr - (fromIntegral $ floor nr))))
-                    .. (max (0 :: Int) (floor (nr - (fromIntegral $ floor nr))))
-                    ],
-                  lcol <-
-                    [  (min (0 :: Int) (floor (nc - (fromIntegral $ floor nc))))
-                    .. (max (0 :: Int) (floor (nc - (fromIntegral $ floor nc))))
-                    ],
-                  fromIntegral lrow / dpr == fromIntegral lcol / dpc
-                  ]
+                (A.log
+                  A.Verbose
+                  ("paassing relative tiles: " ++ show lll ++ " " ++ show len)
+                  lll)
               )
             }
       return ent
@@ -359,17 +367,17 @@ checkBoundsCollision2
   -> V2 Double
 checkBoundsCollision2
   pre@(V2 pr pc) next@(V2 nr nc) dt acc (Boundaries (minr, minc) (maxr, maxc))
-    | (colltr > dt || colltr < -0.1) && (colltc > dt || colltc < -0.1) = acc
-    | (colltr > dt || colltr < -0.1) = (V2 1 0) * acc
-    | (colltc > dt || colltc < -0.1) = (V2 0 1) * acc
-    | otherwise                  = V2 0 0
+    | colltr < 0 && colltc < 0  = V2 0 0
+    | colltr < 0 && colltc >= 0 = (V2 0 1) * acc
+    | colltc < 0 && colltr >= 0 = (V2 1 0) * acc
+    | otherwise                 = acc
     where
       vel@(V2 vr vc) = fmap (/ dt) (next - pre)
       colltr
         | vr > 0 = (((fromIntegral (floor nr :: Int)) + minr - 0.15) - nr) / vr
         | vr < 0 = (((fromIntegral (floor nr :: Int)) + maxr + 0.15) - nr) / vr
-        | otherwise = dt
+        | otherwise = 0
       colltc
         | vc > 0 = (((fromIntegral (floor nc :: Int)) + minc - 0.15) - nc) / vc
         | vc < 0 = (((fromIntegral (floor nc :: Int)) + maxc + 0.15) - nc) / vc
-        | otherwise = dt
+        | otherwise = 0