diff --git a/lib/ui/wonder_illustrations/chichen_itza_illustration.dart b/lib/ui/wonder_illustrations/chichen_itza_illustration.dart index d5831ae7..e1150ef0 100644 --- a/lib/ui/wonder_illustrations/chichen_itza_illustration.dart +++ b/lib/ui/wonder_illustrations/chichen_itza_illustration.dart @@ -61,33 +61,33 @@ class ChichenItzaIllustration extends StatelessWidget { List _buildFg(BuildContext context, Animation anim) { return [ + IllustrationPiece( + fileName: 'foreground-right.png', + alignment: Alignment.bottomCenter, + initialOffset: Offset(20, 40), + initialScale: .95, + heightFactor: .4, + fractionalOffset: Offset(.35, -.1), + zoomAmt: .1, + dynamicHzOffset: 250, + ), IllustrationPiece( fileName: 'foreground-left.png', alignment: Alignment.bottomCenter, initialScale: .9, initialOffset: Offset(-40, 60), heightFactor: .65, - fractionalOffset: Offset(-.4, .2), + fractionalOffset: Offset(-.45, .2), zoomAmt: .25, dynamicHzOffset: -250, ), - IllustrationPiece( - fileName: 'foreground-right.png', - alignment: Alignment.bottomCenter, - initialOffset: Offset(20, 40), - initialScale: .95, - heightFactor: .6, - fractionalOffset: Offset(.4, .2), - zoomAmt: .1, - dynamicHzOffset: 250, - ), IllustrationPiece( fileName: 'top-left.png', alignment: Alignment.topLeft, initialScale: .9, initialOffset: Offset(-40, 60), heightFactor: .75, - fractionalOffset: Offset(-.5, -.3), + fractionalOffset: Offset(-.4, -.3), zoomAmt: .25, dynamicHzOffset: 100, ), @@ -97,7 +97,7 @@ class ChichenItzaIllustration extends StatelessWidget { initialOffset: Offset(20, 40), initialScale: .95, heightFactor: .85, - fractionalOffset: Offset(.4, -.4), + fractionalOffset: Offset(.35, -.4), zoomAmt: .1, dynamicHzOffset: -100, ), diff --git a/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart b/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart index 7387e5fd..73221c08 100644 --- a/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart +++ b/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart @@ -66,8 +66,8 @@ class ChristRedeemerIllustration extends StatelessWidget { initialScale: .9, initialOffset: Offset(-40, 60), heightFactor: .55, - fractionalOffset: Offset(-.25, 0), - zoomAmt: .25, + fractionalOffset: Offset(-.15, .05), + zoomAmt: .1, dynamicHzOffset: -100, ), IllustrationPiece( @@ -77,7 +77,7 @@ class ChristRedeemerIllustration extends StatelessWidget { initialScale: .95, heightFactor: .65, fractionalOffset: Offset(.2, 0), - zoomAmt: .1, + zoomAmt: .15, dynamicHzOffset: 100, ), ]; diff --git a/lib/ui/wonder_illustrations/common/illustration_piece.dart b/lib/ui/wonder_illustrations/common/illustration_piece.dart index f09e00df..c7ba1a01 100644 --- a/lib/ui/wonder_illustrations/common/illustration_piece.dart +++ b/lib/ui/wonder_illustrations/common/illustration_piece.dart @@ -101,7 +101,7 @@ class _IllustrationPieceState extends State { finalTranslation += widget.initialOffset * (1 - curvedAnim); } // Dynamic - final dynamicOffsetAmt = min(context.widthPx / 1500, 1); + final dynamicOffsetAmt = ((context.widthPx - 400) / 1100).clamp(0, 1); finalTranslation += Offset(dynamicOffsetAmt * widget.dynamicHzOffset, 0); // Fractional final width = height * (aspectRatio ?? 0); diff --git a/lib/ui/wonder_illustrations/petra_illustration.dart b/lib/ui/wonder_illustrations/petra_illustration.dart index d353e1d5..7b9978f5 100644 --- a/lib/ui/wonder_illustrations/petra_illustration.dart +++ b/lib/ui/wonder_illustrations/petra_illustration.dart @@ -65,7 +65,7 @@ class PetraIllustration extends StatelessWidget { alignment: Alignment.bottomCenter, initialOffset: Offset(-80, 0), heightFactor: 1, - fractionalOffset: Offset(-.5, 0), + fractionalOffset: Offset(-.55, 0), zoomAmt: .1, dynamicHzOffset: -130, bottom: (_) { @@ -84,7 +84,7 @@ class PetraIllustration extends StatelessWidget { alignment: Alignment.bottomCenter, initialOffset: Offset(80, 00), heightFactor: 1, - fractionalOffset: Offset(.5, 0), + fractionalOffset: Offset(.55, 0), zoomAmt: .15, dynamicHzOffset: 130, bottom: (_) {