diff --git a/src/Init.hs b/src/Init.hs index 3e15d2e..07454d6 100644 --- a/src/Init.hs +++ b/src/Init.hs @@ -89,11 +89,12 @@ initVulkan window = do rainbowVertexShader <- loadShader vulkanLogicalDevice "shadersrc/rainbow.vert" "vert" rainbowFragmentShader <- loadShader vulkanLogicalDevice "shadersrc/rainbow.frag" "frag" meshVertexShader <- loadShader vulkanLogicalDevice "shadersrc/mesh.vert" "vert" + meshFragmentShader <- loadShader vulkanLogicalDevice "shadersrc/rainbow.frag" "frag" renderPass <- createRenderPass vulkanLogicalDevice (Khr.format surfaceFormat) pipelineLayout <- createPipelineLayout vulkanLogicalDevice let redContainer = ShaderContainer (Just redVertexShader) (Just redFragmentShader) rainbowContainer = ShaderContainer (Just rainbowVertexShader) (Just rainbowFragmentShader) - meshContainer = ShaderContainer (Just meshVertexShader) Nothing + meshContainer = ShaderContainer (Just meshVertexShader) (Just meshFragmentShader) redPipelines <- createGraphicsPipelines vulkanLogicalDevice diff --git a/src/Mesh.hs b/src/Mesh.hs index 0bc3707..f958037 100644 --- a/src/Mesh.hs +++ b/src/Mesh.hs @@ -24,9 +24,9 @@ loadMeshes :: V.Vector Vertex loadMeshes = V.fromList - [ Vertex (V3 0.5 0.5 0) (V3 0 1 0) (V4 0 0 0 0) - , Vertex (V3 (-0.5) 0.5 0) (V3 0 1 0) (V4 0 0 0 0) - , Vertex (V3 0 (-0.5) 0) (V3 0 1 0) (V4 0 0 0 0) + [ Vertex (V3 0.5 0.5 0) (V3 0 0 0) (V4 0 1 0 1) + , Vertex (V3 (-0.5) 0.5 0) (V3 0 0 0) (V4 0 1 0 1) + , Vertex (V3 0 (-0.5) 0) (V3 0 0 0) (V4 0 1 0 1) ] uploadMesh