From 69a951fd286207b81636acd40d881a04400a8665 Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 6 Feb 2020 05:46:37 +0100 Subject: [PATCH] squeaky clean graphics now --- examples/example00/Init.hs | 2 +- examples/example01/Init.hs | 2 +- examples/example03/Init.hs | 2 +- examples/example03/Main.hs | 18 +++++++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/examples/example00/Init.hs b/examples/example00/Init.hs index 130e5fd..97285f1 100644 --- a/examples/example00/Init.hs +++ b/examples/example00/Init.hs @@ -44,7 +44,7 @@ load = do GL.bindBuffer GL.ArrayBuffer $= Just verts withArray (loTriangles lobj) $ \ptr -> GL.bufferData GL.ArrayBuffer $= - ( fromIntegral $ length (loTriangles lobj) * 3 * sizeOf (0 :: Double) + ( fromIntegral $ length (loTriangles lobj) {-* 3-} * sizeOf (0 :: Double) , ptr , GL.StaticDraw ) diff --git a/examples/example01/Init.hs b/examples/example01/Init.hs index 1a03e1d..ad7b5ba 100644 --- a/examples/example01/Init.hs +++ b/examples/example01/Init.hs @@ -42,7 +42,7 @@ load = do GL.bindBuffer GL.ArrayBuffer $= Just verts withArray (loTriangles lobj) $ \ptr -> GL.bufferData GL.ArrayBuffer $= - ( fromIntegral $ length (loTriangles lobj) * 3 * sizeOf (0 :: Double) + ( fromIntegral $ length (loTriangles lobj) {-* 3-} * sizeOf (0 :: Double) , ptr , GL.StaticDraw ) diff --git a/examples/example03/Init.hs b/examples/example03/Init.hs index 82ccefe..7ba35bb 100644 --- a/examples/example03/Init.hs +++ b/examples/example03/Init.hs @@ -173,7 +173,7 @@ genVertBufObject path = do GL.bindBuffer GL.ArrayBuffer $= Just vbo withArray (loTriangles lobj) $ \ptr -> GL.bufferData GL.ArrayBuffer $= - ( fromIntegral $ length (loTriangles lobj) * 3 * sizeOf (0 :: Double) + ( fromIntegral $ length (loTriangles lobj) {-* 3-} * sizeOf (0 :: Double) , ptr , GL.StaticDraw ) diff --git a/examples/example03/Main.hs b/examples/example03/Main.hs index 667378c..e651e14 100644 --- a/examples/example03/Main.hs +++ b/examples/example03/Main.hs @@ -60,14 +60,18 @@ main = do withAffection AffectionConfig { initComponents = All , windowTitle = "hw" - , windowConfig = SDL.defaultWindow - { SDL.windowInitialSize = SDL.V2 - (CInt $ fromIntegral $ width o) - (CInt $ fromIntegral $ height o) - , SDL.windowOpenGL = Just SDL.defaultOpenGL - { SDL.glProfile = SDL.Core SDL.Normal 3 2 + , windowConfigs = [ + ( 0 + , SDL.defaultWindow + { SDL.windowInitialSize = SDL.V2 + (CInt $ fromIntegral $ width o) + (CInt $ fromIntegral $ height o) + , SDL.windowGraphicsContext = SDL.OpenGLContext SDL.defaultOpenGL + { SDL.glProfile = SDL.Core SDL.Normal 3 2 + } } - } + ) + ] , initScreenMode = SDL.Fullscreen , preLoop = return () , eventLoop = mapM_ handle