diff --git a/layouts/partials/nasa.html b/layouts/partials/nasa.html index 2013ad61..801d0e6c 100644 --- a/layouts/partials/nasa.html +++ b/layouts/partials/nasa.html @@ -1,6 +1,8 @@
- +
+ diff --git a/layouts/partials/particles.html b/layouts/partials/particles.html index 12d19ccb..c2730780 100644 --- a/layouts/partials/particles.html +++ b/layouts/partials/particles.html @@ -12,6 +12,7 @@ function sun_open() { } +
diff --git a/static/css/nasa.css b/static/css/nasa.css new file mode 100644 index 00000000..12c21d6f --- /dev/null +++ b/static/css/nasa.css @@ -0,0 +1,7 @@ +span.story-related-list { + display: none; +} + +#story-list{ + display:none; +} diff --git a/static/pkg/solar-sys/css/solar.css b/static/pkg/solar/css/solar.css similarity index 96% rename from static/pkg/solar-sys/css/solar.css rename to static/pkg/solar/css/solar.css index e27e548d..afad1d04 100644 --- a/static/pkg/solar-sys/css/solar.css +++ b/static/pkg/solar/css/solar.css @@ -1,6 +1,6 @@ body { color: #ffffff; - font-family: "Segoe UI", Myriad, Helvetica, Arial, "DejaVu Sans", "Noto Sans CJK SC", "Source Han Sans SC", "思源黑体", "等线", "华文细黑", "微软雅黑"; + font-family: "Segoe UI", Myriad, Helvetica, Arial, "DejaVu Sans", "Noto Sans CJK SC", "Source Han Sans SC"; font-size: 20px; text-align: left; background-color: #000000; @@ -169,4 +169,7 @@ a:hover, a:focus { background-color: #9e81d6; } - +.key-h { + text-align: left; + padding:0 10px 10px 10px; +} diff --git a/static/pkg/solar-sys/images/1.png b/static/pkg/solar/images/1.png similarity index 100% rename from static/pkg/solar-sys/images/1.png rename to static/pkg/solar/images/1.png diff --git a/static/pkg/solar-sys/images/2.png b/static/pkg/solar/images/2.png similarity index 100% rename from static/pkg/solar-sys/images/2.png rename to static/pkg/solar/images/2.png diff --git a/static/pkg/solar-sys/images/3.png b/static/pkg/solar/images/3.png similarity index 100% rename from static/pkg/solar-sys/images/3.png rename to static/pkg/solar/images/3.png diff --git a/static/pkg/solar-sys/images/4.png b/static/pkg/solar/images/4.png similarity index 100% rename from static/pkg/solar-sys/images/4.png rename to static/pkg/solar/images/4.png diff --git a/static/pkg/solar-sys/images/5.png b/static/pkg/solar/images/5.png similarity index 100% rename from static/pkg/solar-sys/images/5.png rename to static/pkg/solar/images/5.png diff --git a/static/pkg/solar-sys/images/6.png b/static/pkg/solar/images/6.png similarity index 100% rename from static/pkg/solar-sys/images/6.png rename to static/pkg/solar/images/6.png diff --git a/static/pkg/solar-sys/index.html b/static/pkg/solar/index.html similarity index 79% rename from static/pkg/solar-sys/index.html rename to static/pkg/solar/index.html index 97085d9b..38287ce3 100644 --- a/static/pkg/solar-sys/index.html +++ b/static/pkg/solar/index.html @@ -1,27 +1,31 @@ - SolarSys + ai/solar -
- -
- -

PALE DOTS

-

A mesmerizing journey around the solar system

-

This splash screen comes from screenshots of the project

