From b36422083ee883a40407c3cb86518aca9988f4ec Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 22 May 2021 16:09:34 +0200 Subject: [PATCH] Remove headers from shaders --- examples/models/resources/shaders/glsl330/brdf.fs | 13 ++----------- examples/models/resources/shaders/glsl330/brdf.vs | 8 -------- .../models/resources/shaders/glsl330/cubemap.vs | 8 -------- .../models/resources/shaders/glsl330/irradiance.fs | 8 -------- examples/models/resources/shaders/glsl330/pbr.fs | 8 -------- examples/models/resources/shaders/glsl330/pbr.vs | 8 -------- .../models/resources/shaders/glsl330/prefilter.fs | 13 +++---------- examples/models/resources/shaders/glsl330/skybox.fs | 10 ---------- examples/models/resources/shaders/glsl330/skybox.vs | 8 -------- 9 files changed, 5 insertions(+), 79 deletions(-) diff --git a/examples/models/resources/shaders/glsl330/brdf.fs b/examples/models/resources/shaders/glsl330/brdf.fs index f2774f81c..5f44bfe5f 100644 --- a/examples/models/resources/shaders/glsl330/brdf.fs +++ b/examples/models/resources/shaders/glsl330/brdf.fs @@ -1,16 +1,5 @@ -/******************************************************************************************* -* -* BRDF LUT Generation - Bidirectional reflectance distribution function fragment shader -* -* REF: https://github.com/HectorMF/BRDFGenerator -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 - // Input vertex attributes (from vertex shader) in vec2 fragTexCoord; @@ -86,6 +75,8 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness) return ggx1*ggx2; } +// Bidirectional reflectance distribution function +// Ref: https://github.com/HectorMF/BRDFGenerator vec2 IntegrateBRDF(float NdotV, float roughness) { float A = 0.0; diff --git a/examples/models/resources/shaders/glsl330/brdf.vs b/examples/models/resources/shaders/glsl330/brdf.vs index 06384673b..c93cfd0ea 100644 --- a/examples/models/resources/shaders/glsl330/brdf.vs +++ b/examples/models/resources/shaders/glsl330/brdf.vs @@ -1,11 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Bidirectional reflectance distribution function vertex shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 // Input vertex attributes diff --git a/examples/models/resources/shaders/glsl330/cubemap.vs b/examples/models/resources/shaders/glsl330/cubemap.vs index 5721eaa2c..d3565dfdc 100644 --- a/examples/models/resources/shaders/glsl330/cubemap.vs +++ b/examples/models/resources/shaders/glsl330/cubemap.vs @@ -1,11 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Equirectangular to cubemap vertex shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 // Input vertex attributes diff --git a/examples/models/resources/shaders/glsl330/irradiance.fs b/examples/models/resources/shaders/glsl330/irradiance.fs index 4ef03e052..4b74916d9 100644 --- a/examples/models/resources/shaders/glsl330/irradiance.fs +++ b/examples/models/resources/shaders/glsl330/irradiance.fs @@ -1,11 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Irradiance cubemap fragment shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 // Input vertex attributes (from vertex shader) diff --git a/examples/models/resources/shaders/glsl330/pbr.fs b/examples/models/resources/shaders/glsl330/pbr.fs index 68bf203a2..72779a185 100644 --- a/examples/models/resources/shaders/glsl330/pbr.fs +++ b/examples/models/resources/shaders/glsl330/pbr.fs @@ -1,11 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Physically based rendering fragment shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 #define MAX_REFLECTION_LOD 4.0 diff --git a/examples/models/resources/shaders/glsl330/pbr.vs b/examples/models/resources/shaders/glsl330/pbr.vs index 045428c68..4729b0141 100644 --- a/examples/models/resources/shaders/glsl330/pbr.vs +++ b/examples/models/resources/shaders/glsl330/pbr.vs @@ -1,11 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Physically based rendering vertex shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 // Input vertex attributes diff --git a/examples/models/resources/shaders/glsl330/prefilter.fs b/examples/models/resources/shaders/glsl330/prefilter.fs index 82f0f7710..3ea694f95 100644 --- a/examples/models/resources/shaders/glsl330/prefilter.fs +++ b/examples/models/resources/shaders/glsl330/prefilter.fs @@ -1,14 +1,7 @@ -/******************************************************************************************* -* -* rPBR [shader] - Prefiltered environment for reflections fragment shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 -#define MAX_SAMPLES 1024u -#define CUBEMAP_RESOLUTION 1024.0 + +#define MAX_SAMPLES 1024u +#define CUBEMAP_RESOLUTION 1024.0 // Input vertex attributes (from vertex shader) in vec3 fragPosition; diff --git a/examples/models/resources/shaders/glsl330/skybox.fs b/examples/models/resources/shaders/glsl330/skybox.fs index 800c1c6fc..bb96fc3c3 100644 --- a/examples/models/resources/shaders/glsl330/skybox.fs +++ b/examples/models/resources/shaders/glsl330/skybox.fs @@ -1,13 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Background skybox fragment shader -* -* Copyright (c) 2017 Victor Fisac -* -* 19-Jun-2020 - modified by Giuseppe Mastrangelo (@peppemas) - VFlip Support -* -**********************************************************************************************/ - #version 330 // Input vertex attributes (from vertex shader) diff --git a/examples/models/resources/shaders/glsl330/skybox.vs b/examples/models/resources/shaders/glsl330/skybox.vs index 4fe9a2c30..6279bc497 100644 --- a/examples/models/resources/shaders/glsl330/skybox.vs +++ b/examples/models/resources/shaders/glsl330/skybox.vs @@ -1,11 +1,3 @@ -/******************************************************************************************* -* -* rPBR [shader] - Background skybox vertex shader -* -* Copyright (c) 2017 Victor Fisac -* -**********************************************************************************************/ - #version 330 // Input vertex attributes