Skip to content

GitLab

Commit cd631bff authored by amandaghassaei's avatar amandaghassaei
Browse files

more patterns

parent 526d9b19
Expand all Hide whitespace changes
Inline Side-by-side
assets/Tessellations/hyperbolic_limit_cp.svg 0 → 100644
View file @ cd631bff
This diff is collapsed.
assets/Tessellations/oval_tessellation_cp.svg 0 → 100644
View file @ cd631bff
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="1152px" height="1230px" viewBox="0 0 1152 1230" enable-background="new 0 0 1152 1230" xml:space="preserve">
<path fill="none" stroke="#0000FF" stroke-width="4" stroke-linecap="square" stroke-miterlimit="10" d="M774.379,503.641h131.363
M697.028,609.665l77.351-106.024 M692.359,653.676l4.669-44.011 M675.023,697.018l17.336-43.342 M641.016,734.359l34.008-37.342
M592.337,753.031l48.679-18.672 M539.658,746.362l52.679,6.669 M497.648,717.023l42.01,29.339 M472.309,675.682l25.34,41.342
M462.307,631.671l10.002,44.011 M462.307,587.66v44.011 M472.309,543.65l-10.002,44.01 M497.648,502.307l-25.34,41.344
M539.658,472.968l-42.01,29.339 M592.337,466.298l-52.679,6.67 M641.016,484.97l-48.679-18.672 M675.023,522.312l-34.008-37.343
M692.359,565.655l-17.336-43.343 M697.028,609.665l-4.669-44.01 M745.039,445.628L872.4,414.287 M692.359,565.655l52.68-120.027
M694.361,392.282l110.69-69.35 M675.023,522.312l19.338-130.03 M612.341,357.607l73.351-108.691 M641.016,484.97l-28.675-127.363
M510.318,364.275l16.004-130.696 M592.337,466.298l-82.019-102.023 M418.964,421.622l-46.678-122.029 M539.658,472.968
l-120.694-51.346 M366.952,512.977l-95.355-90.021 M497.648,502.307l-130.696,10.67 M356.95,606.331l-121.362-49.345
M472.309,543.65L356.95,606.331 M372.286,683.682l-130.029-15.336 M462.307,587.66l-90.021,96.021 M396.292,745.03l-130.03,15.337
M462.307,631.671L396.292,745.03 M434.301,801.042l-121.361,50.012 M472.309,675.682l-38.008,125.36 M500.983,848.386
l-95.355,90.021 M497.648,717.023l3.335,131.362 M595.671,865.057l-46.677,122.695 M539.658,746.362l56.013,118.694
M696.361,832.383l16.67,130.03 M592.337,753.031l104.024,79.352 M770.378,754.365l74.017,108.023 M641.016,734.359l129.362,20.006
M800.385,658.343l110.692,69.349 M675.023,697.018l125.361-38.675 M795.05,571.656l127.363,32.008 M692.359,653.676l102.69-82.02
M774.379,503.641l-24.672-14.003 M745.039,445.628l-33.341-9.336 M694.361,392.282l-48.012,2 M612.341,357.607l-53.345,25.339
M510.318,364.275l-38.676,51.346 M418.964,421.622l-10.002,62.015 M366.952,512.977l15.337,52.012 M356.95,606.331l25.339,32.675
M372.286,683.682l24.006,18.004 M396.292,745.03l28.006,12.002 M434.301,801.042l41.342,6.001 M500.983,848.386l52.678-12.668
M595.671,865.057l48.679-39.343 M696.361,832.383l25.339-59.348 M770.378,754.365l-4.668-59.348 M800.385,658.343l-22.672-42.676
M795.05,571.656l-25.339-24.006 M881.07,489.638l-8.67-75.351 M838.393,404.952l-33.341-82.02 M757.041,324.266l-71.35-75.35
M633.013,274.922l-106.69-41.343 M487.646,284.923l-115.36,14.67 M362.284,361.608l-90.688,61.348 M286.933,474.968l-51.345,82.019
M260.928,589.66l-18.671,78.686 M266.262,686.35v74.018 M293.602,772.369l19.337,78.685 M354.282,856.388l51.346,82.02
M458.306,925.738l90.688,62.014 M597.672,948.41l115.359,14.003 M737.704,903.066l106.69-40.678 M839.727,803.709l71.351-76.018
M888.405,685.016l34.008-81.352 M983.76,398.283h130.697 M905.742,503.641l78.018-105.357 M897.074,578.992l8.668-75.352
M924.413,294.26l127.362-32.008 M872.4,414.287l52.013-120.027 M823.057,192.903l110.692-70.685 M805.052,322.932l18.005-130.029
M655.686,121.553l73.35-108.691 M685.691,248.916l-30.006-127.363 M443.636,132.222L459.64,1.525 M526.322,233.579l-82.687-101.357
M251.592,248.249l-46.677-122.694 M372.286,299.593l-120.694-51.344 M140.9,432.957L45.545,342.27 M271.597,422.956L140.9,432.957
M120.229,618.334L-1.133,567.656 M235.588,556.986l-115.359,61.348 M151.569,763.034L20.872,747.697 M242.257,668.346
l-90.688,94.688 M200.914,873.727L70.217,889.062 M266.262,760.367l-65.348,113.359 M276.264,977.082l-120.694,50.012
M312.939,851.054l-36.675,126.028 M410.295,1069.104l-95.355,90.688 M405.628,938.407l4.667,130.696 M605.673,1105.777
l-46.677,122.697 M548.994,987.752l56.679,118.025 M817.722,1041.098l16.005,130.696 M713.031,962.413l104.69,78.685
M973.758,883.061l73.35,108.691 M844.395,862.389l129.363,20.672 M1036.439,690.352l110.691,70.016 M911.077,727.691l125.362-37.34
M1025.77,522.979l127.363,32.008 M922.413,603.664l103.356-80.686 M983.76,398.283l-50.678-28.673 M924.413,294.26l-68.015-19.338
M823.057,192.903l-96.021,4.001 M655.686,121.553l-105.358,51.345 M443.636,132.222l-76.684,102.024 M251.592,248.249
l-20.004,122.695 M140.9,432.957l30.674,103.357 M120.229,618.334l50.011,66.016 M151.569,763.034l49.345,36.675 M200.914,873.727
l56.013,24.672 M276.264,977.082l82.686,10.67 M410.295,1069.104l104.691-25.338 M605.673,1105.777l96.689-78.684 M817.722,1041.098
l49.345-117.36 M973.758,883.061l-8.002-117.359 M1036.439,690.352l-44.011-85.354 M1025.77,522.979l-50.679-49.346"/>
<path fill="none" stroke="#FF0000" stroke-width="4" stroke-linecap="square" stroke-miterlimit="10" d="M749.707,489.638H881.07
M697.028,609.665l52.679-120.027 M711.698,436.292l126.694-31.34 M692.359,565.655l19.339-129.363 M646.35,394.282l110.691-70.016
M675.023,522.312l-28.674-128.03 M558.996,382.946l74.017-108.024 M641.016,484.97l-82.02-102.023 M471.643,415.621l16.004-130.698
M592.337,466.298l-120.694-50.677 M408.962,483.637l-46.678-122.029 M539.658,472.968l-130.696,10.669 M382.289,564.988
l-95.356-90.021 M497.648,502.307l-115.359,62.682 M382.289,639.006L260.928,589.66 M472.309,543.65l-90.02,95.355 M396.292,701.686
l-130.03-15.336 M462.307,587.66l-66.015,114.025 M424.298,757.032l-130.696,15.337 M462.307,631.671l-38.009,125.361
M475.643,807.043l-121.36,49.345 M472.309,675.682l3.334,131.361 M553.661,835.718l-95.355,90.021 M497.648,717.023l56.013,118.694
M644.35,825.714L597.672,948.41 M539.658,746.362l104.691,79.352 M721.7,773.035l16.004,130.031 M592.337,753.031L721.7,773.035
M765.71,695.018l74.017,108.691 M641.016,734.359l124.694-39.342 M777.713,615.667l110.692,69.349 M675.023,697.018l102.689-81.351
M769.711,547.65l127.363,31.342 M692.359,653.676l77.352-106.025 M749.707,489.638l-4.668-44.01 M711.698,436.292l-17.337-44.01
M646.35,394.282l-34.009-36.675 M558.996,382.946l-48.678-18.671 M471.643,415.621l-52.679,6.001 M408.962,483.637l-42.01,29.34
M382.289,564.988l-25.339,41.343 M382.289,639.006l-10.003,44.676 M396.292,701.686v43.345 M424.298,757.032l10.003,44.01
M475.643,807.043l25.341,41.343 M553.661,835.718l42.01,29.339 M644.35,825.714l52.012,6.669 M721.7,773.035l48.678-18.67
M765.71,695.018l34.675-36.675 M777.713,615.667l17.337-44.011 M905.742,503.641l-24.672-14.003 M769.711,547.65l4.668-44.01
M872.4,414.287l-34.008-9.335 M805.052,322.932l-48.011,1.334 M685.691,248.916l-52.679,26.006 M526.322,233.579l-38.676,51.344
M372.286,299.593l-10.002,62.015 M271.597,422.956l15.336,52.012 M235.588,556.986l25.34,32.674 M242.257,668.346l24.005,18.004
M266.262,760.367l27.34,12.002 M312.939,851.054l41.343,5.334 M405.628,938.407l52.678-12.669 M548.994,987.752l48.678-39.342
M713.031,962.413l24.673-59.347 M844.395,862.389l-4.668-58.68 M911.077,727.691l-22.672-42.676 M922.413,603.664l-25.339-24.672
M933.082,369.61h131.364 M881.07,489.638l52.012-120.028 M856.398,274.922l127.361-32.007 M838.393,404.952l18.006-130.03
M727.035,196.904l110.691-70.018 M757.041,324.266l-30.006-127.362 M550.327,172.898l73.35-108.691 M633.013,274.922
l-82.686-102.024 M366.952,234.246l16.004-130.031 M487.646,284.923l-120.694-50.677 M231.588,370.944L184.91,248.249
M362.284,361.608l-130.696,9.336 M171.574,536.314l-95.355-90.02 M286.933,474.968l-115.359,61.347 M170.24,684.35L49.546,633.67
M260.928,589.66L170.24,684.35 M200.914,799.709L70.217,784.372 M266.262,686.35l-65.348,113.359 M256.927,898.398l-130.03,15.336
M293.602,772.369l-36.675,126.029 M358.95,987.752l-121.361,50.011 M354.282,856.388l4.668,131.364 M514.986,1043.766
l-94.688,90.687 M458.306,925.738l56.681,118.027 M702.362,1027.094l-46.677,122.694 M597.672,948.41l104.69,78.684
M867.066,923.737l16.004,130.03 M737.704,903.066l129.362,20.671 M965.756,765.701l73.35,108.691 M839.727,803.709l126.029-38.008
M992.429,604.998l110.692,70.015 M888.405,685.016l104.023-80.018 M975.091,473.633l126.696,32.01 M897.074,578.992l78.017-105.359
M933.082,369.61l-8.669-75.35 M856.398,274.922l-33.342-82.019 M727.035,196.904l-71.35-75.352 M550.327,172.898l-106.691-40.676
M366.952,234.246l-115.36,14.003 M231.588,370.944L140.9,432.957 M171.574,536.314l-51.345,82.02 M170.24,684.35l-18.671,78.685
M200.914,799.709v74.018 M256.927,898.398l19.337,78.684 M358.95,987.752l51.345,81.352 M514.986,1043.766l90.687,62.012
M702.362,1027.094l115.359,14.004 M867.066,923.737l106.691-40.677 M965.756,765.701l70.684-75.35 M992.429,604.998l33.341-82.02
M975.091,473.633l8.669-75.35"/>
<path fill="none" stroke="#000000" stroke-width="4" stroke-linecap="square" stroke-miterlimit="10" d="M1114.457,398.283
l-50.011-28.673 M1051.775,262.252l12.671,107.358 M1051.775,262.252l-68.017-19.337 M933.749,122.219l50.011,120.696
M933.749,122.219l-96.022,4.668 M837.727,126.887L729.035,12.861 M729.035,12.861L623.677,64.207 M623.677,64.207L459.64,1.525
M459.64,1.525l-76.684,102.69 M382.956,104.215l-178.041,21.34 M204.915,125.555L184.91,248.249 M184.91,248.249L45.545,342.27
M45.545,342.27l30.674,104.025 M76.219,446.295L-1.133,567.656 M-1.133,567.656l50.679,66.014 M49.546,633.67L20.872,747.697
M20.872,747.697l49.345,36.675 M70.217,784.372v104.69 M126.897,913.734l-56.68-24.672 M126.897,913.734l28.673,113.358
M155.57,1027.094l82.019,10.669 M314.939,1159.792l-77.351-122.029 M314.939,1159.792l105.358-25.34 M420.298,1134.452
l138.698,94.021 M558.996,1228.475l96.688-78.687 M655.686,1149.788l178.041,22.006 M833.727,1171.794l49.345-118.026
M883.07,1053.768l164.037-62.016 M1039.105,874.393l8.002,117.359 M1039.105,874.393l108.024-114.024 M1147.131,760.367
l-44.01-85.354 M1103.121,675.013l50.012-120.026 M1153.133,554.986l-51.346-49.344 M1101.787,505.643l12.67-107.359"/>
</svg>
index.html
View file @ cd631bff
......@@ -415,7 +415,6 @@
<li><a href="#" class="demo" data-url="Origami/randlettflappingbird.svg">Randlett Flapping Bird</a></li>
<li><a href="#" class="demo" data-url="Origami/singlesquaretwist.svg">Square Twist (single)</a></li>
<li><a href="#" class="demo" data-url="Origami/squaretwistManyAngles.svg">Square Twist (many angles)</a></li>
<li><a href="#" class="demo" data-url="Origami/hypar.svg">Hypar (not fully working yet)</a></li>
</ul>
</li>
<li class="dropdown-submenu">
......@@ -425,10 +424,22 @@
<li><a href="#" class="demo" data-url="Tessellations/waterbomb.svg">Waterbomb (six-crease base)</a></li>
<li><a href="#" class="demo" data-url="Tessellations/waterbombTwist.svg">Waterbomb (eight-crease base)</a></li>
<li><a href="#" class="demo" data-url="Tessellations/reschtritessellation.svg">Resch Triangle Tessellation</a></li>
<li><a href="#" class="demo" data-url="Tessellations/oval_tessellation_cp.svg">Lang Oval Tessellation</a></li>
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-1">Curved Creases<span class="pull-right fui-arrow-right"></span></a>
<ul class="dropdown-menu">
<li><a href="#" class="demo" data-url="Curved/creaseMesh.txt">Curved Crease 1</a></li>
</ul>
</li>
<li class="dropdown-submenu">
<a tabindex="-1">Problematic Patterns<span class="pull-right fui-arrow-right"></span></a>
<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>
</ul>
</li>
<li class="divider"></li>
<li><a href="#" class="demo" data-url="Curved/creaseMesh.txt">Curved Crease 1</a></li>
</ul>
</li>
<li class="divider"></li>
......
js/model.js
View file @ cd631bff
......@@ -188,8 +188,16 @@ function initModel(globals){
}
function buildModel(_faces, _vertices, _allEdges, allCreaseParams){
if (_vertices.length == 0 || _faces.length == 0 || _allEdges.length == 0) {
console.warn("bad geometry");
if (_vertices.length == 0) {
console.warn("no vertices");
return;
}
if (_faces.length == 0) {
console.warn("no faces");
return;
}
if (_allEdges.length == 0) {
console.warn("no edges");
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment