commit 5a7391b04f90abc3512c65d54ddde2f89a5f5325
parent a8b78f2eff9eb25339a3fa4bb555a9211fb866cb
Author: tongong <tongong@gmx.net>
Date: Sun, 18 Aug 2019 16:20:06 +0200
added settings window
Diffstat:
5 files changed, 64 insertions(+), 20 deletions(-)
diff --git a/index.html b/index.html
@@ -14,16 +14,17 @@
<link rel="stylesheet" href="styles.css" />
</head>
-<body bgcolor="#000000" style="margin: 0; height: 100%; overflow: hidden">
+<body bgcolor="#000000">
<div id="overlay">
- <svg width="40" height="40" viewBox="0 0 24 24" class="icon" id="reload">
- <rect width="24" height="24" fill="#000000"/>
- <path fill="#FFFFFF" d="M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
- </svg>
- <svg width="40" height="40" viewBox="0 0 24 24" class="icon" id="settings">
- <rect width="24" height="24" fill="#000000"/>
+ <svg width="40" height="40" viewBox="0 0 24 24" class="icon" id="settingsIcon">
<path fill="#FFFFFF" d="M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z" />
</svg>
+ <svg width="40" height="40" viewBox="0 0 24 24" class="icon" id="reloadIcon">
+ <path fill="#FFFFFF" d="M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
+ </svg>
+ </div>
+ <div id="settings">
+
</div>
</body>
diff --git a/scripts/interface.js b/scripts/interface.js
@@ -1,22 +1,35 @@
var refreshTime;
function initIconAnimation() {
- var icons = document.getElementsByClassName("icon");
- for (var i = 0; i < icons.length; i++) {
- icons[i].addEventListener("mouseenter", function() {
- this.classList.add("animated");
- }, false);
- icons[i].addEventListener("animationend", function() {
- this.classList.remove("animated");
- }, false);
- }
- document.getElementById("reload").addEventListener("click", function() {
+ var reload = document.getElementById("reloadIcon");
+ var settings = document.getElementById("settingsIcon");
+
+ reload.addEventListener("mouseenter", function() {
+ this.classList.add("animated");
+ }, false);
+ reload.addEventListener("animationend", function() {
+ this.classList.remove("animated");
+ }, false);
+ reload.addEventListener("click", function() {
if (state == 3) {
refreshTime = millis();
state = 4;
}
}, false);
- document.getElementById("reload").addEventListener('touchstart', function() {
- this.classList.add("animated");
+ reload.addEventListener('touchstart', function() {
+ this.classList.add("animated");
+ }, false);
+
+ settings.addEventListener("mouseenter", function() {
+ this.classList.add("animated");
+ }, false);
+ settings.addEventListener("animationend", function() {
+ this.classList.remove("animated");
+ }, false);
+ settings.addEventListener("click", function() {
+ document.getElementById("settings").classList.add("in");
+ }, false);
+ settings.addEventListener('touchstart', function() {
+ this.classList.add("animated");
}, false);
}
\ No newline at end of file
diff --git a/scripts/main.js b/scripts/main.js
@@ -57,7 +57,7 @@ function initVars() {
}
function draw() {
- background(0);
+ background(80);
switch (state) {
case 0:
diff --git a/scripts/rotation.js b/scripts/rotation.js
@@ -36,6 +36,7 @@ function getRotation() {
}
function mousePress() {
+ document.getElementById("settings").classList.remove("in");
mousePressed = true;
}
diff --git a/styles.css b/styles.css
@@ -11,6 +11,10 @@
animation: rotate 0.8s;
}
+.icon {
+ float: right;
+}
+
#defaultCanvas0 {
z-index: 0;
width: 100%;
@@ -26,4 +30,29 @@
top: 0;
right: 0;
margin: 10px;
+}
+
+#settings {
+ margin: 10px;
+ z-index: 2;
+ right: -400px;
+ position: absolute;
+ top: 50px;
+ width: 300px;
+ height: 300px;
+ background-color: #000000;
+ border-radius: 20px;
+ -webkit-transition: right 700ms ease-in;
+ -moz-transition: right 700ms ease-in;
+ transition: right 700ms ease-in;
+}
+
+#settings.in {
+ right: 0px;
+}
+
+body {
+ margin: 0;
+ height: 100%;
+ overflow: hidden;
}
\ No newline at end of file