Commit b3f5cb2a authored by amandaghassaei's avatar amandaghassaei
Browse files

small changes

parent e628e2f6
......@@ -5,7 +5,7 @@
id="svg2" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="3456px" height="6912px"
viewBox="0 0 3456 6912" enable-background="new 0 0 3456 6912" xml:space="preserve">
<path opacity="0.3" fill="none" stroke="#FF0000" stroke-linecap="round" stroke-linejoin="round" d="M1039.344,2949.601
<path opacity="0.3" fill="none" stroke="#0000ff" stroke-linecap="round" stroke-linejoin="round" d="M1039.344,2949.601
l0.884-11.264 M1036.708,2960.588l2.636-10.987 M1032.386,2971.027l4.322-10.439 M1026.483,2980.662l5.902-9.634 M1019.146,2989.254
l7.337-8.592 M1010.556,2996.592l8.591-7.338 M1000.923,3002.497l9.633-5.904 M990.484,3006.821l10.438-4.324 M979.498,3009.459
l10.986-2.638 M968.234,3010.345l11.264-0.886 M1184.216,2938.337l0.893,11.263 M1185.108,2949.6l2.641,10.983 M1187.75,2960.583
......@@ -227,7 +227,7 @@
M416.954,2818.687l68.375,68.36 M429.629,2791.242l64.287,88.469 M446.317,2761.505l57.229,112.3 M513.979,2869.478l-45.736-140.74
M497.269,2692.011l27.692,174.823 M392.237,2937.962l71.994-0.015 M464.231,2937.948l71.994-0.015 M536.225,2937.933v-71.994
M536.225,2865.939v-215.968"/>
<path opacity="0.3" fill="none" stroke="#0000FF" stroke-linecap="round" stroke-linejoin="round" d="M1108.598,2983.934l2.7-22.949
<path opacity="0.3" fill="none" stroke="#ff0000" stroke-linecap="round" stroke-linejoin="round" d="M1108.598,2983.934l2.7-22.949
M1103.903,3007.455l4.695-23.521 M1096.999,3031.881l6.904-24.426 M1087.505,3057.598l9.494-25.717 M1074.83,3085.043
l12.675-27.445 M1058.143,3114.78l16.688-29.736 M1036.216,3147.547l21.927-32.767 M1036.216,3147.547l-29.026,36.727
M968.234,3226.314l38.956-42.041 M1113.146,2960.984l2.7,22.949 M1120.541,3007.455l-4.695-23.521 M1120.541,3007.455l6.904,24.426
......@@ -294,7 +294,7 @@
M407.459,2844.404l-6.903,24.427 M416.954,2818.687l-9.494,25.717 M429.629,2791.242l-12.676,27.445 M446.317,2761.505
l-16.688,29.737 M446.317,2761.505l21.926-32.767 M468.243,2728.738l29.026-36.727 M536.225,2649.971l-38.956,42.041
M393.161,2915.3l-0.923,22.948"/>
<path opacity="0.3333" fill="none" stroke="#0000FF" stroke-linecap="round" stroke-linejoin="round" d="M536.225,2649.971V2534.5
<path opacity="0.3333" fill="none" stroke="#ff0000" stroke-linecap="round" stroke-linejoin="round" d="M536.225,2649.971V2534.5
M824.262,2650.074V2534.5 M1112.237,2650.074V2534.5 M1400.259,2650.178V2534.5 M1689.172,2649.976V2534.5 M1977.194,2649.971
V2534.5 M1833.623,3226.526v115.471 M1545.586,3226.422v115.574 M1257.611,3226.422v115.574 M969.589,3226.319v115.678
M680.676,3226.521v115.476"/>
......
......@@ -4,11 +4,11 @@
<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="3456px" height="6912px" viewBox="0 0 3456 6912" enable-background="new 0 0 3456 6912" xml:space="preserve">
<path fill="none" stroke="#000000" stroke-miterlimit="10" d="M2109,3837h-762v-762h762V3837z"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M1347,3837l762-762 M1347,3175.333l54.474,8.596 M1420.323,3148.323
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M1347,3837l762-762 M1347,3175.333l54.474,8.596 M1420.323,3148.323
l-18.849,35.606 M1420.323,3148.323L1347,3075 M1588.568,3316.568l520.502,520.361 M1530.98,3442.9l-129.507-258.97
M1854.789,3328.936L1918.303,3456 M1455.93,3129.473l-8.596-54.473 M1455.93,3129.473l-35.606,18.85 M1455.93,3129.473
l258.971,129.508 M1727.941,3646.303l-127.005-63.514"/>
<path fill="none" stroke="#FF0000" stroke-miterlimit="10" d="M1728,3455.859v190.444 M1347,3402.593l183.98,40.307
<path fill="none" stroke="#0000ff" stroke-miterlimit="10" d="M1728,3455.859v190.444 M1347,3402.593l183.98,40.307
M1588.568,3316.568L1530.98,3442.9 M1600.937,3582.789L1530.98,3442.9 M1401.474,3183.93L1347,3075 M1420.323,3148.323
l168.246,168.246 M1918.303,3456H1727.86 M1918.303,3455.858L2109,3075 M1674.593,3075l40.308,183.98 M1714.901,3258.98
l-126.332,57.588 M1714.901,3258.98l139.888,69.955 M1455.93,3129.473L1347,3075 M1347,3837l380.941-190.697 M1982.401,3836.93
......
This diff is collapsed.
......@@ -3,7 +3,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
x="0px" y="0px" width="2672.654px" height="2569.027px" viewBox="0 0 2672.654 2569.027" xml:space="preserve">
<path fill="none" stroke="#FF0000" stroke-miterlimit="10" d="M245.429,382.13l89.285,89.286 M334.715,471.415l-89.286,89.286
<path fill="none" stroke="#0000ff" stroke-miterlimit="10" d="M245.429,382.13l89.285,89.286 M334.715,471.415l-89.286,89.286
M334.715,471.416h178.571 M513.286,471.416l89.286,89.285 M602.572,382.13l-89.286,89.286 M424,560.701l89.286,89.286
M513.287,649.986L424,739.271 M513.287,649.987h178.57 M691.857,649.987l89.287,89.284 M781.145,560.701l-89.287,89.286
M156.143,649.986h178.571 M334.714,649.986L424,739.271 M424,560.701l-89.286,89.286 M156.143,292.845h178.571 M334.714,292.845
......@@ -102,7 +102,7 @@
M2477.576,1007.136l-89.287-89.287 M2388.289,1096.42l89.287-89.286 M2477.571,649.986l-89.286-89.286 M2388.285,739.271
l89.286-89.287 M2477.571,292.845l-89.286-89.286 M2388.285,382.13l89.286-89.286 M245.433,917.845V739.273 M2388.289,917.848
V739.275 M245.428,1632.133v-178.571 M2388.284,1632.136v-178.572"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M245.429,382.13h714.285 M245.429,560.701h714.285 M424,382.13
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M245.429,382.13h714.285 M245.429,560.701h714.285 M424,382.13
V203.559 M424,739.271v-178.57 M602.571,560.701l0.001-178.571 M781.143,382.13V203.559 M781.145,739.271l-0.002-178.57
M334.715,471.416l89.286,89.285 M424.001,382.13l-89.286,89.286 M424,382.13l89.286,89.286 M513.286,471.415L424,560.701
M513.287,649.987l89.286,89.284 M602.573,560.701l-89.286,89.286 M602.572,560.701l89.285,89.286 M691.857,649.986l-89.285,89.285
......
......@@ -3,20 +3,20 @@
<!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="1566px" height="1174px" viewBox="0 0 1566 1174" enable-background="new 0 0 1566 1174" xml:space="preserve">
<path fill="none" stroke="#0000FF" stroke-linecap="round" stroke-miterlimit="10" d="M298.266,285.743v39.666 M298.266,285.743
l-34.352-19.833 M332.618,265.91l-34.352,19.833 M195.212,345.241l34.352-19.833 M195.212,464.238l34.352-19.833 M298.266,523.736
v39.666 M298.266,523.736l-34.352-19.833 M298.266,523.736l34.352-19.833 M298.266,404.74v39.666 M263.914,384.906l34.352,19.834
M298.266,404.74l34.352-19.834 M195.212,583.234l34.352-19.834 M401.32,226.245v39.666 M401.32,226.245l-34.354-19.833
M435.671,206.412l-34.352,19.833 M504.374,285.743v39.666 M504.374,285.743l-34.353-19.833 M504.374,285.743l34.353-19.833
M401.32,345.241v39.666 M401.32,345.241l-34.354-19.833 M435.671,325.408l-34.352,19.833 M401.319,464.238v39.666 M366.967,444.405
l34.354,19.833 M401.319,464.238l34.352-19.833 M504.374,523.736v39.666 M504.374,523.736l-34.353-19.833 M504.374,523.736
l34.353-19.833 M504.374,404.74v39.666 M470.021,384.906l34.353,19.834 M504.374,404.74l34.353-19.834 M401.319,583.234V622.9
M401.319,583.234L366.967,563.4 M435.67,563.4l-34.352,19.834 M607.427,226.245v39.666 M607.427,226.245l-34.352-19.833
M607.427,226.245l34.354-19.833 M710.48,285.743v39.666 M710.48,285.743l-34.354-19.833 M744.832,265.91l-34.352,19.833
M607.427,345.241v39.666 M607.427,345.241l-34.352-19.833 M607.427,345.241l34.354-19.833 M607.426,464.238v39.666
<path opacity="0.3333" fill="none" stroke="#FF0000" stroke-linecap="round" stroke-miterlimit="10" d="M298.266,285.743v39.666
M298.266,285.743l-34.352-19.833 M332.618,265.91l-34.352,19.833 M195.212,345.241l34.352-19.833 M195.212,464.238l34.352-19.833
M298.266,523.736v39.666 M298.266,523.736l-34.352-19.833 M298.266,523.736l34.352-19.833 M298.266,404.74v39.666 M263.914,384.906
l34.352,19.834 M298.266,404.74l34.352-19.834 M195.212,583.234l34.352-19.834 M401.32,226.245v39.666 M401.32,226.245
l-34.354-19.833 M435.671,206.412l-34.352,19.833 M504.374,285.743v39.666 M504.374,285.743l-34.353-19.833 M504.374,285.743
l34.353-19.833 M401.32,345.241v39.666 M401.32,345.241l-34.354-19.833 M435.671,325.408l-34.352,19.833 M401.319,464.238v39.666
M366.967,444.405l34.354,19.833 M401.319,464.238l34.352-19.833 M504.374,523.736v39.666 M504.374,523.736l-34.353-19.833
M504.374,523.736l34.353-19.833 M504.374,404.74v39.666 M470.021,384.906l34.353,19.834 M504.374,404.74l34.353-19.834
M401.319,583.234V622.9 M401.319,583.234L366.967,563.4 M435.67,563.4l-34.352,19.834 M607.427,226.245v39.666 M607.427,226.245
l-34.352-19.833 M607.427,226.245l34.354-19.833 M710.48,285.743v39.666 M710.48,285.743l-34.354-19.833 M744.832,265.91
l-34.352,19.833 M607.427,345.241v39.666 M607.427,345.241l-34.352-19.833 M607.427,345.241l34.354-19.833 M607.426,464.238v39.666
M573.075,444.405l34.352,19.833 M607.426,464.238l34.354-19.833 M710.48,523.736v39.666 M710.48,523.736l-34.354-19.833
M744.832,503.903l-34.352,19.833 M710.48,404.74v39.666 M676.129,384.906l34.352,19.834 M710.48,404.74l34.352-19.834
M607.426,583.234V622.9 M607.426,583.234L573.074,563.4 M607.426,583.234l34.354-19.834 M813.535,226.245v39.666 M813.535,226.245
M607.426,583.234V622.9 M607.426,583.234L573.074,563.4 M607.426,583.234L641.78,563.4 M813.535,226.245v39.666 M813.535,226.245
l-34.352-19.833 M813.535,226.245l34.352-19.833 M916.588,285.743v39.666 M916.588,285.743l-34.352-19.833 M916.588,285.743
l34.352-19.833 M813.535,345.241v39.666 M813.535,345.241l-34.352-19.833 M813.535,345.241l34.352-19.833 M813.533,464.238v39.666
M779.182,444.405l34.354,19.833 M813.533,464.238l34.352-19.833 M916.588,523.736v39.666 M916.588,523.736l-34.352-19.833
......@@ -40,12 +40,12 @@
M916.588,880.727v39.666 M882.236,860.893l34.352,19.834 M916.588,880.727l34.352-19.834 M1019.645,345.24l-34.353-19.833
M985.29,444.404l34.353,19.833 M1019.643,583.232L985.29,563.4 M985.29,682.396l34.353,19.834 M1019.643,821.227l-34.353-19.832
M985.29,920.391l34.353,19.834"/>
<path opacity="0.25" fill="none" stroke="#0000FF" stroke-linecap="round" stroke-miterlimit="10" enable-background="new " d="
<path opacity="0.5" fill="none" stroke="#FF0000" stroke-linecap="round" stroke-miterlimit="10" enable-background="new " d="
M470.021,979.891l-68.703-118.996l-68.701,118.996 M676.129,979.891l-68.703-118.996l-68.701,118.996 M882.236,979.891
l-68.703-118.996l-68.701,118.996 M229.564,206.413l34.351,59.498 M366.968,325.409l-68.702-118.997l-68.703,118.997H366.968z
M195.212,265.91l68.702,118.997 M195.212,384.907l68.702,118.997 M366.968,563.402l-68.702-118.997l-68.703,118.997H366.968z
M366.968,444.406l-68.702-118.998l-68.703,118.998H366.968z M195.212,503.903L263.914,622.9 M366.969,206.413l-34.351,59.499
h137.403l-34.353-59.499 M573.076,325.409l-68.702-118.997L435.67,325.409H573.076z M470.021,384.907L401.32,265.91l-68.702,118.997
h137.403l-34.354-59.499 M573.076,325.409l-68.702-118.997L435.67,325.409H573.076z M470.021,384.907L401.32,265.91l-68.702,118.997
H470.021z M470.021,503.904l-68.702-118.997l-68.701,118.997H470.021z M573.075,563.402l-68.701-118.997L435.67,563.402H573.075z
M573.075,444.406l-68.701-118.998L435.67,444.406H573.075z M470.021,622.9l-68.702-118.997L332.618,622.9H470.021z
M573.076,206.413l-34.354,59.499h137.404l-34.354-59.499 M779.184,325.409L710.48,206.412l-68.703,118.997H779.184z
......@@ -71,7 +71,7 @@
l-34.351-59.498l-34.353,59.498 M950.939,265.91l68.703-0.001 M950.939,384.906h68.701 M950.939,503.903l68.701-0.001
M950.939,622.898h68.701 M950.939,741.896l68.701-0.002 M950.939,860.893h68.701 M263.914,860.895h-68.702 M263.914,741.896
h-68.702 M263.914,622.9h-68.702 M263.914,503.903h-68.702 M263.914,384.906l-68.702,0.001 M263.915,265.91h-68.702"/>
<path fill="none" stroke="#FF0000" stroke-linecap="round" stroke-miterlimit="10" d="M195.212,226.245l68.703,39.666
<path fill="none" stroke="#0000FF" stroke-linecap="round" stroke-miterlimit="10" d="M195.212,226.245l68.703,39.666
M298.266,285.743v-79.331 M298.266,285.743l-68.703,39.666 M298.266,285.743l68.702,39.666 M195.212,345.241l68.702,39.666
M195.212,464.238l68.702,39.666 M298.266,523.736v-79.331 M298.266,523.736l-68.703,39.666 M298.266,523.736l68.702,39.666
M298.266,404.74v-79.332 M298.266,404.74l-68.703,39.666 M298.266,404.74l68.702,39.666 M195.212,583.234l68.702,39.666
......@@ -83,8 +83,8 @@
M607.427,226.245l-68.702,39.666 M607.427,226.245l68.702,39.666 M710.48,285.743v-79.331 M710.48,285.743l-68.703,39.666
M710.48,285.743l68.703,39.666 M607.427,345.241V265.91 M607.427,345.241l-68.702,39.666 M607.427,345.241l68.702,39.666
M607.426,464.238v-79.331 M607.426,464.238l-68.701,39.666 M607.426,464.238l68.703,39.666 M710.48,523.736v-79.331
M710.48,523.736l-68.703,39.666 M710.48,523.736l68.698,39.666 M710.48,404.74v-79.332 M710.48,404.74l-68.703,39.666
M710.48,404.74l68.698,39.666 M607.426,583.234v-79.331 M607.426,583.234L538.725,622.9 M607.426,583.234l68.703,39.666
M710.48,523.736l-68.703,39.666 M710.48,523.736l68.697,39.666 M710.48,404.74v-79.332 M710.48,404.74l-68.703,39.666
M710.48,404.74l68.697,39.666 M607.426,583.234v-79.331 M607.426,583.234L538.725,622.9 M607.426,583.234l68.703,39.666
M813.535,226.245l-68.703,39.666 M813.535,226.245l68.701,39.666 M916.588,285.743v-79.331 M916.588,285.743l-68.703,39.666
M916.588,285.743l68.703,39.666 M813.535,345.241V265.91 M813.535,345.241l-68.703,39.666 M813.535,345.241l68.701,39.666
M813.533,464.238v-79.331 M813.533,464.238l-68.701,39.666 M813.533,464.238l68.703,39.666 M916.588,523.736v-79.331
......@@ -99,10 +99,10 @@
l68.702,39.666 M401.318,940.225v-79.33 M401.318,940.225l-68.701,39.666 M401.318,940.225l68.703,39.666 M504.373,979.891v-59.498
M504.373,880.727v-79.332 M504.373,880.727l-68.703,39.666 M504.373,880.727l68.701,39.666 M607.427,702.23V622.9 M607.427,702.23
l-68.702,39.666 M607.427,702.23l68.702,39.666 M710.48,761.729v-79.33 M710.48,761.729l-68.703,39.666 M710.48,761.729
l68.698,39.666 M710.48,642.732V563.4 M710.48,642.732l-68.703,39.666 M710.48,642.732l68.698,39.666 M607.427,821.229v-79.332
l68.697,39.666 M710.48,642.732V563.4 M710.48,642.732l-68.703,39.666 M710.48,642.732l68.697,39.666 M607.427,821.229v-79.332
M607.427,821.229l-68.702,39.666 M607.427,821.229l68.702,39.666 M607.426,940.225v-79.33 M607.426,940.225l-68.701,39.666
M607.426,940.225l68.703,39.666 M710.48,979.891v-59.498 M710.48,880.727v-79.332 M710.48,880.727l-68.703,39.666 M710.48,880.727
l68.698,39.666 M813.533,702.23V622.9 M813.533,702.23l-68.701,39.666 M813.533,702.23l68.703,39.666 M916.588,761.729v-79.33
l68.697,39.666 M813.533,702.23V622.9 M813.533,702.23l-68.701,39.666 M813.533,702.23l68.703,39.666 M916.588,761.729v-79.33
M916.588,761.729l-68.703,39.666 M916.588,761.729l68.701,39.666 M916.588,642.732V563.4 M916.588,642.732l-68.703,39.666
M916.588,642.732l68.701,39.666 M813.533,821.229v-79.332 M813.533,821.229l-68.701,39.666 M813.533,821.229l68.703,39.666
M813.533,940.225v-79.33 M813.533,940.225l-68.701,39.666 M813.533,940.225l68.703,39.666 M916.588,979.891v-59.498
......
......@@ -3,32 +3,32 @@
<!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="3456px" height="6912px" viewBox="0 0 3456 6912" enable-background="new 0 0 3456 6912" xml:space="preserve">
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M282.887,2695.431l-504.555,504.556 M282.887,2695.431l504.557,504.556 M1291.998,2695.431l-504.557,504.556 M1291.998,2695.431
l504.557,504.556 M2301.109,2695.431l-504.556,504.556 M2301.109,2695.431l504.556,504.556 M3310.221,2695.431l-504.556,504.556
M3310.221,2695.431l504.557,504.556 M4319.333,2695.431l-504.556,504.556 M4319.333,2695.431l504.556,504.556 M5328.443,2695.431
l-504.556,504.556"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M282.887,3704.542l-504.555,504.556 M282.887,3704.542l504.557,504.556 M1291.998,3704.542l-504.557,504.556 M1291.998,3704.542
l504.557,504.556 M2301.109,3704.542l-504.556,504.556 M2301.109,3704.542l504.556,504.556 M3310.221,3704.542l-504.556,504.556
M3310.221,3704.542l504.557,504.556 M4319.333,3704.542l-504.556,504.556 M4319.333,3704.542l504.556,504.556 M5328.443,3704.542
l-504.556,504.556"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M-221.668,3704.542l504.555,504.556 M787.441,3704.542l-504.556,504.556 M787.441,3704.542l504.557,504.556 M1796.555,3704.542
l-504.557,504.556 M1796.555,3704.542l504.556,504.556 M2805.665,3704.542l-504.556,504.556 M2805.665,3704.542l504.556,504.556
M3814.777,3704.542l-504.557,504.556 M3814.777,3704.542l504.556,504.556 M4823.889,3704.542l-504.556,504.556 M4823.889,3704.542
l504.556,504.556"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M282.887,4713.652l-504.555,504.557 M282.887,4713.652l504.557,504.557 M1291.998,4713.652l-504.557,504.557 M1291.998,4713.652
l504.557,504.557 M2301.109,4713.652l-504.556,504.557 M2301.109,4713.652l504.556,504.557 M3310.221,4713.652l-504.556,504.557
M3310.221,4713.652l504.557,504.557 M4319.333,4713.652l-504.556,504.557 M4319.333,4713.652l504.556,504.557 M5328.443,4713.652
l-504.556,504.557"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M-221.668,2695.431l504.555,504.556 M787.441,2695.431l-504.556,504.556 M787.441,2695.431l504.557,504.556 M1796.555,2695.431
l-504.557,504.556 M1796.555,2695.431l504.556,504.556 M2805.665,2695.431l-504.556,504.556 M2805.665,2695.431l504.556,504.556
M3814.777,2695.431l-504.557,504.556 M3814.777,2695.431l504.556,504.556 M4823.889,2695.431l-504.556,504.556 M4823.889,2695.431
l504.556,504.556"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M30.609,3199.986l-252.277,252.277 M30.609,3199.986l252.278,252.277 M787.441,3452.264l-252.277,252.279 M282.887,3452.264
l252.278,252.279 M1039.721,3199.986l252.277,252.277 M1039.721,3199.986l-252.277,252.277 M1796.555,3452.264l-252.277,252.279
M1291.998,3452.264l252.277,252.279 M2048.832,3199.986l252.277,252.277 M2048.832,3199.986l-252.277,252.277 M2805.665,3452.264
......@@ -36,7 +36,7 @@
M3814.777,3452.264L3562.5,3704.543 M3310.221,3452.264l252.279,252.279 M4067.055,3199.986l252.278,252.277 M4067.055,3199.986
l-252.277,252.277 M4823.889,3452.264l-252.277,252.279 M4319.333,3452.264l252.276,252.279 M5076.166,3199.986l-252.277,252.277
M5076.166,3199.986l252.277,252.277"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M-221.668,3452.264l252.277,252.279 M282.887,3452.264L30.609,3704.543 M535.165,3199.986l252.278,252.277 M535.165,3199.986
l-252.278,252.277 M1291.998,3452.264l-252.277,252.279 M787.441,3452.264l252.278,252.279 M1544.275,3199.986l252.278,252.277
M1544.275,3199.986l-252.277,252.277 M2301.109,3452.264l-252.277,252.278 M1796.555,3452.264l252.277,252.278 M2553.388,3199.986
......@@ -44,7 +44,7 @@
M3562.5,3199.986l252.277,252.277 M3562.5,3199.986l-252.279,252.277 M4319.333,3452.264l-252.278,252.279 M3814.777,3452.264
l252.277,252.279 M4571.609,3199.986l252.278,252.277 M4571.609,3199.986l-252.276,252.277 M4823.889,3452.264l252.277,252.279
M5328.443,3452.264l-252.278,252.279"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M30.609,4209.098l-252.277,252.277 M30.609,4209.098l252.278,252.277 M787.441,4461.375l-252.277,252.277 M282.887,4461.375
l252.278,252.277 M1039.721,4209.098l252.277,252.277 M1039.721,4209.098l-252.277,252.277 M1796.555,4461.375l-252.277,252.277
M1291.998,4461.375l252.277,252.277 M2048.832,4209.098l252.277,252.277 M2048.832,4209.098l-252.277,252.277 M2805.665,4461.375
......@@ -52,7 +52,7 @@
M3814.777,4461.375L3562.5,4713.652 M3310.221,4461.375l252.279,252.277 M4067.055,4209.098l252.278,252.277 M4067.055,4209.098
l-252.277,252.277 M4823.889,4461.375l-252.277,252.277 M4319.333,4461.375l252.276,252.277 M5076.166,4209.098l-252.277,252.277
M5076.166,4209.098l252.277,252.277"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M-221.668,4461.375l252.277,252.277 M282.887,4461.375L30.609,4713.652 M535.165,4209.098l252.278,252.277 M535.165,4209.098
l-252.278,252.277 M1291.998,4461.375l-252.277,252.277 M787.441,4461.375l252.278,252.277 M1544.275,4209.098l252.278,252.277
M1544.275,4209.098l-252.277,252.277 M2301.109,4461.375l-252.277,252.277 M1796.555,4461.375l252.277,252.277 M2553.388,4209.098
......@@ -60,36 +60,36 @@
M3562.5,4209.098l252.277,252.277 M3562.5,4209.098l-252.279,252.277 M4319.333,4461.375l-252.278,252.277 M3814.777,4461.375
l252.277,252.277 M4571.609,4209.098l252.278,252.277 M4571.609,4209.098l-252.277,252.277 M4823.889,4461.375l252.277,252.277
M5328.443,4461.375l-252.278,252.277"/>
<path fill="none" stroke="#FF0000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
<path fill="none" stroke="#0000ff" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M-221.668,4713.652l504.555,504.557 M787.441,4713.652l-504.556,504.557 M787.441,4713.652l504.557,504.557 M1796.555,4713.652
l-504.557,504.557 M1796.555,4713.652l504.556,504.557 M2805.665,4713.652l-504.556,504.557 M2805.665,4713.652l504.556,504.557
M3814.777,4713.652l-504.557,504.557 M3814.777,4713.652l504.556,504.557 M4823.889,4713.652l-504.556,504.557 M4823.889,4713.652
l504.556,504.557"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M-221.668,4209.098h5550.111"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M-221.668,3704.542h5550.111"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M-221.668,3199.986h5550.111"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M-221.668,4713.652h5550.111"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M282.887,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M30.609,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M535.165,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M5076.166,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M3057.943,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M3310.221,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M3562.5,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M3814.777,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M4067.055,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M4319.333,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M4571.609,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M4823.889,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M2805.665,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M2553.388,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M2301.109,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M2048.832,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M1796.555,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M1544.275,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M1291.998,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M1039.721,2695.431v2522.778"/>
<path fill="none" stroke="#0000FF" stroke-miterlimit="10" d="M787.441,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M-221.668,4209.098h5550.111"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M-221.668,3704.542h5550.111"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M-221.668,3199.986h5550.111"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M-221.668,4713.652h5550.111"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M282.887,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M30.609,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M535.165,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M5076.166,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M3057.943,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M3310.221,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M3562.5,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M3814.777,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M4067.055,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M4319.333,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M4571.609,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M4823.889,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M2805.665,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M2553.388,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M2301.109,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M2048.832,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M1796.555,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M1544.275,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M1291.998,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M1039.721,2695.431v2522.778"/>
<path fill="none" stroke="#ff0000" stroke-miterlimit="10" d="M787.441,2695.431v2522.778"/>
<path fill="none" stroke="#000000" stroke-width="0.7087" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
M-221.668,5218.209h5550.111 M5328.443,5218.209V2695.431 M5328.443,2695.431H-221.668 M-221.668,2695.431v2522.778"/>
</svg>
......@@ -3,18 +3,18 @@
<!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="2261.271px" height="2084px" viewBox="0 0 2261.271 2084" enable-background="new 0 0 2261.271 2084" xml:space="preserve">
<path fill="none" stroke="#0000FF" stroke-width="4.3568" stroke-miterlimit="10" d="M135.014,48.805v1026.698 M189.019,48.805
v1026.698 M243.024,48.805v1026.698 M297.03,48.805v1026.698 M351.035,48.805v1026.698 M405.041,48.805v1026.698 M459.046,48.805
v1026.698 M513.051,48.805v1026.698 M567.057,48.805v1026.698 M621.062,48.805v1026.698 M675.066,48.805v1026.698 M729.073,48.805
v1026.698 M783.078,48.805v1026.698 M837.083,48.805v1026.698 M891.089,48.805v1026.698 M945.094,48.805v1026.698 M999.1,48.805
v1026.698 M1053.105,48.805v1026.698 M1107.111,48.805v1026.698 M1161.117,48.805v1026.698 M81.008,1020.908h1134.084
<path opacity="0.5" fill="none" stroke="#FF0000" stroke-width="4.3568" stroke-miterlimit="10" d="M135.014,48.805v1026.698
M189.019,48.805v1026.698 M243.024,48.805v1026.698 M297.03,48.805v1026.698 M351.035,48.805v1026.698 M405.041,48.805v1026.698
M459.046,48.805v1026.698 M513.051,48.805v1026.698 M567.057,48.805v1026.698 M621.062,48.805v1026.698 M675.066,48.805v1026.698
M729.073,48.805v1026.698 M783.078,48.805v1026.698 M837.083,48.805v1026.698 M891.089,48.805v1026.698 M945.094,48.805v1026.698
M999.1,48.805v1026.698 M1053.105,48.805v1026.698 M1107.111,48.805v1026.698 M1161.117,48.805v1026.698 M81.008,1020.908h1134.084
M81.008,966.902h1134.084 M81.008,912.896h1134.084 M81.008,858.893h1134.084 M81.008,804.887h1134.084 M81.008,750.881h1134.084
M81.008,696.875h1134.084 M81.008,642.869h1134.084 M81.008,588.863h1134.084 M81.008,534.857h1134.084 M81.008,480.852h1134.084
M81.008,426.846h1134.084 M81.008,372.84h1134.084 M81.008,318.834h1134.084 M81.008,264.828h1134.084 M81.008,210.822h1134.084
M81.008,156.816h1134.084 M81.008,102.811h1134.084"/>
<path fill="none" stroke="#000000" stroke-width="4.3568" stroke-miterlimit="10" d="M81.008,48.805v1026.111 M1215.121,48.805
v1026.111 M81.008,1074.916h1134.113 M81.008,48.805h1134.113"/>
<path fill="none" stroke="#FF0000" stroke-width="4.3568" stroke-miterlimit="10" d="M81.008,48.805l108.011,108.012
<path fill="none" stroke="#0000FF" stroke-width="4.3568" stroke-miterlimit="10" d="M81.008,48.805l108.011,108.012
M81.008,156.816L189.019,48.805 M243.024,48.805l-54.005,54.006 M297.03,102.811l-54.005-54.006 M351.035,210.822L243.024,102.811
M351.035,102.811L243.024,210.822 M351.035,156.816L459.046,48.805 M351.035,48.805l108.011,108.012 M135.014,156.816
l108.011,108.012 M243.024,156.816l-108.01,108.012 M135.014,210.822l-54.006,54.006 M81.008,264.828l54.006,54.006
......@@ -42,26 +42,26 @@
M1215.121,210.822l-108.012,108.012 M1161.115,318.834l53.977,54.006 M1215.092,372.84l-53.977,54.006 M1161.115,372.84
l-108.01,108.012 M1161.115,480.852l-108.01-108.012 M189.019,318.834L81.008,426.846 M189.019,426.846L81.008,318.834
M135.011,480.852l-54.006,54.006 M135.011,588.863l-54.006-54.006 M189.016,534.857l108.011,108.012 M297.027,534.857
L189.016,642.869 M297.027,480.852l108.011,108.015 M405.038,480.852L297.027,588.863 M351.032,588.863l108.011,108.012
L189.016,642.869 M297.027,480.852l108.011,108.016 M405.038,480.852L297.027,588.863 M351.032,588.863l108.011,108.012
M459.043,588.863L351.032,696.875 M351.032,642.869L243.021,750.881 M243.021,642.869l108.011,108.012 M459.043,534.857
l108.011,108.012 M567.054,534.857L459.043,642.869 M567.054,480.852l108.011,108.015 M675.064,480.852L567.054,588.863
l108.011,108.012 M567.054,534.857L459.043,642.869 M567.054,480.852l108.011,108.016 M675.064,480.852L567.054,588.863
M621.059,588.863L729.07,696.875 M621.059,696.875L729.07,588.863 M621.059,642.869L513.048,750.881 M513.048,642.869
l108.011,108.012 M729.07,534.857l108.011,108.012 M837.081,534.857L729.07,642.869 M837.081,480.852l108.01,108.015
M945.091,480.852l-108.01,108.015 M891.086,588.863l108.011,108.012 M891.086,696.875l108.011-108.012 M891.086,642.869
l108.011,108.012 M729.07,534.857l108.011,108.012 M837.081,534.857L729.07,642.869 M837.081,480.852l108.01,108.016
M945.091,480.852l-108.01,108.016 M891.086,588.863l108.011,108.012 M891.086,696.875l108.011-108.012 M891.086,642.869
L783.075,750.881 M783.075,642.869l108.011,108.012 M999.097,534.857l108.011,108.012 M1107.107,534.857L999.097,642.869
M1107.107,480.852l108.011,108.015 M1215.118,480.852l-108.011,108.015 M1161.112,588.863l53.979,54.006 M1215.092,642.869
M1107.107,480.852l108.011,108.016 M1215.118,480.852l-108.011,108.016 M1161.112,588.863l53.979,54.006 M1215.092,642.869
l-53.979,54.006 M1161.112,642.869l-108.011,108.012 M1161.112,750.881l-108.011-108.012 M189.016,588.863L81.005,696.875
M81.005,588.863l108.011,108.012 M135.008,750.881l-54.006,54.006 M81.002,804.887l54.006,54.006 M189.013,804.887l108.011,108.012
M297.024,804.887L189.013,912.898 M297.024,750.881l108.011,108.012 M405.035,750.881L297.024,858.893 M351.029,858.893
L459.04,966.904 M459.04,858.893L351.029,966.904 M351.029,912.898l-108.01,108.012 M243.019,912.898L351.03,1020.91
M459.04,804.887l108.011,108.012 M567.051,804.887L459.04,912.898 M567.051,750.881l108.012,108.012 M675.062,750.881
L567.051,858.893 M621.056,858.893l108.011,108.015 M621.056,966.904l108.011-108.012 M621.056,912.898L513.045,1020.91
L567.051,858.893 M621.056,858.893l108.011,108.016 M621.056,966.904l108.011-108.012 M621.056,912.898L513.045,1020.91
M513.045,912.898l108.011,108.012 M729.066,804.887l108.012,108.012 M837.078,804.887L729.066,912.898 M837.078,750.881
l108.01,108.012 M945.088,750.881l-108.01,108.012 M891.083,858.893l108.011,108.015 M891.083,966.904l108.011-108.012
l108.01,108.012 M945.088,750.881l-108.01,108.012 M891.083,858.893l108.011,108.016 M891.083,966.904l108.011-108.012
M891.083,912.898L783.072,1020.91 M783.072,912.898l108.011,108.012 M999.094,804.887l108.012,108.012 M1107.104,804.887
l-108.01,108.012 M1107.104,750.881l108.014,108.012 M1215.115,750.881l-108.012,108.012 M1215.092,912.896l-53.982-54.004
l-108.01,108.012 M1107.104,750.881l108.015,108.012 M1215.115,750.881l-108.012,108.012 M1215.092,912.896l-53.982-54.004
M1215.092,912.896l-53.982,54.011 M1161.109,912.898L1053.1,1020.91 M1161.109,1020.91L1053.1,912.898 M189.013,858.893
L81.002,966.904 M81.002,858.893l108.011,108.015 M80.999,1074.916l54.006-54.006 M297.021,1020.91l54.014,54.593 M405.032,1020.91
L81.002,966.904 M81.002,858.893l108.011,108.016 M80.999,1074.916l54.006-54.006 M297.021,1020.91l54.014,54.593 M405.032,1020.91
l-53.997,54.593 M567.048,1020.91l54.015,54.593 M621.062,1075.503l53.996-54.593 M837.075,1020.91l54.014,54.593 M945.085,1020.91
l-53.996,54.593 M1107.102,1020.91l54.016,54.593 M1215.112,1020.91l-53.995,54.593"/>
l-53.996,54.593 M1107.102,1020.91l54.017,54.593 M1215.112,1020.91l-53.995,54.593"/>
</svg>
......@@ -396,4 +396,9 @@ a.seeMore.closed>.fui-triangle-down{
#simulationSettings, #errorInfo, #animationsSettings, #cameraAngle, #edgeVisiblity, #virtualReality, #materialSettings{
margin-top: 15px;
}
.modal-body img{
margin-left: auto;
margin-right: auto;
display: block;
}
\ No newline at end of file
......@@ -215,6 +215,7 @@
vec4 thetas = texture2D(u_theta, scaledCreaseIndex);
vec3 creaseMeta = texture2D(u_creaseMeta, scaledCreaseIndex).xyz;//[k, d, targetTheta]
vec4 creaseGeo = texture2D(u_creaseGeo, scaledCreaseIndex);//[h1, h2, coef1, coef2]
if (creaseGeo[0]< 0.0) continue;
float targetTheta = creaseMeta[2] * u_creasePercent;
float angForce = creaseMeta[0]*(targetTheta-thetas[0]);// + creaseMeta[1]*thetas[1];
......@@ -392,12 +393,15 @@
vec3 node3 = texture2D(u_originalPosition, node3Index).xyz + texture2D(u_lastPosition, node3Index).xyz;
vec3 node4 = texture2D(u_originalPosition, node4Index).xyz + texture2D(u_lastPosition, node4Index).xyz;
float tol = 0.001;
float tol = 0.01;
vec3 creaseVector = node4-node3;
float creaseLength = length(creaseVector);
if (abs(creaseLength)<tol) creaseLength = tol;
if (abs(creaseLength)<tol) {
gl_FragColor = vec4(-1);//disable crease
return;
}
creaseVector /= creaseLength;
vec3 vector1 = node1-node3;
......@@ -409,8 +413,10 @@
float dist1 = sqrt(abs(vector1.x*vector1.x+vector1.y*vector1.y+vector1.z*vector1.z-proj1Length*proj1Length));
float dist2 = sqrt(abs(vector2.x*vector2.x+vector2.y*vector2.y+vector2.z*vector2.z-proj2Length*proj2Length));
if (abs(dist1)<tol) dist1 = tol;
if (abs(dist2)<tol) dist2 = tol;
if (dist1<tol || dist2<tol){
gl_FragColor = vec4(-1);//disable crease
return;
}
gl_FragColor = vec4(dist1, dist2, proj1Length/creaseLength, proj2Length/creaseLength);
}
......@@ -605,15 +611,15 @@
<a href="#" class="seeMore closed" data-id="simulationSettings"><span class="fui-triangle-down"></span><b>Simulation Settings:</b></a><a class="about" href="#" id="aboutStiffness"><span class="fui-question-circle"></span></a><br/>
<div id="simulationSettings" class="hide">
<div class="sliderInput paddingBottom" id="axialStiffness">
<span class="label-slider">Axial Stiffness : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<span class="label-slider">Axial Strength : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<input value="" placeholder="" class="form-control" type="text">
</div>
<div class="sliderInput" id="creaseStiffness">
<span class="label-slider">Fold Stiffness : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<span class="label-slider">Fold Strength : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<input value="" placeholder="" class="form-control" type="text">
</div>
<div class="sliderInput" id="panelStiffness">
<span class="label-slider">Facet Stiffness : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<span class="label-slider">Facet Strength : </span><div class="flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"></div>
<input value="" placeholder="" class="form-control" type="text">
</div>
<div class="sliderInput" id="percentDamping">
......@@ -784,14 +790,18 @@
<b>Importing SVG:</b><br/><br/>
<ul>
<li>The SVG importer supports path objects and line objects (coming). Please convert polygons to paths before importing.</li>
<li>Valley folds are <span style="color:red">red</span> - rgb(255, 0, 0), hex #ff0000</li>
<li>Mountain folds are <span style="color:blue">blue</span> - rgb(0, 0, 255), hex #0000ff</li>
<li>Mountain folds are <span style="color:red">red</span> - rgb(255, 0, 0), hex #ff0000</li>
<li>Valley folds are <span style="color:blue">blue</span> - rgb(0, 0, 255), hex #0000ff</li>
<li>Outline edges are <span style="color:black">black</span> - rgb(0, 0, 0), hex #000000</li>
<img src="assets/examplepattern.jpg"/>
</ul>
<img src="assets/examplepattern.jpg"/>
<ul>
<li>This tool will automatically triangulate regions in the pattern that form polygons with more than three sides.
To control the triangulations draw lines in <span style="color:#cccc00">yellow</span> - rgb(255, 255, 0), hex #ffff00<br/>
In general, patterns move better when their triangulation is symmetric and minimizes long, skinny triangles.</li>
<img src="assets/patternwithtriangulations.jpg"/>
</ul>
<img src="assets/patternwithtriangulations.jpg"/>
<ul>
<li>Stroke and line style do not matter.</li>
<li>The final fold angle of a mountain or valley fold is set by its opacity. For example, 1.0 = 180&deg;
(fully folded), 0.5 = 90&deg;, 0 = 0&deg; (flat). Any fold angle between 0&deg; and 180&deg; may be used.</li>
......@@ -1005,14 +1015,36 @@
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="modal fade" id="aboutStiffnessModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-med">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<p><b>Stiffness Settings</b><br/><br/>
....
<p><b>Simulation Settings</b><br/><br/>
This app uses a compliant dynamic simulation method to solve for the geometry of an origami pattern
at a given fold angle. The simulation sets up several types of constraints: distance constraints prevent the
sheet from stretching or compressing, and angular constraints fold or flatten the sheet. Each of these constraints is weighted by a stiffness - the stiffer the constraint, the better it is enforced
in the simulation. <br/>
<br/>
<b>Axial Stiffness</b> is the stiffness of the distance constraints. Increasing axial
stiffness will decrease the strain in the simulation, but it will also slow down the solver. <br/>
<br/>
Fold and facet stiffnesses correspond to two types of angular constraints. <b>Fold Stiffness</b> is the stiffness of the mountain
and valley creases in the origami pattern. <b>Facet Stiffness</b> is the stiffness of the triangulated faces between
creases in the pattern. Increasing facet stiffness causes the faces between creases to stay very flat as the origami is folded.
As facet stiffness becomes very high, this simulation approaches a <a href="http://www.tsg.ne.jp/TT/cg/TachiFreeformOrigami2010.pdf" target="_blank">
rigid origami simulation</a>, and models the behavior of a rigid material (such as metal) when folded.<br/>
<br/>
Constraints <i>strengths</i> (units of N) are scaled by the length of a particular constraint to determine the <i>stiffness</i>. Axial stiffness is calculated by dividing
axial strength by length; angular stiffness is calculated by multiplying fold or facet strength by length.<br/>
<br/>
Since this is a dynamic simulation, vertices of the origami move with some notion of acceleration and velocity. In order to
keep the system stable and help it converge to a static solution, <a target="_blank" href="https://en.wikipedia.org/wiki/Harmonic_oscillator#Damped_harmonic_oscillator">
damping</a> is added to the distance constraints. The <b>Damping</b> slider allows you to control the amount of damping
present in the simulation, from 0 (no damping) to 1 (critical damping). Decreasing damping makes the simulation more "springy".
It may be useful to temporarily turn down damping to help the simulation more quickly converge towards its static solution - especially
for patterns that take a long time to curl.
</p>
</div>
</div><!-- /.modal-content -->
......
......@@ -174,17 +174,17 @@ function initControls(globals){
globals.simNeedsSync = true;
});
setSliderInput("#axialStiffness", globals.axialStiffness, 10, 40, 1, function(val){
setSliderInput("#axialStiffness", globals.axialStiffness, 10, 100, 1, function(val){
globals.axialStiffness = val;
globals.materialHasChanged = true;
});
setSliderInput("#creaseStiffness", globals.creaseStiffness, 0, 1, 0.01, function(val){
setSliderInput("#creaseStiffness", globals.creaseStiffness, 0, 3, 0.01, function(val){
globals.creaseStiffness = val;
globals.creaseMaterialHasChanged = true;
});
setSliderInput("#panelStiffness", globals.panelStiffness, 0, 1, 0.01, function(val){
setSliderInput("#panelStiffness", globals.panelStiffness, 0, 3, 0.01, function(val){
globals.panelStiffness = val;
globals.creaseMaterialHasChanged = true;
});
......
......@@ -174,7 +174,7 @@ function initDynamicSolver(globals){
// globals.gpuMath.readPixels(0, 0, textureDimCreases * vectorLength, height, pixels);
// var parsedPixels = new Float32Array(pixels.buffer);
// for (var i=0;i<parsedPixels.length;i+=2){
// if (Math.abs(parsedPixels[i])>Math.PI) {
// if (Math.abs(parsedPixels[i+1])>Math.PI-1) {
// console.log(parsedPixels[i+1]);//theta
// }
//
......
......@@ -43,7 +43,7 @@ function initPattern(globals){
if (stroke == "#ff0000" || stroke == "#f00" || stroke == "#FF0000" || stroke == "#F00" || stroke == "red"){
var opacity = parseFloat($(this).attr("opacity"));
if (isNaN(opacity)) opacity = 1;
_mountainAngles.push(opacity*Math.PI);
_mountainAngles.push(-opacity*Math.PI);
return true;
}
return false;
......@@ -54,7 +54,7 @@ function initPattern(globals){
if (stroke == "#0000ff" || stroke == "#00f" || stroke == "#0000FF" || stroke == "#00F" || stroke == "greeen"){
var opacity = parseFloat($(this).attr("opacity"));
if (isNaN(opacity)) opacity = 1;
_valleyAngles.push(-opacity*Math.PI);
_valleyAngles.push(opacity*Math.PI);
return true;
}
return false;
......
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