bachelor/wonders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Shawn 2022-11-29 12:37:04 -07:00
parent 7bf3c942cf
commit 77c749effb
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/ui/wonder_illustrations/chichen_itza_illustration.dart
View File

@ -61,33 +61,33 @@ class ChichenItzaIllustration extends StatelessWidget {
List<Widget> _buildFg(BuildContext context, Animation<double> anim) { List<Widget> _buildFg(BuildContext context, Animation<double> anim) {
return [ 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( IllustrationPiece(
fileName: 'foreground-left.png', fileName: 'foreground-left.png',
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
initialScale: .9, initialScale: .9,
initialOffset: Offset(-40, 60), initialOffset: Offset(-40, 60),
heightFactor: .65, heightFactor: .65,
fractionalOffset: Offset(-.4, .2), fractionalOffset: Offset(-.45, .2),
zoomAmt: .25, zoomAmt: .25,
dynamicHzOffset: -250, 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( IllustrationPiece(
fileName: 'top-left.png', fileName: 'top-left.png',
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
initialScale: .9, initialScale: .9,
initialOffset: Offset(-40, 60), initialOffset: Offset(-40, 60),
heightFactor: .75, heightFactor: .75,
fractionalOffset: Offset(-.5, -.3), fractionalOffset: Offset(-.4, -.3),
zoomAmt: .25, zoomAmt: .25,
dynamicHzOffset: 100, dynamicHzOffset: 100,
), ),
@ -97,7 +97,7 @@ class ChichenItzaIllustration extends StatelessWidget {
initialOffset: Offset(20, 40), initialOffset: Offset(20, 40),
initialScale: .95, initialScale: .95,
heightFactor: .85, heightFactor: .85,
fractionalOffset: Offset(.4, -.4), fractionalOffset: Offset(.35, -.4),
zoomAmt: .1, zoomAmt: .1,
dynamicHzOffset: -100, dynamicHzOffset: -100,
), ),

6
lib/ui/wonder_illustrations/christ_redeemer_illustration.dart
View File

@ -66,8 +66,8 @@ class ChristRedeemerIllustration extends StatelessWidget {
initialScale: .9, initialScale: .9,
initialOffset: Offset(-40, 60), initialOffset: Offset(-40, 60),
heightFactor: .55, heightFactor: .55,
fractionalOffset: Offset(-.25, 0), fractionalOffset: Offset(-.15, .05),
zoomAmt: .25, zoomAmt: .1,
dynamicHzOffset: -100, dynamicHzOffset: -100,
), ),
IllustrationPiece( IllustrationPiece(
@ -77,7 +77,7 @@ class ChristRedeemerIllustration extends StatelessWidget {
initialScale: .95, initialScale: .95,
heightFactor: .65, heightFactor: .65,
fractionalOffset: Offset(.2, 0), fractionalOffset: Offset(.2, 0),
zoomAmt: .1, zoomAmt: .15,
dynamicHzOffset: 100, dynamicHzOffset: 100,
), ),
]; ];

2
lib/ui/wonder_illustrations/common/illustration_piece.dart
View File

@ -101,7 +101,7 @@ class _IllustrationPieceState extends State<IllustrationPiece> {
finalTranslation += widget.initialOffset * (1 - curvedAnim); finalTranslation += widget.initialOffset * (1 - curvedAnim);
} }
// Dynamic // Dynamic
final dynamicOffsetAmt = min(context.widthPx / 1500, 1); final dynamicOffsetAmt = ((context.widthPx - 400) / 1100).clamp(0, 1);
finalTranslation += Offset(dynamicOffsetAmt * widget.dynamicHzOffset, 0); finalTranslation += Offset(dynamicOffsetAmt * widget.dynamicHzOffset, 0);
// Fractional // Fractional
final width = height * (aspectRatio ?? 0); final width = height * (aspectRatio ?? 0);

4
lib/ui/wonder_illustrations/petra_illustration.dart
View File

@ -65,7 +65,7 @@ class PetraIllustration extends StatelessWidget {
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
initialOffset: Offset(-80, 0), initialOffset: Offset(-80, 0),
heightFactor: 1, heightFactor: 1,
fractionalOffset: Offset(-.5, 0), fractionalOffset: Offset(-.55, 0),
zoomAmt: .1, zoomAmt: .1,
dynamicHzOffset: -130, dynamicHzOffset: -130,
bottom: (_) { bottom: (_) {
@ -84,7 +84,7 @@ class PetraIllustration extends StatelessWidget {
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
initialOffset: Offset(80, 00), initialOffset: Offset(80, 00),
heightFactor: 1, heightFactor: 1,
fractionalOffset: Offset(.5, 0), fractionalOffset: Offset(.55, 0),
zoomAmt: .15, zoomAmt: .15,
dynamicHzOffset: 130, dynamicHzOffset: 130,
bottom: (_) { bottom: (_) {