Fixed examples after TextureTarget change. Note that examples/Redbook4/CubeMap.hs is broken.

Author: svenpanne

examples/RedBook4/Checker.hs

@@ -47,7 +47,7 @@ myInit = do
    textureWrapMode Texture2D T $= (Repeated, Repeat)
    textureFilter Texture2D $= ((Nearest, Nothing), Nearest)
    withCheckImage checkImageSize 0x8 (\c -> Color4 c c c 255) $
-      texImage2D Nothing NoProxy 0  RGBA' checkImageSize 0
+      texImage2D Texture2D NoProxy 0  RGBA' checkImageSize 0
    return mbTexName
 
 display ::  Maybe TextureObject -> DisplayCallback

examples/RedBook4/Combiner.hs

@@ -55,7 +55,7 @@ myInit = do
    textureFilter Texture2D $= ((Nearest, Nothing), Nearest)
    -- horiz b & w stripes
    makeImage imageSize (\i _ -> let c = if i .&. 2 == 0 then 255 else 0 in Color4 c c c 255) $
-      texImage2D Nothing NoProxy 0  RGBA' imageSize 0
+      texImage2D Texture2D NoProxy 0  RGBA' imageSize 0
 
    textureBinding Texture2D $= Just texName1
    textureWrapMode Texture2D S $= (Repeated, Repeat)
@@ -64,7 +64,7 @@ myInit = do
    textureFunction $= Decal
    -- wider vertical 50% cyan and black stripes
    makeImage imageSize (\_ j -> let c = if j .&. 4 /= 0 then 128 else 0 in Color4 0 c c 255) $
-      texImage2D Nothing NoProxy 0  RGBA' imageSize 0
+      texImage2D Texture2D NoProxy 0  RGBA' imageSize 0
 
    -- smooth-shaded polygon with multiple texture coordinates
    let vert :: TexCoord2 GLfloat -> Color3 GLfloat -> Vertex3 GLfloat -> IO ()

examples/RedBook4/CubeMap.hs

@@ -39,7 +39,7 @@ withCheckImage (TextureSize2D w h) n f act =
 makeImage :: CubeMapTarget -> (GLubyte -> (Color4 GLubyte)) -> IO ()
 makeImage target f =
    withCheckImage imageSize 0x1 f $
-      texImage2D (Just target) NoProxy 0  RGBA' imageSize 0
+      texImage2D (TextureCubeMap target) NoProxy 0  RGBA' imageSize 0
 
 myInit :: IO ()
 myInit = do
@@ -48,10 +48,10 @@ myInit = do
    shadeModel $= Smooth
 
    rowAlignment Unpack $= 1
-   textureWrapMode TextureCubeMap S $= (Repeated, Repeat)
-   textureWrapMode TextureCubeMap T $= (Repeated, Repeat)
-   textureWrapMode TextureCubeMap R $= (Repeated, Repeat)
-   textureFilter TextureCubeMap $= ((Nearest, Nothing), Nearest)
+   textureWrapMode (TextureCubeMap undefined) S $= (Repeated, Repeat)  -- TODO: WRONG!!!
+   textureWrapMode (TextureCubeMap undefined) T $= (Repeated, Repeat)  -- TODO: WRONG!!!
+   textureWrapMode (TextureCubeMap undefined) R $= (Repeated, Repeat)  -- TODO: WRONG!!!
+   textureFilter (TextureCubeMap undefined) $= ((Nearest, Nothing), Nearest)  -- TODO: WRONG!!!
 
    makeImage TextureCubeMapPositiveX (\c -> Color4   c c   c 255)
    makeImage TextureCubeMapNegativeX (\c -> Color4   0 c   c 255)
@@ -66,7 +66,7 @@ myInit = do
 
    textureFunction $= Modulate
 
-   texture TextureCubeMap $= Enabled
+   texture (TextureCubeMap undefined) $= Enabled  -- TODO: WRONG!!!
    lighting $= Enabled
    light (Light 0) $= Enabled
    autoNormal $= Enabled

examples/RedBook4/Mipmap.hs

