aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRahiel Kasim <rahielkasim@gmail.com>2017-01-30 17:00:27 +0100
committerRahiel Kasim <rahielkasim@gmail.com>2017-01-30 17:00:27 +0100
commit7c06d55ac7e9ee418debd2b0cce0c98749aaddad (patch)
tree644cc349a0ee06a13d95e53500b8deeadd614196
parentcb93e4b305a9aacd3623ac4a489cb523f14b3b7c (diff)
parent89bfa5191c994e62dda62fc54e14d1bbbd3dcf59 (diff)
merge master
-rw-r--r--calc.js2
-rw-r--r--main.js3
-rw-r--r--package.json16
3 files changed, 11 insertions, 10 deletions
diff --git a/calc.js b/calc.js
index 3d4436a..c6bac83 100644
--- a/calc.js
+++ b/calc.js
@@ -1,4 +1,4 @@
-let Vec3 = require("three").Vector3;
+import {Vector3 as Vec3} from "three";
import Body from "./systems.js";
diff --git a/main.js b/main.js
index 0a1b3a0..2926302 100644
--- a/main.js
+++ b/main.js
@@ -1,4 +1,4 @@
-let THREE = require("three");
+import * as THREE from "three";
let OrbitControls = require("three-orbit-controls")(THREE);
let d3 = require("d3");
@@ -324,6 +324,7 @@ function init() {
transparent: false, blending: THREE.AdditiveBlending
});
let sprite = new THREE.Sprite(spriteMaterial);
+ sun.geometry.computeBoundingSphere();
let glowRadius = sun.geometry.boundingSphere.radius * 3;
sprite.scale.set(glowRadius, glowRadius, 1.0);
sun.add(sprite);
diff --git a/package.json b/package.json
index c30411f..6bdcdfd 100644
--- a/package.json
+++ b/package.json
@@ -23,20 +23,20 @@
"url": "https://github.com/sunsistemo/sunsistemo/issues"
},
"devDependencies": {
- "babel-core": "^6.10.4",
- "babel-loader": "^6.2.4",
- "babel-preset-es2015": "^6.9.0",
- "webpack": "^1.13.1",
- "webpack-dev-server": "^1.14.1"
+ "babel-core": "^6.22.1",
+ "babel-loader": "^6.2.10",
+ "babel-preset-es2015": "^6.22.0",
+ "webpack": "^2.2.0",
+ "webpack-dev-server": "^1.16.2"
},
"dependencies": {
"d3": "^3.5.17",
- "three": "^0.78.0",
- "three-orbit-controls": "^72.0.0"
+ "three": "^0.84.0",
+ "three-orbit-controls": "^82.1.0"
},
"babel": {
"presets": [
- "es2015"
+ ["es2015", { "modules": false }]
]
}
}