diff --git a/README.md b/README.md index db76a97..60d262b 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ Note that the controller portion of this app comes in a smartphone flavor too. S - Multiplayer - Canvas Streaming - +- Lobbies diff --git a/app/sensors/complementary-orientation.js b/app/sensors/complementary-orientation.js deleted file mode 100644 index 52c0377..0000000 --- a/app/sensors/complementary-orientation.js +++ /dev/null @@ -1,89 +0,0 @@ -MIN_TIMESTEP = 0.001; -MAX_TIMESTEP = 1; - -function ComplementaryOrientation() { - this.accelerometer = new THREE.Vector3(); - this.gyroscope = new THREE.Vector3(); - - window.addEventListener('devicemotion', this.onDeviceMotionChange_.bind(this)); - window.addEventListener('orientationchange', this.onScreenOrientationChange_.bind(this)); - - this.filter = new ComplementaryFilter(0.98); - this.posePredictor = new PosePredictor(0.050); - - this.filterToWorldQ = new THREE.Quaternion(); - - // Set the filter to world transform, but only for Android. - if (Util.isIOS()) { - this.filterToWorldQ.setFromAxisAngle(new THREE.Vector3(1, 0, 0), Math.PI/2); - } else { - this.filterToWorldQ.setFromAxisAngle(new THREE.Vector3(1, 0, 0), -Math.PI/2); - } - - this.worldToScreenQ = new THREE.Quaternion(); - this.setScreenTransform_(); -} - -ComplementaryOrientation.prototype.onDeviceMotionChange_ = function(deviceMotion) { - var accGravity = deviceMotion.accelerationIncludingGravity; - var rotRate = deviceMotion.rotationRate; - var timestampS = deviceMotion.timeStamp / 1000; - - var deltaS = timestampS - this.previousTimestampS; - if (deltaS <= MIN_TIMESTEP || deltaS > MAX_TIMESTEP) { - console.warn('Invalid timestamps detected. Time step between successive ' + - 'gyroscope sensor samples is very small or not monotonic'); - this.previousTimestampS = timestampS; - return; - } - this.accelerometer.set(-accGravity.x, -accGravity.y, -accGravity.z); - this.gyroscope.set(rotRate.alpha, rotRate.beta, rotRate.gamma); - - // In iOS, rotationRate is reported in degrees, so we first convert to - // radians. - if (Util.isIOS()) { - this.gyroscope.multiplyScalar(Math.PI / 180); - } - - this.filter.addAccelMeasurement(this.accelerometer, timestampS); - this.filter.addGyroMeasurement(this.gyroscope, timestampS); - - this.previousTimestampS = timestampS; -}; - -ComplementaryOrientation.prototype.onScreenOrientationChange_ = - function(screenOrientation) { - this.setScreenTransform_(); -}; - -ComplementaryOrientation.prototype.setScreenTransform_ = function() { - this.worldToScreenQ.set(0, 0, 0, 1); - switch (window.orientation) { - case 0: - break; - case 90: - this.worldToScreenQ.setFromAxisAngle(new THREE.Vector3(0, 0, 1), -Math.PI/2); - break; - case -90: - this.worldToScreenQ.setFromAxisAngle(new THREE.Vector3(0, 0, 1), Math.PI/2); - break; - case 180: - break; - } -}; - -ComplementaryOrientation.prototype.getOrientation = function() { - // Convert from filter space to the the same system used by the - // deviceorientation event. - var orientation = this.filter.getOrientation(); - - // Predict orientation. - this.predictedQ = this.posePredictor.getPrediction(orientation, this.gyroscope, this.previousTimestampS); - - // Convert to THREE coordinate system: -Z forward, Y up, X right. - var out = new THREE.Quaternion(); - out.copy(this.filterToWorldQ); - out.multiply(this.predictedQ); - out.multiply(this.worldToScreenQ); - return out; -}; diff --git a/app/sensors/plot-object.js b/app/sensors/plot-object.js deleted file mode 100644 index 4ca90f4..0000000 --- a/app/sensors/plot-object.js +++ /dev/null @@ -1,72 +0,0 @@ -// Create a three.js scene in which the camera is controlled by the orientation -// from the complementary filter. - -var co = new ComplementaryOrientation(); - -var scene = new THREE.Scene(); - -var camera = new THREE.PerspectiveCamera( 75, window.innerWidth / window.innerHeight, 0.1, 1000 ); -camera.position.z = -1; - -var renderer = new THREE.WebGLRenderer(); -renderer.setSize(window.innerWidth, window.innerHeight); -document.body.appendChild(renderer.domElement); - -var geometry = new THREE.SphereGeometry( 1, 16, 16 ); -var material = new THREE.MeshBasicMaterial( {color: 'red', wireframe: true} ); -var sphereX = new THREE.Mesh( geometry, material ); -sphereX.position.set(5, 0, 0); -scene.add( sphereX ); - -var geometry = new THREE.SphereGeometry( 1, 16, 16 ); -var material = new THREE.MeshBasicMaterial( {color: 'green', wireframe: true} ); -var sphereY = new THREE.Mesh( geometry, material ); -sphereY.position.set(0, 5, 0); -scene.add( sphereY ); - -var geometry = new THREE.SphereGeometry( 1, 16, 16 ); -var material = new THREE.MeshBasicMaterial( {color: 'blue', wireframe: true} ); -var sphereZ = new THREE.Mesh( geometry, material ); -sphereZ.position.set(0, 0, 5); -scene.add( sphereZ ); - -var geometry = new THREE.SphereGeometry( 1, 16, 16 ); -var material = new THREE.MeshBasicMaterial( {color: 'cyan', wireframe: true} ); -var sphereBottom = new THREE.Mesh( geometry, material ); -sphereBottom.position.set(0, -5, 0); -scene.add( sphereBottom ); - -// Add a repeating grid as a skybox. -var boxWidth = 10; -var texture = THREE.ImageUtils.loadTexture( - 'img/box.png' -); -texture.wrapS = THREE.RepeatWrapping; -texture.wrapT = THREE.RepeatWrapping; -texture.repeat.set(boxWidth, boxWidth); - -var geometry = new THREE.BoxGeometry(boxWidth, boxWidth, boxWidth); -var material = new THREE.MeshBasicMaterial({ - map: texture, - color: 0xffffff, - side: THREE.BackSide -}); - -var skybox = new THREE.Mesh(geometry, material); -scene.add(skybox); - -function render() { - camera.quaternion.copy(co.getOrientation()); - - requestAnimationFrame( render ); - renderer.render( scene, camera ); -} -render(); - - -window.addEventListener('resize', function() { - camera.aspect = window.innerWidth / window.innerHeight; - camera.updateProjectionMatrix(); - - renderer.setSize( window.innerWidth, window.innerHeight ); -}); diff --git a/app/sensors/pose-predictor.js b/app/sensors/pose-predictor.js deleted file mode 100644 index d05eb20..0000000 --- a/app/sensors/pose-predictor.js +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2015 Google Inc. All Rights Reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -var DEBUG = false; - -/** - * Given an orientation and the gyroscope data, predicts the future orientation - * of the head. This makes rendering appear faster. - * - * Also see: http://msl.cs.uiuc.edu/~lavalle/papers/LavYerKatAnt14.pdf - * - * @param {Number} predictionTimeS time from head movement to the appearance of - * the corresponding image. - */ -function PosePredictor(predictionTimeS) { - this.predictionTimeS = predictionTimeS; - - // The quaternion corresponding to the previous state. - this.previousQ = new THREE.Quaternion(); - // Previous time a prediction occurred. - this.previousTimestampS = null; - - // The delta quaternion that adjusts the current pose. - this.deltaQ = new THREE.Quaternion(); - // The output quaternion. - this.outQ = new THREE.Quaternion(); -} - -PosePredictor.prototype.getPrediction = function(currentQ, gyro, timestampS) { - if (!this.previousTimestampS) { - this.previousQ.copy(currentQ); - this.previousTimestampS = timestampS; - return currentQ; - } - - // Calculate axis and angle based on gyroscope rotation rate data. - var axis = new THREE.Vector3(); - axis.copy(gyro); - axis.normalize(); - - var angularSpeed = gyro.length(); - - // If we're rotating slowly, don't do prediction. - if (angularSpeed < THREE.Math.degToRad(20)) { - if (DEBUG) { - console.log('Moving slowly, at %s deg/s: no prediction', - THREE.Math.radToDeg(angularSpeed).toFixed(1)); - } - this.outQ.copy(currentQ); - this.previousQ.copy(currentQ); - return this.outQ; - } - - // Get the predicted angle based on the time delta and latency. - var deltaT = timestampS - this.previousTimestampS; - var predictAngle = angularSpeed * this.predictionTimeS; - - this.deltaQ.setFromAxisAngle(axis, predictAngle); - this.outQ.copy(this.previousQ); - this.outQ.multiply(this.deltaQ); - - this.previousQ.copy(currentQ); - - return this.outQ; -}; diff --git a/app/sensors/sensor-sample.js b/app/sensors/sensor-sample.js deleted file mode 100644 index 696ccad..0000000 --- a/app/sensors/sensor-sample.js +++ /dev/null @@ -1,12 +0,0 @@ -function SensorSample(sample, timestampS) { - this.set(sample, timestampS); -}; - -SensorSample.prototype.set = function(sample, timestampS) { - this.sample = sample; - this.timestampS = timestampS; -}; - -SensorSample.prototype.copy = function(sensorSample) { - this.set(sensorSample.sample, sensorSample.timestampS); -}; diff --git a/package.json b/package.json index 280cc84..fe8a140 100644 --- a/package.json +++ b/package.json @@ -16,11 +16,7 @@ "license": "MIT", "homepage": "https://github.com/christianalfoni/webpack-express-boilerplate", "scripts": { - "test": "", - "start": "node server", - "build": "rimraf dist && cross-env NODE_ENV=production webpack --config ./webpack.production.config.js --progress --profile --colors", - "eslint": "eslint .", - "jscs": "jscs ." + "start": "node src/server" }, "dependencies": { "babel-cli": "^6.4.0", diff --git a/paradrop.yaml b/paradrop.yaml index c6611d8..8a96d66 100644 --- a/paradrop.yaml +++ b/paradrop.yaml @@ -1,4 +1,4 @@ version: 1 type: light use: node -command: node server \ No newline at end of file +command: npm start \ No newline at end of file diff --git a/app/sensors/complementary-filter.js b/sensors/complementary-filter.js similarity index 100% rename from app/sensors/complementary-filter.js rename to sensors/complementary-filter.js diff --git a/app/sensors/plot-sensors.js b/sensors/plot-sensors.js similarity index 99% rename from app/sensors/plot-sensors.js rename to sensors/plot-sensors.js index 4f28f6f..7c6d2df 100644 --- a/app/sensors/plot-sensors.js +++ b/sensors/plot-sensors.js @@ -26,7 +26,7 @@ function loop() { lastGyro.applyQuaternion(invGyroOnly); lastGyro.normalize(); gyroHistory.push(lastGyro); - console.log('G: ', lastGyro); + // console.log('G: ', lastGyro); } else { gyroHistory.data = []; } diff --git a/app/sensors/util.js b/sensors/util.js similarity index 100% rename from app/sensors/util.js rename to sensors/util.js diff --git a/app/controller.js b/src/controller.js similarity index 100% rename from app/controller.js rename to src/controller.js diff --git a/app/main.js b/src/display.js similarity index 100% rename from app/main.js rename to src/display.js diff --git a/server.js b/src/server.js similarity index 68% rename from server.js rename to src/server.js index b9f4711..7504969 100644 --- a/server.js +++ b/src/server.js @@ -3,9 +3,12 @@ const app = express(); var http = require('http').Server(app); var io = require('socket.io')(http); -app.use('/assets', express.static('./app')); -app.get('/', (req, res) => { res.sendFile('index.html', { root: './app' }) }) -app.get('/controller', (req, res) => { res.sendFile('controller.html', { root: './app' }) }) +app.get('/', (req, res) => { res.sendFile('display.html', { root: 'views' }) }) +app.get('/controller', (req, res) => { res.sendFile('controller.html', { root: 'views' }) }) + +for (var d of["stylesheets", "vendor", "sensors", "src"]) { + app.use('/assets', express.static(d)); +} io.on('connection', (socket) => { socket.on("controller", (m) => io.emit('input', m)) diff --git a/app/stylesheets/controller.css b/stylesheets/controller.css similarity index 100% rename from app/stylesheets/controller.css rename to stylesheets/controller.css diff --git a/app/stylesheets/pygment_trac.css b/stylesheets/pygment_trac.css similarity index 100% rename from app/stylesheets/pygment_trac.css rename to stylesheets/pygment_trac.css diff --git a/app/stylesheets/stylesheet.css b/stylesheets/stylesheet.css similarity index 100% rename from app/stylesheets/stylesheet.css rename to stylesheets/stylesheet.css diff --git a/app/vendor/cbuffer/.bower.json b/vendor/cbuffer/.bower.json similarity index 100% rename from app/vendor/cbuffer/.bower.json rename to vendor/cbuffer/.bower.json diff --git a/app/vendor/cbuffer/.gitignore b/vendor/cbuffer/.gitignore similarity index 100% rename from app/vendor/cbuffer/.gitignore rename to vendor/cbuffer/.gitignore diff --git a/app/vendor/cbuffer/LICENSE b/vendor/cbuffer/LICENSE similarity index 100% rename from app/vendor/cbuffer/LICENSE rename to vendor/cbuffer/LICENSE diff --git a/app/vendor/cbuffer/README.md b/vendor/cbuffer/README.md similarity index 100% rename from app/vendor/cbuffer/README.md rename to vendor/cbuffer/README.md diff --git a/app/vendor/cbuffer/bower.json b/vendor/cbuffer/bower.json similarity index 100% rename from app/vendor/cbuffer/bower.json rename to vendor/cbuffer/bower.json diff --git a/app/vendor/cbuffer/cbuffer.js b/vendor/cbuffer/cbuffer.js similarity index 100% rename from app/vendor/cbuffer/cbuffer.js rename to vendor/cbuffer/cbuffer.js diff --git a/app/vendor/cbuffer/package.json b/vendor/cbuffer/package.json similarity index 100% rename from app/vendor/cbuffer/package.json rename to vendor/cbuffer/package.json diff --git a/app/vendor/cbuffer/speed/core/initialize.js b/vendor/cbuffer/speed/core/initialize.js similarity index 100% rename from app/vendor/cbuffer/speed/core/initialize.js rename to vendor/cbuffer/speed/core/initialize.js diff --git a/app/vendor/cbuffer/speed/mutator/pop.js b/vendor/cbuffer/speed/mutator/pop.js similarity index 100% rename from app/vendor/cbuffer/speed/mutator/pop.js rename to vendor/cbuffer/speed/mutator/pop.js diff --git a/app/vendor/cbuffer/speed/mutator/push.js b/vendor/cbuffer/speed/mutator/push.js similarity index 100% rename from app/vendor/cbuffer/speed/mutator/push.js rename to vendor/cbuffer/speed/mutator/push.js diff --git a/app/vendor/cbuffer/speed/mutator/reverse.js b/vendor/cbuffer/speed/mutator/reverse.js similarity index 100% rename from app/vendor/cbuffer/speed/mutator/reverse.js rename to vendor/cbuffer/speed/mutator/reverse.js diff --git a/app/vendor/cbuffer/speed/mutator/shift.js b/vendor/cbuffer/speed/mutator/shift.js similarity index 100% rename from app/vendor/cbuffer/speed/mutator/shift.js rename to vendor/cbuffer/speed/mutator/shift.js diff --git a/app/vendor/cbuffer/speed/mutator/unshift.js b/vendor/cbuffer/speed/mutator/unshift.js similarity index 100% rename from app/vendor/cbuffer/speed/mutator/unshift.js rename to vendor/cbuffer/speed/mutator/unshift.js diff --git a/app/vendor/cbuffer/speed/test.js b/vendor/cbuffer/speed/test.js similarity index 100% rename from app/vendor/cbuffer/speed/test.js rename to vendor/cbuffer/speed/test.js diff --git a/app/vendor/cbuffer/test/accessor/indexOf-test.js b/vendor/cbuffer/test/accessor/indexOf-test.js similarity index 100% rename from app/vendor/cbuffer/test/accessor/indexOf-test.js rename to vendor/cbuffer/test/accessor/indexOf-test.js diff --git a/app/vendor/cbuffer/test/accessor/lastIndexOf-test.js b/vendor/cbuffer/test/accessor/lastIndexOf-test.js similarity index 100% rename from app/vendor/cbuffer/test/accessor/lastIndexOf-test.js rename to vendor/cbuffer/test/accessor/lastIndexOf-test.js diff --git a/app/vendor/cbuffer/test/accessor/sortedIndex-test.js b/vendor/cbuffer/test/accessor/sortedIndex-test.js similarity index 100% rename from app/vendor/cbuffer/test/accessor/sortedIndex-test.js rename to vendor/cbuffer/test/accessor/sortedIndex-test.js diff --git a/app/vendor/cbuffer/test/core/cbuffer-test.js b/vendor/cbuffer/test/core/cbuffer-test.js similarity index 100% rename from app/vendor/cbuffer/test/core/cbuffer-test.js rename to vendor/cbuffer/test/core/cbuffer-test.js diff --git a/app/vendor/cbuffer/test/env.js b/vendor/cbuffer/test/env.js similarity index 100% rename from app/vendor/cbuffer/test/env.js rename to vendor/cbuffer/test/env.js diff --git a/app/vendor/cbuffer/test/index.html b/vendor/cbuffer/test/index.html similarity index 100% rename from app/vendor/cbuffer/test/index.html rename to vendor/cbuffer/test/index.html diff --git a/app/vendor/cbuffer/test/iterator/every-test.js b/vendor/cbuffer/test/iterator/every-test.js similarity index 100% rename from app/vendor/cbuffer/test/iterator/every-test.js rename to vendor/cbuffer/test/iterator/every-test.js diff --git a/app/vendor/cbuffer/test/iterator/forEach-test.js b/vendor/cbuffer/test/iterator/forEach-test.js similarity index 100% rename from app/vendor/cbuffer/test/iterator/forEach-test.js rename to vendor/cbuffer/test/iterator/forEach-test.js diff --git a/app/vendor/cbuffer/test/iterator/math-test.js b/vendor/cbuffer/test/iterator/math-test.js similarity index 100% rename from app/vendor/cbuffer/test/iterator/math-test.js rename to vendor/cbuffer/test/iterator/math-test.js diff --git a/app/vendor/cbuffer/test/iterator/some-test.js b/vendor/cbuffer/test/iterator/some-test.js similarity index 100% rename from app/vendor/cbuffer/test/iterator/some-test.js rename to vendor/cbuffer/test/iterator/some-test.js diff --git a/app/vendor/cbuffer/test/mutator/pop-test.js b/vendor/cbuffer/test/mutator/pop-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/pop-test.js rename to vendor/cbuffer/test/mutator/pop-test.js diff --git a/app/vendor/cbuffer/test/mutator/push-test.js b/vendor/cbuffer/test/mutator/push-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/push-test.js rename to vendor/cbuffer/test/mutator/push-test.js diff --git a/app/vendor/cbuffer/test/mutator/reverse-test.js b/vendor/cbuffer/test/mutator/reverse-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/reverse-test.js rename to vendor/cbuffer/test/mutator/reverse-test.js diff --git a/app/vendor/cbuffer/test/mutator/rotateLeft-test.js b/vendor/cbuffer/test/mutator/rotateLeft-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/rotateLeft-test.js rename to vendor/cbuffer/test/mutator/rotateLeft-test.js diff --git a/app/vendor/cbuffer/test/mutator/rotateRight-test.js b/vendor/cbuffer/test/mutator/rotateRight-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/rotateRight-test.js rename to vendor/cbuffer/test/mutator/rotateRight-test.js diff --git a/app/vendor/cbuffer/test/mutator/shift-test.js b/vendor/cbuffer/test/mutator/shift-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/shift-test.js rename to vendor/cbuffer/test/mutator/shift-test.js diff --git a/app/vendor/cbuffer/test/mutator/sort-test.js b/vendor/cbuffer/test/mutator/sort-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/sort-test.js rename to vendor/cbuffer/test/mutator/sort-test.js diff --git a/app/vendor/cbuffer/test/mutator/unshift-test.js b/vendor/cbuffer/test/mutator/unshift-test.js similarity index 100% rename from app/vendor/cbuffer/test/mutator/unshift-test.js rename to vendor/cbuffer/test/mutator/unshift-test.js diff --git a/app/vendor/cbuffer/test/template.js b/vendor/cbuffer/test/template.js similarity index 100% rename from app/vendor/cbuffer/test/template.js rename to vendor/cbuffer/test/template.js diff --git a/app/vendor/cbuffer/test/utility/slice-test.js b/vendor/cbuffer/test/utility/slice-test.js similarity index 100% rename from app/vendor/cbuffer/test/utility/slice-test.js rename to vendor/cbuffer/test/utility/slice-test.js diff --git a/app/vendor/cbuffer/test/utility/utility-test.js b/vendor/cbuffer/test/utility/utility-test.js similarity index 100% rename from app/vendor/cbuffer/test/utility/utility-test.js rename to vendor/cbuffer/test/utility/utility-test.js diff --git a/app/vendor/dat.gui/.bower.json b/vendor/dat.gui/.bower.json similarity index 100% rename from app/vendor/dat.gui/.bower.json rename to vendor/dat.gui/.bower.json diff --git a/app/vendor/dat.gui/bower.json b/vendor/dat.gui/bower.json similarity index 100% rename from app/vendor/dat.gui/bower.json rename to vendor/dat.gui/bower.json diff --git a/app/vendor/dat.gui/dat.color.js b/vendor/dat.gui/dat.color.js similarity index 100% rename from app/vendor/dat.gui/dat.color.js rename to vendor/dat.gui/dat.color.js diff --git a/app/vendor/dat.gui/dat.color.min.js b/vendor/dat.gui/dat.color.min.js similarity index 100% rename from app/vendor/dat.gui/dat.color.min.js rename to vendor/dat.gui/dat.color.min.js diff --git a/app/vendor/dat.gui/dat.gui.js b/vendor/dat.gui/dat.gui.js similarity index 100% rename from app/vendor/dat.gui/dat.gui.js rename to vendor/dat.gui/dat.gui.js diff --git a/app/vendor/dat.gui/dat.gui.min.js b/vendor/dat.gui/dat.gui.min.js similarity index 100% rename from app/vendor/dat.gui/dat.gui.min.js rename to vendor/dat.gui/dat.gui.min.js diff --git a/app/vendor/dat.gui/license.txt b/vendor/dat.gui/license.txt similarity index 100% rename from app/vendor/dat.gui/license.txt rename to vendor/dat.gui/license.txt diff --git a/app/vendor/dat.gui/readme.md b/vendor/dat.gui/readme.md similarity index 100% rename from app/vendor/dat.gui/readme.md rename to vendor/dat.gui/readme.md diff --git a/app/vendor/mathbox/.bower.json b/vendor/mathbox/.bower.json similarity index 100% rename from app/vendor/mathbox/.bower.json rename to vendor/mathbox/.bower.json diff --git a/app/vendor/mathbox/bower.json b/vendor/mathbox/bower.json similarity index 100% rename from app/vendor/mathbox/bower.json rename to vendor/mathbox/bower.json diff --git a/app/vendor/mathbox/build/mathbox-bundle.js b/vendor/mathbox/build/mathbox-bundle.js similarity index 100% rename from app/vendor/mathbox/build/mathbox-bundle.js rename to vendor/mathbox/build/mathbox-bundle.js diff --git a/app/vendor/mathbox/build/mathbox-bundle.min.js b/vendor/mathbox/build/mathbox-bundle.min.js similarity index 100% rename from app/vendor/mathbox/build/mathbox-bundle.min.js rename to vendor/mathbox/build/mathbox-bundle.min.js diff --git a/app/vendor/mathbox/build/mathbox-core.js b/vendor/mathbox/build/mathbox-core.js similarity index 100% rename from app/vendor/mathbox/build/mathbox-core.js rename to vendor/mathbox/build/mathbox-core.js diff --git a/app/vendor/mathbox/build/mathbox-core.min.js b/vendor/mathbox/build/mathbox-core.min.js similarity index 100% rename from app/vendor/mathbox/build/mathbox-core.min.js rename to vendor/mathbox/build/mathbox-core.min.js diff --git a/app/vendor/mathbox/build/mathbox.css b/vendor/mathbox/build/mathbox.css similarity index 100% rename from app/vendor/mathbox/build/mathbox.css rename to vendor/mathbox/build/mathbox.css diff --git a/app/vendor/mathbox/build/shaders.js b/vendor/mathbox/build/shaders.js similarity index 100% rename from app/vendor/mathbox/build/shaders.js rename to vendor/mathbox/build/shaders.js diff --git a/app/vendor/mathbox/gulpfile.js b/vendor/mathbox/gulpfile.js similarity index 100% rename from app/vendor/mathbox/gulpfile.js rename to vendor/mathbox/gulpfile.js diff --git a/app/vendor/mathbox/karma.conf.js b/vendor/mathbox/karma.conf.js similarity index 100% rename from app/vendor/mathbox/karma.conf.js rename to vendor/mathbox/karma.conf.js diff --git a/app/vendor/mathbox/release/mathbox-0.0.2.zip b/vendor/mathbox/release/mathbox-0.0.2.zip similarity index 100% rename from app/vendor/mathbox/release/mathbox-0.0.2.zip rename to vendor/mathbox/release/mathbox-0.0.2.zip diff --git a/app/vendor/mathbox/release/mathbox-0.0.3.zip b/vendor/mathbox/release/mathbox-0.0.3.zip similarity index 100% rename from app/vendor/mathbox/release/mathbox-0.0.3.zip rename to vendor/mathbox/release/mathbox-0.0.3.zip diff --git a/app/vendor/mathbox/vendor/fix.js b/vendor/mathbox/vendor/fix.js similarity index 100% rename from app/vendor/mathbox/vendor/fix.js rename to vendor/mathbox/vendor/fix.js diff --git a/app/vendor/mathbox/vendor/gulp-jsify/index.js b/vendor/mathbox/vendor/gulp-jsify/index.js similarity index 100% rename from app/vendor/mathbox/vendor/gulp-jsify/index.js rename to vendor/mathbox/vendor/gulp-jsify/index.js diff --git a/app/vendor/mathbox/vendor/three.js b/vendor/mathbox/vendor/three.js similarity index 100% rename from app/vendor/mathbox/vendor/three.js rename to vendor/mathbox/vendor/three.js diff --git a/app/vendor/mathbox/vendor/three.min.js b/vendor/mathbox/vendor/three.min.js similarity index 100% rename from app/vendor/mathbox/vendor/three.min.js rename to vendor/mathbox/vendor/three.min.js diff --git a/app/mupen64plus-ui-console.data b/vendor/mupen64plus-ui-console.data similarity index 100% rename from app/mupen64plus-ui-console.data rename to vendor/mupen64plus-ui-console.data diff --git a/app/mupen64plus-ui-console.js b/vendor/mupen64plus-ui-console.js similarity index 100% rename from app/mupen64plus-ui-console.js rename to vendor/mupen64plus-ui-console.js diff --git a/app/vendor/three.min.js b/vendor/three.min.js similarity index 100% rename from app/vendor/three.min.js rename to vendor/three.min.js diff --git a/app/controller.html b/views/controller.html similarity index 83% rename from app/controller.html rename to views/controller.html index 9162be1..a21f8c0 100644 --- a/app/controller.html +++ b/views/controller.html @@ -5,17 +5,17 @@ - + - - - - + + + + @@ -24,9 +24,9 @@ - - - + + +
diff --git a/app/index.html b/views/display.html similarity index 88% rename from app/index.html rename to views/display.html index 8aa61ae..b549e5f 100644 --- a/app/index.html +++ b/views/display.html @@ -4,7 +4,7 @@ - + @@ -20,8 +20,6 @@
@@ -29,7 +27,7 @@
- +