diff --git a/assets/images/chichen_itza/1.5x/chichen.png b/assets/images/chichen_itza/1.5x/chichen.png deleted file mode 100644 index 6ca6ebb6..00000000 Binary files a/assets/images/chichen_itza/1.5x/chichen.png and /dev/null differ diff --git a/assets/images/chichen_itza/4.0x/chichen.png b/assets/images/chichen_itza/4.0x/chichen.png deleted file mode 100644 index 97b710e0..00000000 Binary files a/assets/images/chichen_itza/4.0x/chichen.png and /dev/null differ diff --git a/assets/images/collectibles/2.0x/jewelry.png b/assets/images/collectibles/2.0x/jewelry.png index d8116f2f..9215a6d9 100644 Binary files a/assets/images/collectibles/2.0x/jewelry.png and b/assets/images/collectibles/2.0x/jewelry.png differ diff --git a/assets/images/collectibles/2.0x/picture.png b/assets/images/collectibles/2.0x/picture.png index 533f9151..0c220988 100644 Binary files a/assets/images/collectibles/2.0x/picture.png and b/assets/images/collectibles/2.0x/picture.png differ diff --git a/assets/images/collectibles/2.0x/scroll.png b/assets/images/collectibles/2.0x/scroll.png index 742268b9..3fe2bfec 100644 Binary files a/assets/images/collectibles/2.0x/scroll.png and b/assets/images/collectibles/2.0x/scroll.png differ diff --git a/assets/images/collectibles/2.0x/statue.png b/assets/images/collectibles/2.0x/statue.png index 32f76daa..2e950e06 100644 Binary files a/assets/images/collectibles/2.0x/statue.png and b/assets/images/collectibles/2.0x/statue.png differ diff --git a/assets/images/collectibles/2.0x/textile.png b/assets/images/collectibles/2.0x/textile.png index 7e27a91a..faa58933 100644 Binary files a/assets/images/collectibles/2.0x/textile.png and b/assets/images/collectibles/2.0x/textile.png differ diff --git a/assets/images/collectibles/2.0x/vase.png b/assets/images/collectibles/2.0x/vase.png index 0b33dbcf..be7ce189 100644 Binary files a/assets/images/collectibles/2.0x/vase.png and b/assets/images/collectibles/2.0x/vase.png differ diff --git a/assets/images/collectibles/3.0x/jewelry.png b/assets/images/collectibles/3.0x/jewelry.png index ac5e1e9c..d9254e68 100644 Binary files a/assets/images/collectibles/3.0x/jewelry.png and b/assets/images/collectibles/3.0x/jewelry.png differ diff --git a/assets/images/collectibles/3.0x/picture.png b/assets/images/collectibles/3.0x/picture.png index c849200e..5e631187 100644 Binary files a/assets/images/collectibles/3.0x/picture.png and b/assets/images/collectibles/3.0x/picture.png differ diff --git a/assets/images/collectibles/3.0x/scroll.png b/assets/images/collectibles/3.0x/scroll.png index 8dddbf13..3da73406 100644 Binary files a/assets/images/collectibles/3.0x/scroll.png and b/assets/images/collectibles/3.0x/scroll.png differ diff --git a/assets/images/collectibles/3.0x/statue.png b/assets/images/collectibles/3.0x/statue.png index d35f2017..363e4b84 100644 Binary files a/assets/images/collectibles/3.0x/statue.png and b/assets/images/collectibles/3.0x/statue.png differ diff --git a/assets/images/collectibles/3.0x/textile.png b/assets/images/collectibles/3.0x/textile.png index b1fa1df9..672c305e 100644 Binary files a/assets/images/collectibles/3.0x/textile.png and b/assets/images/collectibles/3.0x/textile.png differ diff --git a/assets/images/collectibles/3.0x/vase.png b/assets/images/collectibles/3.0x/vase.png index f35a30d5..adf094f3 100644 Binary files a/assets/images/collectibles/3.0x/vase.png and b/assets/images/collectibles/3.0x/vase.png differ diff --git a/assets/images/collectibles/4.0x/jewelry.png b/assets/images/collectibles/4.0x/jewelry.png new file mode 100644 index 00000000..e2abc909 Binary files /dev/null and b/assets/images/collectibles/4.0x/jewelry.png differ diff --git a/assets/images/collectibles/4.0x/picture.png b/assets/images/collectibles/4.0x/picture.png new file mode 100644 index 00000000..2ee0d4fe Binary files /dev/null and b/assets/images/collectibles/4.0x/picture.png differ diff --git a/assets/images/collectibles/4.0x/scroll.png b/assets/images/collectibles/4.0x/scroll.png new file mode 100644 index 00000000..6e4f9dfd Binary files /dev/null and b/assets/images/collectibles/4.0x/scroll.png differ diff --git a/assets/images/collectibles/4.0x/statue.png b/assets/images/collectibles/4.0x/statue.png new file mode 100644 index 00000000..fa0781db Binary files /dev/null and b/assets/images/collectibles/4.0x/statue.png differ diff --git a/assets/images/collectibles/4.0x/textile.png b/assets/images/collectibles/4.0x/textile.png new file mode 100644 index 00000000..4ff9cabc Binary files /dev/null and b/assets/images/collectibles/4.0x/textile.png differ diff --git a/assets/images/collectibles/4.0x/vase.png b/assets/images/collectibles/4.0x/vase.png new file mode 100644 index 00000000..05c70610 Binary files /dev/null and b/assets/images/collectibles/4.0x/vase.png differ diff --git a/assets/images/collectibles/jewelry.png b/assets/images/collectibles/jewelry.png index 85b3e094..2ee8bd6e 100644 Binary files a/assets/images/collectibles/jewelry.png and b/assets/images/collectibles/jewelry.png differ diff --git a/assets/images/collectibles/picture.png b/assets/images/collectibles/picture.png index d4743382..dc28206f 100644 Binary files a/assets/images/collectibles/picture.png and b/assets/images/collectibles/picture.png differ diff --git a/assets/images/collectibles/scroll.png b/assets/images/collectibles/scroll.png index b3de1b85..5232059e 100644 Binary files a/assets/images/collectibles/scroll.png and b/assets/images/collectibles/scroll.png differ diff --git a/assets/images/collectibles/statue.png b/assets/images/collectibles/statue.png index ff9b8f06..b0631467 100644 Binary files a/assets/images/collectibles/statue.png and b/assets/images/collectibles/statue.png differ diff --git a/assets/images/collectibles/textile.png b/assets/images/collectibles/textile.png index 2a31003f..c78848dd 100644 Binary files a/assets/images/collectibles/textile.png and b/assets/images/collectibles/textile.png differ diff --git a/assets/images/collectibles/vase.png b/assets/images/collectibles/vase.png index 000b40e2..249f3b00 100644 Binary files a/assets/images/collectibles/vase.png and b/assets/images/collectibles/vase.png differ diff --git a/assets/images/colosseum/1.5x/foreground_left.png b/assets/images/colosseum/1.5x/foreground_left.png deleted file mode 100644 index 13fd7027..00000000 Binary files a/assets/images/colosseum/1.5x/foreground_left.png and /dev/null differ diff --git a/assets/images/colosseum/1.5x/foreground_right.png b/assets/images/colosseum/1.5x/foreground_right.png deleted file mode 100644 index a4d4445d..00000000 Binary files a/assets/images/colosseum/1.5x/foreground_right.png and /dev/null differ diff --git a/assets/images/colosseum/4.0x/foreground_left.png b/assets/images/colosseum/4.0x/foreground_left.png deleted file mode 100644 index c7051b53..00000000 Binary files a/assets/images/colosseum/4.0x/foreground_left.png and /dev/null differ diff --git a/assets/images/colosseum/4.0x/foreground_right.png b/assets/images/colosseum/4.0x/foreground_right.png deleted file mode 100644 index 3ff253c4..00000000 Binary files a/assets/images/colosseum/4.0x/foreground_right.png and /dev/null differ diff --git a/assets/images/great_wall_of_china/1.5x/foreground-left.png b/assets/images/great_wall_of_china/1.5x/foreground-left.png deleted file mode 100644 index eeaf7881..00000000 Binary files a/assets/images/great_wall_of_china/1.5x/foreground-left.png and /dev/null differ diff --git a/assets/images/great_wall_of_china/1.5x/foreground-right.png b/assets/images/great_wall_of_china/1.5x/foreground-right.png deleted file mode 100644 index 22835702..00000000 Binary files a/assets/images/great_wall_of_china/1.5x/foreground-right.png and /dev/null differ diff --git a/assets/images/machu_picchu/1.5x/foreground-back.png b/assets/images/machu_picchu/1.5x/foreground-back.png deleted file mode 100644 index 85c1a848..00000000 Binary files a/assets/images/machu_picchu/1.5x/foreground-back.png and /dev/null differ diff --git a/assets/images/machu_picchu/2.0x/machu-picchu.png b/assets/images/machu_picchu/2.0x/machu-picchu.png old mode 100755 new mode 100644 index 5d5da675..94eb578f Binary files a/assets/images/machu_picchu/2.0x/machu-picchu.png and b/assets/images/machu_picchu/2.0x/machu-picchu.png differ diff --git a/assets/images/machu_picchu/3.0x/machu-picchu.png b/assets/images/machu_picchu/3.0x/machu-picchu.png old mode 100755 new mode 100644 index 1f588f17..8757ccdd Binary files a/assets/images/machu_picchu/3.0x/machu-picchu.png and b/assets/images/machu_picchu/3.0x/machu-picchu.png differ diff --git a/assets/images/machu_picchu/4.0x/foreground-back.png b/assets/images/machu_picchu/4.0x/foreground-back.png deleted file mode 100644 index 014bd5f5..00000000 Binary files a/assets/images/machu_picchu/4.0x/foreground-back.png and /dev/null differ diff --git a/assets/images/machu_picchu/machu-picchu.png b/assets/images/machu_picchu/machu-picchu.png old mode 100755 new mode 100644 index 7e4ac825..fbde9002 Binary files a/assets/images/machu_picchu/machu-picchu.png and b/assets/images/machu_picchu/machu-picchu.png differ diff --git a/assets/images/petra/1.5x/foreground-left.png b/assets/images/petra/1.5x/foreground-left.png deleted file mode 100644 index 7741e790..00000000 Binary files a/assets/images/petra/1.5x/foreground-left.png and /dev/null differ diff --git a/assets/images/petra/1.5x/foreground-right.png b/assets/images/petra/1.5x/foreground-right.png deleted file mode 100644 index d5b80676..00000000 Binary files a/assets/images/petra/1.5x/foreground-right.png and /dev/null differ diff --git a/assets/images/pyramids/1.5x/foreground-back.png b/assets/images/pyramids/1.5x/foreground-back.png deleted file mode 100644 index ab95507a..00000000 Binary files a/assets/images/pyramids/1.5x/foreground-back.png and /dev/null differ diff --git a/assets/images/pyramids/1.5x/foreground-front.png b/assets/images/pyramids/1.5x/foreground-front.png deleted file mode 100644 index 47728985..00000000 Binary files a/assets/images/pyramids/1.5x/foreground-front.png and /dev/null differ diff --git a/assets/images/pyramids/2.0x/foreground-back.png b/assets/images/pyramids/2.0x/foreground-back.png old mode 100755 new mode 100644 index a393a94b..b6003ba3 Binary files a/assets/images/pyramids/2.0x/foreground-back.png and b/assets/images/pyramids/2.0x/foreground-back.png differ diff --git a/assets/images/pyramids/3.0x/foreground-back.png b/assets/images/pyramids/3.0x/foreground-back.png old mode 100755 new mode 100644 index d81cc3ad..6472dda6 Binary files a/assets/images/pyramids/3.0x/foreground-back.png and b/assets/images/pyramids/3.0x/foreground-back.png differ diff --git a/assets/images/pyramids/4.0x/foreground-back.png b/assets/images/pyramids/4.0x/foreground-back.png index a32b7f23..6b0c0500 100644 Binary files a/assets/images/pyramids/4.0x/foreground-back.png and b/assets/images/pyramids/4.0x/foreground-back.png differ diff --git a/assets/images/pyramids/foreground-back.png b/assets/images/pyramids/foreground-back.png old mode 100755 new mode 100644 index c1cd6b8b..93a138be Binary files a/assets/images/pyramids/foreground-back.png and b/assets/images/pyramids/foreground-back.png differ diff --git a/lib/ui/wonder_illustrations/chichen_itza_illustration.dart b/lib/ui/wonder_illustrations/chichen_itza_illustration.dart index e1150ef0..b43939cd 100644 --- a/lib/ui/wonder_illustrations/chichen_itza_illustration.dart +++ b/lib/ui/wonder_illustrations/chichen_itza_illustration.dart @@ -27,18 +27,19 @@ class ChichenItzaIllustration extends StatelessWidget { Positioned.fill( child: IllustrationTexture( ImagePaths.roller2, - color: Colors.white, + color: Color(0xffDC762A), opacity: anim.drive(Tween(begin: 0, end: .5)), flipY: true, + scale: config.shortMode ? 4 : 1.15, ), ), IllustrationPiece( fileName: 'sun.png', - initialOffset: Offset(0, 20), + initialOffset: Offset(0, 50), enableHero: true, - heightFactor: .25, + heightFactor: .4, minHeight: 200, - fractionalOffset: Offset(1, config.shortMode ? 0 : -.5), + fractionalOffset: Offset(.55, config.shortMode ? -.1 : -.35), ), ]; } @@ -47,12 +48,12 @@ class ChichenItzaIllustration extends StatelessWidget { // We want to size to the shortest side return [ Transform.translate( - offset: Offset(0, 20), + offset: Offset(0, config.shortMode ? 40 : -30), child: IllustrationPiece( fileName: 'chichen.png', - heightFactor: .55, - minHeight: 400, - zoomAmt: .05, + heightFactor: .45, + minHeight: 300, + zoomAmt: -.1, enableHero: true, ), ), @@ -67,7 +68,7 @@ class ChichenItzaIllustration extends StatelessWidget { initialOffset: Offset(20, 40), initialScale: .95, heightFactor: .4, - fractionalOffset: Offset(.35, -.1), + fractionalOffset: Offset(.5, -.1), zoomAmt: .1, dynamicHzOffset: 250, ), @@ -77,7 +78,7 @@ class ChichenItzaIllustration extends StatelessWidget { initialScale: .9, initialOffset: Offset(-40, 60), heightFactor: .65, - fractionalOffset: Offset(-.45, .2), + fractionalOffset: Offset(-.4, .2), zoomAmt: .25, dynamicHzOffset: -250, ), @@ -86,9 +87,9 @@ class ChichenItzaIllustration extends StatelessWidget { alignment: Alignment.topLeft, initialScale: .9, initialOffset: Offset(-40, 60), - heightFactor: .75, - fractionalOffset: Offset(-.4, -.3), - zoomAmt: .25, + heightFactor: .65, + fractionalOffset: Offset(-.4, -.4), + zoomAmt: .05, dynamicHzOffset: 100, ), IllustrationPiece( @@ -96,9 +97,9 @@ class ChichenItzaIllustration extends StatelessWidget { alignment: Alignment.topRight, initialOffset: Offset(20, 40), initialScale: .95, - heightFactor: .85, + heightFactor: .65, fractionalOffset: Offset(.35, -.4), - zoomAmt: .1, + zoomAmt: .05, dynamicHzOffset: -100, ), ]; diff --git a/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart b/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart index 73221c08..a1cec23a 100644 --- a/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart +++ b/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart @@ -28,18 +28,19 @@ class ChristRedeemerIllustration extends StatelessWidget { Positioned.fill( child: IllustrationTexture( ImagePaths.roller1, - color: Colors.white, + color: Color(0xffFAE5C8), flipX: false, - opacity: anim.drive(Tween(begin: 0, end: .4)), + opacity: anim.drive(Tween(begin: 0, end: .8)), + scale: config.shortMode ? 4 : 1.15, ), ), IllustrationPiece( fileName: 'sun.png', - initialOffset: Offset(0, 20), + initialOffset: Offset(0, 50), enableHero: true, - heightFactor: .2, + heightFactor: .25, minHeight: 120, - fractionalOffset: Offset(.5, -1), + fractionalOffset: Offset(.7, config.shortMode ? -.5 : -1.35), ), ]; } @@ -51,8 +52,8 @@ class ChristRedeemerIllustration extends StatelessWidget { enableHero: true, heightFactor: 1, alignment: Alignment.bottomCenter, - fractionalOffset: Offset(0, .1), - zoomAmt: .1, + fractionalOffset: Offset(0, config.shortMode ? .5 : .1), + zoomAmt: .7, ) // ]; @@ -63,21 +64,21 @@ class ChristRedeemerIllustration extends StatelessWidget { IllustrationPiece( fileName: 'foreground-left.png', alignment: Alignment.bottomCenter, - initialScale: .9, - initialOffset: Offset(-40, 60), - heightFactor: .55, - fractionalOffset: Offset(-.15, .05), - zoomAmt: .1, + initialScale: .95, + initialOffset: Offset(-140, 60), + heightFactor: .65, + fractionalOffset: Offset(-.25, .05), + zoomAmt: .15, dynamicHzOffset: -100, ), IllustrationPiece( fileName: 'foreground-right.png', alignment: Alignment.bottomCenter, - initialOffset: Offset(20, 40), - initialScale: .95, - heightFactor: .65, - fractionalOffset: Offset(.2, 0), - zoomAmt: .15, + initialOffset: Offset(120, 40), + initialScale: .9, + heightFactor: .55, + fractionalOffset: Offset(.35, .2), + zoomAmt: .1, dynamicHzOffset: 100, ), ]; diff --git a/lib/ui/wonder_illustrations/colosseum_illustration.dart b/lib/ui/wonder_illustrations/colosseum_illustration.dart index cbca64d1..7d989e45 100644 --- a/lib/ui/wonder_illustrations/colosseum_illustration.dart +++ b/lib/ui/wonder_illustrations/colosseum_illustration.dart @@ -30,32 +30,30 @@ class ColosseumIllustration extends StatelessWidget { child: IllustrationTexture( ImagePaths.roller1, color: Colors.white, - opacity: anim.drive(Tween(begin: 0, end: .5)), + opacity: anim.drive(Tween(begin: 0, end: .75)), + scale: config.shortMode ? 4 : 1, ), ), IllustrationPiece( fileName: 'sun.png', - initialOffset: Offset(0, 20), + initialOffset: Offset(0, 50), enableHero: true, - heightFactor: .15, - minHeight: 150, - offset: config.shortMode ? Offset(70, context.heightPx * -.05) : Offset(50, context.heightPx * -.25), + heightFactor: config.shortMode ? .25 : .25, + minHeight: 100, + offset: config.shortMode ? Offset(50, context.heightPx * -.07) : Offset(80, context.heightPx * -.28), ), ]; } List _buildMg(BuildContext context, Animation anim) { return [ - Stack( - children: const [ IllustrationPiece( fileName: 'colosseum.png', enableHero: true, - heightFactor: .55, - minHeight: 400, + heightFactor: .6, + minHeight: 200, zoomAmt: .15, - ), - ], + fractionalOffset: Offset(0, config.shortMode ? .10: -.1), ) ]; } @@ -70,7 +68,7 @@ class ColosseumIllustration extends StatelessWidget { heightFactor: .65, offset: Offset.zero, fractionalOffset: Offset(-.5, .1), - zoomAmt: .25, + zoomAmt: .05, dynamicHzOffset: -150, ), IllustrationPiece( @@ -80,7 +78,7 @@ class ColosseumIllustration extends StatelessWidget { initialScale: .95, heightFactor: .75, fractionalOffset: Offset(.5, .25), - zoomAmt: .1, + zoomAmt: .05, dynamicHzOffset: 150, ), ]; diff --git a/lib/ui/wonder_illustrations/common/paint_textures.dart b/lib/ui/wonder_illustrations/common/paint_textures.dart index ef382fdd..b2b7a1d7 100644 --- a/lib/ui/wonder_illustrations/common/paint_textures.dart +++ b/lib/ui/wonder_illustrations/common/paint_textures.dart @@ -18,7 +18,7 @@ class IllustrationTexture extends StatelessWidget { child: Transform.scale( scaleX: scale * (flipX ? -1 : 1), scaleY: scale * (flipY ? -1 : 1), - child: Image.asset(path, fit: BoxFit.cover, color: color, opacity: opacity, cacheWidth: 1024)), + child: Image.asset(path, repeat: ImageRepeat.repeat, fit: BoxFit.contain, alignment: Alignment.topCenter, color: color, opacity: opacity, cacheWidth: 2048)), ), ); } diff --git a/lib/ui/wonder_illustrations/great_wall_illustration.dart b/lib/ui/wonder_illustrations/great_wall_illustration.dart index 04aabc20..f6f1996f 100644 --- a/lib/ui/wonder_illustrations/great_wall_illustration.dart +++ b/lib/ui/wonder_illustrations/great_wall_illustration.dart @@ -30,17 +30,18 @@ class GreatWallIllustration extends StatelessWidget { child: IllustrationTexture( ImagePaths.roller2, flipX: true, - color: Colors.white, - opacity: anim.drive(Tween(begin: 0, end: .5)), + color: Color(0xff688750), + opacity: anim.drive(Tween(begin: 0, end: 1)), + scale: config.shortMode ? 4 : 1.15, ), ), IllustrationPiece( fileName: 'sun.png', - initialOffset: Offset(0, 20), + initialOffset: Offset(0, 50), enableHero: true, - heightFactor: .15, + heightFactor: config.shortMode ? .05 : .25, minHeight: 150, - offset: config.shortMode ? Offset(-70, context.heightPx * -.05) : Offset(-150, context.heightPx * -.25), + offset: config.shortMode ? Offset(-40, context.heightPx * -.06) : Offset(-75, context.heightPx * -.3), ), ]; } @@ -49,10 +50,11 @@ class GreatWallIllustration extends StatelessWidget { return [ IllustrationPiece( fileName: 'great-wall.png', - heightFactor: .55, - minHeight: 500, + heightFactor: .65, + minHeight: 400, zoomAmt: .05, enableHero: true, + fractionalOffset: Offset(0, config.shortMode ? 0: -.1), ), ]; } @@ -64,7 +66,7 @@ class GreatWallIllustration extends StatelessWidget { alignment: Alignment.bottomCenter, initialScale: .9, initialOffset: Offset(-40, 60), - heightFactor: .75, + heightFactor: .85, fractionalOffset: Offset(-.4, .45), zoomAmt: .25, dynamicHzOffset: -150, @@ -74,8 +76,8 @@ class GreatWallIllustration extends StatelessWidget { alignment: Alignment.bottomCenter, initialOffset: Offset(20, 40), initialScale: .95, - heightFactor: .85, - fractionalOffset: Offset(.4, .25), + heightFactor: 1, + fractionalOffset: Offset(.4, .3), zoomAmt: .1, dynamicHzOffset: 150, ), diff --git a/lib/ui/wonder_illustrations/machu_picchu_illustration.dart b/lib/ui/wonder_illustrations/machu_picchu_illustration.dart index 7c7bc009..a66b42ee 100644 --- a/lib/ui/wonder_illustrations/machu_picchu_illustration.dart +++ b/lib/ui/wonder_illustrations/machu_picchu_illustration.dart @@ -29,18 +29,19 @@ class MachuPicchuIllustration extends StatelessWidget { Positioned.fill( child: IllustrationTexture( ImagePaths.roller1, - flipX: true, - color: Colors.white, - opacity: anim.drive(Tween(begin: 0, end: .7)), + flipX: false, + color: Color(0xff1E736D), + opacity: anim.drive(Tween(begin: 0, end: .5)), + scale: config.shortMode ? 4 : 1, ), ), IllustrationPiece( fileName: 'sun.png', - initialOffset: Offset(0, 20), + initialOffset: Offset(0, 50), enableHero: true, - heightFactor: .15, - minHeight: 150, - offset: config.shortMode ? Offset(-70, context.heightPx * -.05) : Offset(-150, context.heightPx * -.25), + heightFactor: config.shortMode ? .15 : .15, + minHeight: 100, + offset: config.shortMode ? Offset(150, context.heightPx * -.08) : Offset(150, context.heightPx * -.35), ), ]; } @@ -50,8 +51,9 @@ class MachuPicchuIllustration extends StatelessWidget { fileName: 'machu-picchu.png', heightFactor: .65, minHeight: 500, - zoomAmt: .05, + zoomAmt: config.shortMode ? .1 : -1, enableHero: true, + fractionalOffset: Offset(config.shortMode ? 0 : -.05, config.shortMode ? 0.02 : -.12), ), ]; @@ -63,18 +65,18 @@ class MachuPicchuIllustration extends StatelessWidget { initialScale: .9, initialOffset: Offset(0, 60), heightFactor: .6, - fractionalOffset: Offset(0, .3), - zoomAmt: .1, + fractionalOffset: Offset(0, .2), + zoomAmt: .05, dynamicHzOffset: 150, ), IllustrationPiece( fileName: 'foreground-front.png', alignment: Alignment.bottomCenter, initialOffset: Offset(20, 40), - heightFactor: .5, - initialScale: .95, - fractionalOffset: Offset(-.25, .25), - zoomAmt: .12, + heightFactor: .6, + initialScale: 1.2, + fractionalOffset: Offset(-.35, .4), + zoomAmt: .2, dynamicHzOffset: -50, ), ]; diff --git a/lib/ui/wonder_illustrations/petra_illustration.dart b/lib/ui/wonder_illustrations/petra_illustration.dart index 7b9978f5..1edb1249 100644 --- a/lib/ui/wonder_illustrations/petra_illustration.dart +++ b/lib/ui/wonder_illustrations/petra_illustration.dart @@ -29,15 +29,17 @@ class PetraIllustration extends StatelessWidget { Positioned.fill( child: IllustrationTexture( ImagePaths.roller1, - color: Colors.white, + color: WonderType.petra.bgColor, flipX: true, - opacity: anim.drive(Tween(begin: 0, end: .25)), + opacity: anim.drive(Tween(begin: 0, end: 1)), + scale: config.shortMode ? 4 : 1.15, ), ), IllustrationPiece( fileName: 'moon.png', + initialOffset: Offset(0, -150), heightFactor: .15, - minHeight: 100, + minHeight: 50, alignment: Alignment.topCenter, fractionalOffset: Offset(-.7, 0), ), @@ -52,7 +54,7 @@ class PetraIllustration extends StatelessWidget { fileName: 'petra.png', heightFactor: .65, minHeight: 500, - zoomAmt: .1, + zoomAmt: config.shortMode ? -0.05 : -1, enableHero: true, ), ), @@ -65,8 +67,8 @@ class PetraIllustration extends StatelessWidget { alignment: Alignment.bottomCenter, initialOffset: Offset(-80, 0), heightFactor: 1, - fractionalOffset: Offset(-.55, 0), - zoomAmt: .1, + fractionalOffset: Offset(-.6, 0), + zoomAmt: .03, dynamicHzOffset: -130, bottom: (_) { /// To cover everything behind this piece with a solid color, we scale up a container @@ -85,7 +87,7 @@ class PetraIllustration extends StatelessWidget { initialOffset: Offset(80, 00), heightFactor: 1, fractionalOffset: Offset(.55, 0), - zoomAmt: .15, + zoomAmt: .12, dynamicHzOffset: 130, bottom: (_) { /// To cover everything behind this piece with a solid color, we scale up a container and then offset it in negative space diff --git a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart index cfefb11f..0eaec5d7 100644 --- a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart +++ b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart @@ -29,18 +29,20 @@ class PyramidsGizaIllustration extends StatelessWidget { Positioned.fill( child: IllustrationTexture( ImagePaths.roller2, - color: Colors.white, - opacity: anim.drive(Tween(begin: 0, end: .3)), + color: Color(0xff797FD8), + opacity: anim.drive(Tween(begin: 0, end: .75)), flipY: true, + scale: config.shortMode ? 4 : 1.15, + ), ), IllustrationPiece( fileName: 'moon.png', - initialOffset: Offset(0, 20), + initialOffset: Offset(0, 50), enableHero: true, heightFactor: .15, minHeight: 100, - offset: config.shortMode ? Offset(100, context.heightPx * -.1) : Offset(150, context.heightPx * -.15), + offset: config.shortMode ? Offset(100, context.heightPx * -.06) : Offset(150, context.heightPx * -.3), zoomAmt: .05, ), ]; @@ -53,7 +55,8 @@ class PyramidsGizaIllustration extends StatelessWidget { enableHero: true, heightFactor: .5, minHeight: 300, - zoomAmt: .1, + zoomAmt: config.shortMode ? -.2 : -2, + fractionalOffset: Offset(0, config.shortMode ? .1 : -.05), ) ]; } @@ -66,7 +69,7 @@ class PyramidsGizaIllustration extends StatelessWidget { initialOffset: Offset(20, 40), initialScale: .95, heightFactor: .55, - fractionalOffset: Offset(.1, .06), + fractionalOffset: Offset(.2, -.01), zoomAmt: .1, dynamicHzOffset: 150, ), @@ -76,7 +79,7 @@ class PyramidsGizaIllustration extends StatelessWidget { initialScale: .9, initialOffset: Offset(-40, 60), heightFactor: .55, - fractionalOffset: Offset(-.1, .1), + fractionalOffset: Offset(-.09, 0.02), zoomAmt: .25, dynamicHzOffset: -150, ), diff --git a/lib/ui/wonder_illustrations/taj_mahal_illustration.dart b/lib/ui/wonder_illustrations/taj_mahal_illustration.dart index 67a28435..486a1040 100644 --- a/lib/ui/wonder_illustrations/taj_mahal_illustration.dart +++ b/lib/ui/wonder_illustrations/taj_mahal_illustration.dart @@ -31,20 +31,21 @@ class TajMahalIllustration extends StatelessWidget { // Noise texture Positioned.fill( child: IllustrationTexture( - ImagePaths.roller1, + ImagePaths.roller2, flipY: true, - opacity: anim.drive(Tween(begin: 0, end: 1)), + opacity: anim.drive(Tween(begin: 0, end: .7)), color: bgColor, + scale: config.shortMode ? 4 : 1.15, ), ), // Sun IllustrationPiece( fileName: 'sun.png', - initialOffset: Offset(0, 20), + initialOffset: Offset(0, 50), enableHero: true, - heightFactor: .15, + heightFactor: .3, minHeight: 140, - offset: config.shortMode ? Offset(-100, context.heightPx * -.05) : Offset(-150, context.heightPx * -.15), + offset: config.shortMode ? Offset(-100, context.heightPx * -.05) : Offset(-220, context.heightPx * -.34), ), ]; } @@ -61,10 +62,11 @@ class TajMahalIllustration extends StatelessWidget { minHeight: minHeight, enableHero: true, zoomAmt: .05, + fractionalOffset: Offset(0, config.shortMode ? 0 : -.15), top: config.shortMode ? null : (_) => FractionalTranslation( - translation: Offset(0, .85), + translation: Offset(0, 0.73), child: IllustrationPiece( fileName: 'pool.png', heightFactor: heightFactor * poolScale, @@ -88,16 +90,16 @@ class TajMahalIllustration extends StatelessWidget { alignment: Alignment.bottomRight, initialOffset: Offset(20, 40), initialScale: .85, - heightFactor: .4 + .2 * mangoScale, + heightFactor: .5 + .4 * mangoScale, fractionalOffset: Offset(.3, 0), - zoomAmt: .1, + zoomAmt: .25, ), IllustrationPiece( fileName: 'foreground-left.png', alignment: Alignment.bottomLeft, initialScale: .9, initialOffset: Offset(-40, 60), - heightFactor: .5 + .3 * mangoScale, + heightFactor: .6 + .3 * mangoScale, fractionalOffset: Offset(-.3, 0), zoomAmt: .25, dynamicHzOffset: 0,