From fe647a980333576aa3e544743c3aeea0f914fc81 Mon Sep 17 00:00:00 2001 From: deepkolos Date: Mon, 11 Mar 2024 21:05:23 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20cartoon=20water=20positio?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/demoCartoonWater/CartoonWater.json | 243 +++++++++--------- 1 file changed, 124 insertions(+), 119 deletions(-) diff --git a/example/demo/demoCartoonWater/CartoonWater.json b/example/demo/demoCartoonWater/CartoonWater.json index 04588a4..6f7d00b 100644 --- a/example/demo/demoCartoonWater/CartoonWater.json +++ b/example/demo/demoCartoonWater/CartoonWater.json @@ -32,7 +32,8 @@ 0.19215686274509805 ], "baseColorValueType": "vec3", - "expanded": true + "expanded": true, + "baseColorValueUsage": "color" }, "inputs": { "baseColor": { @@ -104,8 +105,8 @@ } ], "position": [ - 4296.064867296497, - 198.06879762879475 + 1263.1608145621221, + -519.2072033477677 ], "name": "Fragment" }, @@ -214,8 +215,8 @@ } ], "position": [ - 4297.836343261305, - -81.46763923361664 + 1264.93229052693, + -798.7436402101791 ], "name": "Vertex" }, @@ -260,8 +261,8 @@ }, "blocks": [], "position": [ - -388.0542745462867, - 959.4445475349363 + -3420.9583272806617, + 242.1685465583738 ], "name": "Time" }, @@ -310,8 +311,8 @@ }, "blocks": [], "position": [ - -168.00353540755737, - 1078.665598242307 + -3200.907588141932, + 361.38959726574444 ], "name": "Multiply" }, @@ -360,8 +361,8 @@ }, "blocks": [], "position": [ - -323.5204370607172, - 1261.4159869372027 + -3356.424489795092, + 544.1399859606402 ], "name": "Divide" }, @@ -388,8 +389,8 @@ }, "blocks": [], "position": [ - -477.61988955064237, - 1261.729615658133 + -3510.5239422850173, + 544.4536146815706 ], "name": "Parameter" }, @@ -416,8 +417,8 @@ }, "blocks": [], "position": [ - -442.6494233295608, - 1355.534509627064 + -3475.5534760639357, + 638.2585086505014 ], "name": "Parameter" }, @@ -475,8 +476,8 @@ }, "blocks": [], "position": [ - 68.12629306883127, - 882.6789602373077 + -2964.7777596655437, + 165.4029592607452 ], "name": "Add" }, @@ -508,8 +509,8 @@ }, "blocks": [], "position": [ - -178.35223769555046, - 745.1010770943416 + -3211.2562904299257, + 27.825076117779076 ], "name": "UV" }, @@ -539,8 +540,8 @@ }, "blocks": [], "position": [ - 92.8796911185928, - 714.3886358885085 + -2940.0243616157823, + -2.8873650880540254 ], "name": "Parameter" }, @@ -606,8 +607,8 @@ }, "blocks": [], "position": [ - 582.7412197241417, - 764.7104804309771 + -2450.162833010233, + 47.4344794544146 ], "name": "Multiply" }, @@ -634,8 +635,8 @@ }, "blocks": [], "position": [ - 322.6831294400112, - 1099.1617317631826 + -2690.8247969047825, + 409.3122011859047 ], "name": "Parameter" }, @@ -666,8 +667,8 @@ }, "blocks": [], "position": [ - 350.65622488507483, - 256.86660033197666 + -2682.2478278493, + -460.40940064458584 ], "name": "UV" }, @@ -729,8 +730,8 @@ }, "blocks": [], "position": [ - 922.397582389214, - 258.71349779898935 + -2110.506470345161, + -458.56250317757315 ], "name": "Add" }, @@ -757,8 +758,8 @@ }, "blocks": [], "position": [ - 1140.127568814603, - 353.38634658159333 + -1892.776483919772, + -363.88965439496917 ], "name": "Parameter" }, @@ -824,8 +825,8 @@ }, "blocks": [], "position": [ - 1308.8813694968694, - 254.0498127084015 + -1724.0226832375056, + -463.22618826816097 ], "name": "Multiply" }, @@ -855,8 +856,8 @@ }, "blocks": [], "position": [ - 1323.8180094094387, - 195.8403270659553 + -1709.0860433249363, + -521.4356739106072 ], "name": "Parameter" }, @@ -887,7 +888,9 @@ "spaceValueType": "string", "expanded": true, "preview": true, - "samplerValueType": "sampler" + "samplerValueType": "sampler", + "texColorSpaceValue": "sRGB", + "texColorSpaceValueType": "string" }, "inputs": { "texture": { @@ -934,17 +937,17 @@ "g": { "connections": [] }, - "a": { + "b": { "connections": [] }, - "b": { + "a": { "connections": [] } }, "blocks": [], "position": [ - 1572.8993945199477, - 240.79548122005087 + -1460.0046582144273, + -476.4805197565116 ], "name": "SampleTexture2D" }, @@ -998,8 +1001,8 @@ }, "blocks": [], "position": [ - 2134.32762753579, - 166.02187234989037 + -898.5764251985852, + -551.2541286266721 ], "name": "Add" }, @@ -1030,7 +1033,9 @@ "spaceValueType": "string", "expanded": true, "preview": true, - "samplerValueType": "sampler" + "samplerValueType": "sampler", + "texColorSpaceValue": "sRGB", + "texColorSpaceValueType": "string" }, "inputs": { "texture": { @@ -1077,17 +1082,17 @@ "g": { "connections": [] }, - "a": { + "b": { "connections": [] }, - "b": { + "a": { "connections": [] } }, "blocks": [], "position": [ - 2359.2572021782753, - 148.0798431547662 + -660.8846221539288, + -631.232037045742 ], "name": "SampleTexture2D" }, @@ -1117,8 +1122,8 @@ }, "blocks": [], "position": [ - 2095.952529614211, - 105.88323831949833 + -936.951523120164, + -611.3927626570642 ], "name": "Parameter" }, @@ -1149,8 +1154,8 @@ }, "blocks": [], "position": [ - 2618.381484215888, - 55.043988520739504 + -414.5225685184869, + -662.232012455823 ], "name": "Parameter" }, @@ -1181,8 +1186,8 @@ }, "blocks": [], "position": [ - 2584.799193291637, - 99.36292280377143 + -448.10485944273796, + -617.9130781727911 ], "name": "Parameter" }, @@ -1258,8 +1263,8 @@ }, "blocks": [], "position": [ - 2853.836143845212, - 32.92706473166095 + -179.06790888916294, + -684.3489362449016 ], "name": "Lerp" }, @@ -1292,8 +1297,8 @@ }, "blocks": [], "position": [ - 3891.490009356867, - -422.16980006339804 + 858.5859566224922, + -1139.4458010399605 ], "name": "Position" }, @@ -1344,8 +1349,8 @@ }, "blocks": [], "position": [ - 3914.2085598948292, - -262.8079091192669 + 881.3045071604542, + -980.0839100958294 ], "name": "Vector 3" }, @@ -1393,8 +1398,8 @@ }, "blocks": [], "position": [ - 3663.8590913062326, - -227.02605034468183 + 630.9550385718576, + -944.3020513212443 ], "name": "Multiply" }, @@ -1432,8 +1437,8 @@ }, "blocks": [], "position": [ - 3479.335876607095, - -230.12403383664537 + 446.4318238727201, + -947.4000348132079 ], "name": "Sine" }, @@ -1460,8 +1465,8 @@ }, "blocks": [], "position": [ - 3474.3239813419054, - -117.34303278433595 + 441.41992860753044, + -834.6190337608984 ], "name": "Parameter" }, @@ -1511,8 +1516,8 @@ }, "blocks": [], "position": [ - 3101.283175659069, - -339.8867724374543 + 68.379122924694, + -1057.1627734140168 ], "name": "Add" }, @@ -1561,8 +1566,8 @@ }, "blocks": [], "position": [ - 3302.8293750568455, - -230.6989863734509 + 269.9253223224705, + -947.9749873500134 ], "name": "Add" }, @@ -1624,8 +1629,8 @@ }, "blocks": [], "position": [ - 2929.8516022613076, - -355.87616699260866 + -103.05245047306744, + -1073.1521679691712 ], "name": "Split" }, @@ -1670,8 +1675,8 @@ }, "blocks": [], "position": [ - 3096.78766144512, - -195.80123290388815 + 63.88360871074519, + -913.0772338804506 ], "name": "Time" }, @@ -1704,8 +1709,8 @@ }, "blocks": [], "position": [ - 2749.4473656659584, - -355.7140791717154 + -283.4566870684166, + -1072.990080148278 ], "name": "Position" }, @@ -1781,8 +1786,8 @@ }, "blocks": [], "position": [ - 3561.7299966205405, - 210.10027048666984 + 528.8259438861655, + -507.17573048989266 ], "name": "Lerp" }, @@ -1813,8 +1818,8 @@ }, "blocks": [], "position": [ - 3141.878884901196, - 278.35001126798704 + 108.97483216682122, + -438.92598970857546 ], "name": "Parameter" }, @@ -1845,8 +1850,8 @@ }, "blocks": [], "position": [ - 3556.20609829685, - 140.26864791320372 + 523.3020455624751, + -577.0073530633588 ], "name": "Parameter" }, @@ -1922,8 +1927,8 @@ }, "blocks": [], "position": [ - 3810.331528281997, - 171.35873764599432 + 777.4274755476222, + -545.9172633305682 ], "name": "Lerp" }, @@ -1950,8 +1955,8 @@ }, "blocks": [], "position": [ - 4137.578371775704, - 278.04361676305064 + 1104.674319041329, + -439.23238421351186 ], "name": "Parameter" }, @@ -1994,8 +1999,8 @@ }, "blocks": [], "position": [ - 3583.791495647559, - 587.1258203655851 + 550.8874429131838, + -130.15018061097737 ], "name": "Step" }, @@ -2032,8 +2037,8 @@ }, "blocks": [], "position": [ - 3329.4599126723265, - 616.2956257086543 + 296.5558599379515, + -100.98037526790824 ], "name": "Saturate" }, @@ -2082,8 +2087,8 @@ }, "blocks": [], "position": [ - 3081.362469157899, - 618.955005551151 + 48.458416423523886, + -98.32099542541152 ], "name": "Divide" }, @@ -2132,8 +2137,8 @@ }, "blocks": [], "position": [ - 2662.5661828546586, - 611.5451222083607 + -370.33786987971644, + -105.73087876820182 ], "name": "Subtract" }, @@ -2160,8 +2165,8 @@ }, "blocks": [], "position": [ - 2881.4719936157658, - 695.4166133142028 + -151.43205911860923, + -21.859387662359723 ], "name": "Parameter" }, @@ -2218,8 +2223,8 @@ }, "blocks": [], "position": [ - 2417.2683709820863, - 756.513488528823 + -615.6356817522887, + 39.23748755226052 ], "name": "Split" }, @@ -2279,8 +2284,8 @@ }, "blocks": [], "position": [ - 2159.2113329190915, - 605.3526078253724 + -873.6927198152835, + -111.92339315119011 ], "name": "Add" }, @@ -2352,8 +2357,8 @@ }, "blocks": [], "position": [ - 302.085202693765, - 701.839890204731 + -2730.81885004061, + -15.436110771831522 ], "name": "NormalFromTexture" }, @@ -2410,8 +2415,8 @@ }, "blocks": [], "position": [ - 738.3729849520502, - 256.1381928084814 + -2294.531067782325, + -461.1378081680811 ], "name": "Vector 3" }, @@ -2472,8 +2477,8 @@ }, "blocks": [], "position": [ - 512.6405711083254, - 255.84711967723723 + -2520.2634816260497, + -461.42888129932527 ], "name": "Split" }, @@ -2508,8 +2513,8 @@ }, "blocks": [], "position": [ - 1930.9686839188694, - 639.0487147027719 + -1101.9353688155056, + -78.22728627379058 ], "name": "ScreenPosition" }, @@ -2544,8 +2549,8 @@ }, "blocks": [], "position": [ - 2199.9112484448865, - 756.4308331477558 + -832.9928042894885, + 39.154832171193334 ], "name": "ScreenPosition" }, @@ -2585,8 +2590,8 @@ }, "blocks": [], "position": [ - 2346.428529159055, - 607.6733125638292 + -686.47552357532, + -109.6026884127333 ], "name": "SceneDepth" }, @@ -2646,8 +2651,8 @@ }, "blocks": [], "position": [ - 4216.337516883902, - -352.66793064412684 + 1183.433464149527, + -1069.9439316206895 ], "name": "Add" }, @@ -2675,8 +2680,8 @@ }, "blocks": [], "position": [ - 13.730047238497924, - 1127.7597329442938 + -3019.1740054958773, + 410.4837319677313 ], "name": "SamplerState" }, @@ -2704,8 +2709,8 @@ }, "blocks": [], "position": [ - 1289.1701824829677, - 448.2417411461221 + -1743.7338702514073, + -269.0342598304404 ], "name": "SamplerState" }, @@ -2733,8 +2738,8 @@ }, "blocks": [], "position": [ - 2066.96779559463, - 336.846153226274 + -965.9362571397451, + -380.4298477502885 ], "name": "SamplerState" }