@@ -19,7 +19,7 @@ import Graphics.UI.GLUT
 makeImage :: Level -> TextureSize2D -> Color4 GLubyte -> IO ()
 makeImage level size@(TextureSize2D w h) col =
    withArray (replicate (fromIntegral (w * h)) col) $
-      texImage2D Nothing NoProxy level RGBA' size 0 . PixelData RGBA UnsignedByte
+      texImage2D Texture2D NoProxy level RGBA' size 0 . PixelData RGBA UnsignedByte
 
 makeImages :: [Color4 GLubyte] -> IO ()
 makeImages colors = sequence_ $ zipWith3 makeImage levels sizes colors

examples/RedBook4/MultiTex.hs

@@ -14,7 +14,7 @@ specifyTexture :: TextureSize2D -> (GLubyte -> GLubyte -> Color4 GLubyte) -> IO
 specifyTexture size@(TextureSize2D w h) f =
    withArray [ f i j | i <- [ 0 .. fromIntegral w - 1 ],
                        j <- [ 0 .. fromIntegral h - 1] ] $
-      texImage2D Nothing NoProxy 0 RGBA' size 0 . PixelData RGBA UnsignedByte
+      texImage2D Texture2D NoProxy 0 RGBA' size 0 . PixelData RGBA UnsignedByte
 
 myInit :: IO ()
 myInit = do

examples/RedBook4/ShadowMap.hs

@@ -48,7 +48,7 @@ makeState = do
 
 myInit :: IO ()
 myInit = do
-   texImage2D Nothing NoProxy 0 DepthComponent' shadowMapSize 0
+   texImage2D Texture2D NoProxy 0 DepthComponent' shadowMapSize 0
               (PixelData DepthComponent UnsignedByte nullPtr)
 
    position (Light 0) $= lightPos
@@ -177,7 +177,7 @@ generateShadowMap torusAngle' showShadow' = do
          matrixMode $= Projection
       matrixMode $= Modelview 0
 
-      copyTexImage2D Nothing 0 DepthComponent' (Position 0 0) shadowMapSize 0
+      copyTexImage2D Texture2D 0 DepthComponent' (Position 0 0) shadowMapSize 0
 
    when showShadow' $ do
       let numShadowMapPixels = fromIntegral (shadowMapWidth * shadowMapHeight)

examples/RedBook4/TexBind.hs

@@ -41,15 +41,15 @@ myInit = do
    textureWrapMode Texture2D T $= (Repeated, Clamp)
    textureFilter Texture2D $= ((Nearest, Nothing), Nearest)
    withCheckImage checkImageSize 0x08 (\c -> Color4 c c c 255) $
-      texImage2D Nothing NoProxy 0  RGBA' checkImageSize 0
+      texImage2D Texture2D NoProxy 0  RGBA' checkImageSize 0
 
    textureBinding Texture2D $= Just texName1
    textureWrapMode Texture2D S $= (Repeated, Clamp)
    textureWrapMode Texture2D T $= (Repeated, Clamp)
    textureFilter Texture2D $= ((Nearest, Nothing), Nearest)
    textureFunction $= Decal
    withCheckImage checkImageSize 0x10 (\c -> Color4 c 0 0 255) $
-      texImage2D Nothing NoProxy 0  RGBA' checkImageSize 0
+      texImage2D Texture2D NoProxy 0  RGBA' checkImageSize 0
    texture Texture2D $= Enabled
    return (texName0, texName1)
 

examples/RedBook4/TexGen.hs

@@ -53,7 +53,7 @@ myInit = do
 
    textureWrapMode Texture1D S $= (Repeated, Repeat)
    textureFilter Texture1D $= ((Linear', Nothing), Linear')
-   withStripeImage $ texImage1D NoProxy 0  RGBA' stripeImageWidth 0
+   withStripeImage $ texImage1D Texture1D NoProxy 0  RGBA' stripeImageWidth 0
 
    textureFunction $= Modulate
    textureGenMode S $= Just (ObjectLinear xEqualZero)

examples/RedBook4/TexProx.hs

@@ -17,15 +17,15 @@ import Graphics.UI.GLUT
 myInit :: IO ()
 myInit = do
    let check = do
-          ok <- get (textureProxyOK (Left Texture2D) 0)
+          ok <- get (textureProxyOK Texture2D 0)
           putStrLn ("proxy allocation " ++ if ok then "succeeded" else "failed")
 
-   texImage2D Nothing Proxy 0 RGBA8 (TextureSize2D 64 64) 0 (PixelData RGBA UnsignedByte nullPtr)
+   texImage2D Texture2D Proxy 0 RGBA8 (TextureSize2D 64 64) 0 (PixelData RGBA UnsignedByte nullPtr)
    check
 
    -- Note: We use a larger texture size here to demonstrate failure,
    -- modern graphic cards can handle the original size.
-   texImage2D Nothing Proxy 0 RGBA16 (TextureSize2D 8192 8192) 0 (PixelData RGBA UnsignedShort nullPtr)
+   texImage2D Texture2D Proxy 0 RGBA16 (TextureSize2D 8192 8192) 0 (PixelData RGBA UnsignedShort nullPtr)
    check
 
 

examples/RedBook4/TexSub.hs

@@ -49,7 +49,7 @@ myInit = do
    textureWrapMode Texture2D S $= (Repeated, Repeat)
    textureWrapMode Texture2D T $= (Repeated, Repeat)
    textureFilter Texture2D $= ((Nearest, Nothing), Nearest)
-   texImage2D Nothing NoProxy 0  RGBA' checkImageSize 0 checkImage
+   texImage2D Texture2D NoProxy 0  RGBA' checkImageSize 0 checkImage
    return (texName, checkImage, subImage)
 
 display :: TextureObject -> DisplayCallback
@@ -89,11 +89,11 @@ keyboard :: TextureObject -> Image -> Image -> KeyboardMouseCallback
 keyboard texName checkImage subImage (Char c) Down _ _ = case toLower c of
    's' -> do
       textureBinding Texture2D $= Just texName
-      texSubImage2D Nothing 0 (TexturePosition2D 12 44) subImageSize subImage
+      texSubImage2D Texture2D 0 (TexturePosition2D 12 44) subImageSize subImage
       postRedisplay Nothing
    'r' -> do
       textureBinding Texture2D $= Just texName
-      texImage2D Nothing NoProxy 0 RGBA' checkImageSize 0 checkImage
+      texImage2D Texture2D NoProxy 0 RGBA' checkImageSize 0 checkImage
       postRedisplay Nothing
    '\27' -> exitWith ExitSuccess
    _ -> return ()

examples/RedBook4/Texture3D.hs

@@ -40,7 +40,7 @@ myInit = do
    textureWrapMode Texture3D T $= (Repeated, Clamp)
    textureWrapMode Texture3D R $= (Repeated, Clamp)
    textureFilter Texture3D $= ((Nearest, Nothing), Nearest)
-   withImage $ texImage3D NoProxy 0  RGB' imageSize 0
+   withImage $ texImage3D Texture3D NoProxy 0  RGB' imageSize 0
    texture Texture3D $= Enabled
 
 display :: DisplayCallback

examples/RedBook4/TextureSurf.hs

@@ -62,7 +62,7 @@ myInit = do
    textureWrapMode Texture2D S $= (Repeated, Repeat)
    textureWrapMode Texture2D T $= (Repeated, Repeat)
    textureFilter Texture2D $= ((Nearest, Nothing), Nearest)
-   withImage $ texImage2D Nothing NoProxy 0 RGB' imageSize 0
+   withImage $ texImage2D Texture2D NoProxy 0 RGB' imageSize 0
    texture Texture2D $= Enabled
    depthFunc $= Just Less
    shadeModel $= Flat

examples/RedBook4/Wrap.hs

@@ -51,7 +51,7 @@ myInit = do
    textureWrapMode Texture2D T $= (Repeated, Repeat)
    textureFilter Texture2D $= ((Nearest, Nothing), Nearest)
    withCheckImage checkImageSize 0x8 (\c -> Color4 c c c 255) $
-      texImage2D Nothing NoProxy 0  RGBA' checkImageSize 0
+      texImage2D Texture2D NoProxy 0  RGBA' checkImageSize 0
    return mbTexName
 
 display ::  Maybe TextureObject -> DisplayCallback