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

minor

Browse Source 
- made map more fance
- changed draw-dist, camera start-pos & max cam distance from plane
This commit is contained in:
Nicole Dresselhaus 2014-04-05 23:27:52 +02:00
parent 38d807b9b1
commit d59e13e64f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Main.hs
View File

@ -111,11 +111,11 @@ main = do
glHud <- initHud glHud <- initHud
let zDistClosest = 1 let zDistClosest = 1
zDistFarthest = zDistClosest + 30 zDistFarthest = zDistClosest + 50
--TODO: Move near/far/fov to state for runtime-changability & central storage --TODO: Move near/far/fov to state for runtime-changability & central storage
fov = 90 --field of view fov = 90 --field of view
near = 1 --near plane near = 1 --near plane
far = 100 --far plane far = 500 --far plane
ratio = fromIntegral fbWidth / fromIntegral fbHeight ratio = fromIntegral fbWidth / fromIntegral fbHeight
frust = createFrustum fov near far ratio frust = createFrustum fov near far ratio
aks = ArrowKeyState { aks = ArrowKeyState {
@ -160,8 +160,8 @@ main = do
, _zDist = 10 , _zDist = 10
, _frustum = frust , _frustum = frust
, _camPosition = Types.Position , _camPosition = Types.Position
{ Types._x = 5 { Types._x = 25
, Types._y = 5 , Types._y = 25
} }
} }
, _io = IOState , _io = IOState

2
src/Map/StaticMaps.hs
View File

@ -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)))) 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 :: 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 -- 2D Manhattan distance
mnh2D :: (Int,Int) -> (Int,Int) -> Int mnh2D :: (Int,Int) -> (Int,Int) -> Int