summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2010-04-10 16:25:27 +0200
committerMatthias Schiffer <matthias@gamezock.de>2010-04-10 16:25:27 +0200
commitd2be8eb4103f266eb2078135960779bcbb82c492 (patch)
tree34caa580d6fc2eec1d3761225fd0fae164c1d556
parent2ff529b0b12e176f02c976833c53a50ef6bad789 (diff)
downloadhtanks-d2be8eb4103f266eb2078135960779bcbb82c492.tar
htanks-d2be8eb4103f266eb2078135960779bcbb82c492.zip
Renamed WiimotePlayer to HWiidPlayer
-rw-r--r--htanks.cabal2
-rw-r--r--src/HTanks.hs6
-rw-r--r--src/HWiidPlayer.hs (renamed from src/WiimotePlayer.hs)24
3 files changed, 16 insertions, 16 deletions
diff --git a/htanks.cabal b/htanks.cabal
index f0a621c..c6f18be 100644
--- a/htanks.cabal
+++ b/htanks.cabal
@@ -14,7 +14,7 @@ data-files: tex/*.png
executable: HTanks
hs-source-dirs: src
main-is: HTanks.hs
-other-modules: Collision, CPUPlayer, DefaultPlayer, WiimotePlayer, Game, GLDriver, GLX, Level, MainLoop, Paths_htanks, Player, Render, Simulation, Texture, Debris,
+other-modules: Collision, CPUPlayer, DefaultPlayer, HWiidPlayer, Game, GLDriver, GLX, Level, MainLoop, Paths_htanks, Player, Render, Simulation, Texture, Debris,
Tank, Bindings.GLX, Bindings.GLPng
--ghc-options: -threaded
extra-libraries: glpng
diff --git a/src/HTanks.hs b/src/HTanks.hs
index e02b247..2fcdb66 100644
--- a/src/HTanks.hs
+++ b/src/HTanks.hs
@@ -7,7 +7,7 @@ import Render
import Player
import CPUPlayer
import DefaultPlayer
-import WiimotePlayer
+import HWiidPlayer
import Simulation
import Tank
@@ -27,14 +27,14 @@ import Foreign.C.Types
main :: IO ()
main = do
let theLevel = testLevel
- wiimotePlayer <- newWiimotePlayer
+ hwiidPlayer <- newHWiidPlayer
gl <- initGL $ glxDriver (levelWidth theLevel) (levelHeight theLevel)
when (initialized gl) $ do
currentTime <- getCurrentTime
let mainState = MainState {run = True, driver = SomeDriver gl, time = currentTime, players =
[ --SomePlayer $ DefaultPlayer S.empty 0 0 False
- SomePlayer $ wiimotePlayer
+ SomePlayer $ hwiidPlayer
, SomePlayer $ CPUPlayer 0
], textures = M.empty}
gameState = GameState {level = theLevel, tanks = [ Tank 5.0 5.0 0 0 1.5 270 False 3 1 5 1
diff --git a/src/WiimotePlayer.hs b/src/HWiidPlayer.hs
index 697cdb0..d1df2e5 100644
--- a/src/WiimotePlayer.hs
+++ b/src/HWiidPlayer.hs
@@ -1,8 +1,8 @@
{-# LANGUAGE DeriveDataTypeable #-}
-module WiimotePlayer ( WiimotePlayer
- , newWiimotePlayer
- ) where
+module HWiidPlayer ( HWiidPlayer
+ , newHWiidPlayer
+ ) where
import Control.Monad
import Data.Bits
@@ -22,11 +22,11 @@ import Player
import Tank
-data WiimotePlayer = WiimotePlayer Wiimote WiimoteAccCal [(Float, Float)]
+data HWiidPlayer = HWiidPlayer Wiimote WiimoteAccCal [(Float, Float)]
deriving (Typeable, Show)
-instance Player WiimotePlayer where
- playerUpdate (WiimotePlayer wiimote cal oldaims) tank = do
+instance Player HWiidPlayer where
+ playerUpdate (HWiidPlayer wiimote cal oldaims) tank = do
state <- getState wiimote
messages <- getMesg wiimote
@@ -59,10 +59,10 @@ instance Player WiimotePlayer where
angle = atan2 my mx
moveangle = if move then Just $ fromRational $ round ((angle - (sin $ 8*x)/8)*1000000*180/pi)%1000000 else Nothing
when foo $ print state
- return (WiimotePlayer wiimote cal aims, moveangle, move, aangle, shoot)
+ return (HWiidPlayer wiimote cal aims, moveangle, move, aangle, shoot)
- renderPlayer (WiimotePlayer _ _ []) = return ()
- renderPlayer (WiimotePlayer _ _ aims) = unsafePreservingMatrix $ do
+ renderPlayer (HWiidPlayer _ _ []) = return ()
+ renderPlayer (HWiidPlayer _ _ aims) = unsafePreservingMatrix $ do
let (x, y) = mulV (1/(fromIntegral $ length aims)) $ foldr addV (0, 0) aims
translate $ Vector3 x y (0 :: GLfloat)
@@ -136,13 +136,13 @@ lengthSqV a = dotV a a
lengthV a = sqrt $ lengthSqV a
-newWiimotePlayer :: IO WiimotePlayer
-newWiimotePlayer = do
+newHWiidPlayer :: IO HWiidPlayer
+newHWiidPlayer = do
wiimote <- open bdAddrAny (flagMesgInterface .|. flagNonblock)
when (wiimote == nullWiimote) $ fail "Wiimote error"
setReportMode wiimote (reportButtons .|. reportAcc .|. reportIR .|. reportNunchuk)
cal <- getAccCal wiimote extNone
- return $ WiimotePlayer wiimote cal []
+ return $ HWiidPlayer wiimote cal []
test :: (Bits a) => a -> a -> Bool
test field bits = (field .&. bits) == bits