- Start -
-
+
+ +
+
+
+ +
diff --git a/static/pkg/solar-sys/js/CelestialBody.js b/static/pkg/solar/js/CelestialBody.js similarity index 100% rename from static/pkg/solar-sys/js/CelestialBody.js rename to static/pkg/solar/js/CelestialBody.js diff --git a/static/pkg/solar-sys/js/Detector.js b/static/pkg/solar/js/Detector.js similarity index 100% rename from static/pkg/solar-sys/js/Detector.js rename to static/pkg/solar/js/Detector.js diff --git a/static/pkg/solar-sys/js/animation.js b/static/pkg/solar/js/animation.js similarity index 100% rename from static/pkg/solar-sys/js/animation.js rename to static/pkg/solar/js/animation.js diff --git a/static/pkg/solar-sys/js/cameraParameters.js b/static/pkg/solar/js/cameraParameters.js similarity index 100% rename from static/pkg/solar-sys/js/cameraParameters.js rename to static/pkg/solar/js/cameraParameters.js diff --git a/static/pkg/solar-sys/js/control.js b/static/pkg/solar/js/control.js similarity index 100% rename from static/pkg/solar-sys/js/control.js rename to static/pkg/solar/js/control.js diff --git a/static/pkg/solar-sys/js/data.js b/static/pkg/solar/js/data.js similarity index 100% rename from static/pkg/solar-sys/js/data.js rename to static/pkg/solar/js/data.js diff --git a/static/pkg/solar-sys/js/index.js b/static/pkg/solar/js/index.js similarity index 99% rename from static/pkg/solar-sys/js/index.js rename to static/pkg/solar/js/index.js index aca188c3..622a4ba1 100644 --- a/static/pkg/solar-sys/js/index.js +++ b/static/pkg/solar/js/index.js @@ -255,4 +255,4 @@ } }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/static/pkg/solar-sys/js/libs/FirstPersonControls.js b/static/pkg/solar/js/libs/FirstPersonControls.js similarity index 100% rename from static/pkg/solar-sys/js/libs/FirstPersonControls.js rename to static/pkg/solar/js/libs/FirstPersonControls.js diff --git a/static/pkg/solar-sys/js/libs/GPUParticleSystem.js b/static/pkg/solar/js/libs/GPUParticleSystem.js similarity index 100% rename from static/pkg/solar-sys/js/libs/GPUParticleSystem.js rename to static/pkg/solar/js/libs/GPUParticleSystem.js diff --git a/static/pkg/solar-sys/js/libs/MTLLoader.js b/static/pkg/solar/js/libs/MTLLoader.js similarity index 100% rename from static/pkg/solar-sys/js/libs/MTLLoader.js rename to static/pkg/solar/js/libs/MTLLoader.js diff --git a/static/pkg/solar-sys/js/libs/OBJLoader.js b/static/pkg/solar/js/libs/OBJLoader.js similarity index 100% rename from static/pkg/solar-sys/js/libs/OBJLoader.js rename to static/pkg/solar/js/libs/OBJLoader.js diff --git a/static/pkg/solar-sys/js/libs/dat.gui.min.js b/static/pkg/solar/js/libs/dat.gui.min.js similarity index 100% rename from static/pkg/solar-sys/js/libs/dat.gui.min.js rename to static/pkg/solar/js/libs/dat.gui.min.js diff --git a/static/pkg/solar-sys/js/libs/jquery-3.2.1.min.js b/static/pkg/solar/js/libs/jquery-3.2.1.min.js similarity index 100% rename from static/pkg/solar-sys/js/libs/jquery-3.2.1.min.js rename to static/pkg/solar/js/libs/jquery-3.2.1.min.js diff --git a/static/pkg/solar-sys/js/libs/stats.min.js b/static/pkg/solar/js/libs/stats.min.js similarity index 79% rename from static/pkg/solar-sys/js/libs/stats.min.js rename to static/pkg/solar/js/libs/stats.min.js index ef000cf4..57ec20c1 100644 --- a/static/pkg/solar-sys/js/libs/stats.min.js +++ b/static/pkg/solar/js/libs/stats.min.js @@ -1,5 +1,5 @@ // stats.js - http://github.com/mrdoob/stats.js -var Stats=function(){function h(a){c.appendChild(a.dom);return a}function k(a){for(var d=0;de+1E3&&(r.update(1E3*a/(c-e),100),e=c,a=0,t)){var d=performance.memory;t.update(d.usedJSHeapSize/1048576,d.jsHeapSizeLimit/1048576)}return c},update:function(){g=this.end()},domElement:c,setMode:k}}; Stats.Panel=function(h,k,l){var c=Infinity,g=0,e=Math.round,a=e(window.devicePixelRatio||1),r=80*a,f=48*a,t=3*a,u=2*a,d=3*a,m=15*a,n=74*a,p=30*a,q=document.createElement("canvas");q.width=r;q.height=f;q.style.cssText="width:80px;height:48px";var b=q.getContext("2d");b.font="bold "+9*a+"px Helvetica,Arial,sans-serif";b.textBaseline="top";b.fillStyle=l;b.fillRect(0,0,r,f);b.fillStyle=k;b.fillText(h,t,u);b.fillRect(d,m,n,p);b.fillStyle=l;b.globalAlpha=.9;b.fillRect(d,m,n,p);return{dom:q,update:function(f, v){c=Math.min(c,f);g=Math.max(g,f);b.fillStyle=l;b.globalAlpha=1;b.fillRect(0,0,r,m);b.fillStyle=k;b.fillText(e(f)+" "+h+" ("+e(c)+"-"+e(g)+")",t,u);b.drawImage(q,d+a,m,n-a,p,d,m,n-a,p);b.fillRect(d+n-a,m,a,p);b.fillStyle=l;b.globalAlpha=.9;b.fillRect(d+n-a,m,a,e((1-f/v)*p))}}};"object"===typeof module&&(module.exports=Stats); diff --git a/static/pkg/solar-sys/js/libs/three.min.js b/static/pkg/solar/js/libs/three.min.js similarity index 100% rename from static/pkg/solar-sys/js/libs/three.min.js rename to static/pkg/solar/js/libs/three.min.js diff --git a/static/pkg/solar-sys/js/libs/tween.min.js b/static/pkg/solar/js/libs/tween.min.js similarity index 100% rename from static/pkg/solar-sys/js/libs/tween.min.js rename to static/pkg/solar/js/libs/tween.min.js diff --git a/static/pkg/solar-sys/js/main.js b/static/pkg/solar/js/main.js similarity index 94% rename from static/pkg/solar-sys/js/main.js rename to static/pkg/solar/js/main.js index a8f02aaa..6a99ea4d 100644 --- a/static/pkg/solar-sys/js/main.js +++ b/static/pkg/solar/js/main.js @@ -32,21 +32,22 @@ var options = { color: 0xfff700, colorRandomness: .2, turbulence: 0., - lifetime: 2., + lifetime: .1, size: 10, sizeRandomness: 2 }; var spawnerOptions = { - spawnRate: 15000, - horizontalSpeed: 1.5, - verticalSpeed: 1.33, timeScale: 1, + spawnRate: 1500000, + horizontalSpeed: .1, + verticalSpeed: .1, timeScale: .1, }; $('.progress').progressInitialize(); var progressBar = $('#control'); - +pre(); +$(this).removeAttr('onclick'); progressBar.click(function (e) { e.preventDefault(); progressBar.progressSet(0); @@ -127,7 +128,7 @@ function initCamera() { roamingCamera = new cameraParameters(3000, 200, "Astronaut"); switchCamera = new cameraParameters(3000, 200, "Sun"); switchCamera.setCamera(); - trackCamera["Galaxy"] = new cameraParameters(7000, 200, "Sun"); + trackCamera["Galaxy"] = new cameraParameters(70000, 200, "Sun"); trackCamera["Galaxy"].theta = 80.0; trackCamera["Galaxy"].phi = 0.0; trackCamera["Comet"] = new cameraParameters(1000, 1000, "Comet"); @@ -187,16 +188,16 @@ function initRender() { renderer.setPixelRatio(window.devicePixelRatio); renderer.setSize(window.innerWidth, window.innerHeight); - // renderer.shadowMapEnabled = true; - // renderer.shadowMapSoft = true; - // renderer.shadowMap.enabled = true; - // renderer.shadowCameraNear = 3; - // renderer.shadowCameraFar = 100; - // renderer.shadowMapDarkness = 0.2; - // renderer.shadowCameraFov = 50; - // renderer.shadowMapBias = 0.0039; - // renderer.shadowMapWidth = 1024; - // renderer.shadowMapHeight = 1024; + //renderer.shadowMapEnabled = true; + //renderer.shadowMapSoft = true; + //renderer.shadowMap.enabled = true; + //renderer.shadowCameraNear = 3; + //renderer.shadowCameraFar = 100; + //renderer.shadowMapDarkness = 0.2; + //renderer.shadowCameraFov = 50; + //renderer.shadowMapBias = 0.0039; + //renderer.shadowMapWidth = 1024; + //renderer.shadowMapHeight = 1024; } function initObjects() { @@ -249,15 +250,15 @@ function initGui() { var orbit = gui.addFolder('Orbit'); orbitParams = { Comet: false, - Mercury: true, - Venus: true, - Earth: true, - Mars: true, - Jupiter: true, - Saturn: true, - Uranus: true, - Neptune: true, - Pluto: true + Mercury: false, + Venus: false, + Earth: false, + Mars: false, + Jupiter: false, + Saturn: false, + Uranus: false, + Neptune: false, + Pluto: false }; var comet = gui.addFolder('CometParameters'); cometParams = { @@ -315,7 +316,7 @@ function initGui() { this.Collision = false; this.Light = 1.0; this.Ambient = 0.4; - this.TimeScale = 1.0; + this.TimeScale = 0.1; this.Screenshot = function () { var dataURL = renderer.domElement.toDataURL(); var newWindow = window.open() @@ -352,7 +353,7 @@ function initGui() { gui.add(control, "Collision"); gui.add(control, "Roam"); gui.add(control, "Screenshot"); - gui.autoPlace = false; + gui.autoPlace = true; } @@ -368,6 +369,7 @@ function init() { stats = new Stats(); gui = new dat.GUI(); gui.close(); + dat.GUI.toggleHide(); window.addEventListener('mousedown', onWindowMouseDown, false); window.addEventListener('mousemove', onWindowMouseMove, false); window.addEventListener('mouseup', onWindowMouseUp, false); diff --git a/static/pkg/solar-sys/js/orbit.js b/static/pkg/solar/js/orbit.js similarity index 100% rename from static/pkg/solar-sys/js/orbit.js rename to static/pkg/solar/js/orbit.js diff --git a/static/pkg/solar-sys/js/renderers/CanvasRenderer.js b/static/pkg/solar/js/renderers/CanvasRenderer.js similarity index 100% rename from static/pkg/solar-sys/js/renderers/CanvasRenderer.js rename to static/pkg/solar/js/renderers/CanvasRenderer.js diff --git a/static/pkg/solar-sys/js/renderers/Projector.js b/static/pkg/solar/js/renderers/Projector.js similarity index 100% rename from static/pkg/solar-sys/js/renderers/Projector.js rename to static/pkg/solar/js/renderers/Projector.js diff --git a/static/pkg/solar-sys/js/shaders.js b/static/pkg/solar/js/shaders.js similarity index 100% rename from static/pkg/solar-sys/js/shaders.js rename to static/pkg/solar/js/shaders.js diff --git a/static/pkg/solar-sys/js/time.js b/static/pkg/solar/js/time.js similarity index 100% rename from static/pkg/solar-sys/js/time.js rename to static/pkg/solar/js/time.js diff --git a/static/pkg/solar-sys/res/callisto/diffuse.jpg b/static/pkg/solar/res/callisto/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/callisto/diffuse.jpg rename to static/pkg/solar/res/callisto/diffuse.jpg diff --git a/static/pkg/solar-sys/res/comet/particle2.png b/static/pkg/solar/res/comet/particle2.png similarity index 100% rename from static/pkg/solar-sys/res/comet/particle2.png rename to static/pkg/solar/res/comet/particle2.png diff --git a/static/pkg/solar-sys/res/comet/perlin-512.png b/static/pkg/solar/res/comet/perlin-512.png similarity index 100% rename from static/pkg/solar-sys/res/comet/perlin-512.png rename to static/pkg/solar/res/comet/perlin-512.png diff --git a/static/pkg/solar-sys/res/deimos/bump.jpg b/static/pkg/solar/res/deimos/bump.jpg similarity index 100% rename from static/pkg/solar-sys/res/deimos/bump.jpg rename to static/pkg/solar/res/deimos/bump.jpg diff --git a/static/pkg/solar-sys/res/deimos/diffuse.jpg b/static/pkg/solar/res/deimos/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/deimos/diffuse.jpg rename to static/pkg/solar/res/deimos/diffuse.jpg diff --git a/static/pkg/solar-sys/res/dione/diffuse.jpg b/static/pkg/solar/res/dione/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/dione/diffuse.jpg rename to static/pkg/solar/res/dione/diffuse.jpg diff --git a/static/pkg/solar-sys/res/earth/bump.jpg b/static/pkg/solar/res/earth/bump.jpg similarity index 100% rename from static/pkg/solar-sys/res/earth/bump.jpg rename to static/pkg/solar/res/earth/bump.jpg diff --git a/static/pkg/solar-sys/res/earth/clouds.png b/static/pkg/solar/res/earth/clouds.png similarity index 100% rename from static/pkg/solar-sys/res/earth/clouds.png rename to static/pkg/solar/res/earth/clouds.png diff --git a/static/pkg/solar-sys/res/earth/diffuse.jpg b/static/pkg/solar/res/earth/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/earth/diffuse.jpg rename to static/pkg/solar/res/earth/diffuse.jpg diff --git a/static/pkg/solar-sys/res/earth/night.png b/static/pkg/solar/res/earth/night.png similarity index 100% rename from static/pkg/solar-sys/res/earth/night.png rename to static/pkg/solar/res/earth/night.png diff --git a/static/pkg/solar-sys/res/earth/spec.jpg b/static/pkg/solar/res/earth/spec.jpg similarity index 100% rename from static/pkg/solar-sys/res/earth/spec.jpg rename to static/pkg/solar/res/earth/spec.jpg diff --git a/static/pkg/solar-sys/res/effects/flare.jpg b/static/pkg/solar/res/effects/flare.jpg similarity index 100% rename from static/pkg/solar-sys/res/effects/flare.jpg rename to static/pkg/solar/res/effects/flare.jpg diff --git a/static/pkg/solar-sys/res/europa/diffuse.jpg b/static/pkg/solar/res/europa/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/europa/diffuse.jpg rename to static/pkg/solar/res/europa/diffuse.jpg diff --git a/static/pkg/solar-sys/res/io/diffuse.png b/static/pkg/solar/res/io/diffuse.png similarity index 100% rename from static/pkg/solar-sys/res/io/diffuse.png rename to static/pkg/solar/res/io/diffuse.png diff --git a/static/pkg/solar-sys/res/jupiter/clouds.png b/static/pkg/solar/res/jupiter/clouds.png similarity index 100% rename from static/pkg/solar-sys/res/jupiter/clouds.png rename to static/pkg/solar/res/jupiter/clouds.png diff --git a/static/pkg/solar-sys/res/jupiter/diffuse.jpg b/static/pkg/solar/res/jupiter/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/jupiter/diffuse.jpg rename to static/pkg/solar/res/jupiter/diffuse.jpg diff --git a/static/pkg/solar-sys/res/jupiter/ring.png b/static/pkg/solar/res/jupiter/ring.png similarity index 100% rename from static/pkg/solar-sys/res/jupiter/ring.png rename to static/pkg/solar/res/jupiter/ring.png diff --git a/static/pkg/solar-sys/res/loading/earth.jpg b/static/pkg/solar/res/loading/earth.jpg similarity index 100% rename from static/pkg/solar-sys/res/loading/earth.jpg rename to static/pkg/solar/res/loading/earth.jpg diff --git a/static/pkg/solar-sys/res/loading/splash.png b/static/pkg/solar/res/loading/splash.png similarity index 100% rename from static/pkg/solar-sys/res/loading/splash.png rename to static/pkg/solar/res/loading/splash.png diff --git a/static/pkg/solar-sys/res/mars/bump.jpg b/static/pkg/solar/res/mars/bump.jpg similarity index 100% rename from static/pkg/solar-sys/res/mars/bump.jpg rename to static/pkg/solar/res/mars/bump.jpg diff --git a/static/pkg/solar-sys/res/mars/diffuse.jpg b/static/pkg/solar/res/mars/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/mars/diffuse.jpg rename to static/pkg/solar/res/mars/diffuse.jpg diff --git a/static/pkg/solar-sys/res/mercury/bump.jpg b/static/pkg/solar/res/mercury/bump.jpg similarity index 100% rename from static/pkg/solar-sys/res/mercury/bump.jpg rename to static/pkg/solar/res/mercury/bump.jpg diff --git a/static/pkg/solar-sys/res/mercury/diffuse.jpg b/static/pkg/solar/res/mercury/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/mercury/diffuse.jpg rename to static/pkg/solar/res/mercury/diffuse.jpg diff --git a/static/pkg/solar-sys/res/moon/bump.jpg b/static/pkg/solar/res/moon/bump.jpg similarity index 100% rename from static/pkg/solar-sys/res/moon/bump.jpg rename to static/pkg/solar/res/moon/bump.jpg diff --git a/static/pkg/solar-sys/res/moon/diffuse.jpg b/static/pkg/solar/res/moon/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/moon/diffuse.jpg rename to static/pkg/solar/res/moon/diffuse.jpg diff --git a/static/pkg/solar-sys/res/neptune/diffuse.jpg b/static/pkg/solar/res/neptune/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/neptune/diffuse.jpg rename to static/pkg/solar/res/neptune/diffuse.jpg diff --git a/static/pkg/solar-sys/res/neptune/ring.png b/static/pkg/solar/res/neptune/ring.png similarity index 100% rename from static/pkg/solar-sys/res/neptune/ring.png rename to static/pkg/solar/res/neptune/ring.png diff --git a/static/pkg/solar-sys/res/phobos/bump.jpg b/static/pkg/solar/res/phobos/bump.jpg similarity index 100% rename from static/pkg/solar-sys/res/phobos/bump.jpg rename to static/pkg/solar/res/phobos/bump.jpg diff --git a/static/pkg/solar-sys/res/phobos/diffuse.jpg b/static/pkg/solar/res/phobos/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/phobos/diffuse.jpg rename to static/pkg/solar/res/phobos/diffuse.jpg diff --git a/static/pkg/solar-sys/res/pluto/diffuse.jpg b/static/pkg/solar/res/pluto/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/pluto/diffuse.jpg rename to static/pkg/solar/res/pluto/diffuse.jpg diff --git a/static/pkg/solar-sys/res/prompt/ding.wav b/static/pkg/solar/res/prompt/ding.wav similarity index 100% rename from static/pkg/solar-sys/res/prompt/ding.wav rename to static/pkg/solar/res/prompt/ding.wav diff --git a/static/pkg/solar-sys/res/saturn/bump.png b/static/pkg/solar/res/saturn/bump.png similarity index 100% rename from static/pkg/solar-sys/res/saturn/bump.png rename to static/pkg/solar/res/saturn/bump.png diff --git a/static/pkg/solar-sys/res/saturn/clouds.png b/static/pkg/solar/res/saturn/clouds.png similarity index 100% rename from static/pkg/solar-sys/res/saturn/clouds.png rename to static/pkg/solar/res/saturn/clouds.png diff --git a/static/pkg/solar-sys/res/saturn/diffuse.png b/static/pkg/solar/res/saturn/diffuse.png similarity index 100% rename from static/pkg/solar-sys/res/saturn/diffuse.png rename to static/pkg/solar/res/saturn/diffuse.png diff --git a/static/pkg/solar-sys/res/saturn/ring.png b/static/pkg/solar/res/saturn/ring.png similarity index 100% rename from static/pkg/solar-sys/res/saturn/ring.png rename to static/pkg/solar/res/saturn/ring.png diff --git a/static/pkg/solar-sys/res/skybox/negX.jpg b/static/pkg/solar/res/skybox/negX.jpg similarity index 100% rename from static/pkg/solar-sys/res/skybox/negX.jpg rename to static/pkg/solar/res/skybox/negX.jpg diff --git a/static/pkg/solar-sys/res/skybox/negY.jpg b/static/pkg/solar/res/skybox/negY.jpg similarity index 100% rename from static/pkg/solar-sys/res/skybox/negY.jpg rename to static/pkg/solar/res/skybox/negY.jpg diff --git a/static/pkg/solar-sys/res/skybox/negZ.jpg b/static/pkg/solar/res/skybox/negZ.jpg similarity index 100% rename from static/pkg/solar-sys/res/skybox/negZ.jpg rename to static/pkg/solar/res/skybox/negZ.jpg diff --git a/static/pkg/solar-sys/res/skybox/posX.jpg b/static/pkg/solar/res/skybox/posX.jpg similarity index 100% rename from static/pkg/solar-sys/res/skybox/posX.jpg rename to static/pkg/solar/res/skybox/posX.jpg diff --git a/static/pkg/solar-sys/res/skybox/posY.jpg b/static/pkg/solar/res/skybox/posY.jpg similarity index 100% rename from static/pkg/solar-sys/res/skybox/posY.jpg rename to static/pkg/solar/res/skybox/posY.jpg diff --git a/static/pkg/solar-sys/res/skybox/posZ.jpg b/static/pkg/solar/res/skybox/posZ.jpg similarity index 100% rename from static/pkg/solar-sys/res/skybox/posZ.jpg rename to static/pkg/solar/res/skybox/posZ.jpg diff --git a/static/pkg/solar-sys/res/skybox/skydome.jpg b/static/pkg/solar/res/skybox/skydome.jpg similarity index 100% rename from static/pkg/solar-sys/res/skybox/skydome.jpg rename to static/pkg/solar/res/skybox/skydome.jpg diff --git a/static/pkg/solar-sys/res/sol/diffuse.png b/static/pkg/solar/res/sol/diffuse.png similarity index 100% rename from static/pkg/solar-sys/res/sol/diffuse.png rename to static/pkg/solar/res/sol/diffuse.png diff --git a/static/pkg/solar-sys/res/sol/overlay.png b/static/pkg/solar/res/sol/overlay.png similarity index 100% rename from static/pkg/solar-sys/res/sol/overlay.png rename to static/pkg/solar/res/sol/overlay.png diff --git a/static/pkg/solar-sys/res/space/lab.jpg b/static/pkg/solar/res/space/lab.jpg similarity index 100% rename from static/pkg/solar-sys/res/space/lab.jpg rename to static/pkg/solar/res/space/lab.jpg diff --git a/static/pkg/solar-sys/res/space/man.obj b/static/pkg/solar/res/space/man.obj similarity index 100% rename from static/pkg/solar-sys/res/space/man.obj rename to static/pkg/solar/res/space/man.obj diff --git a/static/pkg/solar-sys/res/space/sol.jpg b/static/pkg/solar/res/space/sol.jpg similarity index 100% rename from static/pkg/solar-sys/res/space/sol.jpg rename to static/pkg/solar/res/space/sol.jpg diff --git a/static/pkg/solar-sys/res/space/tiangong.mtl b/static/pkg/solar/res/space/tiangong.mtl similarity index 100% rename from static/pkg/solar-sys/res/space/tiangong.mtl rename to static/pkg/solar/res/space/tiangong.mtl diff --git a/static/pkg/solar-sys/res/space/tiangong.obj b/static/pkg/solar/res/space/tiangong.obj similarity index 100% rename from static/pkg/solar-sys/res/space/tiangong.obj rename to static/pkg/solar/res/space/tiangong.obj diff --git a/static/pkg/solar-sys/res/titan/diffuse.jpg b/static/pkg/solar/res/titan/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/titan/diffuse.jpg rename to static/pkg/solar/res/titan/diffuse.jpg diff --git a/static/pkg/solar-sys/res/uranus/diffuse.jpg b/static/pkg/solar/res/uranus/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/uranus/diffuse.jpg rename to static/pkg/solar/res/uranus/diffuse.jpg diff --git a/static/pkg/solar-sys/res/uranus/ring.png b/static/pkg/solar/res/uranus/ring.png similarity index 100% rename from static/pkg/solar-sys/res/uranus/ring.png rename to static/pkg/solar/res/uranus/ring.png diff --git a/static/pkg/solar-sys/res/venus/bump.jpg b/static/pkg/solar/res/venus/bump.jpg similarity index 100% rename from static/pkg/solar-sys/res/venus/bump.jpg rename to static/pkg/solar/res/venus/bump.jpg diff --git a/static/pkg/solar-sys/res/venus/clouds.jpg b/static/pkg/solar/res/venus/clouds.jpg similarity index 100% rename from static/pkg/solar-sys/res/venus/clouds.jpg rename to static/pkg/solar/res/venus/clouds.jpg diff --git a/static/pkg/solar-sys/res/venus/diffuse.jpg b/static/pkg/solar/res/venus/diffuse.jpg similarity index 100% rename from static/pkg/solar-sys/res/venus/diffuse.jpg rename to static/pkg/solar/res/venus/diffuse.jpg diff --git a/static/pkg/solar-sys/run.js b/static/pkg/solar/run.js similarity index 100% rename from static/pkg/solar-sys/run.js rename to static/pkg/solar/run.js