From 8956dc838628e80432a1cf57f81f1524232c99bc Mon Sep 17 00:00:00 2001 From: nmss Date: Tue, 5 Jan 2016 12:53:44 +0100 Subject: [PATCH] Remove ability to force the result --- .gitignore | 52 ++++++++++++++++++++++-------------------- css/style.css | 6 ----- index.html | 16 ------------- js/script.js | 63 ++------------------------------------------------- 4 files changed, 30 insertions(+), 107 deletions(-) diff --git a/.gitignore b/.gitignore index 58bcbf8..74d4172 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,33 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + .DS_Store .AppleDouble .LSOverride # Icon must end with two \r -Icon +Icon + # Thumbnails ._* @@ -41,3 +42,6 @@ Icon Network Trash Folder Temporary Items .apdisk + +typings +.vscode diff --git a/css/style.css b/css/style.css index a8f0251..5a277d8 100644 --- a/css/style.css +++ b/css/style.css @@ -138,9 +138,3 @@ body { .collection { margin: 0; } - -.force { - position: relative; - top: -22px; - left: 70%; -} diff --git a/index.html b/index.html index d2a597d..6accb97 100644 --- a/index.html +++ b/index.html @@ -38,10 +38,6 @@ On -
- - -
@@ -54,10 +50,6 @@ On -
- - -
@@ -70,10 +62,6 @@ On -
- - -
@@ -86,10 +74,6 @@ On -
- - -
diff --git a/js/script.js b/js/script.js index eabbd3a..2a1a086 100644 --- a/js/script.js +++ b/js/script.js @@ -9,7 +9,6 @@ var drawingCanvas = document.getElementById('canvas'); var statusLabel = document.getElementById('status_label'); var resultPanel = document.getElementById('result_panel'); - var menuForces = document.querySelectorAll('.force input'); var particles = []; var segments = []; @@ -18,8 +17,6 @@ var mouseBody = null; var mouseConstraint = null; var playerName = null; - var forcedPlanet = null; - var segmentPercent = null; //adapt angularVelocity to tend toward 20 var targetSpeed = 20; @@ -157,8 +154,7 @@ updatePosition(); var angularVelocity = wheel.body.angularVelocity; - var clockwiseRotation = angularVelocity > 0; - var minVelocity = forcedPlanet ? 0.2 : 0.05; + var minVelocity = 0.05; if (!wheelSpinning || wheelStopped || Math.abs(angularVelocity) >= minVelocity) { return; @@ -167,30 +163,7 @@ var score = wheel.getScore(); var currentPlanet = wheel.segments[score]; - if (!forcedPlanet) { - return handleRotationEnding(currentPlanet); - } - - if (currentPlanet.id !== forcedPlanet.id) { - wheel.body.angularVelocity = clockwiseRotation ? minVelocity : -minVelocity; - return; - } - - var currentSegmentPercent = clockwiseRotation ? wheel.getSegmentPercent(score) : 1 - wheel.getSegmentPercent(score); - - if (!segmentPercent) { - segmentPercent = Math.random(); - } - - if (currentSegmentPercent < segmentPercent) { - var newVelocity = minVelocity * (1 - currentSegmentPercent / segmentPercent); - newVelocity = newVelocity > 0.05 ? newVelocity : 0.05; - wheel.body.angularVelocity = clockwiseRotation ? newVelocity : -newVelocity; - return; - } - - segmentPercent = null; - handleRotationEnding(currentPlanet); + return handleRotationEnding(currentPlanet); } function draw() { @@ -289,31 +262,6 @@ wheel.deltaPI = Math.PI * 2 / wheel.segments.length; } - function onForceChange(e) { - if (e.target.checked) { - var disabledInputs = _.reject(menuForces, function(menuForce) { - return menuForce.id === e.target.id; - }); - var disabledInputsLength = disabledInputs.length; - - for (var i = 0; i < disabledInputsLength; i++) { - disabledInputs[i].setAttribute('disabled', 'disabled'); - } - - forcedPlanet = _.find(planets, { - id: parseInt(_.last(e.target.id)) - }); - return; - } - - forcedPlanet = null; - var l = menuForces.length; - - for (var j = 0; j < l; j++) { - menuForces[j].removeAttribute('disabled'); - } - } - window.onload = function() { initSegments(); initDrawingCanvas(); @@ -356,13 +304,6 @@ menuSwitches[i].addEventListener('change', onSwitchChange); } - // Menu force buttons - l = menuForces.length; - - for (var j = 0; j < l; j++) { - menuForces[j].addEventListener('change', onForceChange); - } - // Wheel Damping var wheelDamping = document.getElementById('wheel_damping'); var wheelDampingLabel = document.getElementById('wheel_damping_label');