diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index 3a657e2..e259f68 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -1853 \ No newline at end of file +1863 \ No newline at end of file diff --git a/Common/dataobjects/AnonymousUserSettings.cs b/Common/dataobjects/AnonymousUserSettings.cs index bde9efa..5bec81a 100644 --- a/Common/dataobjects/AnonymousUserSettings.cs +++ b/Common/dataobjects/AnonymousUserSettings.cs @@ -15,7 +15,7 @@ namespace FLocal.Common.dataobjects { //this._skinId = allSkins[Util.RandomInt(0, allSkins.Length)].id; this._skinId = 28; this._modernSkinId = 2; - this._machicharaId = 2; + this._machicharaId = 5; } public int threadsPerPage { diff --git a/static/js/machichara/fractalsnow-bg-specific.js b/static/js/machichara/fractalsnow-bg-specific.js index 5719484..6431873 100644 --- a/static/js/machichara/fractalsnow-bg-specific.js +++ b/static/js/machichara/fractalsnow-bg-specific.js @@ -26,7 +26,7 @@ var sqrt3_2 = Math.sqrt(3) / 2; // Height of an equilateral triangle var flakes = []; // Things that are dropping var scrollspeed = 64; // How often we animate things - var snowspeed = 500; // How often we add a new snowflake + var snowspeed = 200; // How often we add a new snowflake var maxflakes = 20; // Max number of flakes to be added at the same time var rand = function (n) { return Math.floor(n * Math.random()); } @@ -110,8 +110,9 @@ function createSnowflake() { var order = 2; var size = 10 + rand(90); - var t = (document.body.offsetWidth - 964) / 2; - var x = (rand(2) == 0) ? rand(t) : t + 964 + rand(t); // Make it fit with my blog +// var t = (document.body.offsetWidth - 964) / 2; +// var x = (rand(2) == 0) ? rand(t) : t + 964 + rand(t); // Make it fit with my blog + var x = rand(document.body.offsetWidth); var y = window.pageYOffset; flakes.push({ x: x, y: y, vx: 0, vy: 3 + rand(3), size: size, order: order }); diff --git a/static/js/machichara/fractalsnow-specific.js b/static/js/machichara/fractalsnow-specific.js index cba0ea9..5d0e069 100644 --- a/static/js/machichara/fractalsnow-specific.js +++ b/static/js/machichara/fractalsnow-specific.js @@ -68,20 +68,22 @@ var sqrt3_2 = Math.sqrt(3)/2; // Height of an equilateral triangle var flakes = []; // Things that are dropping var scrollspeed = 80; // How often we animate things - var snowspeed = 500; // How often we add a new snowflake + var snowspeed = 1500; // How often we add a new snowflake var rand = function(n) { return Math.floor(n*Math.random()); } // Add a new snowflake at the top of the viewport function createSnowflake() { var order = 2 + rand(3); // 2nd, 3rd, or 4th order fractal var size = 10 + rand(90); + var width = size; + var height = size*sqrt3_2*4/3; var x = rand(window.innerWidth - size); var y = window.pageYOffset; // Create a element var canvas = document.createElement("canvas"); - canvas.width = size; - canvas.height = size*sqrt3_2*4/3; + canvas.width = width; + canvas.height = height; canvas.style.position = "absolute"; canvas.style.left = x + "px"; canvas.style.top = y + "px"; @@ -97,17 +99,18 @@ // Add the canvas to the document and to our array of snowflakes document.body.appendChild(canvas); - flakes.push({elt:canvas, x: x, y:y, vy:3+rand(3)}); + flakes.push({elt:canvas, x: x, y:y, vy:3+rand(3), width:width, height:height}); } // This function animates the flakes falling down the screen function moveSnowflakes() { var maxy = window.pageYOffset + window.innerHeight; + var maxx = window.pageXOffset + window.innerWidth; var i = 0; while(i < flakes.length) { // Loop through the array of flakes var flake = flakes[i]; flake.y += flake.vy; - if (flake.y > maxy) { + if ((flake.y+flake.height > maxy) || (flake.x+flake.width > maxx)) { // The flake has scrolled off, so get rid of it document.body.removeChild(flake.elt); flakes.splice(i, 1);