commit d9c743e1c552f78a7e57d823de0a2f9c77365f8a
author Viktor Lidholt <viktorl@google.com> Tue Aug 18 10:33:34 2015 -0700
committer Viktor Lidholt <viktorl@google.com> Tue Aug 18 10:33:34 2015 -0700
tree 41aeb01a69076fe4d12448c0e7d18e6d376ba4c5
parent 66c2cc2ae1f37e3dd2942bfa04390b45aacc4913

Fixes loading of assets in demo game

examples/game/lib/main.dart

diff --git a/examples/game/lib/main.dart b/examples/game/lib/main.dart
index 6a28fab..df2e18c 100644
--- a/examples/game/lib/main.dart
+++ b/examples/game/lib/main.dart
@@ -45,15 +45,6 @@
     'assets/game_ui.png',
   ]));
 
-  // TODO(eseidel): These load in serial which is bad for startup!
-  String json = await _bundle.loadString('assets/sprites.json');
-  _spriteSheet = new SpriteSheet(_imageMap['assets/sprites.png'], json);
-
-  json = await _bundle.loadString('assets/game_ui.json');
-  _spriteSheetUI = new SpriteSheet(_imageMap['assets/game_ui.png'], json);
-
-  _app = new GameDemoApp();
-
   // TODO(eseidel): SoundEffect doesn't really do anything except hold a future.
   _sounds['explosion'] = new SoundEffect(_bundle.load('assets/explosion.wav'));
   _sounds['laser'] = new SoundEffect(_bundle.load('assets/laser.wav'));
@@ -63,11 +54,23 @@
     _sounds['laser'].load(),
   ]);
 
+  await Future.wait(loads);
+
+  // TODO(eseidel): These load in serial which is bad for startup!
+  String json = await _bundle.loadString('assets/sprites.json');
+  _spriteSheet = new SpriteSheet(_imageMap['assets/sprites.png'], json);
+
+  json = await _bundle.loadString('assets/game_ui.json');
+  _spriteSheetUI = new SpriteSheet(_imageMap['assets/game_ui.png'], json);
+
+  _app = new GameDemoApp();
+
+  assert(_spriteSheet.image != null);
+
   SoundTrackPlayer stPlayer = SoundTrackPlayer.sharedInstance();
   SoundTrack music = await stPlayer.load(_bundle.load('assets/temp_music.aac'));
   stPlayer.play(music);
 
-  await Future.wait(loads);
   runApp(_app);
 }
 
@@ -245,6 +248,8 @@
     sprtBackground.position = new Point(512.0, 512.0);
     addChild(sprtBackground);
 
+    assert(_spriteSheet.image != null);
+
     StarField starField = new StarField(_spriteSheet, 200, true);
     addChild(starField);
   }