mirror
/
osci-render
kopia lustrzana https://github.com/jameshball/osci-render
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Completed code cleanup (untested)

pull/35/head
James Ball 2020-02-11 22:26:10 +00:00
rodzic 10e0418ef4
commit b6ab9cf586
6 zmienionych plików z 2411 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1411
models/boomer.obj 100644
Wyświetl plik

Plik diff jest za duży Load Diff

40
models/cube.obj 100644
Wyświetl plik

@ -0,0 +1,40 @@
# Blender v2.81 (sub 16) OBJ File: ''
# www.blender.org
mtllib cube.mtl
o Cube
v 1.000000 1.000000 -1.000000
v 1.000000 -1.000000 -1.000000
v 1.000000 1.000000 1.000000
v 1.000000 -1.000000 1.000000
v -1.000000 1.000000 -1.000000
v -1.000000 -1.000000 -1.000000
v -1.000000 1.000000 1.000000
v -1.000000 -1.000000 1.000000
vt 0.625000 0.500000
vt 0.875000 0.500000
vt 0.875000 0.750000
vt 0.625000 0.750000
vt 0.375000 0.750000
vt 0.625000 1.000000
vt 0.375000 1.000000
vt 0.375000 0.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.375000 0.250000
vt 0.125000 0.500000
vt 0.375000 0.500000
vt 0.125000 0.750000
vn 0.0000 1.0000 0.0000
vn 0.0000 0.0000 1.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
usemtl Material
s off
f 1/1/1 5/2/1 7/3/1 3/4/1
f 4/5/2 3/4/2 7/6/2 8/7/2
f 8/8/3 7/9/3 5/10/3 6/11/3
f 6/12/4 2/13/4 4/5/4 8/14/4
f 2/13/5 1/1/5 3/4/5 4/5/5
f 6/11/6 5/10/6 1/1/6 2/13/6

954
models/machine.obj 100644
Wyświetl plik

