mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-06 22:47:32 -06:00
Small improvement of tpmsd infill (#10049)
* smooth tpmsd Changed the number of initial segments in the make_waves function from 4 to 16 for finer wave discretization. This should improve the accuracy of the generated wave polylines. * Update param_tpmsd.svg
This commit is contained in:
Rodrigo
GitHub
parent
a8141ef360
commit
f8ef9bc363
2 changed files with 45 additions and 155 deletions
|
|
@ -22,93 +22,16 @@
|
|||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:zoom="24.479167"
|
||||
inkscape:cx="12.214468"
|
||||
inkscape:cy="12.88851"
|
||||
inkscape:zoom="45.254834"
|
||||
inkscape:cx="17.987029"
|
||||
inkscape:cy="12.805262"
|
||||
inkscape:window-width="2560"
|
||||
inkscape:window-height="1377"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg10"
|
||||
showguides="true">
|
||||
<sodipodi:guide
|
||||
position="7.4348935,20.691064"
|
||||
orientation="1,0"
|
||||
id="guide13"
|
||||
inkscape:locked="false" />
|
||||
<sodipodi:guide
|
||||
position="10.662128,17.545532"
|
||||
orientation="0,-1"
|
||||
id="guide14"
|
||||
inkscape:locked="false" />
|
||||
<sodipodi:guide
|
||||
position="17.525106,21.140426"
|
||||
orientation="1,0"
|
||||
id="guide19"
|
||||
inkscape:locked="false" />
|
||||
<sodipodi:guide
|
||||
position="11.029787,7.4961704"
|
||||
orientation="0,-1"
|
||||
id="guide20"
|
||||
inkscape:locked="false" />
|
||||
</sodipodi:namedview>
|
||||
<line
|
||||
x1="1.5"
|
||||
y1="17.5"
|
||||
x2="17.5"
|
||||
y2="1.5"
|
||||
style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.75"
|
||||
id="line1" />
|
||||
<line
|
||||
x1="22.5"
|
||||
y1="16.5"
|
||||
x2="17.5"
|
||||
y2="21.5"
|
||||
style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.75"
|
||||
id="line2" />
|
||||
<line
|
||||
x1="7.5"
|
||||
y1="1.5"
|
||||
x2="1.5"
|
||||
y2="7.5"
|
||||
style="fill:none;stroke:#575757;stroke-linecap:round;stroke-linejoin:round;opacity:0.75;stroke-opacity:1"
|
||||
id="line3" />
|
||||
<line
|
||||
x1="22.5"
|
||||
y1="6.5"
|
||||
x2="6.5"
|
||||
y2="22.5"
|
||||
style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round;opacity:0.75"
|
||||
id="line4" />
|
||||
<line
|
||||
x1="18.5"
|
||||
y1="22.5"
|
||||
x2="1.5"
|
||||
y2="5.5"
|
||||
style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"
|
||||
id="line7" />
|
||||
<line
|
||||
x1="17.5"
|
||||
y1="1.5"
|
||||
x2="22.5"
|
||||
y2="6.5"
|
||||
style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"
|
||||
id="line8" />
|
||||
<line
|
||||
x1="1.5"
|
||||
y1="15.5"
|
||||
x2="8.5"
|
||||
y2="22.5"
|
||||
style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"
|
||||
id="line9" />
|
||||
<line
|
||||
x1="7.5"
|
||||
y1="1.5"
|
||||
x2="22.5"
|
||||
y2="16.5"
|
||||
style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"
|
||||
id="line10" />
|
||||
showguides="true" />
|
||||
<path
|
||||
d="M3.5,1.5h17a2,2,0,0,1,2,2v17a2,2,0,0,1-2,2H3.5a2,2,0,0,1-2-2V3.5A2,2,0,0,1,3.5,1.5Z"
|
||||
style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"
|
||||
|
|
@ -117,76 +40,42 @@
|
|||
style="fill:#939393;fill-opacity:1;stroke:none;stroke-width:0.0408511"
|
||||
d="M 2.90923,22.896259 C 2.0613133,22.674106 1.4709446,22.121791 1.1317723,21.233374 l -0.09007,-0.235927 -0.010758,-8.854467 c -0.0094,-7.7388928 -0.00304,-8.8917826 0.050495,-9.1506389 0.1859554,-0.8991302 0.9034473,-1.644147 1.8305395,-1.9007639 0.2366323,-0.065499 0.8566253,-0.070301 9.0778082,-0.070301 7.25241,0 8.863843,0.00978 9.048511,0.054939 0.41936,0.1025422 0.894759,0.3676462 1.184681,0.6606312 0.460787,0.465656 0.674736,0.9256377 0.740656,1.5923869 0.02306,0.2331921 0.03324,3.8138627 0.02551,8.9669367 -0.01218,8.11996 -0.0168,8.591678 -0.08634,8.820989 -0.280161,0.923863 -1.004037,1.61516 -1.884942,1.800108 -0.246575,0.05177 -1.492743,0.05983 -9.04851,0.0585 -8.488697,-0.0015 -8.7718539,-0.004 -9.0601322,-0.07951 z m 18.140693,-0.972914 c 0.331179,-0.133671 0.679356,-0.465886 0.829868,-0.791824 l 0.118507,-0.256627 0.01067,-8.781151 C 22.020819,2.3471958 22.04116,3.0891606 21.749942,2.6450177 21.599404,2.4154289 21.375482,2.2298349 21.079149,2.0890425 l -0.18383,-0.08734 H 12.010213 3.1251064 L 2.8684789,2.1202084 C 2.5425414,2.270721 2.2103264,2.6188978 2.0766551,2.9500767 l -0.095379,0.2363063 -0.011773,8.578723 c -0.00774,5.63809 0.00244,8.687076 0.029697,8.89482 0.093595,0.713409 0.5893405,1.239468 1.2564016,1.333226 0.1304402,0.01833 4.1343554,0.03159 8.8975893,0.02945 l 8.660426,-0.0039 z"
|
||||
id="path18" />
|
||||
<g
|
||||
id="g22"
|
||||
transform="matrix(1.005528,0,0,1.005528,-284.3849,-929.53132)"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.01989005;stroke-dasharray:none;stroke-opacity:1">
|
||||
<g
|
||||
id="g26"
|
||||
transform="matrix(0.20848903,0,0,0.20848903,234.2996,741.49731)"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.09540093;stroke-dasharray:none;stroke-opacity:1">
|
||||
<g
|
||||
id="g25"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.09540093;stroke-dasharray:none;stroke-opacity:1">
|
||||
<path
|
||||
style="fill:#575757;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511;stroke-opacity:1"
|
||||
d="m 12.847206,16.115289 -0.325345,-0.327265 2.133833,-2.133833 2.133833,-2.133833 0.336923,0.336924 0.336923,0.336923 -2.12388,2.124174 c -1.168133,1.168296 -2.133568,2.124174 -2.14541,2.124174 -0.01184,0 -0.167937,-0.147269 -0.346877,-0.327264 z"
|
||||
id="path21" />
|
||||
d="m 242.24433,953.1427 c 2.41634,0.034 4.85811,0.0685 7.25372,0.0238 4.81496,-0.09 9.44196,-0.45875 13.41146,-1.99804 1.82617,-0.70815 3.52041,-1.68272 4.93981,-3.03133 1.13152,-1.0751 2.07818,-2.41806 2.7437,-3.88292 0.66553,-1.46486 1.08821,-3.02601 1.39603,-4.62759 0.66119,-3.44013 0.80391,-7.10747 1.15952,-10.39304 0.26711,-2.46787 0.66196,-4.70591 1.31545,-6.35074 0.42497,-1.06965 0.92891,-1.86275 1.55021,-2.45158 0.62129,-0.58883 1.482,-1.08822 2.60084,-1.49345 1.11885,-0.40523 2.47944,-0.70639 3.98056,-0.93114 3.33585,-0.49945 7.32241,-0.60831 11.10357,-1.1895 1.97868,-0.30414 3.91492,-0.73834 5.71534,-1.518 1.42883,-0.61874 2.76044,-1.49742 3.83999,-2.56194 1.07956,-1.06452 1.93659,-2.30465 2.6115,-3.64247 1.45684,-2.88778 2.10667,-6.21944 2.43293,-9.75357 0.32626,-3.53412 0.31166,-7.28875 0.26414,-11.02316 -0.006,-0.49199 -0.0132,-0.98354 -0.0201,-1.474 h -5.10039 l 5.1e-4,0.0359 c 0.0396,2.81557 0.0778,5.59659 0.0778,5.59659 -0.19559,6.41285 -0.58043,9.85971 -0.58043,9.85971 -1.33123,4.00029 -1.91463,5.1435 -1.91463,5.1435 -1.41735,1.80699 -2.21458,2.46835 -2.21458,2.46835 -2.23261,1.0634 -3.69969,1.46201 -3.69969,1.46201 -4.95371,0.83909 -8.97151,0.95184 -8.97151,0.95184 -5.71276,0.79548 -7.55271,1.1586 -7.55271,1.1586 -3.47167,1.26386 -5.13747,2.19295 -5.13747,2.19295 -2.29139,2.41691 -3.00736,3.60745 -3.00736,3.60745 -1.35336,3.13091 -1.791,5.1587 -1.791,5.1587 -0.85869,5.83665 -0.97122,9.79137 -0.97122,9.79137 -0.73101,4.72236 -1.02483,6.01996 -1.02483,6.01996 -0.779,2.14885 -1.24169,2.95922 -1.24169,2.95922 -1.51073,1.73921 -2.75354,2.55079 -2.75354,2.55079 -4.56905,1.75542 -8.70783,2.18247 -8.70783,2.18247 -6.85743,0.12671 -9.25191,0.0935 -11.67225,0.0594 l -0.0359,-5e-4 z"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.09540093;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path7-4"
|
||||
sodipodi:nodetypes="cssssssssssssssssccscccccccccccccccscc" />
|
||||
<path
|
||||
style="fill:#575757;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511;stroke-opacity:1"
|
||||
d="m 7.8534456,21.130094 -0.3361443,-0.3379 2.1346396,-2.134349 2.1346401,-2.134349 0.336144,0.3379 0.336144,0.337899 -2.13464,2.134349 -2.1346391,2.134349 z"
|
||||
id="path22" />
|
||||
d="m 271.56839,982.46676 c -0.034,-2.41634 -0.0686,-4.85811 -0.0238,-7.25372 0.09,-4.81496 0.45876,-9.44196 1.99805,-13.41146 0.70815,-1.82617 1.68271,-3.52041 3.03133,-4.93981 1.0751,-1.13152 2.41806,-2.07818 3.88292,-2.74371 1.46486,-0.66552 3.02601,-1.0882 4.62759,-1.39602 3.44012,-0.6612 7.10747,-0.80391 10.39304,-1.15952 2.46787,-0.26711 4.70591,-0.66196 6.35074,-1.31545 1.06965,-0.42497 1.86275,-0.92891 2.45158,-1.55021 0.58883,-0.62129 1.08822,-1.482 1.49345,-2.60084 0.40523,-1.11885 0.70638,-2.47944 0.93114,-3.98056 0.49945,-3.33585 0.60831,-7.32241 1.1895,-11.10357 0.30414,-1.97868 0.73834,-3.91492 1.518,-5.71534 0.61874,-1.42883 1.49742,-2.76044 2.56194,-3.84 1.06452,-1.07955 2.30465,-1.93658 3.64247,-2.61149 2.88778,-1.45684 6.21944,-2.10667 9.75357,-2.43293 3.53412,-0.32626 7.28875,-0.31166 11.02315,-0.26415 0.492,0.006 0.98354,0.0132 1.47401,0.0201 v 5.10039 l -0.0359,-5.1e-4 c -2.81557,-0.0396 -5.59659,-0.0778 -5.59659,-0.0778 -6.41285,0.19559 -9.85971,0.58043 -9.85971,0.58043 -4.00029,1.33123 -5.1435,1.91463 -5.1435,1.91463 -1.80699,1.41735 -2.46835,2.21458 -2.46835,2.21458 -1.0634,2.2326 -1.46201,3.69969 -1.46201,3.69969 -0.8391,4.9537 -0.95184,8.97151 -0.95184,8.97151 -0.79549,5.71276 -1.1586,7.55271 -1.1586,7.55271 -1.26386,3.47166 -2.19295,5.13747 -2.19295,5.13747 -2.41692,2.29138 -3.60745,3.00736 -3.60745,3.00736 -3.13091,1.35336 -5.15871,1.791 -5.15871,1.791 -5.83664,0.85869 -9.79136,0.97122 -9.79136,0.97122 -4.72236,0.73101 -6.01996,1.02483 -6.01996,1.02483 -2.14885,0.779 -2.95922,1.24169 -2.95922,1.24169 -1.73921,1.51073 -2.55079,2.75354 -2.55079,2.75354 -1.75542,4.56905 -2.18247,8.70783 -2.18247,8.70783 -0.12671,6.85743 -0.0935,9.25191 -0.0594,11.67225 l 5e-4,0.0359 z"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.09540093;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path8-2"
|
||||
sodipodi:nodetypes="cssssssssssssssssccscccccccccccccccscc" />
|
||||
<path
|
||||
style="fill:#575757;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511;stroke-opacity:1"
|
||||
d="m 6.546827,21.763848 0.2344496,-0.234449 0.2344496,0.234449 0.2344496,0.23445 H 6.7812766 6.3123774 Z"
|
||||
id="path23" />
|
||||
d="m 315.53867,982.46676 c 0.56866,-3.26382 0.71472,-6.69801 1.04975,-9.79336 0.26711,-2.46787 0.66196,-4.70591 1.31544,-6.35074 0.42497,-1.06965 0.92892,-1.86275 1.55021,-2.45158 0.6213,-0.58883 1.48201,-1.08823 2.60085,-1.49345 1.11884,-0.40523 2.47943,-0.70639 3.98056,-0.93114 3.33585,-0.49945 7.32241,-0.60831 11.10357,-1.1895 0.24338,-0.0374 0.48612,-0.0768 0.72804,-0.11853 V 954.947 c -0.32137,0.0671 -0.65252,0.12937 -0.99227,0.18692 -3.27703,0.55509 -7.29483,0.66783 -11.13625,1.20274 -1.87134,0.26058 -3.7113,0.6237 -5.44713,1.25562 -1.73583,0.63193 -3.40164,1.56103 -4.72047,2.95211 -0.97255,1.02583 -1.68853,2.21637 -2.22915,3.46706 -0.81273,1.88021 -1.25037,3.90801 -1.5549,5.97793 -0.55416,3.76672 -0.66669,7.72145 -1.17617,11.01266 -0.0784,0.50627 -0.16578,0.99584 -0.26328,1.46472 z"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.09540093;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path10-3"
|
||||
sodipodi:nodetypes="cssssssccssssssscc" />
|
||||
<path
|
||||
style="fill:#575757;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511;stroke-opacity:1"
|
||||
d="m 17.861947,11.121574 -0.336135,-0.33789 2.13578,-2.1354894 2.135779,-2.135489 0.09025,0.096067 c 0.0827,0.088027 0.09025,0.1368911 0.09025,0.583812 v 0.4877446 l -1.889895,1.8895673 -1.889895,1.8895675 z"
|
||||
id="path24" />
|
||||
id="path13"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.09540093;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 242.24433,914.36362 c 5.93188,-1.18366 12.18304,-0.64248 17.9227,-2.77546 2.99045,-1.06215 5.46813,-3.40375 6.63316,-6.36102 1.97348,-4.85312 1.85987,-10.18795 2.48623,-15.30992 0.11991,-1.02993 0.26559,-2.05784 0.47767,-3.07322 h -5.19146 c -0.215,1.24914 -0.36892,2.50793 -0.49786,3.76858 -0.49119,4.23086 -0.41243,8.62265 -1.97915,12.64584 -0.67781,1.8559 -2.3263,3.16931 -4.18514,3.72589 -5.06962,1.59358 -10.4786,1.23093 -15.66615,2.18811 z"
|
||||
sodipodi:nodetypes="ccccccccccc" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 6.5877715,21.763941 0.193505,-0.193505 0.193505,0.193505 0.1935051,0.193506 H 6.7812765 6.3942664 Z"
|
||||
id="path1" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="M 7.8529991,21.088808 7.558256,20.792085 9.6516156,18.699021 c 1.1513474,-1.151185 2.1121364,-2.093064 2.1350854,-2.093064 0.02295,0 0.174361,0.133526 0.33647,0.296724 l 0.294743,0.296723 -2.09336,2.093064 c -1.1513475,1.151185 -2.1121362,2.093064 -2.1350855,2.093064 -0.022949,0 -0.1743606,-0.133526 -0.3364694,-0.296724 z"
|
||||
id="path2" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 12.847659,16.074118 -0.285957,-0.284076 2.113902,-2.114406 2.113903,-2.114406 0.316736,0.318165 0.316735,0.318166 -2.093037,2.081645 c -1.15117,1.144905 -2.116277,2.081047 -2.144681,2.080316 -0.0284,-7.31e-4 -0.180324,-0.129163 -0.337601,-0.285404 z"
|
||||
id="path3" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 17.86151,11.080298 -0.294742,-0.296722 2.118341,-2.118048 c 2.117619,-2.1173249 2.118364,-2.1180149 2.185127,-2.0226982 0.05244,0.074868 0.06679,0.1965381 0.06679,0.5664281 v 0.4710787 l -1.848677,1.8483423 c -1.016773,1.0165881 -1.867445,1.8483421 -1.890384,1.8483421 -0.02294,0 -0.174341,-0.133525 -0.33645,-0.296723 z"
|
||||
id="path4" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="M 2.8696064,6.137744 2.5334527,5.7998348 4.422634,3.9109812 6.3118152,2.0221276 H 6.804957 c 0.4607028,0 0.4989051,0.00614 0.5807596,0.093265 L 7.4733352,2.2086584 5.3395475,4.3421556 3.20576,6.475653 Z"
|
||||
id="path5" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 17.861947,21.130084 -0.336135,-0.33789 2.135779,-2.135489 2.13578,-2.135489 0.09025,0.09607 c 0.0827,0.08803 0.09025,0.136891 0.09025,0.583812 v 0.487745 l -1.889895,1.889567 -1.889895,1.889567 z"
|
||||
id="path6" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="M 7.8633763,11.131459 7.5380311,10.804194 9.6718639,8.6703613 11.805697,6.5365285 12.14262,6.8734517 12.479543,7.2103748 10.355663,9.334549 c -1.1681333,1.168296 -2.1335682,2.124174 -2.1454103,2.124174 -0.011842,0 -0.1679366,-0.147269 -0.3468764,-0.327264 z"
|
||||
id="path7" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 2.8696157,16.146264 -0.3361442,-0.3379 2.1346395,-2.134349 2.1346397,-2.134349 0.3361442,0.3379 0.3361442,0.337899 -2.1346396,2.134349 -2.1346395,2.134349 z"
|
||||
id="path8" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 2.0017021,17.218723 v -0.468899 l 0.2344496,0.23445 0.2344496,0.234449 -0.2344496,0.23445 -0.2344496,0.234449 z"
|
||||
id="path9" />
|
||||
<path
|
||||
style="fill:#949494;fill-opacity:0.74902;stroke:#575757;stroke-width:0.0408511"
|
||||
d="M 12.878117,6.137744 12.541963,5.7998348 14.431144,3.9109812 16.320326,2.0221276 h 0.493142 c 0.460702,0 0.498905,0.00614 0.580759,0.093265 l 0.08762,0.093265 -2.133788,2.1334972 -2.133787,2.1334974 z"
|
||||
id="path11" />
|
||||
<path
|
||||
style="fill:#009688;fill-opacity:1;stroke:#575757;stroke-width:0.0408511"
|
||||
d="M 6.8044173,8.9013728 C 5.8891463,8.6799894 5.1293329,7.9312103 4.8777561,7.0026907 4.7837651,6.6557878 4.7837651,6.0488929 4.8777561,5.70199 5.3133212,4.0944072 7.0721201,3.2823661 8.5576782,4.0029623 9.8573624,4.6333971 10.401452,6.2283001 9.7552143,7.513329 9.4074091,8.204932 8.7490599,8.7280789 8.0061889,8.9031641 7.6791867,8.9802341 7.1270552,8.9794111 6.8044173,8.9013741 Z M 7.7254879,7.9858114 c 0.518457,-0.097597 0.962572,-0.4436182 1.1925798,-0.929168 0.1209241,-0.2552726 0.1304428,-0.3066675 0.1304428,-0.704303 0,-0.3976356 -0.00952,-0.4490305 -0.1304428,-0.7043031 -0.6030824,-1.2731159 -2.4041171,-1.2731159 -3.0071994,0 -0.1209241,0.2552726 -0.1304429,0.3066675 -0.1304429,0.7043031 0,0.3976355 0.00952,0.4490304 0.1304429,0.704303 0.3306819,0.6980745 1.0595769,1.0713019 1.8146196,0.929168 z"
|
||||
id="path19" />
|
||||
<path
|
||||
style="fill:#009688;fill-opacity:1;stroke:#575757;stroke-width:0.0408511"
|
||||
d="M 16.935481,8.9013728 C 16.02021,8.6799894 15.260397,7.9312103 15.00882,7.0026907 c -0.09399,-0.3469029 -0.09399,-0.9537978 0,-1.3007007 0.435565,-1.6075828 2.194364,-2.4196239 3.679922,-1.6990277 1.299684,0.6304348 1.843774,2.2253378 1.197536,3.5103667 -0.347805,0.691603 -1.006154,1.2147499 -1.749025,1.3898351 -0.327003,0.07707 -0.879134,0.076247 -1.201772,-0.00179 z m 0.921071,-0.9155614 c 0.518457,-0.097597 0.962572,-0.4436182 1.192579,-0.929168 0.120924,-0.2552726 0.130443,-0.3066675 0.130443,-0.704303 0,-0.3976356 -0.0095,-0.4490305 -0.130443,-0.7043031 -0.603082,-1.2731159 -2.404117,-1.2731159 -3.007199,0 -0.120924,0.2552726 -0.130443,0.3066675 -0.130443,0.7043031 0,0.3976355 0.0095,0.4490304 0.130443,0.704303 0.330682,0.6980745 1.059577,1.0713019 1.81462,0.929168 z"
|
||||
id="path20" />
|
||||
<path
|
||||
style="fill:#009688;fill-opacity:1;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 6.8044173,19.073288 c -0.915271,-0.221384 -1.6750844,-0.970163 -1.9266612,-1.898683 -0.093991,-0.346902 -0.093991,-0.953797 0,-1.3007 0.4355651,-1.607583 2.194364,-2.419624 3.6799221,-1.699028 1.2996842,0.630435 1.8437738,2.225338 1.1975361,3.510367 -0.3478052,0.691603 -1.0061544,1.21475 -1.7490254,1.389835 -0.3270022,0.07707 -0.8791337,0.07625 -1.2017716,-0.0018 z m 0.9210706,-0.915562 c 0.518457,-0.0976 0.962572,-0.443618 1.1925798,-0.929168 0.1209241,-0.255272 0.1304428,-0.306667 0.1304428,-0.704303 0,-0.397635 -0.00952,-0.44903 -0.1304428,-0.704303 -0.6030824,-1.273116 -2.4041171,-1.273116 -3.0071994,0 -0.1209241,0.255273 -0.1304429,0.306668 -0.1304429,0.704303 0,0.397636 0.00952,0.449031 0.1304429,0.704303 0.3306819,0.698075 1.0595769,1.071302 1.8146196,0.929168 z"
|
||||
id="path25" />
|
||||
<path
|
||||
style="fill:#009688;fill-opacity:1;stroke:#575757;stroke-width:0.0408511"
|
||||
d="m 16.935481,19.073288 c -0.915271,-0.221384 -1.675084,-0.970163 -1.926661,-1.898683 -0.09399,-0.346902 -0.09399,-0.953797 0,-1.3007 0.435565,-1.607583 2.194364,-2.419624 3.679922,-1.699028 1.299684,0.630435 1.843774,2.225338 1.197536,3.510367 -0.347805,0.691603 -1.006154,1.21475 -1.749025,1.389835 -0.327003,0.07707 -0.879134,0.07625 -1.201772,-0.0018 z m 0.921071,-0.915562 c 0.518457,-0.0976 0.962572,-0.443618 1.192579,-0.929168 0.120924,-0.255272 0.130443,-0.306667 0.130443,-0.704303 0,-0.397635 -0.0095,-0.44903 -0.130443,-0.704303 -0.603082,-1.273116 -2.404117,-1.273116 -3.007199,0 -0.120924,0.255273 -0.130443,0.306668 -0.130443,0.704303 0,0.397636 0.0095,0.449031 0.130443,0.704303 0.330682,0.698075 1.059577,1.071302 1.81462,0.929168 z"
|
||||
id="path26" />
|
||||
d="m 242.24433,914.36362 z m 8.71065,-0.88529 z m 12.18589,-3.36566 z m 4.97298,-9.26881 z"
|
||||
style="fill:#009688;fill-opacity:1;stroke:#000000;stroke-width:0.09540093;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path21-2" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 9 KiB |
|
|
@ -55,8 +55,9 @@ static Polylines make_waves(double gridZ, double density_adjusted, double line_s
|
|||
std::vector<std::pair<double,double>> wave;
|
||||
{//fill one wave
|
||||
const auto v=[&](double u){return acos(a/b*cos(u));};
|
||||
for(int c=0;c<=4;++c){
|
||||
const double u=minU+2*M_PI*c/4;
|
||||
const int initialSegments=16;
|
||||
for(int c=0;c<=initialSegments;++c){
|
||||
const double u=minU+2*M_PI*c/initialSegments;
|
||||
wave.emplace_back(u,v(u));
|
||||
}
|
||||
{//refine
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue