Skip to content

Commit d071ebd

Browse files
JustinBDevJustinBDev
committed
further rebasing
1 parent 5fd4e3f commit d071ebd

7 files changed

+36809
-243728
lines changed

‎demo_communist.html

-95
This file was deleted.

‎demo_factions.html

+94-93
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,95 @@
1-
<!DOCTYPE html>
2-
<html>
3-
4-
<head>
5-
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
6-
<meta charset="utf-8">
7-
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
8-
<title>Milky Way</title>
9-
<link href="http://fonts.googleapis.com/css?family=Orbitron:400" rel="stylesheet" type="text/css" />
10-
<!-- Custom CSS -->
11-
<style type="text/css">
12-
#systemDetails,
13-
#hud {
14-
width: 450px;
15-
}
16-
17-
h1 {
18-
position: fixed;
19-
top: 2%;
20-
left: 0;
21-
width: 100%;
22-
font-size: 1.3rem;
23-
text-align: center;
24-
color: #ccc;
25-
font-family: "Orbitron";
26-
}
27-
28-
h1 a {
29-
color: inherit;
30-
}
31-
32-
#edmap {
33-
position: fixed;
34-
top: 10%;
35-
right: 0;
36-
width: 100%;
37-
height: 80%;
38-
}
39-
40-
#debug {
41-
position: fixed;
42-
bottom: 5%;
43-
right: 0;
44-
width: 100%;
45-
text-align: center;
46-
color: #aaa;
47-
font-family: "Helvetica";
48-
font-size: 0.8rem;
49-
}
50-
</style>
51-
52-
</head>
53-
54-
<body>
55-
56-
<h1>Milky Way</h1>
57-
58-
<div id="edmap"></div>
59-
60-
<div id="debug"></div>
61-
62-
63-
64-
<!-- jQuery -->
65-
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
66-
<!-- Three.js -->
67-
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r75/three.min.js"></script>
68-
69-
<!-- Launch ED3Dmap -->
70-
<link href="css/styles.css" rel="stylesheet" type="text/css" />
71-
<script src="js/ed3dmap.min.js?v=6"></script>
72-
<script type="text/javascript">
73-
74-
var d = new Date()
75-
d.setDate(d.getDate() - 1);
76-
var queryDate = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':00:00';
77-
78-
Ed3d.init({
79-
container: 'edmap',
80-
// jsonPath : "http://www.edsm.net/api-v1/systems?coords=1&known=1&startdatetime="+queryDate,
81-
jsonPath: "json_samples/factions.json",
82-
withHudPanel: true,
83-
hudMultipleSelect: false,
84-
effectScaleSystem: [50, 10000],
85-
startAnim: false,
86-
showGalaxyInfos: true,
87-
cameraPos: [25, 14100, -12900],
88-
});
89-
90-
</script>
91-
92-
</body>
93-
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
6+
<meta charset="utf-8">
7+
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
8+
<title>Milky Way</title>
9+
<link href="http://fonts.googleapis.com/css?family=Orbitron:400" rel="stylesheet" type="text/css" />
10+
<!-- Custom CSS -->
11+
<style type="text/css">
12+
#systemDetails,
13+
#hud {
14+
width: 450px;
15+
}
16+
17+
h1 {
18+
position: fixed;
19+
top: 2%;
20+
left: 0;
21+
width: 100%;
22+
font-size: 1.3rem;
23+
text-align: center;
24+
color: #ccc;
25+
font-family: "Orbitron";
26+
}
27+
28+
h1 a {
29+
color: inherit;
30+
}
31+
32+
#edmap {
33+
position: fixed;
34+
top: 10%;
35+
right: 0;
36+
width: 100%;
37+
height: 80%;
38+
}
39+
40+
#debug {
41+
position: fixed;
42+
bottom: 5%;
43+
right: 0;
44+
width: 100%;
45+
text-align: center;
46+
color: #aaa;
47+
font-family: "Helvetica";
48+
font-size: 0.8rem;
49+
}
50+
</style>
51+
52+
</head>
53+
54+
<body>
55+
56+
<h1>Milky Way</h1>
57+
58+
<div id="edmap"></div>
59+
60+
<div id="debug"></div>
61+
62+
63+
64+
<!-- jQuery -->
65+
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
66+
<!-- Three.js -->
67+
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r75/three.min.js"></script>
68+
69+
<!-- Launch ED3Dmap -->
70+
<link href="css/styles.css" rel="stylesheet" type="text/css" />
71+
<script src="js/ed3dmap.min.js?v=6"></script>
72+
<script type="text/javascript">
73+
74+
var d = new Date()
75+
d.setDate(d.getDate() - 1);
76+
var queryDate = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':00:00';
77+
78+
Ed3d.init({
79+
container: 'edmap',
80+
// jsonPath : "http://www.edsm.net/api-v1/systems?coords=1&known=1&startdatetime="+queryDate,
81+
jsonPath: "json_samples/factions.json",
82+
withHudPanel: true,
83+
withOptionsPanel: true,
84+
hudMultipleSelect: true,
85+
effectScaleSystem: [10, 800],
86+
startAnim: true,
87+
showGalaxyInfos: true,
88+
systemColor: '#FF0000'
89+
});
90+
91+
</script>
92+
93+
</body>
94+
9495
</html>

0 commit comments

Comments
 (0)