From 1717c62f258c3cad297e9d066da7cbe57f8be200 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Thu, 15 Jun 2023 18:14:02 -0700 Subject: Changeset: 98 Cleanup and prepare for rewriting shader system --- assets/Ires/M_BasicWall.json | 12 ------------ assets/Ires/M_DebugWireframe.json | 8 -------- assets/Ires/M_Default.json | 12 ------------ assets/Ires/M_Player.json | 12 ------------ assets/Ires/S_Default.json | 41 --------------------------------------- assets/Ires/S_SimpleLine.json | 22 +++------------------ 6 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 assets/Ires/M_BasicWall.json delete mode 100644 assets/Ires/M_DebugWireframe.json delete mode 100644 assets/Ires/M_Default.json delete mode 100644 assets/Ires/M_Player.json delete mode 100644 assets/Ires/S_Default.json (limited to 'assets/Ires') diff --git a/assets/Ires/M_BasicWall.json b/assets/Ires/M_BasicWall.json deleted file mode 100644 index a48e6a5..0000000 --- a/assets/Ires/M_BasicWall.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Type": "IresMaterial", - "Uid": "23a51e918a64b577-3480de4676ece5c0", - "Value": { - "Shader": "8e197cd56ad96b14-2007ff9216c015b7", - "Fields": [{ - "Name": "taint", - "Type": "Vector", - "Value": [0.03868706524372101, 0.6346951127052307, 0.7892156839370728, 0.0] - }] - } -} \ No newline at end of file diff --git a/assets/Ires/M_DebugWireframe.json b/assets/Ires/M_DebugWireframe.json deleted file mode 100644 index 8caf5ed..0000000 --- a/assets/Ires/M_DebugWireframe.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Type": "IresMaterial", - "Uid": "79a63d57682fde87-56adec0dbab49ed3", - "Value": { - "Shader": "0967d593c58e0994-d8d7e196996ec656", - "Fields": [] - } -} \ No newline at end of file diff --git a/assets/Ires/M_Default.json b/assets/Ires/M_Default.json deleted file mode 100644 index fcc9fe0..0000000 --- a/assets/Ires/M_Default.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Type": "IresMaterial", - "Uid": "104aa12e79a79024-61039c36e5400247", - "Value": { - "Shader": "8e197cd56ad96b14-2007ff9216c015b7", - "Fields": [{ - "Name": "taint", - "Type": "Vector", - "Value": [1.0, 1.0, 1.0, 0.0] - }] - } -} \ No newline at end of file diff --git a/assets/Ires/M_Player.json b/assets/Ires/M_Player.json deleted file mode 100644 index e9b9de9..0000000 --- a/assets/Ires/M_Player.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Type": "IresMaterial", - "Uid": "79e789190791fb95-caa26deaff57be51", - "Value": { - "Shader": "8e197cd56ad96b14-2007ff9216c015b7", - "Fields": [{ - "Name": "taint", - "Type": "Vector", - "Value": [1.0, 1.0, 1.0, 0.0] - }] - } -} \ No newline at end of file diff --git a/assets/Ires/S_Default.json b/assets/Ires/S_Default.json deleted file mode 100644 index 442603b..0000000 --- a/assets/Ires/S_Default.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "Type": "IresShader", - "Uid": "8e197cd56ad96b14-2007ff9216c015b7", - "Value": { - "SourceFile": ".stationary/Shaders/Default.glsl", - "Inputs": [{ - "Name": "pos", - "Semantic": "VES_Position", - "OpenGLLocation": 0, - "ScalarType": "float", - "Width": 1, - "Height": 3, - "ArrayLength": 1 - }, { - "Name": "texcoord", - "Semantic": "VES_TexCoords1", - "OpenGLLocation": 1, - "ScalarType": "float", - "Width": 1, - "Height": 2, - "ArrayLength": 1 - }, { - "Name": "color", - "Semantic": "VES_Color1", - "OpenGLLocation": 2, - "ScalarType": "float", - "Width": 1, - "Height": 4, - "ArrayLength": 1 - }], - "Outputs": [{ - "Name": "fragColor", - "Semantic": "VES_Generic", - "OpenGLLocation": 0, - "ScalarType": "float", - "Width": 1, - "Height": 4, - "ArrayLength": 1 - }] - } -} \ No newline at end of file diff --git a/assets/Ires/S_SimpleLine.json b/assets/Ires/S_SimpleLine.json index b2dc464..5b62b0e 100644 --- a/assets/Ires/S_SimpleLine.json +++ b/assets/Ires/S_SimpleLine.json @@ -1,25 +1,9 @@ { "Type": "IresShader", - "Uid": "0967d593c58e0994-d8d7e196996ec656", + "Uid": "1d6ae0953c91b56f-333f006389f662d9", "Value": { "SourceFile": ".stationary/Shaders/SimpleLine.glsl", - "Inputs": [{ - "Name": "pos", - "Semantic": "VES_Generic", - "OpenGLLocation": 0, - "ScalarType": "float", - "Width": 1, - "Height": 3, - "ArrayLength": 1 - }], - "Outputs": [{ - "Name": "fragColor", - "Semantic": "VES_Generic", - "OpenGLLocation": 0, - "ScalarType": "float", - "Width": 1, - "Height": 4, - "ArrayLength": 1 - }] + "Inputs": [], + "Outputs": [] } } \ No newline at end of file -- cgit v1.2.3-70-g09d2