From 675b0ff15593ab0df47b650b513843e1047045ad Mon Sep 17 00:00:00 2001 From: nek0 Date: Wed, 23 Dec 2020 16:39:45 +0100 Subject: [PATCH] we have a player! --- res/shaders/frag.shader | 3 ++- src/Scenes/Test.hs | 10 +++++----- src/Types/Map.hs | 8 ++++---- src/Types/Player.hs | 10 +++++----- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/res/shaders/frag.shader b/res/shaders/frag.shader index b5b4e56..f08a387 100644 --- a/res/shaders/frag.shader +++ b/res/shaders/frag.shader @@ -12,6 +12,7 @@ void main() { //vec4 texColor = texture(u_texture, v_texCoord); int index = int(v_texIndex); - color = texture(u_textures[index], v_texCoord); + //color = texture(u_textures[index], v_texCoord); + color = texture(u_textures[index], v_texCoord) * v_color; //color = vec4(0.0, 1.0, 0.0, 1.0); } diff --git a/src/Scenes/Test.hs b/src/Scenes/Test.hs index 8a56d3d..768a9f1 100644 --- a/src/Scenes/Test.hs +++ b/src/Scenes/Test.hs @@ -104,14 +104,14 @@ instance Scene Test where shader "u_textures" (map - ((\(GL.TextureObject o) -> o) . textureId) + textureSlot [ (tileMapTexture $ mapTileMap loadedMap) , tex ] ) let pituicat = Pituicat - (V2 0 (-1748)) + (V2 400 1748) (V2 0 0) (V2 0 0) 100 @@ -242,19 +242,19 @@ populate layers props actors = actorsHere (lisRaw, lvs) = toVertices l lis = V.map - (+ if null is then 0 else V.maximum is) + (+ if null is then 0 else V.maximum is + 1) lisRaw pis = V.map (+ if null (is V.++ lis) then 0 - else V.maximum (is V.++ lis)) + else V.maximum (is V.++ lis) + 1) pisRaw cis = V.map (+ if null (is V.++ lis V.++ pis) then 0 - else V.maximum (is V.++ lis V.++ pis)) + else V.maximum (is V.++ lis V.++ pis) + 1) cisRaw in ( is V.++ lis V.++ pis V.++ cis diff --git a/src/Types/Map.hs b/src/Types/Map.hs index b358ab9..74695a2 100644 --- a/src/Types/Map.hs +++ b/src/Types/Map.hs @@ -52,22 +52,22 @@ instance Drawable Tile where , V.fromList [ newVertex (V3 (fromIntegral x * 32) (fromIntegral y * 32) 0) - (V4 0 0 0 1) + (V4 1 1 1 1) (V2 u1 v1) 0 , newVertex (V3 (fromIntegral (x + 1) * 32) (fromIntegral y * 32) 0) - (V4 0 0 0 1) + (V4 1 1 1 1) (V2 u2 v1) 0 , newVertex (V3 (fromIntegral (x + 1) * 32) (fromIntegral (y + 1) * 32) 0) - (V4 0 0 0 1) + (V4 1 1 1 1) (V2 u2 v2) 0 , newVertex (V3 (fromIntegral x * 32) (fromIntegral (y + 1) * 32) 0) - (V4 0 0 0 1) + (V4 1 1 1 1) (V2 u1 v2) 0 ] diff --git a/src/Types/Player.hs b/src/Types/Player.hs index e629747..d696007 100644 --- a/src/Types/Player.hs +++ b/src/Types/Player.hs @@ -30,23 +30,23 @@ instance Drawable Pituicat where , V.fromList [ newVertex (V3 (realToFrac x - 25) (realToFrac y - 25) 0) - (V4 0 0 0 1) + (V4 0 1 0 1) (V2 0 (1 - 50 / 1024)) 1 , newVertex (V3 (realToFrac x + 25) (realToFrac y - 25) 0) - (V4 0 0 0 1) + (V4 0 1 0 1) (V2 (50 / 1024) (1 - 50 / 1024)) 1 , newVertex (V3 (realToFrac x + 25) (realToFrac y + 25) 0) - (V4 0 0 0 1) + (V4 0 1 0 1) (V2 (50 / 1024) 1) 1 , newVertex (V3 (realToFrac x - 25) (realToFrac y + 25) 0) - (V4 0 0 0 1) - (V2 (50 / 1024) 1) + (V4 0 1 0 1) + (V2 0 1) 1 ] )