@ -0,0 +1,954 @@
# Blender v2.81 (sub 16) OBJ File: ''
# www.blender.org
mtllib machine.mtl
o Cube.001_Cube.003
v 0.830000 1.240000 0.400000
v 0.830000 1.240000 -0.400000
v 1.230000 0.840000 0.400000
v 1.230000 1.240000 0.400000
v 1.230000 0.840000 -0.400000
v 1.230000 1.240000 -0.400000
v 0.130000 0.840000 0.400000
v 0.130000 1.240000 0.400000
v 0.130000 0.840000 -0.400000
v 0.130000 1.240000 -0.400000
v 0.530000 1.240000 0.400000
v 0.530000 1.240000 -0.400000
v 0.130000 0.140000 0.400000
v 0.130000 0.540000 0.400000
v 0.130000 0.140000 -0.400000
v 0.130000 0.540000 -0.400000
v 0.530000 0.140000 0.400000
v 0.530000 0.140000 -0.400000
v 0.830000 0.140000 0.400000
v 0.830000 0.140000 -0.400000
v 1.230000 0.140000 0.400000
v 1.230000 0.540000 0.400000
v 1.230000 0.140000 -0.400000
v 1.230000 0.540000 -0.400000
v 0.880000 0.840000 -0.400000
v 0.880000 0.840000 0.400000
v 0.830000 0.890000 -0.400000
v 0.830000 0.890000 0.400000
v 0.480000 0.840000 0.400000
v 0.480000 0.840000 -0.400000
v 0.530000 0.890000 0.400000
v 0.530000 0.890000 -0.400000
v 0.480000 0.540000 -0.400000
v 0.480000 0.540000 0.400000
v 0.530000 0.490000 -0.400000
v 0.530000 0.490000 0.400000
v 0.880000 0.540000 -0.400000
v 0.880000 0.540000 0.400000
v 0.830000 0.490000 -0.400000
v 0.830000 0.490000 0.400000
v -0.680000 1.230000 -0.400000
v -0.680000 1.230000 0.400000
v -0.572700 1.219432 -0.400000
v -0.572700 1.219432 0.400000
v -0.469524 1.188134 -0.400000
v -0.469524 1.188134 0.400000
v -0.374436 1.137308 -0.400000
v -0.374436 1.137308 0.400000
v -0.291091 1.068909 -0.400000
v -0.291091 1.068909 0.400000
v -0.222692 0.985564 -0.400000
v -0.222692 0.985564 0.400000
v -0.171866 0.890476 -0.400000
v -0.171866 0.890476 0.400000
v -0.140568 0.787300 -0.400000
v -0.140568 0.787300 0.400000
v -0.130000 0.680000 -0.400000
v -0.130000 0.680000 0.400000
v -0.140568 0.572701 -0.400000
v -0.140568 0.572700 0.400000
v -0.171866 0.469524 -0.400000
v -0.171866 0.469524 0.400000
v -0.222692 0.374437 -0.400000
v -0.222692 0.374436 0.400000
v -0.291091 0.291091 -0.400000
v -0.291091 0.291091 0.400000
v -0.374436 0.222692 -0.400000
v -0.374436 0.222692 0.400000
v -0.469524 0.171866 -0.400000
v -0.469524 0.171866 0.400000
v -0.572700 0.140568 -0.400000
v -0.572700 0.140568 0.400000
v -0.680000 0.130000 -0.400000
v -0.680000 0.130000 0.400000
v -0.787300 0.140568 -0.400000
v -0.787300 0.140568 0.400000
v -0.890476 0.171867 -0.400000
v -0.890476 0.171867 0.400000
v -0.985564 0.222692 -0.400000
v -0.985564 0.222692 0.400000
v -1.068909 0.291092 -0.400000
v -1.068909 0.291092 0.400000
v -1.137308 0.374437 -0.400000
v -1.137308 0.374437 0.400000
v -1.188134 0.469525 -0.400000
v -1.188134 0.469525 0.400000
v -1.219432 0.572701 -0.400000
v -1.219432 0.572701 0.400000
v -1.230000 0.680001 -0.400000
v -1.230000 0.680001 0.400000
v -1.219432 0.787300 -0.400000
v -1.219432 0.787300 0.400000
v -1.188133 0.890477 -0.400000
v -1.188133 0.890477 0.400000
v -1.137308 0.985564 -0.400000
v -1.137308 0.985564 0.400000
v -1.068908 1.068909 -0.400000
v -1.068908 1.068909 0.400000
v -0.985563 1.137309 -0.400000
v -0.985563 1.137309 0.400000
v -0.890475 1.188134 -0.400000
v -0.890475 1.188134 0.400000
v -0.787299 1.219432 -0.400000
v -0.787299 1.219432 0.400000
v -1.188000 -1.198000 0.400000
v -1.188000 -0.162000 0.400000
v -1.188000 -1.198000 -0.400000
v -1.188000 -0.162000 -0.400000
v -0.152000 -1.198000 0.400000
v -0.152000 -0.162000 0.400000
v -0.152000 -1.198000 -0.400000
v -0.152000 -0.162000 -0.400000
v 0.300000 -0.160000 -0.200000
v 0.300000 -0.160000 0.200000
v 0.398995 -0.201005 -0.200000
v 0.398995 -0.201005 0.200000
v 0.440000 -0.300000 -0.200000
v 0.440000 -0.300000 0.200000
v 0.398995 -0.398995 -0.200000
v 0.398995 -0.398995 0.200000
v 0.300000 -0.440000 -0.200000
v 0.300000 -0.440000 0.200000
v 0.201005 -0.398995 -0.200000
v 0.201005 -0.398995 0.200000
v 0.160000 -0.300000 -0.200000
v 0.160000 -0.300000 0.200000
v 0.201005 -0.201005 -0.200000
v 0.201005 -0.201005 0.200000
v 0.692000 -0.160000 -0.200000
v 0.692000 -0.160000 0.200000
v 0.790995 -0.201005 -0.200000
v 0.790995 -0.201005 0.200000
v 0.832000 -0.300000 -0.200000
v 0.832000 -0.300000 0.200000
v 0.790995 -0.398995 -0.200000
v 0.790995 -0.398995 0.200000
v 0.692000 -0.440000 -0.200000
v 0.692000 -0.440000 0.200000
v 0.593005 -0.398995 -0.200000
v 0.593005 -0.398995 0.200000
v 0.552000 -0.300000 -0.200000
v 0.552000 -0.300000 0.200000
v 0.593005 -0.201005 -0.200000
v 0.593005 -0.201005 0.200000
v 1.084000 -0.160000 -0.200000
v 1.084000 -0.160000 0.200000
v 1.182995 -0.201005 -0.200000
v 1.182995 -0.201005 0.200000
v 1.224000 -0.300000 -0.200000
v 1.224000 -0.300000 0.200000
v 1.182995 -0.398995 -0.200000
v 1.182995 -0.398995 0.200000
v 1.084000 -0.440000 -0.200000
v 1.084000 -0.440000 0.200000
v 0.985005 -0.398995 -0.200000
v 0.985005 -0.398995 0.200000
v 0.944000 -0.300000 -0.200000
v 0.944000 -0.300000 0.200000
v 0.985005 -0.201005 -0.200000
v 0.985005 -0.201005 0.200000
v 0.300000 -0.552000 -0.200000
v 0.300000 -0.552000 0.200000
v 0.398995 -0.593005 -0.200000
v 0.398995 -0.593005 0.200000
v 0.440000 -0.692000 -0.200000
v 0.440000 -0.692000 0.200000
v 0.398995 -0.790995 -0.200000
v 0.398995 -0.790995 0.200000
v 0.300000 -0.832000 -0.200000
v 0.300000 -0.832000 0.200000
v 0.201005 -0.790995 -0.200000
v 0.201005 -0.790995 0.200000
v 0.160000 -0.692000 -0.200000
v 0.160000 -0.692000 0.200000
v 0.201005 -0.593005 -0.200000
v 0.201005 -0.593005 0.200000
v 0.692000 -0.552000 -0.200000
v 0.692000 -0.552000 0.200000
v 0.790995 -0.593005 -0.200000
v 0.790995 -0.593005 0.200000
v 0.832000 -0.692000 -0.200000
v 0.832000 -0.692000 0.200000
v 0.790995 -0.790995 -0.200000
v 0.790995 -0.790995 0.200000
v 0.692000 -0.832000 -0.200000
v 0.692000 -0.832000 0.200000
v 0.593005 -0.790995 -0.200000
v 0.593005 -0.790995 0.200000
v 0.552000 -0.692000 -0.200000
v 0.552000 -0.692000 0.200000
v 0.593005 -0.593005 -0.200000
v 0.593005 -0.593005 0.200000
v 1.084000 -0.552000 -0.200000
v 1.084000 -0.552000 0.200000
v 1.182995 -0.593005 -0.200000
v 1.182995 -0.593005 0.200000
v 1.224000 -0.692000 -0.200000
v 1.224000 -0.692000 0.200000
v 1.182995 -0.790995 -0.200000
v 1.182995 -0.790995 0.200000
v 1.084000 -0.832000 -0.200000
v 1.084000 -0.832000 0.200000
v 0.985005 -0.790995 -0.200000
v 0.985005 -0.790995 0.200000
v 0.944000 -0.692000 -0.200000
v 0.944000 -0.692000 0.200000
v 0.985005 -0.593005 -0.200000
v 0.985005 -0.593005 0.200000
v 0.300000 -0.944000 -0.200000
v 0.300000 -0.944000 0.200000
v 0.398995 -0.985005 -0.200000
v 0.398995 -0.985005 0.200000
v 0.440000 -1.084000 -0.200000
v 0.440000 -1.084000 0.200000
v 0.398995 -1.182995 -0.200000
v 0.398995 -1.182995 0.200000
v 0.300000 -1.224000 -0.200000
v 0.300000 -1.224000 0.200000
v 0.201005 -1.182995 -0.200000
v 0.201005 -1.182995 0.200000
v 0.160000 -1.084000 -0.200000
v 0.160000 -1.084000 0.200000
v 0.201005 -0.985005 -0.200000
v 0.201005 -0.985005 0.200000
v 0.692000 -0.944000 -0.200000
v 0.692000 -0.944000 0.200000
v 0.790995 -0.985005 -0.200000
v 0.790995 -0.985005 0.200000
v 0.832000 -1.084000 -0.200000
v 0.832000 -1.084000 0.200000
v 0.790995 -1.182995 -0.200000
v 0.790995 -1.182995 0.200000
v 0.692000 -1.224000 -0.200000
v 0.692000 -1.224000 0.200000
v 0.593005 -1.182995 -0.200000
v 0.593005 -1.182995 0.200000
v 0.552000 -1.084000 -0.200000
v 0.552000 -1.084000 0.200000
v 0.593005 -0.985005 -0.200000
v 0.593005 -0.985005 0.200000
v 1.084000 -0.944000 -0.200000
v 1.084000 -0.944000 0.200000
v 1.182995 -0.985005 -0.200000
v 1.182995 -0.985005 0.200000
v 1.224000 -1.084000 -0.200000
v 1.224000 -1.084000 0.200000
v 1.182995 -1.182995 -0.200000
v 1.182995 -1.182995 0.200000
v 1.084000 -1.224000 -0.200000
v 1.084000 -1.224000 0.200000
v 0.985005 -1.182995 -0.200000
v 0.985005 -1.182995 0.200000
v 0.944000 -1.084000 -0.200000
v 0.944000 -1.084000 0.200000
v 0.985005 -0.985005 -0.200000
v 0.985005 -0.985005 0.200000
vt 0.375000 0.500000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.375000 0.750000
vt 0.875000 0.500000
vt 0.875000 0.750000
vt 0.375000 0.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.375000 0.250000
vt 0.625000 0.500000
vt 0.875000 0.500000
vt 0.875000 0.750000
vt 0.625000 0.750000
vt 0.375000 0.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.375000 0.250000
vt 0.125000 0.500000
vt 0.375000 0.500000
vt 0.375000 0.750000
vt 0.125000 0.750000
vt 0.593750 0.250000
vt 0.593750 0.000000
vt 0.375000 0.500000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.375000 0.750000
vt 0.125000 0.500000
vt 0.125000 0.750000
vt 0.656250 0.750000
vt 0.656250 0.500000
vt 0.843750 0.500000
vt 0.843750 0.750000
vt 0.406250 0.000000
vt 0.406250 0.250000
vt 0.156250 0.750000
vt 0.156250 0.500000
vt 0.343750 0.500000
vt 0.343750 0.750000
vt 0.406250 0.750000
vt 0.406250 0.500000
vt 0.593750 0.500000
vt 0.593750 0.750000
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.968750 1.000000
vt 0.968750 0.500000
vt 0.937500 1.000000
vt 0.937500 0.500000
vt 0.906250 1.000000
vt 0.906250 0.500000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.843750 1.000000
vt 0.843750 0.500000
vt 0.812500 1.000000
vt 0.812500 0.500000
vt 0.781250 1.000000
vt 0.781250 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.718750 1.000000
vt 0.718750 0.500000
vt 0.687500 1.000000
vt 0.687500 0.500000
vt 0.656250 1.000000
vt 0.656250 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.531250 1.000000
vt 0.531250 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.468750 1.000000
vt 0.468750 0.500000
vt 0.437500 1.000000
vt 0.437500 0.500000
vt 0.406250 1.000000
vt 0.406250 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.343750 1.000000
vt 0.343750 0.500000
vt 0.312500 1.000000
vt 0.312500 0.500000
vt 0.281250 1.000000
vt 0.281250 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.218750 1.000000
vt 0.218750 0.500000
vt 0.187500 1.000000
vt 0.187500 0.500000
vt 0.156250 1.000000
vt 0.156250 0.500000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.093750 1.000000
vt 0.093750 0.500000
vt 0.062500 1.000000
vt 0.062500 0.500000
vt 0.296822 0.485388
vt 0.250000 0.490000
vt 0.203179 0.485389
vt 0.158156 0.471731
vt 0.116663 0.449553
vt 0.080295 0.419706
vt 0.050447 0.383337
vt 0.028269 0.341844
vt 0.014612 0.296822
vt 0.010000 0.250000
vt 0.014611 0.203179
vt 0.028269 0.158156
vt 0.050447 0.116663
vt 0.080294 0.080294
vt 0.116663 0.050447
vt 0.158156 0.028269
vt 0.203178 0.014612
vt 0.250000 0.010000
vt 0.296822 0.014612
vt 0.341844 0.028269
vt 0.383337 0.050447
vt 0.419706 0.080294
vt 0.449553 0.116663
vt 0.471731 0.158156
vt 0.485388 0.203178
vt 0.490000 0.250000
vt 0.485388 0.296822
vt 0.471731 0.341844
vt 0.449553 0.383337
vt 0.419706 0.419706
vt 0.383337 0.449553
vt 0.341844 0.471731
vt 0.031250 1.000000
vt 0.031250 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.796822 0.485388
vt 0.841844 0.471731
vt 0.883337 0.449553
vt 0.919706 0.419706
vt 0.949553 0.383337
vt 0.971731 0.341844
vt 0.985388 0.296822
vt 0.990000 0.250000
vt 0.985388 0.203178
vt 0.971731 0.158156
vt 0.949553 0.116663
vt 0.919706 0.080294
vt 0.883337 0.050447
vt 0.841844 0.028269
vt 0.796822 0.014612
vt 0.750000 0.010000
vt 0.703178 0.014612
vt 0.658156 0.028269
vt 0.616663 0.050447
vt 0.580294 0.080294
vt 0.550447 0.116663
vt 0.528269 0.158156
vt 0.514611 0.203179
vt 0.510000 0.250000
vt 0.514612 0.296822
vt 0.528269 0.341844
vt 0.550447 0.383337
vt 0.580295 0.419706
vt 0.616663 0.449553
vt 0.658156 0.471731
vt 0.703179 0.485389
vt 0.375000 0.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.375000 0.250000
vt 0.625000 0.500000
vt 0.375000 0.500000
vt 0.625000 0.750000
vt 0.375000 0.750000
vt 0.625000 1.000000
vt 0.375000 1.000000
vt 0.125000 0.500000
vt 0.125000 0.750000
vt 0.875000 0.500000
vt 0.875000 0.750000
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vt 1.000000 0.500000
vt 1.000000 1.000000
vt 0.875000 1.000000
vt 0.875000 0.500000
vt 0.750000 1.000000
vt 0.750000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.500000
vt 0.250000 1.000000
vt 0.250000 0.500000
vt 0.419706 0.419706
vt 0.250000 0.490000
vt 0.080294 0.419706
vt 0.010000 0.250000
vt 0.080294 0.080294
vt 0.250000 0.010000
vt 0.419706 0.080294
vt 0.490000 0.250000
vt 0.125000 1.000000
vt 0.125000 0.500000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 0.750000 0.490000
vt 0.919706 0.419706
vt 0.990000 0.250000
vt 0.919706 0.080294
vt 0.750000 0.010000
vt 0.580294 0.080294
vt 0.510000 0.250000
vt 0.580294 0.419706
vn 1.0000 0.0000 0.0000
vn 0.0000 1.0000 0.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn -0.0000 0.0000 1.0000
vn 0.0000 0.0000 -1.0000
vn 0.0980 0.9952 0.0000
vn 0.2903 0.9569 0.0000
vn 0.4714 0.8819 0.0000
vn 0.6344 0.7730 0.0000
vn 0.7730 0.6344 0.0000
vn 0.8819 0.4714 0.0000
vn 0.9569 0.2903 0.0000
vn 0.9952 0.0980 0.0000
vn 0.9952 -0.0980 -0.0000
vn 0.9569 -0.2903 -0.0000
vn 0.8819 -0.4714 -0.0000
vn 0.7730 -0.6344 -0.0000
vn 0.6344 -0.7730 -0.0000
vn 0.4714 -0.8819 0.0000
vn 0.2903 -0.9569 0.0000
vn 0.0980 -0.9952 0.0000
vn -0.0980 -0.9952 0.0000
vn -0.2903 -0.9569 0.0000
vn -0.4714 -0.8819 0.0000
vn -0.6344 -0.7730 0.0000
vn -0.7730 -0.6344 -0.0000
vn -0.8819 -0.4714 0.0000
vn -0.9569 -0.2903 0.0000
vn -0.9952 -0.0980 0.0000
vn -0.9952 0.0980 0.0000
vn -0.9569 0.2903 0.0000
vn -0.8819 0.4714 0.0000
vn -0.7730 0.6344 0.0000
vn -0.6344 0.7730 0.0000
vn -0.4714 0.8819 0.0000
vn -0.2903 0.9569 0.0000
vn -0.0980 0.9952 0.0000
vn 0.3827 0.9239 0.0000
vn 0.9239 0.3827 0.0000
vn 0.9239 -0.3827 0.0000
vn 0.3827 -0.9239 -0.0000
vn -0.3827 -0.9239 -0.0000
vn -0.9239 -0.3827 0.0000
vn -0.9239 0.3827 0.0000
vn -0.3827 0.9239 0.0000
usemtl None
s off
f 5/1/1 6/2/1 4/3/1 3/4/1
f 6/2/2 2/5/2 1/6/2 4/3/2
f 7/7/3 8/8/3 10/9/3 9/10/3
f 12/11/2 10/12/2 8/13/2 11/14/2
f 13/15/3 14/16/3 16/17/3 15/18/3
f 15/19/4 18/20/4 17/21/4 13/22/4
f 9/10/4 30/23/4 29/24/4 7/7/4
f 23/25/1 24/26/1 22/27/1 21/28/1
f 20/29/4 23/25/4 21/28/4 19/30/4
f 28/31/2 27/32/2 32/33/2 31/34/2
f 14/16/2 34/35/2 33/36/2 16/17/2
f 33/36/3 34/35/3 29/24/3 30/23/3
f 36/37/4 35/38/4 39/39/4 40/40/4
f 18/20/1 35/38/1 36/37/1 17/21/1
f 38/41/1 37/42/1 25/43/1 26/44/1
f 19/30/3 40/40/3 39/39/3 20/29/3
f 24/26/2 37/42/2 38/41/2 22/27/2
f 3/4/4 26/44/4 25/43/4 5/1/4
f 11/14/1 31/34/1 32/33/1 12/11/1
f 2/5/3 27/32/3 28/31/3 1/6/3
f 4/3/5 1/6/5 28/31/5 31/34/5 11/14/5 8/13/5 7/7/5 29/24/5 34/35/5 14/16/5 13/15/5 17/21/5 36/37/5 40/40/5 19/30/5 21/28/5 22/27/5 38/41/5 26/44/5 3/4/5
f 2/5/6 6/2/6 5/1/6 25/43/6 37/42/6 24/26/6 23/25/6 20/29/6 39/39/6 35/38/6 18/20/6 15/18/6 16/17/6 33/36/6 30/23/6 9/10/6 10/12/6 12/11/6 32/33/6 27/32/6
f 41/45/7 42/46/7 44/47/7 43/48/7
f 43/48/8 44/47/8 46/49/8 45/50/8
f 45/50/9 46/49/9 48/51/9 47/52/9
f 47/52/10 48/51/10 50/53/10 49/54/10
f 49/54/11 50/53/11 52/55/11 51/56/11
f 51/56/12 52/55/12 54/57/12 53/58/12
f 53/58/13 54/57/13 56/59/13 55/60/13
f 55/60/14 56/59/14 58/61/14 57/62/14
f 57/62/15 58/61/15 60/63/15 59/64/15
f 59/64/16 60/63/16 62/65/16 61/66/16
f 61/66/17 62/65/17 64/67/17 63/68/17
f 63/68/18 64/67/18 66/69/18 65/70/18
f 65/70/19 66/69/19 68/71/19 67/72/19
f 67/72/20 68/71/20 70/73/20 69/74/20
f 69/74/21 70/73/21 72/75/21 71/76/21
f 71/76/22 72/75/22 74/77/22 73/78/22
f 73/78/23 74/77/23 76/79/23 75/80/23
f 75/80/24 76/79/24 78/81/24 77/82/24
f 77/82/25 78/81/25 80/83/25 79/84/25
f 79/84/26 80/83/26 82/85/26 81/86/26
f 81/86/27 82/85/27 84/87/27 83/88/27
f 83/88/28 84/87/28 86/89/28 85/90/28
f 85/90/29 86/89/29 88/91/29 87/92/29
f 87/92/30 88/91/30 90/93/30 89/94/30
f 89/94/31 90/93/31 92/95/31 91/96/31
f 91/96/32 92/95/32 94/97/32 93/98/32
f 93/98/33 94/97/33 96/99/33 95/100/33
f 95/100/34 96/99/34 98/101/34 97/102/34
f 97/102/35 98/101/35 100/103/35 99/104/35
f 99/104/36 100/103/36 102/105/36 101/106/36
f 44/107/5 42/108/5 104/109/5 102/110/5 100/111/5 98/112/5 96/113/5 94/114/5 92/115/5 90/116/5 88/117/5 86/118/5 84/119/5 82/120/5 80/121/5 78/122/5 76/123/5 74/124/5 72/125/5 70/126/5 68/127/5 66/128/5 64/129/5 62/130/5 60/131/5 58/132/5 56/133/5 54/134/5 52/135/5 50/136/5 48/137/5 46/138/5
f 101/106/37 102/105/37 104/139/37 103/140/37
f 103/140/38 104/139/38 42/141/38 41/142/38
f 41/143/6 43/144/6 45/145/6 47/146/6 49/147/6 51/148/6 53/149/6 55/150/6 57/151/6 59/152/6 61/153/6 63/154/6 65/155/6 67/156/6 69/157/6 71/158/6 73/159/6 75/160/6 77/161/6 79/162/6 81/163/6 83/164/6 85/165/6 87/166/6 89/167/6 91/168/6 93/169/6 95/170/6 97/171/6 99/172/6 101/173/6 103/174/6
f 105/175/3 106/176/3 108/177/3 107/178/3
f 107/178/6 108/177/6 112/179/6 111/180/6
f 111/180/1 112/179/1 110/181/1 109/182/1
f 109/182/5 110/181/5 106/183/5 105/184/5
f 107/185/4 111/180/4 109/182/4 105/186/4
f 112/179/2 108/187/2 106/188/2 110/181/2
f 113/189/39 114/190/39 116/191/39 115/192/39
f 115/192/40 116/191/40 118/193/40 117/194/40
f 117/194/41 118/193/41 120/195/41 119/196/41
f 119/196/42 120/195/42 122/197/42 121/198/42
f 121/198/43 122/197/43 124/199/43 123/200/43
f 123/200/44 124/199/44 126/201/44 125/202/44
f 116/203/5 114/204/5 128/205/5 126/206/5 124/207/5 122/208/5 120/209/5 118/210/5
f 125/202/45 126/201/45 128/211/45 127/212/45
f 127/212/46 128/211/46 114/213/46 113/214/46
f 113/215/6 115/216/6 117/217/6 119/218/6 121/219/6 123/220/6 125/221/6 127/222/6
f 129/223/39 130/224/39 132/225/39 131/226/39
f 131/226/40 132/225/40 134/227/40 133/228/40
f 133/228/41 134/227/41 136/229/41 135/230/41
f 135/230/42 136/229/42 138/231/42 137/232/42
f 137/232/43 138/231/43 140/233/43 139/234/43
f 139/234/44 140/233/44 142/235/44 141/236/44
f 132/237/5 130/238/5 144/239/5 142/240/5 140/241/5 138/242/5 136/243/5 134/244/5
f 141/236/45 142/235/45 144/245/45 143/246/45
f 143/246/46 144/245/46 130/247/46 129/248/46
f 129/249/6 131/250/6 133/251/6 135/252/6 137/253/6 139/254/6 141/255/6 143/256/6
f 145/257/39 146/258/39 148/259/39 147/260/39
f 147/260/40 148/259/40 150/261/40 149/262/40
f 149/262/41 150/261/41 152/263/41 151/264/41
f 151/264/42 152/263/42 154/265/42 153/266/42
f 153/266/43 154/265/43 156/267/43 155/268/43
f 155/268/44 156/267/44 158/269/44 157/270/44
f 148/271/5 146/272/5 160/273/5 158/274/5 156/275/5 154/276/5 152/277/5 150/278/5
f 157/270/45 158/269/45 160/279/45 159/280/45
f 159/280/46 160/279/46 146/281/46 145/282/46
f 145/283/6 147/284/6 149/285/6 151/286/6 153/287/6 155/288/6 157/289/6 159/290/6
f 161/291/39 162/292/39 164/293/39 163/294/39
f 163/294/40 164/293/40 166/295/40 165/296/40
f 165/296/41 166/295/41 168/297/41 167/298/41
f 167/298/42 168/297/42 170/299/42 169/300/42
f 169/300/43 170/299/43 172/301/43 171/302/43
f 171/302/44 172/301/44 174/303/44 173/304/44
f 164/305/5 162/306/5 176/307/5 174/308/5 172/309/5 170/310/5 168/311/5 166/312/5
f 173/304/45 174/303/45 176/313/45 175/314/45
f 175/314/46 176/313/46 162/315/46 161/316/46
f 161/317/6 163/318/6 165/319/6 167/320/6 169/321/6 171/322/6 173/323/6 175/324/6
f 177/325/39 178/326/39 180/327/39 179/328/39
f 179/328/40 180/327/40 182/329/40 181/330/40
f 181/330/41 182/329/41 184/331/41 183/332/41
f 183/332/42 184/331/42 186/333/42 185/334/42
f 185/334/43 186/333/43 188/335/43 187/336/43
f 187/336/44 188/335/44 190/337/44 189/338/44
f 180/339/5 178/340/5 192/341/5 190/342/5 188/343/5 186/344/5 184/345/5 182/346/5
f 189/338/45 190/337/45 192/347/45 191/348/45
f 191/348/46 192/347/46 178/349/46 177/350/46
f 177/351/6 179/352/6 181/353/6 183/354/6 185/355/6 187/356/6 189/357/6 191/358/6
f 193/359/39 194/360/39 196/361/39 195/362/39
f 195/362/40 196/361/40 198/363/40 197/364/40
f 197/364/41 198/363/41 200/365/41 199/366/41
f 199/366/42 200/365/42 202/367/42 201/368/42
f 201/368/43 202/367/43 204/369/43 203/370/43
f 203/370/44 204/369/44 206/371/44 205/372/44
f 196/373/5 194/374/5 208/375/5 206/376/5 204/377/5 202/378/5 200/379/5 198/380/5
f 205/372/45 206/371/45 208/381/45 207/382/45
f 207/382/46 208/381/46 194/383/46 193/384/46
f 193/385/6 195/386/6 197/387/6 199/388/6 201/389/6 203/390/6 205/391/6 207/392/6
f 209/393/39 210/394/39 212/395/39 211/396/39
f 211/396/40 212/395/40 214/397/40 213/398/40
f 213/398/41 214/397/41 216/399/41 215/400/41
f 215/400/42 216/399/42 218/401/42 217/402/42
f 217/402/43 218/401/43 220/403/43 219/404/43
f 219/404/44 220/403/44 222/405/44 221/406/44
f 212/407/5 210/408/5 224/409/5 222/410/5 220/411/5 218/412/5 216/413/5 214/414/5
f 221/406/45 222/405/45 224/415/45 223/416/45
f 223/416/46 224/415/46 210/417/46 209/418/46
f 209/419/6 211/420/6 213/421/6 215/422/6 217/423/6 219/424/6 221/425/6 223/426/6
f 225/427/39 226/428/39 228/429/39 227/430/39
f 227/430/40 228/429/40 230/431/40 229/432/40
f 229/432/41 230/431/41 232/433/41 231/434/41
f 231/434/42 232/433/42 234/435/42 233/436/42
f 233/436/43 234/435/43 236/437/43 235/438/43
f 235/438/44 236/437/44 238/439/44 237/440/44
f 228/441/5 226/442/5 240/443/5 238/444/5 236/445/5 234/446/5 232/447/5 230/448/5
f 237/440/45 238/439/45 240/449/45 239/450/45
f 239/450/46 240/449/46 226/451/46 225/452/46
f 225/453/6 227/454/6 229/455/6 231/456/6 233/457/6 235/458/6 237/459/6 239/460/6
f 241/461/39 242/462/39 244/463/39 243/464/39
f 243/464/40 244/463/40 246/465/40 245/466/40
f 245/466/41 246/465/41 248/467/41 247/468/41
f 247/468/42 248/467/42 250/469/42 249/470/42
f 249/470/43 250/469/43 252/471/43 251/472/43
f 251/472/44 252/471/44 254/473/44 253/474/44
f 244/475/5 242/476/5 256/477/5 254/478/5 252/479/5 250/480/5 248/481/5 246/482/5
f 253/474/45 254/473/45 256/483/45 255/484/45
f 255/484/46 256/483/46 242/485/46 241/486/46
f 241/487/6 243/488/6 245/489/6 247/490/6 249/491/6 251/492/6 253/493/6 255/494/6

