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

HUD-Texture renders.

Browse Source 
HUD-Texture renders and the whole screen is black.

Still TODO:

- Will have to sort out alpha
- Clean up

refs #472 @5h
This commit is contained in:
Nicole Dresselhaus 2014-04-04 11:15:00 +02:00
parent 8e0450a712
commit ba84ede01d
6 changed files with 135 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Pioneers.cabal
View File

@ -37,5 +37,6 @@ executable Pioneers
linear >=1.3.1 && <1.4, linear >=1.3.1 && <1.4,
lens >=3.10.1 && <3.11, lens >=3.10.1 && <3.11,
SDL2 >= 0.1.0, SDL2 >= 0.1.0,
time >=1.4.0 && <1.5 time >=1.4.0 && <1.5,
GLUtil >= 0.7

8
shaders/ui/fragment.shader
View File

@ -1,8 +1,10 @@
#version 330 #version 110
uniform sampler2D blitTexture; uniform sampler2D tex;
varying vec2 texcoord;
void main(void) void main()
{ {
gl_FragColor = texture2D(tex, texcoord);
} }

8
shaders/ui/vertex.shader
View File

@ -1,6 +1,10 @@
#version 330 #version 110
attribute vec2 position;
varying vec2 texcoord;
void main() void main()
{ {
//null-program gl_Position = vec4(position, 0.0, 1.0);
texcoord = position * vec2(0.5) + vec2(0.5);
} }

75
src/Main.hs
View File

