diff options
Diffstat (limited to 'advanced_opengl/8.geometry_shader/shaders')
5 files changed, 7 insertions, 7 deletions
diff --git a/advanced_opengl/8.geometry_shader/shaders/base.fs b/advanced_opengl/8.geometry_shader/shaders/base.fs index 283d885..73897db 100644 --- a/advanced_opengl/8.geometry_shader/shaders/base.fs +++ b/advanced_opengl/8.geometry_shader/shaders/base.fs @@ -7,5 +7,5 @@ out vec4 frag_color; void main(void) { - frag_color = vec4(fcolor, 1.0f); + frag_color = vec4(fcolor, 1.0); } diff --git a/advanced_opengl/8.geometry_shader/shaders/base.vs b/advanced_opengl/8.geometry_shader/shaders/base.vs index 2924e6c..9ad9e7a 100644 --- a/advanced_opengl/8.geometry_shader/shaders/base.vs +++ b/advanced_opengl/8.geometry_shader/shaders/base.vs @@ -10,5 +10,5 @@ void main(void) { vs_out.color = acolor; - gl_Position = vec4(apos, 0.0f, 1.0f); + gl_Position = vec4(apos, 0.0, 1.0); } diff --git a/advanced_opengl/8.geometry_shader/shaders/basic.vs b/advanced_opengl/8.geometry_shader/shaders/basic.vs index 9a630b6..77e8b70 100644 --- a/advanced_opengl/8.geometry_shader/shaders/basic.vs +++ b/advanced_opengl/8.geometry_shader/shaders/basic.vs @@ -11,6 +11,6 @@ uniform mat4 projection; void main(void) { - gl_Position = projection*view*model*vec4(apos, 1.0f); + gl_Position = projection*view*model*vec4(apos, 1.0); tex_coords = atex_coords; } diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.gs b/advanced_opengl/8.geometry_shader/shaders/explosion.gs index 1883ad2..3498878 100644 --- a/advanced_opengl/8.geometry_shader/shaders/explosion.gs +++ b/advanced_opengl/8.geometry_shader/shaders/explosion.gs @@ -21,9 +21,9 @@ get_normal(void) vec4 explode(vec4 position, vec3 normal) { - float magnitude = 0.2f; - vec3 direction = normal*magnitude*((sin(time)+1.0f)/2.0f); - vec4 result = position+vec4(direction, 0.0f); + float magnitude = 0.2; + vec3 direction = normal*magnitude*((sin(time)+1.0)/2.0); + vec4 result = position+vec4(direction, 0.0); return(result); } diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.vs b/advanced_opengl/8.geometry_shader/shaders/explosion.vs index 5925b8f..46abd27 100644 --- a/advanced_opengl/8.geometry_shader/shaders/explosion.vs +++ b/advanced_opengl/8.geometry_shader/shaders/explosion.vs @@ -14,5 +14,5 @@ void main(void) { vs_out.gtex_coords = atex_coords; - gl_Position = projection*view*model*vec4(apos, 1.0f); + gl_Position = projection*view*model*vec4(apos, 1.0); } |