Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

attempting to compensate once more

Browse Source
This commit is contained in:
Jonas Betzendahl 2014-05-16 18:59:26 +02:00
parent c624121e23
commit ffa45515c3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Map/Map.hs
View File

@ -42,9 +42,11 @@ giveMapHeight :: PlayMap
-> (Double, Double) -> (Double, Double)
-> Double -> Double
giveMapHeight mop (x,z) giveMapHeight mop (x,z)
| outsideMap (x,z) = 0.0 | outsideMap (x,z') = 0.0
| otherwise = sum $ map (\(p,d) -> (hlu p) * (1 - (d / totald))) tups | otherwise = sum $ map (\(p,d) -> (hlu p) * (1 - (d / totald))) tups
where where
z' = z * ((sqrt 3)/2)
outsideMap :: (Double, Double) -> Bool outsideMap :: (Double, Double) -> Bool
outsideMap (mx, mz) = let ((a,b),(c,d)) = bounds mop outsideMap (mx, mz) = let ((a,b),(c,d)) = bounds mop
fr = fromIntegral fr = fromIntegral
@ -56,13 +58,13 @@ giveMapHeight mop (x,z)
-- reference Points -- reference Points
refs :: [(Int, Int)] refs :: [(Int, Int)]
refs = remdups $ map clmp $ map (tadd (floor x, floor z)) mods refs = remdups $ map clmp $ map (tadd (floor x, floor z')) mods
where where
mods = [(-1,-1),(-1,2),(0,0),(0,1),(1,0),(1,1),(2,-1),(2,2)] mods = [(-1,-1),(-1,2),(0,0),(0,1),(1,0),(1,1),(2,-1),(2,2)]
tadd (a,b) (c,d) = (a+b,c+d) tadd (a,b) (c,d) = (a+b,c+d)
-- tupels with reference point and distance -- tupels with reference point and distance
tups = map (\t -> (t, dist (x,z) t)) refs tups = map (\t -> (t, dist (x,z') t)) refs
-- total distance of all for reference point from the point in question -- total distance of all for reference point from the point in question
totald = sum $ map (\(_,d) -> d) tups totald = sum $ map (\(_,d) -> d) tups