aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRahiel Kasim <rahielkasim@gmail.com>2016-02-25 21:20:17 +0100
committerRahiel Kasim <rahielkasim@gmail.com>2016-02-25 21:20:17 +0100
commitc1067c922bf17ab014ff53427111956e7fb79195 (patch)
tree8ff5f4977aaa851634819b14b324ae4f5a8836c8
parent8fd80ce53bd641c6f9522d6811af2230217b5fed (diff)
add about button that links to our report (closes #12)
-rw-r--r--README.md4
-rw-r--r--main.js6
-rw-r--r--report/Pictures/Euler_Sling.png (renamed from Report/Pictures/Euler_Sling.png)bin43343 -> 43343 bytes
-rw-r--r--report/Pictures/Flowchart.png (renamed from Report/Pictures/Flowchart.png)bin78511 -> 78511 bytes
-rw-r--r--report/Pictures/Flowchart.svg (renamed from Report/Pictures/Flowchart.svg)0
-rw-r--r--report/Pictures/Leapfrog_Sling.png (renamed from Report/Pictures/Leapfrog_Sling.png)bin18259 -> 18259 bytes
-rw-r--r--report/Pictures/errors_leap_symplectic.png (renamed from Report/Pictures/errors_leap_symplectic.png)bin212769 -> 212769 bytes
-rw-r--r--report/Pictures/errors_leapfrog.png (renamed from Report/Pictures/errors_leapfrog.png)bin213262 -> 213262 bytes
-rw-r--r--report/Pictures/errors_symplectic1.png (renamed from Report/Pictures/errors_symplectic1.png)bin266294 -> 266294 bytes
-rw-r--r--report/Pictures/leapfrog.png (renamed from Report/Pictures/leapfrog.png)bin1235 -> 1235 bytes
-rw-r--r--report/Pictures/sunsistemoPrtSc.png (renamed from Report/Pictures/sunsistemoPrtSc.png)bin539019 -> 539019 bytes
-rw-r--r--report/Pictures/symplecticEuler_Sling.png (renamed from Report/Pictures/symplecticEuler_Sling.png)bin18509 -> 18509 bytes
-rw-r--r--report/references.bib (renamed from Report/references.bib)0
-rw-r--r--report/sunsistemo.pdf (renamed from Report/sunsistemo.pdf)bin1642469 -> 1642469 bytes
-rw-r--r--report/sunsistemo.tex (renamed from Report/sunsistemo.tex)0
-rwxr-xr-xupdate.bash11
16 files changed, 11 insertions, 10 deletions
diff --git a/README.md b/README.md
index c38dce2..2498719 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,3 @@ Lee Stemkoski.
* The initial conditions for the three-body planar periodic orbits are from
[arXiv:1303.0181 **[physics.class-ph]**](http://arxiv.org/abs/1303.0181).
* GitHub corner by [Tim Holman](http://tholman.com/github-corners/).
-
-# License
-
-[GPL-3.0+](https://github.com/sunsistemo/sunsistemo/blob/master/LICENSE.txt)
diff --git a/main.js b/main.js
index 0432879..2b5be73 100644
--- a/main.js
+++ b/main.js
@@ -41,7 +41,8 @@ let menuList = [
{"label": "Random Bodies", "function": systems.genBodies, "args": [200, "solar", false, true]},
{"label": "Angular Momentum", "function": systems.genBodiesRot, "args": [200, "solar", true, false]},
{"label": "Angular with Bounce", "function": systems.genBodiesRot, "args": [200, "balls", true, true, true]},
- {"label": "Choreographies", "function": showSubmenu, "args": [choreoSubmenuList]}
+ {"label": "Choreographies", "function": showSubmenu, "args": [choreoSubmenuList]},
+ {"label": "About", "function": function () { window.open("sunsistemo.pdf"); }, "args": []}
];
gui(menuList);
@@ -150,6 +151,9 @@ function gui(buttonList) {
clearSubmenu();
d["function"](...d["args"]);
}
+ else if (d["label"] === "About") {
+ d["function"]();
+ }
else {
clearSimulation();
simulate(d);
diff --git a/Report/Pictures/Euler_Sling.png b/report/Pictures/Euler_Sling.png
index c340853..c340853 100644
--- a/Report/Pictures/Euler_Sling.png
+++ b/report/Pictures/Euler_Sling.png
Binary files differ
diff --git a/Report/Pictures/Flowchart.png b/report/Pictures/Flowchart.png
index 3eeffbf..3eeffbf 100644
--- a/Report/Pictures/Flowchart.png
+++ b/report/Pictures/Flowchart.png
Binary files differ
diff --git a/Report/Pictures/Flowchart.svg b/report/Pictures/Flowchart.svg
index 95433de..95433de 100644
--- a/Report/Pictures/Flowchart.svg
+++ b/report/Pictures/Flowchart.svg
diff --git a/Report/Pictures/Leapfrog_Sling.png b/report/Pictures/Leapfrog_Sling.png
index d1b45a0..d1b45a0 100644
--- a/Report/Pictures/Leapfrog_Sling.png
+++ b/report/Pictures/Leapfrog_Sling.png
Binary files differ
diff --git a/Report/Pictures/errors_leap_symplectic.png b/report/Pictures/errors_leap_symplectic.png
index 0d0624a..0d0624a 100644
--- a/Report/Pictures/errors_leap_symplectic.png
+++ b/report/Pictures/errors_leap_symplectic.png
Binary files differ
diff --git a/Report/Pictures/errors_leapfrog.png b/report/Pictures/errors_leapfrog.png
index c4feb3f..c4feb3f 100644
--- a/Report/Pictures/errors_leapfrog.png
+++ b/report/Pictures/errors_leapfrog.png
Binary files differ
diff --git a/Report/Pictures/errors_symplectic1.png b/report/Pictures/errors_symplectic1.png
index a23712c..a23712c 100644
--- a/Report/Pictures/errors_symplectic1.png
+++ b/report/Pictures/errors_symplectic1.png
Binary files differ
diff --git a/Report/Pictures/leapfrog.png b/report/Pictures/leapfrog.png
index 5466493..5466493 100644
--- a/Report/Pictures/leapfrog.png
+++ b/report/Pictures/leapfrog.png
Binary files differ
diff --git a/Report/Pictures/sunsistemoPrtSc.png b/report/Pictures/sunsistemoPrtSc.png
index b61ef7f..b61ef7f 100644
--- a/Report/Pictures/sunsistemoPrtSc.png
+++ b/report/Pictures/sunsistemoPrtSc.png
Binary files differ
diff --git a/Report/Pictures/symplecticEuler_Sling.png b/report/Pictures/symplecticEuler_Sling.png
index bc870eb..bc870eb 100644
--- a/Report/Pictures/symplecticEuler_Sling.png
+++ b/report/Pictures/symplecticEuler_Sling.png
Binary files differ
diff --git a/Report/references.bib b/report/references.bib
index 3f32e22..3f32e22 100644
--- a/Report/references.bib
+++ b/report/references.bib
diff --git a/Report/sunsistemo.pdf b/report/sunsistemo.pdf
index 952ffc7..952ffc7 100644
--- a/Report/sunsistemo.pdf
+++ b/report/sunsistemo.pdf
Binary files differ
diff --git a/Report/sunsistemo.tex b/report/sunsistemo.tex
index ce74f40..ce74f40 100644
--- a/Report/sunsistemo.tex
+++ b/report/sunsistemo.tex
diff --git a/update.bash b/update.bash
index 158d219..d0f79e9 100755
--- a/update.bash
+++ b/update.bash
@@ -7,13 +7,14 @@ cp index.html "$path"
cp style.css "$path"
cp -r textures/ "$path"
cp validation/index.html "$path"/validation/
+cp report/sunsistemo.pdf "$path"
./node_modules/.bin/webpack --optimize-minimize --output-path "$path"
cd "$path"
-git mv CNAME CNAME-disabled
-git commit -m "force cloudfare cache refresh"
-git push
-sleep 300
-git mv CNAME-disabled CNAME
+# git mv CNAME CNAME-disabled
+# git commit -m "force cloudfare cache refresh"
+# git push
+# sleep 300
+# git mv CNAME-disabled CNAME
git add -A
git commit -m "update sunsistemo"
git push -u origin master