Merge branch 'master' of gitlab.icynet.eu:voxspatium/voxspatium
This commit is contained in:
commit
85b7351688
|
@ -1,6 +1,6 @@
|
|||
#version 110
|
||||
#version 330
|
||||
|
||||
varying vec2 uv_p;
|
||||
in vec2 uv_p;
|
||||
|
||||
void main(void) {
|
||||
gl_FragColor = vec4(uv_p.xy, 0.5f, 1.0f);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#version 110
|
||||
#version 330
|
||||
|
||||
attribute vec3 position;
|
||||
attribute vec3 normal;
|
||||
attribute vec2 uv;
|
||||
varying vec2 uv_p;
|
||||
in vec3 position;
|
||||
in vec3 normal;
|
||||
in vec2 uv;
|
||||
out vec2 uv_p;
|
||||
|
||||
uniform mat4 projectionMatrix;
|
||||
uniform mat4 viewMatrix;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#version 110
|
||||
#version 330
|
||||
|
||||
varying vec3 cardial_color;
|
||||
in vec3 cardial_color;
|
||||
|
||||
void main(void) {
|
||||
gl_FragColor = vec4(cardial_color.xyz, 1.0f);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#version 110
|
||||
#version 330
|
||||
|
||||
attribute vec3 position;
|
||||
attribute vec3 color;
|
||||
varying vec3 cardial_color;
|
||||
in vec3 position;
|
||||
in vec3 color;
|
||||
out vec3 cardial_color;
|
||||
|
||||
uniform mat4 projectionMatrix;
|
||||
uniform mat4 viewMatrix;
|
||||
|
|
Loading…
Reference in New Issue