Merge pull request #8 from anyWareSculpture/audioview

Correct build and initialization of Audioview
anyWareSculpture · Nov 27, 2015 · 6cc5011 · 6cc5011
2 parents 834acb0 + 90b1079
commit 6cc5011
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 67 deletions.
diff --git a/app/src/app.js b/app/src/app.js
@@ -8,7 +8,7 @@ const SculptureActionCreator = require("@anyware/game-logic/lib/actions/sculptur
 const HandshakeView = require('./views/handshake-view');
 const PanelView = require('./views/panel-view');
 const DiskView = require('./views/disk-view');
-const AudioView = require('./views/audio-view');
+const AudioView = require('@anyware/shared-views/lib/audio-view');
 
 const SerialManager = require('./serial/serial-manager');
 
@@ -121,7 +121,7 @@ export default class SculptureApp {
   }
 
   _beginFirstGame() {
-    if (!this.client || !this.client.connected || !this.serialSearched) {
+    if (!this.client || !this.client.connected || !this.serialSearched || !this.audioInitialized) {
       return;
     }
 

diff --git a/app/src/views/audio-view.js b/app/src/views/audio-view.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -81,7 +81,7 @@ gulp.task('collect-static', function collectStatic() {
 });
 
 gulp.task('collect-sounds', function collectSounds() {
-  return gulp.src('sounds/**/*')
+  return gulp.src(['node_modules/@anyware/sound-assets/**/*.wav'])
     .pipe(gulp.dest(path.join(BUILD_DIRECTORY, 'sounds')));
 });
 

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/anyWareSculpture/sculpture-client#readme",
   "dependencies": {
     "@anyware/game-logic": "^11.0.1",
+    "@anyware/sound-assets": "anyWareSculpture/sound-assets",
     "@anyware/streaming-client": "^1.3.4",
     "browser-serialport": "^2.0.2",
     "flux": "^2.0.3",