Shader manager "test" on raymarcher + fixes

This commit is contained in:
Emmanuel BENOîT 2017-10-04 17:29:48 +02:00
parent 40e6911209
commit 61d6027a42
9 changed files with 91 additions and 46 deletions

View file

@ -1,5 +1,7 @@
#version 450 core
//! type vertex
out gl_PerVertex {
vec4 gl_Position;
};

View file

@ -1,3 +1,5 @@
//! type library
struct T_PBRMaterialOld
{
vec3 cAlbedo, cSpecular;

View file

@ -1,5 +1,3 @@
#version 450
layout( location = 0 ) uniform float u_Time;
layout( location = 1 ) uniform vec2 u_Resolution;
layout( location = 2 ) uniform vec3 u_CamPos;

7
shaders/scene.f.glsl Normal file
View file

@ -0,0 +1,7 @@
#version 450 core
//! type fragment
//! include raymarch-header.glsl
//! include pbr.glsl
//! include blinn-phong.glsl
//! include map.glsl
//! include raymarcher.glsl