From e5d17625ce064ed60d7fb7e7dd40ddf22b99b3ed Mon Sep 17 00:00:00 2001 From: Jan-Felix Date: Tue, 5 Jul 2022 13:15:09 +0200 Subject: [PATCH] update to latest wand templates --- test/cases/wand.only/0.svg | 2 +- test/cases/wand.only/Template.sol | 132 ++++---- test/cases/wand.only/background.partial.hbs | 17 +- test/cases/wand.only/birthchart.partial.hbs | 23 +- test/cases/wand.only/filter.partial.hbs | 200 ++++++------ test/cases/wand.only/halo.partial.hbs | 2 +- test/cases/wand.only/handles.partial.hbs | 326 +++++++++----------- test/cases/wand.only/sparkle.partial.hbs | 12 +- test/cases/wand.only/stars.partial.hbs | 14 +- test/cases/wand.only/stone.partial.hbs | 36 +-- test/cases/wand.only/xpBar.partial.hbs | 35 +-- 11 files changed, 369 insertions(+), 430 deletions(-) diff --git a/test/cases/wand.only/0.svg b/test/cases/wand.only/0.svg index 871fba3..d15cd59 100644 --- a/test/cases/wand.only/0.svg +++ b/test/cases/wand.only/0.svg @@ -1 +1 @@ - FLOURISHING MISTY WORLD \ No newline at end of file + FLOURISHING MISTY WORLD \ No newline at end of file diff --git a/test/cases/wand.only/Template.sol b/test/cases/wand.only/Template.sol index bc1fa25..90cfb88 100644 --- a/test/cases/wand.only/Template.sol +++ b/test/cases/wand.only/Template.sol @@ -1,9 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.6; -string constant __constant0 = ' '; -string constant __constant2 = '-grad" gradientUnits="objectBoundingBox" x1="80%" x2="20%" y1="200%" y2="-400%"> ', - __constant0, - '0.8 0 " /> ', - ' ' + '" /> ', + ' ', + ' ', + ' ', - ' ' + ', 1000, 1060)" cx="1000" cy="1060" r="260" filter="url(#s)" /> ', + ' ' ) ); } @@ -222,7 +219,7 @@ contract Template { __result = string( abi.encodePacked( __result, - ' ' + ' ' ) ); for (uint256 __i; __i < __input.aspects.length; __i++) { @@ -319,13 +316,11 @@ contract Template { SolidMustacheHelpers.intToString(__input.aspects[__i].x2, 0), ",", SolidMustacheHelpers.intToString(__input.aspects[__i].y2, 0), - ' m25,25" stroke="url(#aspectgradient)" stroke-width="8" clip-path="url(#aspect-clip)" /> ' + ' m25,25" stroke="url(#ag)" stroke-width="8" clip-path="url(#ac)" /> ' ) ); } - __result = string( - abi.encodePacked(__result, ' ') - ); + __result = string(abi.encodePacked(__result, ' ')); for (uint256 __i2; __i2 < __input.planets.length; __i2++) { __result = string(abi.encodePacked(__result, " ")); if (__input.planets[__i2].visible) { @@ -355,7 +350,7 @@ contract Template { __result = string( abi.encodePacked( __result, - ' ' + ' ' ) ); for (uint256 __i; __i < __input.sparkles.length; __i++) { @@ -368,7 +363,7 @@ contract Template { SolidMustacheHelpers.intToString(__input.sparkles[__i].ty, 0), ") scale(", SolidMustacheHelpers.uintToString(__input.sparkles[__i].scale, 2), - ')" href="#sprkl" /> ' + ')" href="#sp" /> ' ) ); } @@ -385,9 +380,8 @@ library BackgroundLayer { __result = string( abi.encodePacked( __result, - ' ', - __constant0, - '1 0 " /> ', + ' ', + ' ', " " ) ); @@ -403,11 +397,11 @@ library BackgroundLayer { SolidMustacheHelpers.uintToString(__input.layers[__i].turbFreqY, 3), '" numOctaves="', SolidMustacheHelpers.uintToString(__input.layers[__i].turbOct, 0), - '" seed="1004123123" result="turb_', + '" seed="1004123123" result="t', SolidMustacheHelpers.uintToString(__i, 0), '" /> ' ) @@ -501,20 +495,25 @@ library BackgroundLayer { __result = string( abi.encodePacked( __result, - ' ' + ' ' ) ); for (uint256 __i2; __i2 < __input.layers.length; __i2++) { __result = string( abi.encodePacked( __result, - ' ' ) ); } - __result = string(abi.encodePacked(__result, " ")); + __result = string( + abi.encodePacked( + __result, + ' ' + ) + ); } function background(Template.Background memory __input) @@ -545,7 +544,7 @@ library BackgroundLayer { '%, 1)" d="M0 0h2000v3000H0z"/> ' + '%, 1)"/> ' ) ); } @@ -596,7 +595,7 @@ library BackgroundLayer { __result = string( abi.encodePacked( __result, - ' ' + '%, 1)"/> ' ) ); } @@ -613,7 +612,7 @@ library BackgroundLayer { __result = string( abi.encodePacked( __result, - ' ' + ' ' ) ); } @@ -626,21 +625,13 @@ library BackgroundLayer { __result = string( abi.encodePacked( __result, - " ', + ' * 37.2%) 100%;fill:none;stroke-width:28;stroke:url(#xpg);opacity:1;mix-blend-mode:plus-lighter"/> ', __input.crown - ? ' ' + ? ' ' : "" ) ); @@ -654,9 +645,9 @@ library BackgroundLayer { __result = string( abi.encodePacked( __result, - ' ' + '"/> ' ) ); } @@ -704,19 +695,20 @@ library HandleLayer { __result = string( abi.encodePacked( __result, - ' ', + ' ', __input.handle0 - ? ' ' + ? ' ' : "", __input.handle1 - ? ' ' + ? ' ' : "", __input.handle2 - ? ' ' + ? ' ' : "", __input.handle3 - ? ' ' - : "" + ? ' ' + : "", + "" ) ); } diff --git a/test/cases/wand.only/background.partial.hbs b/test/cases/wand.only/background.partial.hbs index 8a4ef05..d7d1f60 100644 --- a/test/cases/wand.only/background.partial.hbs +++ b/test/cases/wand.only/background.partial.hbs @@ -21,30 +21,25 @@ {{/if}} {{#if linear}} {{#if light}} - + - + {{/if}} {{#if dark}} - + - + {{/if}} {{/if}} - - - - - - - + + - - - - - - + + - - - - + + + + - - - - - + + + - - + + - - + + - - - - + + + + + + {{~#if handle0~}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{~/if~}} + {{~#if handle1~}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{~/if~}} {{~#if handle2~}} - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + {{~/if~}} {{~#if handle3~}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{~/if~}} \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{{~/if~}} + \ No newline at end of file diff --git a/test/cases/wand.only/sparkle.partial.hbs b/test/cases/wand.only/sparkle.partial.hbs index 622d95b..2cca75b 100644 --- a/test/cases/wand.only/sparkle.partial.hbs +++ b/test/cases/wand.only/sparkle.partial.hbs @@ -1,14 +1,14 @@ - - - + + + - + {{#each sparkles}} - + {{/each}} \ No newline at end of file diff --git a/test/cases/wand.only/stars.partial.hbs b/test/cases/wand.only/stars.partial.hbs index de9d954..28b5d4a 100644 --- a/test/cases/wand.only/stars.partial.hbs +++ b/test/cases/wand.only/stars.partial.hbs @@ -1,16 +1,16 @@ - - + + - + - - + + @@ -29,7 +29,7 @@ width="100%" height="100%" fill="white" - mask="url(#starsmask)" - clip-path="url(#starsclip)" + mask="url(#stm)" + clip-path="url(#stc)" /> \ No newline at end of file diff --git a/test/cases/wand.only/stone.partial.hbs b/test/cases/wand.only/stone.partial.hbs index b1915eb..241acd7 100644 --- a/test/cases/wand.only/stone.partial.hbs +++ b/test/cases/wand.only/stone.partial.hbs @@ -1,4 +1,4 @@ - + {{! }} @@ -40,38 +40,37 @@ /> - - + + - + - + {{! clip paths }} - + {{! stone base }} {{! stone shadow }} @@ -79,12 +78,12 @@ cx="1200" cy="1060" r="520" - fill="url(#stoneshadow)" - clip-path="url(#stoneclip)" + fill="url(#ss)" + clip-path="url(#sc)" /> - + - - - \ No newline at end of file + + \ No newline at end of file diff --git a/test/cases/wand.only/xpBar.partial.hbs b/test/cases/wand.only/xpBar.partial.hbs index 414db56..9f62c8f 100644 --- a/test/cases/wand.only/xpBar.partial.hbs +++ b/test/cases/wand.only/xpBar.partial.hbs @@ -1,49 +1,34 @@ - - - - - + - + - - + + - - - + + + {{#if crown}} - + {{/if}} \ No newline at end of file