This commit is contained in:
luboslenco
2024-09-30 23:42:58 +02:00
parent 123dac7823
commit 2c26c71b0f
4 changed files with 28 additions and 53 deletions
+26 -41
View File
@@ -1,46 +1,31 @@
#version 450
/**
* Copyright (C) 2013 Jorge Jimenez (jorge@iryoku.com)
* Copyright (C) 2013 Jose I. Echevarria (joseignacioechevarria@gmail.com)
* Copyright (C) 2013 Belen Masia (bmasia@unizar.es)
* Copyright (C) 2013 Fernando Navarro (fernandn@microsoft.com)
* Copyright (C) 2013 Diego Gutierrez (diegog@unizar.es)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is furnished to
* do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. As clarification, there
* is no requirement that the copyright notice and permission be included in
* binary distributions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
/**
* _______ ___ ___ ___ ___
* / || \/ | / \ / \
* | (---- | \ / | / ^ \ / ^ \
* \ \ | |\/| | / /_\ \ / /_\ \
* ----) | | | | | / _____ \ / _____ \
* |_______/ |__| |__| /__/ \__\ /__/ \__\
*
* E N H A N C E D
* S U B P I X E L M O R P H O L O G I C A L A N T I A L I A S I N G
*
* http://www.iryoku.com/smaa/
*/
// Copyright (C) 2013 Jorge Jimenez (jorge@iryoku.com)
// Copyright (C) 2013 Jose I. Echevarria (joseignacioechevarria@gmail.com)
// Copyright (C) 2013 Belen Masia (bmasia@unizar.es)
// Copyright (C) 2013 Fernando Navarro (fernandn@microsoft.com)
// Copyright (C) 2013 Diego Gutierrez (diegog@unizar.es)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// this software and associated documentation files (the "Software"), to deal in
// the Software without restriction, including without limitation the rights to
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
// of the Software, and to permit persons to whom the Software is furnished to
// do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software. As clarification, there
// is no requirement that the copyright notice and permission be included in
// binary distributions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
// http://www.iryoku.com/smaa/
#define SMAA_THRESHOLD 0.1
#define SMAA_DEPTH_THRESHOLD (0.1 * SMAA_THRESHOLD) // For depth edge detection, depends on the depth range of the scene
@@ -3,7 +3,6 @@
uniform vec2 screen_size_inv;
in vec2 pos;
out vec2 tex_coord;
out vec4 offset;
-1
View File
@@ -4,7 +4,6 @@ uniform mat4 SMVP;
in vec3 pos;
in vec3 nor;
out vec3 normal;
void main() {
+2 -10
View File
@@ -53,7 +53,7 @@ function node_shader_add_out(raw: node_shader_t, s: string) {
array_push(raw.outs, s);
}
function node_shader_add_uniform(raw: node_shader_t, s: string, link: string = null, included: bool = false) {
function node_shader_add_uniform(raw: node_shader_t, s: string, link: string = null) {
let ar: string[] = string_split(s, " ");
// layout(RGBA8) image3D voxels
let utype: string = ar[ar.length - 2];
@@ -74,7 +74,7 @@ function node_shader_add_uniform(raw: node_shader_t, s: string, link: string = n
}
node_shader_context_add_constant(raw.context, ar[0], ar[1], link);
}
if (included == false && array_index_of(raw.uniforms, s) == -1) {
if (array_index_of(raw.uniforms, s) == -1) {
array_push(raw.uniforms, s);
}
}
@@ -98,13 +98,6 @@ function node_shader_add_function(raw: node_shader_t, s: string) {
map_set(raw.functions, fname, s);
}
function node_shader_contains(raw: node_shader_t, s: string): bool {
return string_index_of(raw.main, s) >= 0 ||
string_index_of(raw.main_normal, s) >= 0 ||
array_index_of(raw.ins, s) >= 0 ||
string_index_of(raw.main_attribs, s) >= 0;
}
function node_shader_write(raw: node_shader_t, s: string) {
if (raw.write_normal > 0) {
raw.main_normal += s + "\n";
@@ -628,7 +621,6 @@ function node_shader_get_glsl(raw: node_shader_t, shared_sampler: string, versio
///end
function node_shader_get(raw: node_shader_t): string {
if (raw.shader_type == "vert") {
node_shader_vstruct_to_vsin(raw);
}