diff --git a/data/scripts/colors.js b/data/scripts/colors.js index 53f4461e..1d23e350 100644 --- a/data/scripts/colors.js +++ b/data/scripts/colors.js @@ -1,22 +1,46 @@ //Cycles through a rainbow! setInterval(changeColor, 100) -var colorShiftingClock = 0 -var colorFrequency = 2 * Math.PI / 600 -var numberOfColors = 1 -var lightness = 120 -var lightAdjust = 120 +var regularAdjust = -60 +var lightAdjust = 100 +var lightLead = 100 +var colorJumps = 510 +var currentColorIndex = 0 function changeColor() { - for (var i = 1; i <= numberOfColors; i ++) { - var rgbValues = indexToColor(colorShiftingClock + ((i - 1) * 2 * Math.PI / numberOfColors / colorFrequency), colorFrequency) - document.documentElement.style.setProperty("--shifting-color-" + i, "rgb(" + rgbValues[0] + "," + rgbValues[1] + "," + rgbValues[2] + ")") - } - var rgbLightValues = indexToColor(colorShiftingClock + ((i - 1) * 2 * Math.PI / numberOfColors / colorFrequency), colorFrequency) - document.documentElement.style.setProperty("--shifting-color-1-light", "rgb(" + parseInt(rgbLightValues[0] + lightAdjust) + "," + parseInt(rgbLightValues[1] + lightAdjust) + "," + parseInt(rgbLightValues[2] + lightAdjust) + ")") - colorShiftingClock += 1 + var colors = indexToColor(currentColorIndex) + document.documentElement.style.setProperty("--shifting-color-1", "rgb(" + parseInt(colors[0] + regularAdjust) + "," + parseInt(colors[1] + regularAdjust) + "," + parseInt(colors[2] + regularAdjust) + ")") + var lightColors = indexToColor(currentColorIndex + lightLead) + document.documentElement.style.setProperty("--shifting-color-1-light", "rgb(" + parseInt(lightColors[0] + lightAdjust) + "," + parseInt(lightColors[1] + lightAdjust) + "," + parseInt(lightColors[2] + lightAdjust) + ")") + currentColorIndex += 255 / colorJumps } -function indexToColor(colorIndex, frequency) { - var red = Math.sin(colorIndex * frequency + 0) * (255 - lightness) + lightness - var green = Math.sin(colorIndex * frequency + 2 * Math.PI / 3) * (255 - lightness) + lightness - var blue = Math.sin(colorIndex * frequency + 4 * Math.PI / 3) * (255 - lightness) + lightness +function indexToColor(colorIndex) { + var red = 0, green = 0, blue = 0 + var realColorIndex = colorIndex - Math.floor(colorIndex / 1530) * 1530 + var colorStage = Math.floor(realColorIndex / 255) + switch(colorStage) { + case 0: + green = 255 + red = realColorIndex - Math.floor(realColorIndex / 255) * 255 + break + case 1: + red = 255 + green = 255 - realColorIndex + Math.floor(realColorIndex / 255) * 255 + break + case 2: + red = 255 + blue = realColorIndex - Math.floor(realColorIndex / 255) * 255 + break + case 3: + blue = 255 + red = 255 - realColorIndex + Math.floor(realColorIndex / 255) * 255 + break + case 4: + blue = 255 + green = realColorIndex - Math.floor(realColorIndex / 255) * 255 + break + case 5: + green = 255 + blue = 255 - realColorIndex + Math.floor(realColorIndex / 255) * 255 + break + } return [red, green, blue] } \ No newline at end of file diff --git a/data/site/images/48.png b/data/site/images/48.png deleted file mode 100644 index 357dce5d..00000000 Binary files a/data/site/images/48.png and /dev/null differ diff --git a/data/site/images/background.png b/data/site/images/background.png deleted file mode 100644 index 52a5ff90..00000000 Binary files a/data/site/images/background.png and /dev/null differ diff --git a/data/site/images/background.xcf b/data/site/images/background.xcf deleted file mode 100644 index 02a34cef..00000000 Binary files a/data/site/images/background.xcf and /dev/null differ diff --git a/data/site/images/hex.png b/data/site/images/hex.png deleted file mode 100644 index fc68878d..00000000 Binary files a/data/site/images/hex.png and /dev/null differ diff --git a/data/site/images/lowpoly.png b/data/site/images/lowpoly.png index 1381b023..c11295a8 100644 Binary files a/data/site/images/lowpoly.png and b/data/site/images/lowpoly.png differ diff --git a/data/site/images/lowpoly.xcf b/data/site/images/lowpoly.xcf new file mode 100644 index 00000000..4ed417bb Binary files /dev/null and b/data/site/images/lowpoly.xcf differ diff --git a/data/site/images/strip.png b/data/site/images/strip.png deleted file mode 100644 index 8b29e968..00000000 Binary files a/data/site/images/strip.png and /dev/null differ diff --git a/data/site/images/strip.xcf b/data/site/images/strip.xcf deleted file mode 100644 index 48c51240..00000000 Binary files a/data/site/images/strip.xcf and /dev/null differ diff --git a/data/site/styles.css b/data/site/styles.css index 6025e549..4e934829 100644 --- a/data/site/styles.css +++ b/data/site/styles.css @@ -36,8 +36,8 @@ src: url("../fonts/goudy-medieval.ttf"); } :root { - --shifting-color-1: rgb(128, 237, 18); - --shifting-color-1-light: rgb(255, 255, 168); + --shifting-color-1: #00c300; + --shifting-color-1-light: #c8ff64; --light-color: #eee; --dark-color: #333; }