justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add uniform buffer window coordinate matrix

Browse Source
This commit is contained in:
justin
2021-06-24 17:17:30 +02:00
parent 9c94ec93bd
commit 93936346f7
3 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shader/twoD/basic.vert
+1 -2
View File
@@ -2,8 +2,7 @@
layout (location = 0) in vec3 position; layout (location = 0) in vec3 position;
layout (location = 1) in vec4 color; layout (location = 1) in vec4 color;
layout (std140, binding = 0) uniform TheMat layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
{ mat4 theMat; } ;
out vec4 vColor; out vec4 vColor;
uniform mat4 worldMat; uniform mat4 worldMat;
src/Dodge/Render.hs
+9 -10
View File
@@ -57,14 +57,6 @@ doDrawing pdata w = do
wallPoints = map fst wallPointsCol wallPoints = map fst wallPointsCol
let pmat = perspectiveMatrixb rot camzoom trans wins viewFroms let pmat = perspectiveMatrixb rot camzoom trans wins viewFroms
pmata <- (newMatrix RowMajor $ perspectiveMatrix rot camzoom trans wins viewFroms) :: IO (GLmatrix GLfloat)
-- withMatrix pmata $ \_ ptr ->
-- bufferData UniformBuffer $=
-- (fromIntegral $ sizeOf (head pmat) * length pmat
-- ,ptr
-- ,StreamDraw
-- )
withArray pmat $ \ptr -> withArray pmat $ \ptr ->
bufferData UniformBuffer $= bufferData UniformBuffer $=
(fromIntegral $ sizeOf (head pmat) * length pmat (fromIntegral $ sizeOf (head pmat) * length pmat
@@ -72,8 +64,6 @@ doDrawing pdata w = do
,StreamDraw ,StreamDraw
) )
-- bufferData UniformBuffer $=
-- set the coordinate uniforms ready for drawing elements using world coordinates -- set the coordinate uniforms ready for drawing elements using world coordinates
--setIsoMatrixUniforms pdata rot camzoom trans wins --setIsoMatrixUniforms pdata rot camzoom trans wins
setPerpMatrixUniforms pdata rot camzoom trans wins viewFroms setPerpMatrixUniforms pdata rot camzoom trans wins viewFroms
@@ -145,6 +135,15 @@ doDrawing pdata w = do
-- reset the coordinate uniforms for pictures that are drawn wrt to window -- reset the coordinate uniforms for pictures that are drawn wrt to window
-- coordinates -- coordinates
resetShaderUniforms (map extractProgAndUnis $ _pictureShaders pdata) resetShaderUniforms (map extractProgAndUnis $ _pictureShaders pdata)
let pmata = perspectiveMatrixc 0 1 (0,0) (2,2)
withArray pmata $ \ptr ->
bufferData UniformBuffer $=
(fromIntegral $ sizeOf (head pmat) * length pmat
,ptr
,StreamDraw
)
blendFunc $= (SrcAlpha,OneMinusSrcAlpha) blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
_ <- renderFoldable pdata (picToLTree Nothing $ fixedCoordPictures w) _ <- renderFoldable pdata (picToLTree Nothing $ fixedCoordPictures w)
eTicks <- SDL.ticks eTicks <- SDL.ticks
src/MatrixHelper.hs
+50 -42
View File
@@ -2,6 +2,7 @@ module MatrixHelper
( perspectiveMatrix ( perspectiveMatrix
, perspectiveMatrixa , perspectiveMatrixa
, perspectiveMatrixb , perspectiveMatrixb
, perspectiveMatrixc
, isoMatrix , isoMatrix
) where ) where
--import Geometry --import Geometry
@@ -34,17 +35,12 @@ perspectiveMatrix rot zoom (tranx,trany) (winx,winy) (viewFromx,viewFromy) =
(V4 0 1 0 0) (V4 0 1 0 0)
(V4 0 0 1 0) (V4 0 0 1 0)
(V4 (viewFromx-tranx) (viewFromy-trany) 0 1) (V4 (viewFromx-tranx) (viewFromy-trany) 0 1)
perMat = Linear.Matrix.transpose $
V4 (V4 1 0 0 0)
(V4 0 1 0 0)
(V4 0 0 1 1)
(V4 0 0 0 1)
tranMat1 = Linear.Matrix.transpose $ tranMat1 = Linear.Matrix.transpose $
V4 (V4 1 0 0 0) V4 (V4 1 0 0 0)
(V4 0 1 0 0) (V4 0 1 0 0)
(V4 0 0 1 0) (V4 0 0 1 0)
(V4 (-viewFromx) (-viewFromy) 0 1) (V4 (-viewFromx) (-viewFromy) 0 1)
wmat = scalMat !*! rotMat !*! tranMat2 !*! perMat !*! tranMat1 wmat = scalMat !*! rotMat !*! tranMat2 !*! lmt perMat !*! tranMat1
vToL (V4 a b c d) = [a,b,c,d] vToL (V4 a b c d) = [a,b,c,d]
in concatMap vToL $ vToL wmat in concatMap vToL $ vToL wmat
{- | A matrix that gives a top down view with no perspective. -} {- | A matrix that gives a top down view with no perspective. -}
@@ -98,27 +94,15 @@ perspectiveMatrixa rot zoom (tranx,trany) (winx,winy) (viewFromx,viewFromy) =
(V4 0 1 0 0) (V4 0 1 0 0)
(V4 0 0 1 0) (V4 0 0 1 0)
(V4 (viewFromx-tranx) (viewFromy-trany) 0 1) (V4 (viewFromx-tranx) (viewFromy-trany) 0 1)
perMat =
V4 (V4 1 0 0 0)
(V4 0 1 0 0)
(V4 0 0 1 1)
(V4 0 0 0 1)
tranMat1 = tranMat1 =
V4 (V4 1 0 0 0) V4 (V4 1 0 0 0)
(V4 0 1 0 0) (V4 0 1 0 0)
(V4 0 0 1 0) (V4 0 0 1 0)
(V4 (-viewFromx) (-viewFromy) 0 1) (V4 (-viewFromx) (-viewFromy) 0 1)
wmat = scalMat !*! rotMat !*! tranMat2 !*! perMat !*! tranMat1 wmat = scalMat !*! rotMat !*! tranMat2 !*! lmt perMat !*! tranMat1
vToL (V4 a b c d) = [a,b,c,d] vToL (V4 a b c d) = [a,b,c,d]
in concatMap vToL $ vToL wmat in concatMap vToL $ vToL wmat
transMat :: Point2 -> V4 (V4 Float)
transMat (x,y) = V4
(V4 1 0 0 0)
(V4 0 1 0 0)
(V4 0 0 1 0)
(V4 x y 0 1)
perspectiveMatrixb perspectiveMatrixb
:: Float -- ^ Rotation :: Float -- ^ Rotation
-> Float -- ^ Zoom -> Float -- ^ Zoom
@@ -127,31 +111,55 @@ perspectiveMatrixb
-> Point2 -- ^ View froms -> Point2 -- ^ View froms
-> [GLfloat] -> [GLfloat]
perspectiveMatrixb rot zoom (tranx,trany) (winx,winy) (viewFromx,viewFromy) = perspectiveMatrixb rot zoom (tranx,trany) (winx,winy) (viewFromx,viewFromy) =
let scalMat = Linear.Matrix.transpose $ V4 let wmat = lmt $ lmt (scaleMat (2*zoom/winx,2*zoom/winy))
(V4 (2*zoom/winx) 0 0 (0::GLfloat)) !*! rotMatr (-rot)
(V4 0 (2*zoom/winy) 0 0) !*! lmt (transMat (viewFromx-tranx,viewFromy-trany))
(V4 0 0 1 0) !*! lmt perMat
(V4 0 0 0 1) !*! lmt (transMat (-viewFromx,-viewFromy))
rotMat = Linear.Matrix.transpose $ vToL (V4 a b c d) = [a,b,c,d]
V4 (V4 (cos rot) (sin (-rot)) 0 0) in concatMap vToL $ vToL wmat
(V4 (sin rot) (cos rot) 0 0)
(V4 0 0 1 0) perspectiveMatrixc
(V4 0 0 0 1) :: Float -- ^ Rotation
tranMat2 = Linear.Matrix.transpose $ -> Float -- ^ Zoom
V4 (V4 1 0 0 0) -> Point2 -- ^ Translation
(V4 0 1 0 0) -> Point2 -- ^ Window size
(V4 0 0 1 0) -> [GLfloat]
(V4 (viewFromx-tranx) (viewFromy-trany) 0 1) perspectiveMatrixc rot zoom (tranx,trany) (winx,winy) =
perMat = Linear.Matrix.transpose $ let wmat = lmt $ lmt (scaleMat (2*zoom/winx,2*zoom/winy))
V4 (V4 1 0 0 0) !*! rotMatr (-rot)
!*! lmt (transMat (-tranx,-trany))
vToL (V4 a b c d) = [a,b,c,d]
in concatMap vToL $ vToL wmat
lmt :: V4 (V4 a) -> V4 (V4 a)
lmt = Linear.Matrix.transpose
perMat :: V4 (V4 Float)
perMat = V4
(V4 1 0 0 0)
(V4 0 1 0 0) (V4 0 1 0 0)
(V4 0 0 1 1) (V4 0 0 1 1)
(V4 0 0 0 1) (V4 0 0 0 1)
tranMat1 = Linear.Matrix.transpose $
V4 (V4 1 0 0 0) scaleMat :: Point2 -> V4 (V4 Float)
scaleMat (x,y) = V4
(V4 x 0 0 0)
(V4 0 y 0 0)
(V4 0 0 1 0)
(V4 0 0 0 1)
rotMatr :: Float -> V4 (V4 Float)
rotMatr a = V4
(V4 (cos a) (sin (-a)) 0 0)
(V4 (sin a) (cos a) 0 0)
(V4 0 0 1 0)
(V4 0 0 0 1)
transMat :: Point2 -> V4 (V4 Float)
transMat (x,y) = V4
(V4 1 0 0 0)
(V4 0 1 0 0) (V4 0 1 0 0)
(V4 0 0 1 0) (V4 0 0 1 0)
(V4 (-viewFromx) (-viewFromy) 0 1) (V4 x y 0 1)
wmat = Linear.Matrix.transpose $ scalMat !*! rotMat !*! tranMat2 !*! perMat !*! tranMat1
vToL (V4 a b c d) = [a,b,c,d]
in concatMap vToL $ vToL wmat