Skip to content

Commit 65836ce

Browse files
gbiobobgbiobob
committed
Moving code to Three.js r75
1 parent 209ea45 commit 65836ce

18 files changed

+1231
-788
lines changed

‎.gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
minify/
1+
minify/
2+
demo_planet.html
3+
demo_edsm.html
4+
js/ed3dplanet.js
5+
json_samples/eddb.json
6+
json_samples/edsm.json

‎data/milkyway.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -45,52 +45,52 @@
4545
{"x":-7265, "z":4226, "rotate":-35},
4646
{"x":6858, "z":-576, "rotate":0}
4747
],
48-
"The outer arm vacuus" : [
48+
"The outer Arm vacuus" : [
4949
{"x":10, "z":-14500, "rotate":0}
5050
],
51-
"The Sagittarius arm" : [
51+
"The Sagittarius Arm" : [
5252
{"x":5379, "z":4768, "rotate":0}
5353
],
54-
"The Carina-Sagittarius arm" : [
54+
"The Carina-Sagittarius Arm" : [
5555
{"x":22458, "z":10237, "rotate":45},
5656
{"x":29632, "z":25285, "rotate":82},
5757
{"x":28962, "z":40634, "rotate":105},
5858
{"x":17446, "z":58185, "rotate":-40}
5959
],
60-
"The new outer arm" : [
60+
"The new outer Arm" : [
6161
{"x":-31158, "z":16529, "rotate":90},
6262
{"x":-28281, "z":3070, "rotate":112},
6363
{"x":-18972, "z":-8546, "rotate":-35}
6464

6565
],
66-
"The Perseus arm" : [
66+
"The Perseus Arm" : [
6767
{"x":-19961, "z":30870, "rotate":60 },
6868
{"x":-22778, "z":10633, "rotate":110 },
6969
{"x":-7525, "z":-3597, "rotate":-25 },
7070
{"x":8039, "z":-7019, "rotate":0 },
7171
{"x":32905, "z":4565, "rotate":45 }
7272
],
73-
"The Norma arm" : [
73+
"The Norma Arm" : [
7474
{"x":7944, "z":17960, "rotate":40 },
7575
{"x":13524, "z":29918, "rotate":90 },
7676
{"x":7498, "z":40348, "rotate":-35 }
7777
],
78-
"The Cygnus arm" : [
78+
"The Cygnus Arm" : [
7979
{"x":-7724, "z":43523, "rotate":0 },
8080
{"x":-22353, "z":37643, "rotate":38 }
8181
],
82-
"The Scutum-Centaurus arm" : [
82+
"The Scutum-Centaurus Arm" : [
8383
{"x":-33364, "z":46016, "rotate":45 },
8484
{"x":-15742, "z":54759, "rotate":0 },
8585
{"x":-334, "z":53331, "rotate":-14 },
8686
{"x":14300, "z":46140, "rotate":-38 },
8787
{"x":19815, "z":31418, "rotate":90 },
8888
{"x":16637, "z":17458, "rotate":48 }
8989
],
90-
"The near 3KPC arm" : [
90+
"The near 3 KPC Arm" : [
9191
{"x":5765, "z":22639, "rotate":45 }
9292
],
93-
"The far 3KPC arm" : [
93+
"The far 3 KPC Arm" : [
9494
{"x":-4906 ,"z":28535, "rotate":45 }
9595
]
9696
},
@@ -134,5 +134,4 @@
134134
]
135135

136136
}
137-
138137
}

‎demo_galnet.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
<!-- jQuery -->
3636
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
3737
<!-- Three.js -->
38-
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r73/three.min.js"></script>
39-
38+
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r75/three.min.js"></script>
4039

4140
<!-- Launch ED3Dmap -->
4241
<link href="css/styles.css" rel="stylesheet" type="text/css" />

‎demo_infos.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h1>Milky Way</h1>
6262
<!-- jQuery -->
6363
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
6464
<!-- Three.js -->
65-
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r73/three.min.js"></script>
65+
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r75/three.min.js"></script>
6666

6767
<!-- Launch ED3Dmap -->
6868
<link href="css/styles.css" rel="stylesheet" type="text/css" />

‎demo_no_jsonfile.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h1>NO JSon file test</h1>
4949
<!-- jQuery -->
5050
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
5151
<!-- Three.js -->
52-
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r73/three.min.js"></script>
52+
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r75/three.min.js"></script>
5353

5454
<!-- JSon inside a container -->
5555
<div id="json_data">

‎demo_routes.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ <h1>Milky Way</h1>
6161
<!-- jQuery -->
6262
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
6363
<!-- Three.js -->
64-
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r73/three.min.js"></script>
64+
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r75/three.min.js"></script>
6565

6666
<!-- Launch ED3Dmap -->
6767
<link href="css/styles.css" rel="stylesheet" type="text/css" />

‎js/components/action.class.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ var Action = {
264264
mx: Ed3d.playerPos[0], my: Ed3d.playerPos[1] , mz: -Ed3d.playerPos[2]
265265
};
266266
camera.position.set(moveTo.x, moveTo.y, moveTo.z);
267-
controls.center.set(moveTo.mx, moveTo.my, moveTo.mz);
267+
controls.target.set(moveTo.mx, moveTo.my, moveTo.mz);
268268

269269
},
270270

@@ -281,7 +281,7 @@ var Action = {
281281

282282
var moveFrom = {
283283
x: camera.position.x, y: camera.position.y , z: camera.position.z,
284-
mx: controls.center.x, my: controls.center.y , mz: controls.center.z
284+
mx: controls.target.x, my: controls.target.y , mz: controls.target.z
285285
};
286286

287287
//-- Move to player position if defined, else move to Sol
@@ -307,7 +307,7 @@ var Action = {
307307
.start()
308308
.onUpdate(function () {
309309
camera.position.set(moveFrom.x, moveFrom.y, moveFrom.z);
310-
controls.center.set(moveFrom.mx, moveFrom.my, moveFrom.mz);
310+
controls.target.set(moveFrom.mx, moveFrom.my, moveFrom.mz);
311311
})
312312
.onComplete(function () {
313313
controls.enabled = true;
@@ -348,7 +348,7 @@ var Action = {
348348

349349
var moveFrom = {
350350
x: camera.position.x, y: camera.position.y , z: camera.position.z,
351-
mx: controls.center.x, my: controls.center.y , mz: controls.center.z
351+
mx: controls.target.x, my: controls.target.y , mz: controls.target.z
352352
};
353353
var moveCoords = {
354354
x: goX, y: goY + 15, z: goZ + 15,
@@ -359,7 +359,7 @@ var Action = {
359359
.start()
360360
.onUpdate(function () {
361361
camera.position.set(moveFrom.x, moveFrom.y, moveFrom.z);
362-
controls.center.set(moveFrom.mx, moveFrom.my, moveFrom.mz);
362+
controls.target.set(moveFrom.mx, moveFrom.my, moveFrom.mz);
363363
})
364364
.onComplete(function () {
365365
controls.update();

‎js/components/grid.class.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ var Grid = {
6666

6767
}
6868

69-
this.obj = new THREE.Line( geometry, material, THREE.LinePieces );
69+
this.obj = new THREE.LineSegments( geometry, material );
7070
this.obj.position.set(0,0,-20000);
7171

7272
//-- Add quadrant
@@ -85,7 +85,7 @@ var Grid = {
8585

8686
quadrant.vertices.push( new THREE.Vector3( 0, 0, - size ) );
8787
quadrant.vertices.push( new THREE.Vector3( 0, 0, size ) );
88-
var quadrantL = new THREE.Line( quadrant, material, THREE.LinePieces );
88+
var quadrantL = new THREE.LineSegments( quadrant, material );
8989

9090

9191
this.obj.add(quadrantL);

‎js/components/hud.class.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ var HUD = {
113113
case 'top':
114114
Ed3d.isTopView = true;
115115
var moveFrom = {x: camera.position.x, y: camera.position.y , z: camera.position.z};
116-
var moveCoords = {x: controls.center.x, y: controls.center.y+500, z: controls.center.z};
116+
var moveCoords = {x: controls.target.x, y: controls.target.y+500, z: controls.target.z};
117117
HUD.moveCamera(moveFrom,moveCoords);
118118
break;
119119

120120
case '3d':
121121
Ed3d.isTopView = false;
122122
var moveFrom = {x: camera.position.x, y: camera.position.y , z: camera.position.z};
123-
var moveCoords = {x: controls.center.x-100, y: controls.center.y+500, z: controls.center.z+500};
123+
var moveCoords = {x: controls.target.x-100, y: controls.target.y+500, z: controls.target.z+500};
124124
HUD.moveCamera(moveFrom,moveCoords);
125125
break;
126126

‎js/ed3dmap.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ var Ed3d = {
282282
});
283283
Ed3d.material.glow_2 = new THREE.SpriteMaterial({
284284

285-
map: Ed3d.textures.flare_white, transparent: true, size: 15,
286-
vertexColors: THREE.VertexColors,
285+
map: Ed3d.textures.flare_white,
286+
transparent: true,
287287
blending: THREE.AdditiveBlending,
288288
depthWrite: false,
289289
opacity: 0.5
@@ -334,11 +334,11 @@ var Ed3d = {
334334

335335
//controls
336336
controls = new THREE.OrbitControls(camera, container);
337-
controls.rotateSpeed = 1.0;
338-
controls.zoomSpeed = 3.0;
337+
controls.rotateSpeed = 0.6;
338+
controls.zoomSpeed = 2.0;
339339
controls.panSpeed = 0.8;
340340
controls.maxDistance = 60000;
341-
controls.noZoom=!1;controls.noPan=!1;controls.staticMoving=!0;controls.dynamicDampingFactor=.3;
341+
controls.enableZoom=1;controls.enablePan=1;controls.enableDamping=!0;controls.dampingFactor=.3;
342342

343343

344344
// Add Fog
@@ -516,6 +516,8 @@ var Ed3d = {
516516

517517
function animate(time) {
518518

519+
//rendererStats.update(renderer);
520+
519521
if(scene.visible == false) {
520522
requestAnimationFrame( animate );
521523
return;
@@ -534,16 +536,16 @@ function animate(time) {
534536
//-- If 2D top view, lock camera pos
535537
if(Ed3d.isTopView) {
536538
camera.rotation.set(-Math.PI/2,0,0);
537-
camera.position.x = controls.center.x;
538-
camera.position.z = controls.center.z;
539+
camera.position.x = controls.target.x;
540+
camera.position.z = controls.target.z;
539541
}
540542

541543

542544
renderer.render(scene, camera);
543545

544-
$('#cx').html(Math.round(controls.center.x));
545-
$('#cy').html(Math.round(controls.center.y));
546-
$('#cz').html(Math.round(-controls.center.z)); // Reverse z coord
546+
$('#cx').html(Math.round(controls.target.x));
547+
$('#cy').html(Math.round(controls.target.y));
548+
$('#cz').html(Math.round(-controls.target.z)); // Reverse z coord
547549

548550
$('#distsol').html(Ed3d.calcDistSol(controls.target));
549551

‎js/ed3dmap.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/renderstats/README.md

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
threex.rendererstats
2+
====================
3+
4+
It is a three.js extension to display realtime informations about ```THREE.WebGLRenderer```.
5+
Here is a [basic example](http://jeromeetienne.github.io/threex.rendererstats/examples/basic.html). It is widely inpired from @mrdoob [stats.js](https://github.com/mrdoob/stats.js/).
6+
It is released under MIT license.
7+
8+
## How To install it
9+
10+
You can install it manually or with
11+
[bower](http://bower.io/).
12+
for the manual version, first include ```threex.rendererstats.js``` with the usual
13+
14+
```html
15+
<script src='threex.rendererstats.js'></script>
16+
```
17+
18+
or with
19+
[bower](http://bower.io/)
20+
you type the following to install the package.
21+
22+
```bash
23+
bower install -s threex.rendererstats=https://github.com/jeromeetienne/threex.rendererstats/archive/master.zip
24+
```
25+
26+
then you add that in your html
27+
28+
```html
29+
<script src="bower_components/threex.rendererstats/threex.rendererstats.js"></script>
30+
```
31+
32+
## How To Use It
33+
34+
```
35+
var rendererStats = new THREEx.RendererStats()
36+
```
37+
38+
position it on the page with css with something along this line
39+
40+
```
41+
rendererStats.domElement.style.position = 'absolute'
42+
rendererStats.domElement.style.left = '0px'
43+
rendererStats.domElement.style.bottom = '0px'
44+
document.body.appendChild( rendererStats.domElement )
45+
```
46+
47+
finally update it at every frame
48+
49+
```
50+
rendererStats.update(renderer);
51+
```

‎vendor/renderstats/threex.rendererstats.js

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/**
2+
* @author mrdoob / http://mrdoob.com/
3+
* @author jetienne / http://jetienne.com/
4+
*/
5+
/** @namespace */
6+
var THREEx = THREEx || {}
7+
8+
/**
9+
* provide info on THREE.WebGLRenderer
10+
*
11+
* @param {Object} renderer the renderer to update
12+
* @param {Object} Camera the camera to update
13+
*/
14+
THREEx.RendererStats = function (){
15+
16+
var msMin = 100;
17+
var msMax = 0;
18+
19+
var container = document.createElement( 'div' );
20+
container.style.cssText = 'width:80px;opacity:0.9;cursor:pointer';
21+
22+
var msDiv = document.createElement( 'div' );
23+
msDiv.style.cssText = 'padding:0 0 3px 3px;text-align:left;background-color:#200;';
24+
container.appendChild( msDiv );
25+
26+
var msText = document.createElement( 'div' );
27+
msText.style.cssText = 'color:#f00;font-family:Helvetica,Arial,sans-serif;font-size:9px;font-weight:bold;line-height:15px';
28+
msText.innerHTML= 'WebGLRenderer';
29+
msDiv.appendChild( msText );
30+
31+
var msTexts = [];
32+
var nLines = 9;
33+
for(var i = 0; i < nLines; i++){
34+
msTexts[i] = document.createElement( 'div' );
35+
msTexts[i].style.cssText = 'color:#f00;background-color:#311;font-family:Helvetica,Arial,sans-serif;font-size:9px;font-weight:bold;line-height:15px';
36+
msDiv.appendChild( msTexts[i] );
37+
msTexts[i].innerHTML= '-';
38+
}
39+
40+
41+
var lastTime = Date.now();
42+
return {
43+
domElement: container,
44+
45+
update: function(webGLRenderer){
46+
// sanity check
47+
console.assert(webGLRenderer instanceof THREE.WebGLRenderer)
48+
49+
// refresh only 30time per second
50+
if( Date.now() - lastTime < 1000/30 ) return;
51+
lastTime = Date.now()
52+
53+
var i = 0;
54+
msTexts[i++].textContent = "== Memory =====";
55+
msTexts[i++].textContent = "Programs: " + webGLRenderer.info.memory.programs;
56+
msTexts[i++].textContent = "Geometries: "+webGLRenderer.info.memory.geometries;
57+
msTexts[i++].textContent = "Textures: " + webGLRenderer.info.memory.textures;
58+
59+
msTexts[i++].textContent = "== Render =====";
60+
msTexts[i++].textContent = "Calls: " + webGLRenderer.info.render.calls;
61+
msTexts[i++].textContent = "Vertices: " + webGLRenderer.info.render.vertices;
62+
msTexts[i++].textContent = "Faces: " + webGLRenderer.info.render.faces;
63+
msTexts[i++].textContent = "Points: " + webGLRenderer.info.render.points;
64+
}
65+
}
66+
};

0 commit comments

Comments
 (0)