From d59e13e64f3d0d12a3cfd92fb6ee22483ea52898 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sat, 5 Apr 2014 23:27:52 +0200 Subject: [PATCH] minor - made map more fance - changed draw-dist, camera start-pos & max cam distance from plane --- src/Main.hs | 8 ++++---- src/Map/StaticMaps.hs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index 155c934..b37fc93 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -111,11 +111,11 @@ main = do glHud <- initHud let zDistClosest = 1 - zDistFarthest = zDistClosest + 30 + zDistFarthest = zDistClosest + 50 --TODO: Move near/far/fov to state for runtime-changability & central storage fov = 90 --field of view near = 1 --near plane - far = 100 --far plane + far = 500 --far plane ratio = fromIntegral fbWidth / fromIntegral fbHeight frust = createFrustum fov near far ratio aks = ArrowKeyState { @@ -160,8 +160,8 @@ main = do , _zDist = 10 , _frustum = frust , _camPosition = Types.Position - { Types._x = 5 - , Types._y = 5 + { Types._x = 25 + , Types._y = 25 } } , _io = IOState diff --git a/src/Map/StaticMaps.hs b/src/Map/StaticMaps.hs index 1283981..895fdc5 100644 --- a/src/Map/StaticMaps.hs +++ b/src/Map/StaticMaps.hs @@ -8,7 +8,7 @@ gauss2Dgeneral :: Floating q => q -> q -> q -> q -> q -> q -> q -> q gauss2Dgeneral amp x0 y0 sX sY x y = amp * exp (-(((x-x0)^2/(2 * sX^2))+((y-y0)^2/(2 * sY^2)))) gauss2D :: Floating q => q -> q -> q -gauss2D x y = gauss2Dgeneral 45 100.0 100.0 50.0 50.0 x y +gauss2D x y = gauss2Dgeneral 15 100.0 100.0 15.0 15.0 x y -- 2D Manhattan distance mnh2D :: (Int,Int) -> (Int,Int) -> Int