neocturne/obj-model-opengl
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Float -> GLfloat conversion for current opengl library

Browse source
This commit is contained in:
Matthias Schiffer 2011-01-03 15:30:03 +01:00
parent c8a67b6a5f
commit 015ebf1f57
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Data/Obj3D/OpenGL.hs
View file

@ -68,9 +68,11 @@ getIndex v = do
makeVertexData :: ObjModel -> FaceVertex -> Interleaved makeVertexData :: ObjModel -> FaceVertex -> Interleaved
makeVertexData model (v, t, n) = Interleaved tu (-tv) nx ny nz vx vy vz makeVertexData model (v, t, n) = Interleaved tu (-tv) nx ny nz vx vy vz
where where
(vx, vy, vz) = genericIndex (objVertices model) v (vx, vy, vz) = rtf3 $ genericIndex (objVertices model) v
(tu, tv) = if isJust t then genericIndex (objTexCoords model) $ fromJust t else (0, 0) (tu, tv) = rtf2 $ if isJust t then genericIndex (objTexCoords model) $ fromJust t else (0, 0)
(nx, ny, nz) = if isJust n then genericIndex (objNormals model) $ fromJust n else (0, 0, 0) (nx, ny, nz) = rtf3 $ if isJust n then genericIndex (objNormals model) $ fromJust n else (0, 0, 0)
rtf2 (x, y) = (realToFrac x, realToFrac y)
rtf3 (x, y, z) = (realToFrac x, realToFrac y, realToFrac z)
interleaveObj :: ObjModel -> ([Interleaved], [[Integer]]) interleaveObj :: ObjModel -> ([Interleaved], [[Integer]])