Working 3D with .obj file loading

4 files changed, 41 insertions, 0 deletions

diff --git a/src/shaders/basic.frag b/src/shaders/basic.frag
new file mode 100644
index 0000000..00d2a13
--- /dev/null
+++ b/src/shaders/basic.frag
@@ -0,0 +1,6 @@
+#version 330 core
+out vec4 FragColor;
+void main()
+{
+	FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
+}
diff --git a/src/shaders/basic.vert b/src/shaders/basic.vert
new file mode 100644
index 0000000..684ddbb
--- /dev/null
+++ b/src/shaders/basic.vert
@@ -0,0 +1,6 @@
+#version 330 core
+layout (location = 0) in vec3 aPos;
+void main()
+{
+	gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0);
+}
diff --git a/src/shaders/test.frag b/src/shaders/test.frag
new file mode 100644
index 0000000..cd2ee4c
--- /dev/null
+++ b/src/shaders/test.frag
@@ -0,0 +1,10 @@
+#version 330 core
+
+out vec4 FragColor;
+
+in vec4 vertexColor;
+
+void main()
+{
+	FragColor = vertexColor;
+}
diff --git a/src/shaders/test.vert b/src/shaders/test.vert
new file mode 100644
index 0000000..851352d
--- /dev/null
+++ b/src/shaders/test.vert
@@ -0,0 +1,19 @@
+#version 330 core
+
+layout (location = 0) in vec3 aPos;
+
+uniform mat4 projection;
+uniform mat4 model;
+
+out vec4 vertexColor;
+
+void main()
+{
+	vec4 v = vec4(aPos, 1.0);
+	vec4 newPosition = model * v;
+	vec4 projectedPosition = projection * newPosition;
+	gl_Position = projectedPosition ;
+
+//	gl_Position = u_mvp * vec4(aPos, 1.0);
+	vertexColor = vec4(0.0, 0.5, 0.0, 1.0);
+}