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

WIP, does not compile.

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-05-15 21:16:43 +02:00
parent 87946cb501
commit a3f0043591
No known key found for this signature in database
GPG Key ID: BC16D887851A1A80
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Importer/IQM/Parser.hs
View File

@ -216,7 +216,7 @@ parseIQM a =
vbo <- sequence $ map toVBOfromVAO va vbo <- sequence $ map toVBOfromVAO va
return $ raw return $ raw
{ vertexArrays = va' { vertexArrays = va'
, vertexArrayObjects = vbo , vertexBufferObjects = vbo
} }
-- | Creates a BufferObject on the Graphicscard for each BufferObject -- | Creates a BufferObject on the Graphicscard for each BufferObject

3
src/Importer/IQM/Types.hs
View File

@ -109,7 +109,8 @@ data IQM = IQM
, texts :: [ByteString] , texts :: [ByteString]
, meshes :: [IQMMesh] , meshes :: [IQMMesh]
, vertexArrays :: [IQMVertexArray] , vertexArrays :: [IQMVertexArray]
, vertexArrayObjects :: [BufferObject] , vertexBufferObjects :: [BufferObject]
, vertexArrayObject :: VertexArrayObject
} deriving (Show, Eq) } deriving (Show, Eq)
-- | Different Vertex-Array-Types in IQM -- | Different Vertex-Array-Types in IQM

4
src/Render/Types.hs
View File

@ -34,7 +34,7 @@ instance GLCamera Camera where
getCam (Flat (x',z')) dist' xa' ya' = getCam (Flat (x',z')) dist' xa' ya' =
lookAt (cpos ^+^ at') at' up lookAt (cpos ^+^ at') at' up
where where
at' = V3 x 0 z at' = V3 x (y+1) z
cpos = crot !* (V3 0 0 (-dist)) cpos = crot !* (V3 0 0 (-dist))
crot = ( crot = (
(fromQuaternion $ axisAngle upmap (xa::CFloat)) (fromQuaternion $ axisAngle upmap (xa::CFloat))
@ -52,7 +52,7 @@ instance GLCamera Camera where
getCam (Sphere (inc',az') r') dist' xa' ya' = --inclination (pitch), azimuth (yaw) getCam (Sphere (inc',az') r') dist' xa' ya' = --inclination (pitch), azimuth (yaw)
lookAt (cpos ^+^ at') at' up lookAt (cpos ^+^ at') at' up
where where
at' = sphereToCart r inc az at' = sphereToCart (r+1) inc az
cpos = crot !* (V3 0 0 (-dist)) cpos = crot !* (V3 0 0 (-dist))
crot = ( crot = (
(fromQuaternion $ axisAngle upmap (xa::CFloat)) (fromQuaternion $ axisAngle upmap (xa::CFloat))