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/M_BasicWall.json | 4 +-- assets/Ires/M_DebugWireframe.json | 4 +-- assets/Ires/M_Default.json | 4 +-- assets/Ires/M_Player.json | 4 +-- assets/Ires/SS_Player.json | 10 +++++- assets/Ires/S_Default.json | 67 +++++++++++---------------------------- assets/Ires/S_SimpleLine.json | 30 ++++-------------- 7 files changed, 43 insertions(+), 80 deletions(-) (limited to 'assets/Ires') diff --git a/assets/Ires/M_BasicWall.json b/assets/Ires/M_BasicWall.json index a0e2395..a48e6a5 100644 --- a/assets/Ires/M_BasicWall.json +++ b/assets/Ires/M_BasicWall.json @@ -1,8 +1,8 @@ { "Type": "IresMaterial", - "Uid": [2568492772925683063, 3783268081215530432], + "Uid": "23a51e918a64b577-3480de4676ece5c0", "Value": { - "Shader": [10239352483866045204, 2308094336962663863], + "Shader": "8e197cd56ad96b14-2007ff9216c015b7", "Fields": [{ "Name": "taint", "Type": "Vector", diff --git a/assets/Ires/M_DebugWireframe.json b/assets/Ires/M_DebugWireframe.json index c610011..8caf5ed 100644 --- a/assets/Ires/M_DebugWireframe.json +++ b/assets/Ires/M_DebugWireframe.json @@ -1,8 +1,8 @@ { "Type": "IresMaterial", - "Uid": [8765761170342665863, 6245907801943875283], + "Uid": "79a63d57682fde87-56adec0dbab49ed3", "Value": { - "Shader": [677745099593877908, 15625205469120742998], + "Shader": "0967d593c58e0994-d8d7e196996ec656", "Fields": [] } } \ No newline at end of file diff --git a/assets/Ires/M_Default.json b/assets/Ires/M_Default.json index 0422e94..fcc9fe0 100644 --- a/assets/Ires/M_Default.json +++ b/assets/Ires/M_Default.json @@ -1,8 +1,8 @@ { "Type": "IresMaterial", - "Uid": [1173927873865027620, 6990602806197486151], + "Uid": "104aa12e79a79024-61039c36e5400247", "Value": { - "Shader": [10239352483866045204, 2308094336962663863], + "Shader": "8e197cd56ad96b14-2007ff9216c015b7", "Fields": [{ "Name": "taint", "Type": "Vector", diff --git a/assets/Ires/M_Player.json b/assets/Ires/M_Player.json index b2494dc..e9b9de9 100644 --- a/assets/Ires/M_Player.json +++ b/assets/Ires/M_Player.json @@ -1,8 +1,8 @@ { "Type": "IresMaterial", - "Uid": [8784140338803637141, 14601353797962284625], + "Uid": "79e789190791fb95-caa26deaff57be51", "Value": { - "Shader": [10239352483866045204, 2308094336962663863], + "Shader": "8e197cd56ad96b14-2007ff9216c015b7", "Fields": [{ "Name": "taint", "Type": "Vector", diff --git a/assets/Ires/SS_Player.json b/assets/Ires/SS_Player.json index b413317..c2920ed 100644 --- a/assets/Ires/SS_Player.json +++ b/assets/Ires/SS_Player.json @@ -1 +1,9 @@ -{"Type":"IresSpritesheet","Uid":[15827420425478528881,8130926596581515031],"Value":{"SpriteSheet":"S_Player.png","WSplit":6,"HSplit":4}} \ No newline at end of file +{ + "Type": "IresSpritesheet", + "Uid": "dba64b050b68df71-70d6daa8fc045f17", + "Value": { + "SpriteSheet": "S_Player.png", + "WSplit": 6, + "HSplit": 4 + } +} \ No newline at end of file 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 diff --git a/assets/Ires/S_SimpleLine.json b/assets/Ires/S_SimpleLine.json index c20538d..b2dc464 100644 --- a/assets/Ires/S_SimpleLine.json +++ b/assets/Ires/S_SimpleLine.json @@ -1,41 +1,25 @@ { "Type": "IresShader", - "Uid": [677745099593877908, 15625205469120742998], + "Uid": "0967d593c58e0994-d8d7e196996ec656", "Value": { "SourceFile": ".stationary/Shaders/SimpleLine.glsl", - "Inputs": [ - { + "Inputs": [{ "Name": "pos", - "Semantic": "Position", + "Semantic": "VES_Generic", "OpenGLLocation": 0, "ScalarType": "float", "Width": 1, "Height": 3, "ArrayLength": 1 - } - ], - "Outputs": [ - { + }], + "Outputs": [{ "Name": "fragColor", - "Semantic": "Generic", + "Semantic": "VES_Generic", "OpenGLLocation": 0, "ScalarType": "float", "Width": 1, "Height": 4, "ArrayLength": 1 - } - ], - "Uniforms": [ - { - "Type": "Math", - "AutoFill": true, - "Value": { - "Name": "transformation", - "ScalarType": "float", - "Width": 4, - "Height": 4 - } - } - ] + }] } } \ No newline at end of file -- cgit v1.2.3-70-g09d2