From 21192a63e1411134b3096da4e5f9a511f913c9b9 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Tue, 13 Jun 2023 16:46:47 -0700 Subject: Changeset: 95 Change Uid's serialization format from JSON array to just a string --- assets/Ires/S_Default.json | 67 +++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 48 deletions(-) (limited to 'assets/Ires/S_Default.json') diff --git a/assets/Ires/S_Default.json b/assets/Ires/S_Default.json index 0bfcb1b..442603b 100644 --- a/assets/Ires/S_Default.json +++ b/assets/Ires/S_Default.json @@ -1,70 +1,41 @@ { "Type": "IresShader", - "Uid": [10239352483866045204, 2308094336962663863], + "Uid": "8e197cd56ad96b14-2007ff9216c015b7", "Value": { "SourceFile": ".stationary/Shaders/Default.glsl", - "Inputs": [ - { - "Semantic": "VES_Position", + "Inputs": [{ "Name": "pos", + "Semantic": "VES_Position", + "OpenGLLocation": 0, "ScalarType": "float", "Width": 1, "Height": 3, - "OpenGLLocation": 0 - }, - { - "Semantic": "VES_TexCoords1", + "ArrayLength": 1 + }, { "Name": "texcoord", + "Semantic": "VES_TexCoords1", + "OpenGLLocation": 1, "ScalarType": "float", "Width": 1, "Height": 2, - "OpenGLLocation": 1 - }, - { - "Semantic": "VES_Color1", + "ArrayLength": 1 + }, { "Name": "color", + "Semantic": "VES_Color1", + "OpenGLLocation": 2, "ScalarType": "float", "Width": 1, "Height": 4, - "OpenGLLocation": 2 - } - ], - "Outputs": [ - { + "ArrayLength": 1 + }], + "Outputs": [{ "Name": "fragColor", + "Semantic": "VES_Generic", + "OpenGLLocation": 0, "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": "VES_Color1", - "ScalarType": "float", - "Width": 1, - "Height": 4 - } - }, - { - "Type": "Sampler", - "Value": { - "Name": "textureAtlas" - } - } - ] + "ArrayLength": 1 + }] } } \ No newline at end of file -- cgit v1.2.3-70-g09d2