Skip to content

Commit

Permalink
fixing save/load to be backward compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
KRA2008 committed Oct 8, 2016
1 parent ec4442f commit 9e379c5
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 41 deletions.
18 changes: 13 additions & 5 deletions StereoSketcher/saveandload.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,15 @@ function load() {
}

function loadSketch(sketch) {
setMode(sketch.mode);
setZoomLevel(sketch.zoomLevel);
buffer = sketch.buffer;
if(sketch.mode) {
setMode(sketch.mode);
}
if(sketch.zoomLevel) {
setZoomLevel(sketch.zoomLevel);
}
if(sketch.buffer) {
buffer = sketch.buffer;
}
var loadedDots = sketch.dots;
var dot;
for(var ii=0;ii<loadedDots.length;ii++) {
Expand Down Expand Up @@ -150,8 +156,10 @@ function loadSketch(sketch) {
loadImage(shape,dots,loadedDots);
}
}
picker.color.fromString(sketch.background);
setBackground();
if(sketch.background) {
picker.color.fromString(sketch.background);
setBackground();
}
if(imagesWaitingToFinish===0) {
finishLoadingSketch(sketch);
} else {
Expand Down
72 changes: 36 additions & 36 deletions StereoSketcher/shifter.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
'use strict';

var IPD=0;
var buffer=30;
var IPD = 0;
var buffer = 30;
var cloneSpeed = 5;

function shiftOut() {
var dots = getDots();
var dot;
var moved = [];
for(var ii=0;ii<dots.length;ii++) {
for (var ii = 0; ii < dots.length; ii++) {
dot = dots[ii];
if(dot.isSelected()) {
dot.setShift(dot.getShift()+1);
if (dot.isSelected()) {
dot.setShift(dot.getShift() + 1);
moved.push(dot);
}
}
snapDots(moved,false);
snapDots(moved, false);
}

function shiftIn() {
var dots = getDots();
var dot;
var moved = [];
for(var ii=0;ii<dots.length;ii++) {
for (var ii = 0; ii < dots.length; ii++) {
dot = dots[ii];
if(dot.isSelected()) {
dot.setShift(dot.getShift()-1);
if (dot.isSelected()) {
dot.setShift(dot.getShift() - 1);
moved.push(dot);
}
}
snapDots(moved,false);
snapDots(moved, false);
}

function clonesRight() {
Expand All @@ -41,13 +41,13 @@ function clonesLeft() {
}

function moveClones(right) {
if(mode!=3) {
if(right) {
buffer+=cloneSpeed;
if (mode != 3) {
if (right) {
buffer += cloneSpeed;
} else {
buffer-=cloneSpeed;
buffer -= cloneSpeed;
}
snapDots(getDots(),true);
snapDots(getDots(), true);
}
}

Expand All @@ -60,28 +60,28 @@ function findSketchWidth() {
var dotX;
var dot;
var bases = getBases();
if(bases.length != 0) {
if (bases.length != 0) {
buffer = 0;
var x1 = bases[0].dots[0].getAttribute("cx");
var x2 = bases[0].dots[1].getAttribute("cx");
return (x2-x1)/2;
return (x2 - x1) / 2;
}
if(dots[0]) {
if (dots[0]) {
maxX = parseFloat(dots[0].getAttribute("cx"));
minX = maxX;
for(var ii=1;ii<dots.length;ii++) {
for (var ii = 1; ii < dots.length; ii++) {
dot = dots[ii];
if(dot.lines.length===0 && dot.faces.length===0 && dot.images.length===0) {
if (dot.lines.length === 0 && dot.faces.length === 0 && dot.images.length === 0) {
continue;
}
dotX = parseFloat(dot.getAttribute("cx"));
if(dotX>maxX) {
if (dotX > maxX) {
maxX = dotX;
} else if(dotX<minX) {
} else if (dotX < minX) {
minX = dotX;
}
}
return maxX-minX;
return maxX - minX;
} else {
return 0;
}
Expand All @@ -90,10 +90,10 @@ function findSketchWidth() {
function findIPD() {
switch(mode) {
case 1:
IPD = findSketchWidth()+buffer;
IPD = findSketchWidth() + buffer;
return;
case 2:
IPD = (findSketchWidth()+buffer)*-1;
IPD = (findSketchWidth() + buffer) * -1;
return;
case 3:
IPD = 0;
Expand All @@ -102,15 +102,15 @@ function findIPD() {
}

function invertShift() {
var dots = getDots();
var dot
var shifted = [];
for (var ii = 0; ii < dots.length; ii++) {
dot = dots[ii];
if (dot.isSelected()) {
dot.setShift(dot.getShift() * -1);
shifted.push(dot);
}
}
snapDots(shifted);
var dots = getDots();
var dot
var shifted = [];
for (var ii = 0; ii < dots.length; ii++) {
dot = dots[ii];
if (dot.isSelected()) {
dot.setShift(dot.getShift() * -1);
shifted.push(dot);
}
}
snapDots(shifted);
}

0 comments on commit 9e379c5

Please sign in to comment.