@ -1,6 +1,18 @@
{-# LANGUAGE BangPatterns, DoAndIfThenElse #-} {-# LANGUAGE BangPatterns, DoAndIfThenElse #-}
module Main where module Main where
import Data.Int (Int8)
import Graphics.Rendering.OpenGL.GL.Texturing.Specification (TextureSize2D)
import Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable (PixelInternalFormat(..))
import Graphics.Rendering.OpenGL.GL.Texturing.Specification (texImage2D)
import Foreign.Marshal.Array (pokeArray)
import Control.Monad (liftM)
import Foreign.Marshal.Alloc (allocaBytes)
import Graphics.Rendering.OpenGL.GL.Texturing.Parameters (textureFilter)
import Graphics.Rendering.OpenGL.GL.Texturing.Specification (TextureTarget2D(Texture2D))
import Graphics.Rendering.OpenGL.GL.Texturing.Objects (textureBinding)
import Graphics.Rendering.OpenGL.GL.Texturing.Parameters (TextureFilter(..))
-- Monad-foo and higher functional stuff -- Monad-foo and higher functional stuff
import Control.Monad (unless, void, when, join) import Control.Monad (unless, void, when, join)
import Control.Arrow ((***)) import Control.Arrow ((***))
@ -16,8 +28,10 @@ import Control.Monad.RWS.Strict (RWST, ask, asks,
import Data.Distributive (distribute, collect) import Data.Distributive (distribute, collect)
-- FFI -- FFI
import Foreign (Ptr, castPtr, with) import Foreign (Ptr, castPtr, with, sizeOf)
import Foreign.C (CFloat) import Foreign.C (CFloat)
import Foreign.C.Types (CInt)
import Data.Word (Word8)
-- Math -- Math
import Control.Lens ((^.), (.~), (%~)) import Control.Lens ((^.), (.~), (%~))
@ -32,6 +46,7 @@ import Graphics.UI.SDL as SDL
import qualified Graphics.Rendering.OpenGL.GL as GL import qualified Graphics.Rendering.OpenGL.GL as GL
import Graphics.Rendering.OpenGL.Raw.Core31 import Graphics.Rendering.OpenGL.Raw.Core31
import Data.Time (getCurrentTime, diffUTCTime) import Data.Time (getCurrentTime, diffUTCTime)
import Graphics.GLUtil.BufferObjects (offset0)
import Graphics.Rendering.OpenGL.Raw.ARB.TessellationShader import Graphics.Rendering.OpenGL.Raw.ARB.TessellationShader
-- Our modules -- Our modules
@ -40,7 +55,8 @@ import Render.Misc (checkError,
createFrustum, getCam, createFrustum, getCam,
curb, tryWithTexture) curb, tryWithTexture)
import Render.Render (initRendering, import Render.Render (initRendering,
initMapShader) initMapShader,
initHud)
import UI.Callbacks import UI.Callbacks
import UI.GUIOverlay import UI.GUIOverlay
import Types import Types
@ -84,6 +100,7 @@ main = do
--TTF.setFontStyle font TTFNormal --TTF.setFontStyle font TTFNormal
--TTF.setFontHinting font TTFHNormal --TTF.setFontHinting font TTFHNormal
glHud <- initHud
let zDistClosest = 1 let zDistClosest = 1
zDistFarthest = zDistClosest + 30 zDistFarthest = zDistClosest + 30
--TODO: Move near/far/fov to state for runtime-changability & central storage --TODO: Move near/far/fov to state for runtime-changability & central storage
@ -157,7 +174,7 @@ main = do
} }
, _gl = GLState , _gl = GLState
{ _glMap = glMap { _glMap = glMap
, _hudTexture = Nothing , _glHud = glHud
} }
, _game = GameState , _game = GameState
{ {
@ -202,6 +219,9 @@ draw = do
liftIO $ do liftIO $ do
--(vi,GL.UniformLocation proj) <- initShader --(vi,GL.UniformLocation proj) <- initShader
GL.clear [GL.ColorBuffer, GL.DepthBuffer] GL.clear [GL.ColorBuffer, GL.DepthBuffer]
GL.currentProgram GL.$= Just (state ^. gl.glMap.mapProgram)
checkError "clearing buffer" checkError "clearing buffer"
--set up projection (= copy from state) --set up projection (= copy from state)
with (distribute frust) $ \ptr -> with (distribute frust) $ \ptr ->
@ -241,12 +261,28 @@ draw = do
glPolygonMode gl_FRONT gl_LINE glPolygonMode gl_FRONT gl_LINE
glDrawArrays gl_PATCHES 0 (fromIntegral numVert) glDrawArrays gl_PATCHES 0 (fromIntegral numVert)
checkError "draw" checkError "draw map"
{-renderer <- getRenderer (env ^. windowObject) -- Drawing HUD
let hud = state ^. gl.glHud
stride = fromIntegral $ sizeOf (undefined::GLfloat) * 2
vad = GL.VertexArrayDescriptor 2 GL.Float stride offset0
GL.currentProgram GL.$= Just (hud ^. hudProgram)
GL.activeTexture GL.$= GL.TextureUnit 0
textureBinding GL.Texture2D GL.$= Just (hud ^. hudTexture)
GL.bindBuffer GL.ArrayBuffer GL.$= Just (hud ^. hudVBO)
GL.vertexAttribPointer (hud ^. hudVertexIndex) GL.$= (GL.ToFloat, vad)
GL.vertexAttribArray (hud ^. hudVertexIndex) GL.$= GL.Enabled
GL.bindBuffer GL.ElementArrayBuffer GL.$= Just (hud ^. hudEBO)
GL.drawElements GL.TriangleStrip 4 GL.UnsignedInt offset0
{-let winRenderer = env ^. renderer
tryWithTexture tryWithTexture
(state ^. gl.hudTexture) --maybe tex (state ^. gl.hudTexture) --maybe tex
(\tex -> renderCopy renderer tex Nothing Nothing) --function with "hole" (\tex -> renderCopy winRenderer tex Nothing Nothing) --function with "hole"
--Nothing == whole source-tex, whole dest-tex --Nothing == whole source-tex, whole dest-tex
(return ()) --fail-case-} (return ()) --fail-case-}
@ -346,19 +382,20 @@ adjustWindow = do
frust = createFrustum fov near far ratio frust = createFrustum fov near far ratio
liftIO $ glViewport 0 0 (fromIntegral fbWidth) (fromIntegral fbHeight) liftIO $ glViewport 0 0 (fromIntegral fbWidth) (fromIntegral fbHeight)
modify $ camera.frustum .~ frust modify $ camera.frustum .~ frust
hudTex <- liftIO $ do liftIO $ do
putStrLn $ show (env ^. windowObject) let texid = state ^. gl.glHud.hudTexture
case state ^. gl.hudTexture of int = fromInteger . toInteger
Just tex -> destroyTexture tex textureBinding Texture2D GL.$= Just texid
_ -> return () checkError "bind HUD-Tex"
winRenderer <- getRenderer (env ^. windowObject) textureFilter Texture2D GL.$= ((Linear', Nothing), Linear')
createTexture checkError "filter HUD-Tex"
winRenderer -- where allocaBytes (fbWidth*fbHeight*4) $ \ptr -> do
PixelFormatRGBA8888 -- RGBA32-bit let imData = take (fbWidth*fbHeight*4) (cycle [255,0,0,128] :: [Int8])
TextureAccessStreaming -- change occasionally --putStrLn $ show imData
fbWidth -- width pokeArray ptr imData
fbHeight -- height texImage2D Texture2D GL.NoProxy 0 RGBA8 (GL.TextureSize2D (int fbWidth) (int fbHeight)) 0
modify $ gl.hudTexture .~ (Just hudTex) -- -} (GL.PixelData GL.RGBA GL.UnsignedByte ptr)
checkError "setting up HUD-Tex"
processEvents :: Pioneers () processEvents :: Pioneers ()
processEvents = do processEvents = do

63
src/Render/Render.hs
View File

@ -1,9 +1,11 @@
{-# LANGUAGE BangPatterns #-} {-# LANGUAGE BangPatterns, InstanceSigs, ExistentialQuantification #-}
module Render.Render where module Render.Render where
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Data.Array.Storable
import qualified Data.Vector.Storable as V
import Foreign.Marshal.Array (withArray) import Foreign.Marshal.Array (withArray)
import Foreign.Storable (sizeOf) import Foreign.Storable
import Graphics.Rendering.OpenGL.GL.BufferObjects import Graphics.Rendering.OpenGL.GL.BufferObjects
import Graphics.Rendering.OpenGL.GL.Framebuffer (clearColor) import Graphics.Rendering.OpenGL.GL.Framebuffer (clearColor)
import Graphics.Rendering.OpenGL.GL.ObjectName import Graphics.Rendering.OpenGL.GL.ObjectName
@ -11,10 +13,16 @@ import Graphics.Rendering.OpenGL.GL.PerFragment
import Graphics.Rendering.OpenGL.GL.Shaders import Graphics.Rendering.OpenGL.GL.Shaders
import Graphics.Rendering.OpenGL.GL.StateVar import Graphics.Rendering.OpenGL.GL.StateVar
import Graphics.Rendering.OpenGL.GL.VertexArrays (Capability (..), import Graphics.Rendering.OpenGL.GL.VertexArrays (Capability (..),
vertexAttribArray) vertexAttribArray,
VertexArrayDescriptor,
DataType(Float))
import Graphics.Rendering.OpenGL.GL.VertexSpec import Graphics.Rendering.OpenGL.GL.VertexSpec
import Graphics.Rendering.OpenGL.Raw.Core31 import Graphics.Rendering.OpenGL.Raw.Core31
import Render.Misc import Render.Misc
import Foreign.Ptr (Ptr, wordPtrToPtr)
import Types
import Graphics.GLUtil.BufferObjects (makeBuffer)
mapVertexShaderFile :: String mapVertexShaderFile :: String
mapVertexShaderFile = "shaders/map/vertex.shader" mapVertexShaderFile = "shaders/map/vertex.shader"
@ -30,7 +38,6 @@ uiVertexShaderFile = "shaders/ui/vertex.shader"
uiFragmentShaderFile :: String uiFragmentShaderFile :: String
uiFragmentShaderFile = "shaders/ui/fragment.shader" uiFragmentShaderFile = "shaders/ui/fragment.shader"
initBuffer :: [GLfloat] -> IO BufferObject initBuffer :: [GLfloat] -> IO BufferObject
initBuffer varray = initBuffer varray =
let let
@ -113,27 +120,51 @@ initMapShader = do
checkError "initShader" checkError "initShader"
return (program, colorIndex, normalIndex, vertexIndex, projectionMatrixIndex, viewMatrixIndex, modelMatrixIndex, normalMatrixIndex, tessLevelInner, tessLevelOuter) return (program, colorIndex, normalIndex, vertexIndex, projectionMatrixIndex, viewMatrixIndex, modelMatrixIndex, normalMatrixIndex, tessLevelInner, tessLevelOuter)
{-initUIShader :: IO ( initHud :: IO GLHud
Program -- ^ the GLSL-program initHud = do
, AttribLocation -- ^ the UI-Texture ! vertexSource <- B.readFile "shaders/ui/vertex.shader"
) ! fragmentSource <- B.readFile "shaders/ui/fragment.shader"
initUIShader = do
! vertexSource <- B.readFile uiVertexShaderFile
! fragmentSource <- B.readFile uiFragmentShaderFile
vertexShader <- compileShaderSource VertexShader vertexSource vertexShader <- compileShaderSource VertexShader vertexSource
checkError "compile Vertex" checkError "compile UI-Vertex"
fragmentShader <- compileShaderSource FragmentShader fragmentSource fragmentShader <- compileShaderSource FragmentShader fragmentSource
checkError "compile Frag" checkError "compile UI-Fragment"
program <- createProgramUsing [vertexShader, fragmentShader] program <- createProgramUsing [vertexShader, fragmentShader]
checkError "compile Program" checkError "compile Program"
tex <- genObjectName
currentProgram $= Just program
texIndex <- get (uniformLocation program "tex")
checkError "ui-tex"
-- | simple triangle over the whole screen.
let vertexBufferData = reverse [-1, -1, 1, -1, -1, 1, 1, 1] :: [GLfloat]
vertexIndex <- get (attribLocation program "position")
vertexAttribArray vertexIndex $= Enabled
checkError "vertexInd"
ebo <- makeBuffer ElementArrayBuffer ([0..3] :: [GLuint])
vbo <- makeBuffer ArrayBuffer vertexBufferData
att <- get (activeAttribs program) att <- get (activeAttribs program)
putStrLn $ unlines $ "Attributes: ":map show att putStrLn $ unlines $ "Attributes: ":map show att
putStrLn $ unlines $ ["Indices: ", show (colorIndex, normalIndex, vertexIndex)] putStrLn $ unlines $ ["Indices: ", show (texIndex)]
checkError "initHud"
return GLHud
{ _hudTexture = tex
, _hudTexIndex = texIndex
, _hudVertexIndex = vertexIndex
, _hudVert = 4
, _hudVBO = vbo
, _hudEBO = ebo
, _hudProgram = program
}
checkError "initShader"
return (program, )-}
initRendering :: IO () initRendering :: IO ()

14
src/Types.hs
View File

@ -9,6 +9,7 @@ import Data.Time (UTCTime)
import Linear.Matrix (M44) import Linear.Matrix (M44)
import Control.Monad.RWS.Strict (RWST) import Control.Monad.RWS.Strict (RWST)
import Control.Lens import Control.Lens
import Graphics.Rendering.OpenGL.GL.Texturing.Objects (TextureObject)
--Static Read-Only-State --Static Read-Only-State
@ -88,9 +89,19 @@ data GLMapState = GLMapState
, _mapProgram :: !GL.Program , _mapProgram :: !GL.Program
} }
data GLHud = GLHud
{ _hudTexture :: !TextureObject -- ^ Texture itself
, _hudTexIndex :: !GL.UniformLocation -- ^ Position of Texture in Shader
, _hudVertexIndex :: !GL.AttribLocation -- ^ Position of Vertices in Shader
, _hudVert :: !GL.NumArrayIndices -- ^ Number of Vertices to draw
, _hudVBO :: !GL.BufferObject -- ^ Vertex-Buffer-Object
, _hudEBO :: !GL.BufferObject -- ^ Element-Buffer-Object
, _hudProgram :: !GL.Program -- ^ Program for rendering HUD
}
data GLState = GLState data GLState = GLState
{ _glMap :: !GLMapState { _glMap :: !GLMapState
, _hudTexture :: Maybe Texture , _glHud :: !GLHud
} }
data UIState = UIState data UIState = UIState
@ -111,6 +122,7 @@ data State = State
$(makeLenses ''State) $(makeLenses ''State)
$(makeLenses ''GLState) $(makeLenses ''GLState)
$(makeLenses ''GLMapState) $(makeLenses ''GLMapState)
$(makeLenses ''GLHud)
$(makeLenses ''KeyboardState) $(makeLenses ''KeyboardState)
$(makeLenses ''ArrowKeyState) $(makeLenses ''ArrowKeyState)
$(makeLenses ''MouseState) $(makeLenses ''MouseState)