aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0e72df0..a04fb99 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,7 @@
#include "../include/RenderBackend/OpenGL/ShaderProgram.hpp"
#include "../include/RenderBackend/OpenGL/DeviceMemory.hpp"
#include "../include/RenderBackend/OpenGL/DeviceFrame.hpp"
+#include "../include/Triangle2D.hpp"
// TODO: Disallow shader variables that begin with "gl_" as reserved variables
// start with that. What about hlsl?
@@ -29,17 +30,17 @@ int main()
DeviceFrame frame;
- f32 verticesRaw[] =
- {
- 0.0f, 0.5f,
- 0.5f, -0.5f,
- -0.5f, -0.5f
- };
- DeviceMemory *triangle = frame.alloc();
- DataView<f32> vertices(verticesRaw, 6);
- triangle->copy(vertices, DeviceMemory::StorageType::STATIC);
+ Triangle2D cpuTriangle(
+ Vertex2D(0.0f, 0.5f),
+ Vertex2D(0.5f, -0.5f),
+ Vertex2D(-0.5f, -0.5f)
+ );
+
+ DeviceMemory *gpuTriangle = frame.alloc();
+ DataView<Triangle2D> triangles(&cpuTriangle, 1);
+ gpuTriangle->copy(triangles, DeviceMemory::StorageType::STATIC);
- CompiledVertexShader *vertexShader = createVertexShader(*triangle);
+ CompiledVertexShader *vertexShader = createVertexShader(*gpuTriangle);
CompiledPixelShader *pixelShader = createPixelShader();
ShaderProgram shaderProgram;