bloxorz 0.1 → 0.1.1

raw patch · 8 files changed

+33/−11 lines, 8 filesdep ~OpenGLdep ~base

Dependency ranges changed: OpenGL, base

Files

CHANGELOG +6/−0
Etc.hs +1/−1
Main.hs +2/−2
Paths_bloxorz.hs.1 +4/−0
Quaternion.hs +2/−2
README +10/−1
bloxorz.cabal +4/−4
makefile +4/−1

CHANGELOG view

@@ -1,3 +1,9 @@+2010.10.20.+---------------------------------------------+Float vs GLfloat problem fixed+README building part updated++ 2009.07.02 --------------------------------------------- Cabalized

Etc.hs view

@@ -12,7 +12,7 @@ double2float = realToFrac  -piPer2 :: Float+piPer2 :: GLfloat piPer2 = pi / 2.0

Main.hs view

@@ -124,7 +124,7 @@ updateGame :: State -> (GLFW.KeyButtonState,                         GLFW.KeyButtonState,                         GLFW.KeyButtonState,-                        GLFW.KeyButtonState) -> Float -> State+                        GLFW.KeyButtonState) -> GLfloat -> State updateGame state keys dt =   if isCubeUpdated cube0 cube1     then@@ -255,7 +255,7 @@   -- dt   nowD <- get time   let now = double2float nowD-  let dt = now - lastTime+  let dt = realToFrac $ now - lastTime    -- game   newState <- update state dt

+ Paths_bloxorz.hs.1 view

@@ -0,0 +1,4 @@+module Paths_bloxorz where++getDataFileName :: FilePath -> IO FilePath+getDataFileName = return

Quaternion.hs view

@@ -4,12 +4,12 @@ import Graphics.Rendering.OpenGL.GL  -type Quaternion = (Float, Float, Float, Float) -- w x y z+type Quaternion = (GLfloat, GLfloat, GLfloat, GLfloat) -- w x y z  quatIdentity :: Quaternion quatIdentity = (1.0, 0.0, 0.0, 0.0) -quatFromAngleAxis :: Float -> Float -> Float -> Float -> Quaternion+quatFromAngleAxis :: GLfloat -> GLfloat -> GLfloat -> GLfloat -> Quaternion quatFromAngleAxis angle ax ay az = (w, x, y, z)   where     w = cos half

README view

@@ -10,7 +10,16 @@ written as a homework.  Building:-  ghc --make -O2 -o bloxorz Main.hs+  (a) the easy and prefered way: Cabal+      $ cabal install bloxorz++  (b) the other easy way: make+      $ make++  (c) the hard way: by hand+      $ cp Paths_bloxorz.hs.1 Paths_bloxorz.hs+      $ ghc --make -O2 -o bloxorz Main.hs+  Controls:   Esc, q - Quit

bloxorz.cabal view

@@ -1,5 +1,5 @@ Name:                bloxorz-Version:             0.1+Version:             0.1.1 Synopsis:	     OpenGL Logic Game Description:	     Roll the block on the board to the end hole. License:             GPL@@ -8,12 +8,12 @@ Category:            Game Build-Type:          Simple Cabal-Version:       >= 1.2-Tested-with:         GHC==6.8.2-Extra-Source-Files:  README, CHANGELOG, TODO, makefile+Tested-with:         GHC==6.12.1+Extra-Source-Files:  README, CHANGELOG, TODO, makefile, Paths_bloxorz.hs.1 Data-Files:	     data/bg.tga, data/cube.tga, data/floor.tga  Executable bloxorz   Executable:          bloxorz   Main-is:             Main.hs-  Build-Depends:       base > 3 && < 4, OpenGL, GLFW+  Build-Depends:       base >= 3 && < 5, OpenGL >= 2.3, GLFW   Other-Modules:       Cubezor, Etc, Maps, Quaternion

makefile view

@@ -1,5 +1,5 @@ PROGRAM = bloxorz-OBJS = Quaternion.o Maps.o Paths_Bloxorz.o Etc.o Cubezor.o Main.o+OBJS = Quaternion.o Maps.o Paths_bloxorz.o Etc.o Cubezor.o Main.o  all: build @@ -13,3 +13,6 @@  %.o: %.hs 	ghc -O2 -c -o $@ $<++Paths_bloxorz.hs:+	cp Paths_bloxorz.hs.1 Paths_bloxorz.hs