Merge pull request #1 from ballantynedewolf/v1.4

V1.4
This commit is contained in:
ballantynedewolf 2017-02-17 16:46:54 +11:00 committed by GitHub
commit 965ff119bb
1 changed files with 3 additions and 29 deletions

View File

@ -892,7 +892,6 @@
<option value="2">Sloan</option> <option value="2">Sloan</option>
<option value="3">LandoltC</option> <option value="3">LandoltC</option>
<option value="4">TumblingE</option> <option value="4">TumblingE</option>
<option value="5">Shapes</option>
</select> </select>
</div> </div>
</div> </div>
@ -1374,25 +1373,6 @@
<svg id="TumblingE_W" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;"> <svg id="TumblingE_W" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;">
<polygon points="0,0 5,0 5,5 0,5 0,4 4,4 4,3 0,3 0,2 4,2 4,1 0,1" fill="black" /> <polygon points="0,0 5,0 5,5 0,5 0,4 4,4 4,3 0,3 0,2 4,2 4,1 0,1" fill="black" />
</svg> </svg>
<!--new Shapes-->
<svg id="WolfShapes_C" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;">
<path d="M 2 0 H 3 V 2 H 5 V 3 H 3 V 5 H 2 V 3 H 0 V 2 H 2 V 0" fill="black"></path>
</svg>
<svg id="WolfShapes_S" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;">
<path d="M 0 0 H 5 V 5 H 0 V 1 H 1 V 4 H 4 V 1 H 0 V 0" fill="black"></path>
</svg>
<svg id="WolfShapes_T" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;">
<path d="M 2.5 0 L 5 5 H 0 L 2.5 0 V 2 L 1.5 4 H 3.5 L 2.5 2 V 0" fill="black"></path>
</svg>
<svg id="WolfShapes_H" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;">
<path d="M 2.5 5 C -1.3 3 0 0 1.5 0 Q 2.2 0 2.5 0.5 V 1.9 Q 2.2 0.8 1.5 1 C 0.7 1.2 0.7 2.9 2.5 3.9 C 4.3 2.9 4.3 1.2 3.5 1 Q 2.8 0.8 2.5 1.9 V 0.5 Q 2.8 0 3.5 0 C 5 0 6.3 3 2.5 5" fill="black"></path>
</svg>
<svg id="WolfShapes_O" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;">
<path d="M 2.5 0 A 2.5 2.5 0 0 1 2.5 5 V 4 A 1.5 1.5 0 1 0 2.5 1 A 1.5 1.5 0 0 0 2.5 4 V 5 A 2.5 2.5 0 0 1 2.5 0" fill="black"></path>
</svg>
<svg id="WolfShapes_F" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0,0,5,5" height="8.73mm" style="margin: 3.49mm;">
<path d="M 2 0 H 3 V 1.8 L 4.7 1.2 L 5 2.1 L 3.3 2.7 L 4.4 4.2 L 3.6 4.8 L 2.5 3.3 L 1.4 4.8 L 0.6 4.2 L 1.7 2.7 L 0 2.1 L 0.3 1.2 L 2 1.8 V 0" fill="black"></path>
</svg>
</div> </div>
<!--end setting bar--> <!--end setting bar-->
<div class="mask"></div> <div class="mask"></div>
@ -1505,9 +1485,6 @@
case '4': case '4':
$('#sAlphabet').append('<option value="6">Tumbling E</option>'); $('#sAlphabet').append('<option value="6">Tumbling E</option>');
break; break;
case '5':
$('#sAlphabet').append('<option value="7">Shapes</option>');
break;
} }
}); });
}; };
@ -1625,9 +1602,6 @@
case '6': case '6':
arrayCharacter = ['TumblingE_N,TumblingE_S,TumblingE_E,TumblingE_N,TumblingE_W', 'TumblingE_E,TumblingE_E,TumblingE_N,TumblingE_W,TumblingE_S', 'TumblingE_E,TumblingE_S,TumblingE_S,TumblingE_W,TumblingE_N', 'TumblingE_N,TumblingE_W,TumblingE_N,TumblingE_S,TumblingE_E', 'TumblingE_S,TumblingE_W,TumblingE_N,TumblingE_W,TumblingE_E', 'TumblingE_W,TumblingE_E,TumblingE_S,TumblingE_N,TumblingE_S', 'TumblingE_W,TumblingE_N,TumblingE_E,TumblingE_S,TumblingE_W', 'TumblingE_S,TumblingE_N,TumblingE_N,TumblingE_W,TumblingE_E', 'TumblingE_N,TumblingE_E,TumblingE_S,TumblingE_W,TumblingE_W', 'TumblingE_N,TumblingE_S,TumblingE_E,TumblingE_N,TumblingE_W', 'TumblingE_E,TumblingE_E,TumblingE_N,TumblingE_W,TumblingE_S', 'TumblingE_E,TumblingE_S,TumblingE_S,TumblingE_W,TumblingE_N', 'TumblingE_N,TumblingE_W,TumblingE_N,TumblingE_S,TumblingE_E', 'TumblingE_S,TumblingE_W,TumblingE_N,TumblingE_W,TumblingE_E'] arrayCharacter = ['TumblingE_N,TumblingE_S,TumblingE_E,TumblingE_N,TumblingE_W', 'TumblingE_E,TumblingE_E,TumblingE_N,TumblingE_W,TumblingE_S', 'TumblingE_E,TumblingE_S,TumblingE_S,TumblingE_W,TumblingE_N', 'TumblingE_N,TumblingE_W,TumblingE_N,TumblingE_S,TumblingE_E', 'TumblingE_S,TumblingE_W,TumblingE_N,TumblingE_W,TumblingE_E', 'TumblingE_W,TumblingE_E,TumblingE_S,TumblingE_N,TumblingE_S', 'TumblingE_W,TumblingE_N,TumblingE_E,TumblingE_S,TumblingE_W', 'TumblingE_S,TumblingE_N,TumblingE_N,TumblingE_W,TumblingE_E', 'TumblingE_N,TumblingE_E,TumblingE_S,TumblingE_W,TumblingE_W', 'TumblingE_N,TumblingE_S,TumblingE_E,TumblingE_N,TumblingE_W', 'TumblingE_E,TumblingE_E,TumblingE_N,TumblingE_W,TumblingE_S', 'TumblingE_E,TumblingE_S,TumblingE_S,TumblingE_W,TumblingE_N', 'TumblingE_N,TumblingE_W,TumblingE_N,TumblingE_S,TumblingE_E', 'TumblingE_S,TumblingE_W,TumblingE_N,TumblingE_W,TumblingE_E']
break; break;
case '7':
arrayCharacter= ['WolfShapes_T,WolfShapes_F,WolfShapes_S,WolfShapes_C,WolfShapes_H', 'WolfShapes_O,WolfShapes_C,WolfShapes_T,WolfShapes_S,WolfShapes_F', 'WolfShapes_T,WolfShapes_S,WolfShapes_C,WolfShapes_F,WolfShapes_H', 'WolfShapes_H,WolfShapes_C,WolfShapes_T,WolfShapes_O,WolfShapes_F', 'WolfShapes_C,WolfShapes_T,WolfShapes_O,WolfShapes_F,WolfShapes_S', 'WolfShapes_F,WolfShapes_S,WolfShapes_T,WolfShapes_O,WolfShapes_H', 'WolfShapes_S,WolfShapes_T,WolfShapes_O,WolfShapes_C,WolfShapes_F', 'WolfShapes_O,WolfShapes_S,WolfShapes_C,WolfShapes_F,WolfShapes_H', 'WolfShapes_H,WolfShapes_T,WolfShapes_S,WolfShapes_C,WolfShapes_F', 'WolfShapes_T,WolfShapes_C,WolfShapes_O,WolfShapes_F,WolfShapes_S', 'WolfShapes_S,WolfShapes_H,WolfShapes_T,WolfShapes_C,WolfShapes_F', 'WolfShapes_F,WolfShapes_C,WolfShapes_S,WolfShapes_T,WolfShapes_O', 'WolfShapes_T,WolfShapes_F,WolfShapes_O,WolfShapes_H,WolfShapes_C', 'WolfShapes_H,WolfShapes_O,WolfShapes_S,WolfShapes_F,WolfShapes_T']
break;
} }
var arrayHeight = -1; var arrayHeight = -1;
for (var i = arrayCharacter.length - 1; i >= 0; i--) { for (var i = arrayCharacter.length - 1; i >= 0; i--) {