motion progress

src/app/motion/motion.component.html

@@ -1,5 +1,4 @@
 <section class="motion" [ngClass]="{ 'loading': !model }">
  <h2>Motion</h2>
- <pre>{{ rotation | json }}</pre>
  <article id="brainbrowser"></article>
 </section>

src/app/motion/motion.component.ts

@@ -30,8 +30,8 @@ export class MotionComponent implements OnInit {
  this.rotation = data.data;
 
  if (this.model) {
- console.log(this.model);
- this.model.rotation.set(...this.rotation);
+ this.viewer.resetView();
+ this.viewer.model.rotation.set(...this.rotation);
  }
  });
  }
@@ -42,12 +42,10 @@ export class MotionComponent implements OnInit {
  this.viewer.render();
  this.viewer.setWireframe(true);
  this.viewer.loadModelFromURL('app/motion/models/brain-surface.obj');
-
+ this.viewer.setClearColor(0x333333);
+
  this.viewer.addEventListener('displaymodel', (data) => {
  this.model = data.model;
- this.model.rotation.set(...this.rotation);
- this.viewer.updated = true;
- this.viewer.updateViewport();
  });
  });
  }

src/server/providers/motion.provider.js

@@ -17,15 +17,19 @@ module.exports = class Motion {
  this.simulate();
  } else {
  if (this.hasMotion(auxData)) {
- this.auxData = auxData;
+ this.auxData = this.amplify(auxData);
  this.emit();
  }
  } 
 
  }
 
- hasMotion () {
- return auxData.reduce((a, b) => a + b, 0)
+ hasMotion (auxData) {
+ return auxData.reduce((a, b) => a + b, 0);
+ }
+
+ amplify (auxData) {
+ return auxData.map(axis => Math.round(axis));
  }
 
  simulate () {

src/server/providers/signal.provider.js

@@ -42,7 +42,7 @@ module.exports = class Signal {
  }
 
  add (sample) {
- //console.log('sample', sample);
+ console.log('sample', sample);
  Object.keys(sample.channelData).forEach((channel, i) => {
  this.signals[i].push(sample.channelData[channel]);
  });