summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/images/daniel.jpgbin0 -> 1426065 bytes
-rw-r--r--resources/shaders/anchorPoint.vert1
-rwxr-xr-xresources/shaders/shader.frag3
-rwxr-xr-xresources/shaders/shader.vert2
4 files changed, 6 insertions, 0 deletions
diff --git a/resources/images/daniel.jpg b/resources/images/daniel.jpg
new file mode 100644
index 0000000..9341da7
--- /dev/null
+++ b/resources/images/daniel.jpg
Binary files differ
diff --git a/resources/shaders/anchorPoint.vert b/resources/shaders/anchorPoint.vert
index c074d00..784dbfb 100644
--- a/resources/shaders/anchorPoint.vert
+++ b/resources/shaders/anchorPoint.vert
@@ -3,6 +3,7 @@
layout(location = 0) in vec3 position; // Position of the vertex
layout(location = 2) in vec3 vcolor; // Normal of the vertex
+
uniform mat4 proj;
uniform mat4 view;
uniform mat4 model;
diff --git a/resources/shaders/shader.frag b/resources/shaders/shader.frag
index 28b449a..ea7569b 100755
--- a/resources/shaders/shader.frag
+++ b/resources/shaders/shader.frag
@@ -10,6 +10,9 @@ in float refrProb;
in vec2 uv;
in float matIor;
+uniform sampler2D texture_img;
+
+
uniform int wire = 0;
uniform float red = 1.0;
uniform float green = 1.0;
diff --git a/resources/shaders/shader.vert b/resources/shaders/shader.vert
index 0888e37..7a7dde5 100755
--- a/resources/shaders/shader.vert
+++ b/resources/shaders/shader.vert
@@ -2,6 +2,8 @@
layout(location = 0) in vec3 position; // Position of the vertex
layout(location = 1) in vec3 normal; // Normal of the vertex
+layout(location = 3) in vec3 texCoords; // Normal of the vertex
+
uniform mat4 proj;
uniform mat4 view;