From 497a0ddb2ab57f6c517543ca20ea1b8333214710 Mon Sep 17 00:00:00 2001 From: hnOsmium0001 Date: Tue, 19 Apr 2022 12:36:02 -0700 Subject: Add hardcoded dependencies for IresManager, migrate Shader to Ires --- assets/Shaders/S_Default.glsl | 38 ------------------------- assets/Shaders/S_Default.json | 65 ------------------------------------------- 2 files changed, 103 deletions(-) delete mode 100644 assets/Shaders/S_Default.glsl delete mode 100644 assets/Shaders/S_Default.json (limited to 'assets/Shaders') diff --git a/assets/Shaders/S_Default.glsl b/assets/Shaders/S_Default.glsl deleted file mode 100644 index 1d93471..0000000 --- a/assets/Shaders/S_Default.glsl +++ /dev/null @@ -1,38 +0,0 @@ -#type vertex -#version 330 core - -layout(location = 0) in vec3 pos; -layout(location = 1) in vec4 color; -layout(location = 2) in vec2 texcoord; - -out Vertex2Fragmnet { - vec4 color; - vec2 texcoord; -} v2f; - -// Autofill uniforms -uniform mat4 transformation; - -void main() { - gl_Position = transformation * vec4(pos, 1.0); - v2f.color = color; - v2f.texcoord = texcoord; -} - -#type fragment -#version 330 core - -in Vertex2Fragmnet { - vec4 color; - vec2 texcoord; -} v2f; - -out vec4 fragColor; - -// Material uniforms -uniform sampler2D textureAtlas; -uniform vec4 taint; - -void main() { - fragColor = texture(textureAtlas, v2f.texcoord) * v2f.color * taint; -} diff --git a/assets/Shaders/S_Default.json b/assets/Shaders/S_Default.json deleted file mode 100644 index df37792..0000000 --- a/assets/Shaders/S_Default.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "Inputs": [ - { - "Semantic": "Position", - "Name": "pos", - "ScalarType": "float", - "Width": 1, - "Height": 3, - "OpenGLLocation": 0 - }, - { - "Semantic": "TexCoords1", - "Name": "texcoord", - "ScalarType": "float", - "Width": 1, - "Height": 2, - "OpenGLLocation": 1 - }, - { - "Semantic": "Color1", - "Name": "color", - "ScalarType": "float", - "Width": 1, - "Height": 4, - "OpenGLLocation": 2 - } - ], - "Outputs": [ - { - "Name": "fragColor", - "ScalarType": "float", - "Width": 1, - "Height": 4, - "OpenGLLocation": 0 - } - ], - "Uniforms": [ - { - "Type": "Math", - "AutoFill": true, - "Value": { - "Name": "transformation", - "ScalarType": "float", - "Width": 4, - "Height": 4 - } - }, - { - "Type": "Math", - "Value": { - "Name": "taint", - "Semantic": "Color1", - "ScalarType": "float", - "Width": 1, - "Height": 4 - } - }, - { - "Type": "Sampler", - "Value": { - "Name": "textureAtlas" - } - } - ] -} \ No newline at end of file -- cgit v1.2.3-70-g09d2