8
src/shapes/Ellipse.java
Wyświetl plik

@ -39,7 +39,7 @@ public class Ellipse extends Shape {
}
@Override
public Shape rotate(double theta) {
public Ellipse rotate(double theta) {
if (theta + rotation > 2 * Math.PI) {
theta -= 2 * Math.PI;
}
@ -48,12 +48,12 @@ public class Ellipse extends Shape {
}
@Override
public Shape scale(double factor) {
public Ellipse scale(double factor) {
return new Ellipse(a * factor, b * factor, weight, rotation, position.scale(factor));
}
@Override
public Shape translate(Vector2 vector) {
return new Ellipse(a, b, weight, rotation, position.add(vector));
public Ellipse translate(Vector2 vector) {
return new Ellipse(a, b, weight, rotation, position.translate(vector));
}
}

2
src/shapes/Line.java
Wyświetl plik

@ -36,7 +36,7 @@ public class Line extends Shape {
@Override
public Line translate(Vector2 vector) {
return new Line(getA().add(vector), getB().add(vector));
return new Line(getA().translate(vector), getB().translate(vector));
}
@Override

2
src/shapes/Vector2.java
Wyświetl plik

@ -61,7 +61,7 @@ public class Vector2 extends Shape{
}
@Override
public Shape translate(Vector2 vector) {
public Vector2 translate(Vector2 vector) {
return new Vector2(getX() + vector.getX(), getY() + vector.getY());
}