patterns

index.html

@@ -438,6 +438,7 @@
                                 <ul class="dropdown-menu">
                                     <li><a href="#" class="demo" data-url="Origami/hypar.svg">Hypar</a></li>
                                     <li><a href="#" class="demo" data-url="Tessellations/hyperbolic_limit_cp.svg">Lang Hyperbolic Limit</a></li>
+                                    <li><a href="#" class="demo" data-url="Tessellations/honeycomb_333_cp.svg">Lang Honeycomb Tessellation</a></li>
                                 </ul>
                             </li>
                         </ul>
@@ -588,13 +589,13 @@
                     </label>
                 </div>
             </div><br/>
-            Rendering:
-            <div class="indent">
-                <label class="checkbox" for="ambientOcclusion">
-                    <input id="ambientOcclusion" data-toggle="checkbox" class="custom-checkbox layersSelector" type="checkbox"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
-                    Ambient Occlusion
-                </label>
-            </div>
+            <!--Rendering:-->
+            <!--<div class="indent">-->
+                <!--<label class="checkbox" for="ambientOcclusion">-->
+                    <!--<input id="ambientOcclusion" data-toggle="checkbox" class="custom-checkbox layersSelector" type="checkbox"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>-->
+                    <!--Ambient Occlusion-->
+                <!--</label>-->
+            <!--</div>-->
         </div>
     </div>
 </div>

js/pattern.js

@@ -40,7 +40,7 @@ function initPattern(globals){
 
                 var $mountains = $paths.filter(function(){
                     var stroke = $(this).attr("stroke").toLowerCase();
-                    if (stroke == "#ff0000" || stroke == "#f00"){
+                    if (stroke == "#ff0000" || stroke == "#f00" || stroke == "#FF0000" || stroke == "#F00"){
                         var opacity = parseFloat($(this).attr("opacity"));
                         if (isNaN(opacity)) opacity = 1;
                         _mountainAngles.push(opacity*Math.PI);
@@ -51,7 +51,7 @@ function initPattern(globals){
 
                 var $valleys = $paths.filter(function(){
                     var stroke = $(this).attr("stroke").toLowerCase();
-                    if (stroke == "#0000ff" || stroke == "#00f"){
+                    if (stroke == "#0000ff" || stroke == "#00f" || stroke == "#0000FF" || stroke == "#00F"){
                         var opacity = parseFloat($(this).attr("opacity"));
                         if (isNaN(opacity)) opacity = 1;
                         _valleyAngles.push(-opacity*Math.PI);
@@ -67,7 +67,7 @@ function initPattern(globals){
 
                 var $triangulations = $paths.filter(function(){
                     var stroke = $(this).attr("stroke").toLowerCase();
-                    return stroke == "#ffff00" || stroke == "#ff0";
+                    return stroke == "#ffff00" || stroke == "#ff0" || stroke == "#FFFF00" || stroke == "#FF0";
                 });
 
                 parseSVG($outlines, $mountains, $valleys, $cuts, $triangulations, _mountainAngles, _valleyAngles);
@@ -327,8 +327,9 @@ function initPattern(globals){
             }
         }
         if (_weededVertices.length > 0){
-            alert("Some vertices are not fully connected, try increasing vertex merge tolerance");
-            return;
+            console.log(_weededVertices);
+            globals.warn("Some vertices are not fully connected, try increasing vertex merge tolerance");
+            // return;
         }
 
         removeCombinedFromSet(combined, outlines);