diff --git a/Player.cpp b/Player.cpp index 6b1f5a9..1546e1c 100644 --- a/Player.cpp +++ b/Player.cpp @@ -88,7 +88,7 @@ void Player::addWeapon(std::shared_ptr weapon) { _weapons.back()->setReloadCallBack([this]() { Timeline::animate(AnimationListTag("reload_weapon"), std::make_shared(_weapons[_selectedWeapon], - 4 * Consts::PI, + -4 * Consts::PI, _weapons[_selectedWeapon]->reloadTime()/2, Animation::LoopOut::None, Animation::InterpolationType::Cos)); diff --git a/obj/ak47.obj b/obj/ak47.obj index 5876092..d04d120 100644 --- a/obj/ak47.obj +++ b/obj/ak47.obj @@ -2,14 +2,14 @@ m 001 59 39 34 255 m 002 104 105 110 255 m 003 64 64 64 255 o Cube -v 0.035068 -0.126740 0.120392 -v 0.035068 0.049771 0.120392 -v 0.035264 -0.103337 -0.285680 -v 0.035264 0.022924 -0.285680 -v -0.035068 -0.126740 0.120392 -v -0.035068 0.049771 0.120392 -v -0.034585 -0.103337 -0.285680 -v -0.034585 0.022924 -0.285680 +v -0.024207 -0.071709 -0.159259 +v -0.024207 0.104802 -0.159259 +v -0.024407 -0.048306 0.246812 +v -0.024407 0.077955 0.246812 +v 0.045930 -0.071709 -0.159259 +v 0.045930 0.104802 -0.159259 +v 0.045442 -0.048306 0.246813 +v 0.045442 0.077955 0.246813 g Cube_Cube_Material.002 usemtl Material.002 s off @@ -26,14 +26,14 @@ f 2 4 8 f 1 3 4 f 5 1 2 o Cube.001 -v 0.015972 -0.071301 -0.555060 -v 0.015972 -0.041822 -0.555060 -v 0.015972 -0.071301 -0.643495 -v 0.015972 -0.041822 -0.643495 -v -0.015972 -0.071301 -0.555060 -v -0.015972 -0.041822 -0.555060 -v -0.015972 -0.071301 -0.643495 -v -0.015972 -0.041822 -0.643495 +v -0.005117 -0.016270 0.516193 +v -0.005117 0.013209 0.516193 +v -0.005118 -0.016270 0.604628 +v -0.005118 0.013209 0.604628 +v 0.026826 -0.016270 0.516193 +v 0.026826 0.013209 0.516193 +v 0.026825 -0.016270 0.604629 +v 0.026825 0.013209 0.604629 g Cube.001_Cube.001_Material.002 usemtl Material.002 s off @@ -50,14 +50,14 @@ f 10 12 16 f 9 11 12 f 13 9 10 o Cube.002 -v 0.029415 -0.072730 -0.284520 -v 0.029415 -0.010247 -0.284520 -v 0.029415 -0.072730 -0.561148 -v 0.029415 -0.010247 -0.561148 -v -0.029415 -0.072730 -0.284520 -v -0.029415 -0.010247 -0.284520 -v -0.029415 -0.072730 -0.561148 -v -0.029415 -0.010247 -0.561148 +v -0.018558 -0.017699 0.245653 +v -0.018558 0.044784 0.245653 +v -0.018561 -0.017699 0.522281 +v -0.018561 0.044784 0.522281 +v 0.040273 -0.017699 0.245653 +v 0.040273 0.044784 0.245653 +v 0.040270 -0.017699 0.522282 +v 0.040270 0.044784 0.522282 g Cube.002_Cube.002_Material.003 usemtl Material.003 s off @@ -74,14 +74,14 @@ f 18 20 24 f 17 19 20 f 21 17 18 o Cube.003 -v -0.033922 -0.405141 -0.179085 -v -0.033922 -0.115882 -0.138360 -v -0.033922 -0.387777 -0.317041 -v -0.033922 -0.110051 -0.276315 -v 0.033922 -0.405141 -0.179085 -v 0.033922 -0.115882 -0.138360 -v 0.033922 -0.387777 -0.317041 -v 0.033922 -0.110051 -0.276315 +v 0.044780 -0.350110 0.140219 +v 0.044781 -0.060851 0.099493 +v 0.044779 -0.332746 0.278174 +v 0.044779 -0.055020 0.237449 +v -0.023064 -0.350110 0.140218 +v -0.023063 -0.060851 0.099492 +v -0.023065 -0.332746 0.278174 +v -0.023065 -0.055020 0.237448 g Cube.003_Cube.003_Material.003 usemtl Material.003 s off @@ -98,14 +98,14 @@ f 26 32 28 f 25 28 27 f 29 26 25 o Cube.004 -v 0.018424 -0.282368 -0.007315 -v 0.018424 -0.119183 -0.044863 -v 0.018424 -0.263330 0.081372 -v 0.018424 -0.123191 0.028773 -v -0.018424 -0.282368 -0.007315 -v -0.018424 -0.119183 -0.044863 -v -0.018424 -0.263330 0.081372 -v -0.018424 -0.123191 0.028773 +v -0.007564 -0.227337 -0.031552 +v -0.007565 -0.064152 0.005996 +v -0.007564 -0.208299 -0.120240 +v -0.007564 -0.068160 -0.067640 +v 0.029284 -0.227337 -0.031552 +v 0.029284 -0.064152 0.005997 +v 0.029285 -0.208299 -0.120239 +v 0.029285 -0.068160 -0.067639 g Cube.004_Cube.004_Material.003 usemtl Material.003 s off @@ -122,14 +122,14 @@ f 34 40 36 f 33 36 35 f 37 34 33 o Cube.005 -v 0.031618 -0.162150 0.492525 -v 0.031618 0.086381 0.505471 -v 0.014525 -0.076977 0.120068 -v 0.014525 0.027698 0.120009 -v -0.031618 -0.162150 0.492525 -v -0.031618 0.086381 0.505471 -v -0.014525 -0.076977 0.120068 -v -0.014525 0.027698 0.120009 +v -0.020753 -0.107119 -0.531392 +v -0.020753 0.141412 -0.544338 +v -0.003664 -0.021946 -0.158935 +v -0.003664 0.082729 -0.158876 +v 0.042483 -0.107119 -0.531391 +v 0.042483 0.141412 -0.544337 +v 0.025386 -0.021946 -0.158934 +v 0.025386 0.082729 -0.158876 g Cube.005_Cube.005_Material.001 usemtl Material.001 s off @@ -146,14 +146,14 @@ f 42 44 48 f 41 43 44 f 45 41 42 o Cube.006 -v 0.010288 -0.173633 -0.146763 -v 0.013580 -0.176261 -0.029808 -v 0.010255 -0.190279 -0.149144 -v 0.013548 -0.192908 -0.026321 -v -0.013548 -0.173593 -0.146321 -v -0.010255 -0.176221 -0.029366 -v -0.013580 -0.190240 -0.148702 -v -0.010288 -0.192868 -0.025879 +v 0.000571 -0.118602 0.107896 +v -0.002720 -0.121230 -0.009059 +v 0.000603 -0.135248 0.110277 +v -0.002688 -0.137877 -0.012546 +v 0.024406 -0.118562 0.107455 +v 0.021115 -0.121190 -0.009501 +v 0.024439 -0.135209 0.109835 +v 0.021147 -0.137837 -0.012988 g Cube.006_Cube.006_Material.002 usemtl Material.002 s off @@ -170,14 +170,14 @@ f 54 52 50 f 50 51 49 f 54 49 53 o Cube.007 -v 0.018161 -0.010612 -0.285129 -v 0.018161 0.022513 -0.285129 -v 0.018161 -0.010612 -0.437630 -v 0.018161 0.022513 -0.437630 -v -0.018161 -0.010612 -0.285129 -v -0.018161 0.022513 -0.285129 -v -0.018161 -0.010612 -0.437630 -v -0.018161 0.022513 -0.437630 +v -0.007304 0.044419 0.246262 +v -0.007304 0.077544 0.246262 +v -0.007306 0.044419 0.398763 +v -0.007306 0.077544 0.398763 +v 0.029018 0.044419 0.246262 +v 0.029018 0.077544 0.246262 +v 0.029017 0.044419 0.398763 +v 0.029017 0.077544 0.398763 g Cube.007_Cube.007_Material.001 usemtl Material.001 s off @@ -194,18 +194,18 @@ f 58 60 64 f 57 59 60 f 61 57 58 o Cube.008 -v 0.017955 0.048825 0.109364 -v 0.017955 0.044800 0.025378 -v 0.006310 0.065377 0.108571 -v 0.006310 0.061352 0.024584 -v -0.017955 0.048825 0.109364 -v -0.017955 0.044800 0.025378 -v -0.005847 0.065377 0.108571 -v -0.005847 0.061352 0.024584 -v 0.005985 0.054117 0.108571 -v -0.005985 0.054117 0.108571 -v -0.005985 0.050092 0.024584 -v 0.005985 0.050092 0.024584 +v -0.007094 0.103856 -0.148231 +v -0.007095 0.099831 -0.064245 +v 0.004551 0.120408 -0.147438 +v 0.004550 0.116383 -0.063451 +v 0.028816 0.103856 -0.148230 +v 0.028815 0.099831 -0.064244 +v 0.016708 0.120408 -0.147437 +v 0.016707 0.116383 -0.063451 +v 0.004876 0.109148 -0.147438 +v 0.016846 0.109148 -0.147437 +v 0.016845 0.105123 -0.063451 +v 0.004875 0.105123 -0.063451 g Cube.008_Cube.008_Material.003 usemtl Material.003 s off @@ -230,14 +230,14 @@ f 69 66 65 f 68 73 67 f 73 75 74 o Cube.009 -v 0.002480 -0.042568 -0.605447 -v 0.002480 -0.042702 -0.619324 -v 0.002480 0.028007 -0.608896 -v 0.002480 0.027404 -0.622773 -v -0.002480 -0.042568 -0.605447 -v -0.002480 -0.042702 -0.619324 -v -0.002480 0.028007 -0.608896 -v -0.002480 0.027404 -0.622773 +v 0.008374 0.012463 0.566580 +v 0.008374 0.012329 0.580457 +v 0.008374 0.083038 0.570030 +v 0.008374 0.082435 0.583906 +v 0.013334 0.012463 0.566580 +v 0.013334 0.012329 0.580457 +v 0.013334 0.083038 0.570030 +v 0.013334 0.082435 0.583906 g Cube.009_Cube.009_Material.003 usemtl Material.003 s off @@ -254,14 +254,14 @@ f 78 84 80 f 78 79 77 f 81 78 77 o Cube.010 -v 0.027866 -0.000667 -0.131518 -v 0.027866 -0.033649 -0.131102 -v 0.027866 -0.002420 -0.270536 -v 0.027866 -0.035403 -0.270120 -v 0.042710 -0.000667 -0.131518 -v 0.042710 -0.033649 -0.131102 -v 0.042710 -0.002420 -0.270536 -v 0.042710 -0.035403 -0.270120 +v -0.017007 0.054364 0.092651 +v -0.017007 0.021382 0.092235 +v -0.017009 0.052611 0.231668 +v -0.017009 0.019628 0.231252 +v -0.031851 0.054364 0.092651 +v -0.031851 0.021382 0.092235 +v -0.031853 0.052611 0.231668 +v -0.031853 0.019628 0.231252 g Cube.010_Cube.010_Material.003 usemtl Material.003 s off @@ -278,14 +278,14 @@ f 86 88 92 f 85 87 88 f 89 85 86 o Cube.011 -v 0.029556 -0.037273 0.058604 -v 0.029556 -0.068587 0.066782 -v 0.033219 -0.092377 -0.111469 -v 0.033219 -0.103680 -0.108517 -v 0.041020 -0.037273 0.058604 -v 0.041020 -0.068587 0.066782 -v 0.037357 -0.092377 -0.111469 -v 0.037357 -0.103680 -0.108517 +v -0.018695 0.017758 -0.097471 +v -0.018695 -0.013556 -0.105649 +v -0.022360 -0.037346 0.072602 +v -0.022360 -0.048649 0.069650 +v -0.030160 0.017758 -0.097471 +v -0.030160 -0.013556 -0.105649 +v -0.026498 -0.037346 0.072601 +v -0.026498 -0.048649 0.069650 g Cube.011_Cube.011_Material.003 usemtl Material.003 s off @@ -302,14 +302,14 @@ f 98 94 96 f 94 93 95 f 97 93 94 o Cube.012 -v 0.001472 -0.054794 -0.634165 -v 0.001472 -0.057739 -0.634165 -v 0.001472 -0.054794 -0.631221 -v 0.001472 -0.057739 -0.631221 -v -0.001472 -0.054794 -0.634165 -v -0.001472 -0.057739 -0.634165 -v -0.001472 -0.054794 -0.631221 -v -0.001472 -0.057739 -0.631221 +v 0.009382 0.000237 0.595298 +v 0.009382 -0.002708 0.595298 +v 0.009382 0.000237 0.592354 +v 0.009382 -0.002708 0.592354 +v 0.012326 0.000237 0.595298 +v 0.012326 -0.002708 0.595298 +v 0.012326 0.000237 0.592354 +v 0.012326 -0.002708 0.592354 g Cube.012_Cube.012_None usemtl None s off diff --git a/obj/gold_ak47.obj b/obj/gold_ak47.obj index ba250a7..6258d01 100644 --- a/obj/gold_ak47.obj +++ b/obj/gold_ak47.obj @@ -2,14 +2,14 @@ m 001 59 39 34 255 m 002 152 111 22 255 m 003 191 154 46 255 o Cube -v 0.035068 -0.126740 0.120392 -v 0.035068 0.049771 0.120392 -v 0.035264 -0.103337 -0.285680 -v 0.035264 0.022924 -0.285680 -v -0.035068 -0.126740 0.120392 -v -0.035068 0.049771 0.120392 -v -0.034585 -0.103337 -0.285680 -v -0.034585 0.022924 -0.285680 +v -0.024207 -0.071709 -0.159259 +v -0.024207 0.104802 -0.159259 +v -0.024407 -0.048306 0.246812 +v -0.024407 0.077955 0.246812 +v 0.045930 -0.071709 -0.159259 +v 0.045930 0.104802 -0.159259 +v 0.045442 -0.048306 0.246813 +v 0.045442 0.077955 0.246813 g Cube_Cube_Material.002 usemtl Material.002 s off @@ -26,14 +26,14 @@ f 2 4 8 f 1 3 4 f 5 1 2 o Cube.001 -v 0.015972 -0.071301 -0.555060 -v 0.015972 -0.041822 -0.555060 -v 0.015972 -0.071301 -0.643495 -v 0.015972 -0.041822 -0.643495 -v -0.015972 -0.071301 -0.555060 -v -0.015972 -0.041822 -0.555060 -v -0.015972 -0.071301 -0.643495 -v -0.015972 -0.041822 -0.643495 +v -0.005117 -0.016270 0.516193 +v -0.005117 0.013209 0.516193 +v -0.005118 -0.016270 0.604628 +v -0.005118 0.013209 0.604628 +v 0.026826 -0.016270 0.516193 +v 0.026826 0.013209 0.516193 +v 0.026825 -0.016270 0.604629 +v 0.026825 0.013209 0.604629 g Cube.001_Cube.001_Material.002 usemtl Material.002 s off @@ -50,14 +50,14 @@ f 10 12 16 f 9 11 12 f 13 9 10 o Cube.002 -v 0.029415 -0.072730 -0.284520 -v 0.029415 -0.010247 -0.284520 -v 0.029415 -0.072730 -0.561148 -v 0.029415 -0.010247 -0.561148 -v -0.029415 -0.072730 -0.284520 -v -0.029415 -0.010247 -0.284520 -v -0.029415 -0.072730 -0.561148 -v -0.029415 -0.010247 -0.561148 +v -0.018558 -0.017699 0.245653 +v -0.018558 0.044784 0.245653 +v -0.018561 -0.017699 0.522281 +v -0.018561 0.044784 0.522281 +v 0.040273 -0.017699 0.245653 +v 0.040273 0.044784 0.245653 +v 0.040270 -0.017699 0.522282 +v 0.040270 0.044784 0.522282 g Cube.002_Cube.002_Material.003 usemtl Material.003 s off @@ -74,14 +74,14 @@ f 18 20 24 f 17 19 20 f 21 17 18 o Cube.003 -v -0.033922 -0.405141 -0.179085 -v -0.033922 -0.115882 -0.138360 -v -0.033922 -0.387777 -0.317041 -v -0.033922 -0.110051 -0.276315 -v 0.033922 -0.405141 -0.179085 -v 0.033922 -0.115882 -0.138360 -v 0.033922 -0.387777 -0.317041 -v 0.033922 -0.110051 -0.276315 +v 0.044780 -0.350110 0.140219 +v 0.044781 -0.060851 0.099493 +v 0.044779 -0.332746 0.278174 +v 0.044779 -0.055020 0.237449 +v -0.023064 -0.350110 0.140218 +v -0.023063 -0.060851 0.099492 +v -0.023065 -0.332746 0.278174 +v -0.023065 -0.055020 0.237448 g Cube.003_Cube.003_Material.003 usemtl Material.003 s off @@ -98,14 +98,14 @@ f 26 32 28 f 25 28 27 f 29 26 25 o Cube.004 -v 0.018424 -0.282368 -0.007315 -v 0.018424 -0.119183 -0.044863 -v 0.018424 -0.263330 0.081372 -v 0.018424 -0.123191 0.028773 -v -0.018424 -0.282368 -0.007315 -v -0.018424 -0.119183 -0.044863 -v -0.018424 -0.263330 0.081372 -v -0.018424 -0.123191 0.028773 +v -0.007564 -0.227337 -0.031552 +v -0.007565 -0.064152 0.005996 +v -0.007564 -0.208299 -0.120240 +v -0.007564 -0.068160 -0.067640 +v 0.029284 -0.227337 -0.031552 +v 0.029284 -0.064152 0.005997 +v 0.029285 -0.208299 -0.120239 +v 0.029285 -0.068160 -0.067639 g Cube.004_Cube.004_Material.003 usemtl Material.003 s off @@ -122,14 +122,14 @@ f 34 40 36 f 33 36 35 f 37 34 33 o Cube.005 -v 0.031618 -0.162150 0.492525 -v 0.031618 0.086381 0.505471 -v 0.014525 -0.076977 0.120068 -v 0.014525 0.027698 0.120009 -v -0.031618 -0.162150 0.492525 -v -0.031618 0.086381 0.505471 -v -0.014525 -0.076977 0.120068 -v -0.014525 0.027698 0.120009 +v -0.020753 -0.107119 -0.531392 +v -0.020753 0.141412 -0.544338 +v -0.003664 -0.021946 -0.158935 +v -0.003664 0.082729 -0.158876 +v 0.042483 -0.107119 -0.531391 +v 0.042483 0.141412 -0.544337 +v 0.025386 -0.021946 -0.158934 +v 0.025386 0.082729 -0.158876 g Cube.005_Cube.005_Material.001 usemtl Material.001 s off @@ -146,14 +146,14 @@ f 42 44 48 f 41 43 44 f 45 41 42 o Cube.006 -v 0.010288 -0.173633 -0.146763 -v 0.013580 -0.176261 -0.029808 -v 0.010255 -0.190279 -0.149144 -v 0.013548 -0.192908 -0.026321 -v -0.013548 -0.173593 -0.146321 -v -0.010255 -0.176221 -0.029366 -v -0.013580 -0.190240 -0.148702 -v -0.010288 -0.192868 -0.025879 +v 0.000571 -0.118602 0.107896 +v -0.002720 -0.121230 -0.009059 +v 0.000603 -0.135248 0.110277 +v -0.002688 -0.137877 -0.012546 +v 0.024406 -0.118562 0.107455 +v 0.021115 -0.121190 -0.009501 +v 0.024439 -0.135209 0.109835 +v 0.021147 -0.137837 -0.012988 g Cube.006_Cube.006_Material.002 usemtl Material.002 s off @@ -170,14 +170,14 @@ f 54 52 50 f 50 51 49 f 54 49 53 o Cube.007 -v 0.018161 -0.010612 -0.285129 -v 0.018161 0.022513 -0.285129 -v 0.018161 -0.010612 -0.437630 -v 0.018161 0.022513 -0.437630 -v -0.018161 -0.010612 -0.285129 -v -0.018161 0.022513 -0.285129 -v -0.018161 -0.010612 -0.437630 -v -0.018161 0.022513 -0.437630 +v -0.007304 0.044419 0.246262 +v -0.007304 0.077544 0.246262 +v -0.007306 0.044419 0.398763 +v -0.007306 0.077544 0.398763 +v 0.029018 0.044419 0.246262 +v 0.029018 0.077544 0.246262 +v 0.029017 0.044419 0.398763 +v 0.029017 0.077544 0.398763 g Cube.007_Cube.007_Material.001 usemtl Material.001 s off @@ -194,18 +194,18 @@ f 58 60 64 f 57 59 60 f 61 57 58 o Cube.008 -v 0.017955 0.048825 0.109364 -v 0.017955 0.044800 0.025378 -v 0.006310 0.065377 0.108571 -v 0.006310 0.061352 0.024584 -v -0.017955 0.048825 0.109364 -v -0.017955 0.044800 0.025378 -v -0.005847 0.065377 0.108571 -v -0.005847 0.061352 0.024584 -v 0.005985 0.054117 0.108571 -v -0.005985 0.054117 0.108571 -v -0.005985 0.050092 0.024584 -v 0.005985 0.050092 0.024584 +v -0.007094 0.103856 -0.148231 +v -0.007095 0.099831 -0.064245 +v 0.004551 0.120408 -0.147438 +v 0.004550 0.116383 -0.063451 +v 0.028816 0.103856 -0.148230 +v 0.028815 0.099831 -0.064244 +v 0.016708 0.120408 -0.147437 +v 0.016707 0.116383 -0.063451 +v 0.004876 0.109148 -0.147438 +v 0.016846 0.109148 -0.147437 +v 0.016845 0.105123 -0.063451 +v 0.004875 0.105123 -0.063451 g Cube.008_Cube.008_Material.003 usemtl Material.003 s off @@ -230,14 +230,14 @@ f 69 66 65 f 68 73 67 f 73 75 74 o Cube.009 -v 0.002480 -0.042568 -0.605447 -v 0.002480 -0.042702 -0.619324 -v 0.002480 0.028007 -0.608896 -v 0.002480 0.027404 -0.622773 -v -0.002480 -0.042568 -0.605447 -v -0.002480 -0.042702 -0.619324 -v -0.002480 0.028007 -0.608896 -v -0.002480 0.027404 -0.622773 +v 0.008374 0.012463 0.566580 +v 0.008374 0.012329 0.580457 +v 0.008374 0.083038 0.570030 +v 0.008374 0.082435 0.583906 +v 0.013334 0.012463 0.566580 +v 0.013334 0.012329 0.580457 +v 0.013334 0.083038 0.570030 +v 0.013334 0.082435 0.583906 g Cube.009_Cube.009_Material.003 usemtl Material.003 s off @@ -254,14 +254,14 @@ f 78 84 80 f 78 79 77 f 81 78 77 o Cube.010 -v 0.027866 -0.000667 -0.131518 -v 0.027866 -0.033649 -0.131102 -v 0.027866 -0.002420 -0.270536 -v 0.027866 -0.035403 -0.270120 -v 0.042710 -0.000667 -0.131518 -v 0.042710 -0.033649 -0.131102 -v 0.042710 -0.002420 -0.270536 -v 0.042710 -0.035403 -0.270120 +v -0.017007 0.054364 0.092651 +v -0.017007 0.021382 0.092235 +v -0.017009 0.052611 0.231668 +v -0.017009 0.019628 0.231252 +v -0.031851 0.054364 0.092651 +v -0.031851 0.021382 0.092235 +v -0.031853 0.052611 0.231668 +v -0.031853 0.019628 0.231252 g Cube.010_Cube.010_Material.003 usemtl Material.003 s off @@ -278,14 +278,14 @@ f 86 88 92 f 85 87 88 f 89 85 86 o Cube.011 -v 0.029556 -0.037273 0.058604 -v 0.029556 -0.068587 0.066782 -v 0.033219 -0.092377 -0.111469 -v 0.033219 -0.103680 -0.108517 -v 0.041020 -0.037273 0.058604 -v 0.041020 -0.068587 0.066782 -v 0.037357 -0.092377 -0.111469 -v 0.037357 -0.103680 -0.108517 +v -0.018695 0.017758 -0.097471 +v -0.018695 -0.013556 -0.105649 +v -0.022360 -0.037346 0.072602 +v -0.022360 -0.048649 0.069650 +v -0.030160 0.017758 -0.097471 +v -0.030160 -0.013556 -0.105649 +v -0.026498 -0.037346 0.072601 +v -0.026498 -0.048649 0.069650 g Cube.011_Cube.011_Material.003 usemtl Material.003 s off @@ -302,14 +302,14 @@ f 98 94 96 f 94 93 95 f 97 93 94 o Cube.012 -v 0.001472 -0.054794 -0.634165 -v 0.001472 -0.057739 -0.634165 -v 0.001472 -0.054794 -0.631221 -v 0.001472 -0.057739 -0.631221 -v -0.001472 -0.054794 -0.634165 -v -0.001472 -0.057739 -0.634165 -v -0.001472 -0.054794 -0.631221 -v -0.001472 -0.057739 -0.631221 +v 0.009382 0.000237 0.595298 +v 0.009382 -0.002708 0.595298 +v 0.009382 0.000237 0.592354 +v 0.009382 -0.002708 0.592354 +v 0.012326 0.000237 0.595298 +v 0.012326 -0.002708 0.595298 +v 0.012326 0.000237 0.592354 +v 0.012326 -0.002708 0.592354 g Cube.012_Cube.012_None usemtl None s off diff --git a/obj/gun.obj b/obj/gun.obj index d3fd2a9..6f741d6 100644 --- a/obj/gun.obj +++ b/obj/gun.obj @@ -2,40 +2,40 @@ m 000 115 115 115 255 m 001 186 185 185 255 m 002 59 59 59 255 o Cube -v 0.023535 -0.036121 0.021633 -v 0.022901 -0.107817 0.006247 -v 0.026093 -0.201580 0.152144 -v 0.026093 -0.206303 0.060939 -v -0.021545 -0.034506 0.021814 -v -0.022016 -0.108958 0.006247 -v -0.026668 -0.201580 0.152144 -v -0.026668 -0.206303 0.060939 -v 0.029438 -0.071857 0.012911 -v -0.026668 -0.205387 0.107356 -v 0.026093 -0.205387 0.103030 -v -0.028368 -0.072325 0.012248 -v -0.000288 -0.123595 0.003225 -v -0.000288 -0.201580 0.152144 -v -0.000288 -0.206303 0.060939 -v -0.000288 -0.020320 0.027159 -v -0.000288 -0.069816 0.016020 -v -0.000288 -0.205387 0.103030 -v -0.020384 -0.135676 0.041450 -v 0.020801 -0.070176 0.094145 -v -0.020187 -0.069557 0.094430 -v 0.020536 -0.135222 0.041600 -v 0.023274 -0.103063 0.071567 -v -0.023045 -0.103162 0.071242 -v -0.000230 -0.141100 0.038322 -v -0.000230 -0.064619 0.098422 -v -0.023477 -0.167453 0.054170 -v 0.023406 -0.134301 0.141551 -v 0.024662 -0.148267 0.096099 -v -0.000258 -0.170207 0.052582 -v -0.000258 -0.131479 0.143723 -v -0.023377 -0.133987 0.141696 -v 0.023271 -0.167223 0.054246 -v -0.024828 -0.148317 0.095934 +v -0.024252 0.023934 -0.086526 +v -0.023618 -0.047762 -0.071141 +v -0.026816 -0.141525 -0.217037 +v -0.026812 -0.146248 -0.125833 +v 0.020828 0.025550 -0.086710 +v 0.021300 -0.048903 -0.071143 +v 0.025944 -0.141525 -0.217040 +v 0.025949 -0.146248 -0.125835 +v -0.030155 -0.011802 -0.077804 +v 0.025946 -0.145332 -0.172253 +v -0.026814 -0.145332 -0.167923 +v 0.027652 -0.012270 -0.077145 +v -0.000429 -0.063540 -0.068120 +v -0.000436 -0.141525 -0.217039 +v -0.000432 -0.146248 -0.125834 +v -0.000430 0.039735 -0.092054 +v -0.000429 -0.009761 -0.080915 +v -0.000434 -0.145332 -0.167925 +v 0.019666 -0.075621 -0.106346 +v -0.021522 -0.010121 -0.159039 +v 0.019466 -0.009502 -0.159326 +v -0.021254 -0.075167 -0.106494 +v -0.023994 -0.043008 -0.136460 +v 0.022326 -0.043107 -0.136138 +v -0.000488 -0.081045 -0.103217 +v -0.000491 -0.004563 -0.163317 +v 0.022759 -0.107398 -0.119066 +v -0.024129 -0.074246 -0.206445 +v -0.025383 -0.088212 -0.160993 +v -0.000460 -0.110152 -0.117477 +v -0.000465 -0.071424 -0.208618 +v 0.022654 -0.073932 -0.206592 +v -0.023990 -0.107168 -0.119140 +v 0.024108 -0.088262 -0.160830 g Cube_Cube_Material.000 usemtl Material.000 s off @@ -104,22 +104,22 @@ f 23 20 28 f 22 33 30 f 21 32 31 o Cylinder -v -0.000288 -0.126129 0.005883 -v 0.024507 -0.110324 0.009499 -v 0.031201 -0.072167 0.016175 -v 0.024507 -0.034010 0.025922 -v -0.000288 -0.018205 0.032652 -v -0.023670 -0.034010 0.025922 -v -0.030364 -0.072167 0.016175 -v -0.023670 -0.110324 0.009499 -v -0.000288 -0.102348 -0.042581 -v 0.037869 -0.086543 -0.042581 -v 0.038843 -0.048386 -0.042581 -v 0.026782 -0.008569 -0.041029 -v -0.000288 0.002526 -0.041616 -v -0.038444 -0.010230 -0.042581 -v -0.054249 -0.048386 -0.042581 -v -0.038444 -0.086543 -0.042581 +v -0.000429 -0.066073 -0.070777 +v -0.025224 -0.050268 -0.074393 +v -0.031918 -0.012112 -0.081069 +v -0.025225 0.026045 -0.090815 +v -0.000430 0.041850 -0.097547 +v 0.022953 0.026045 -0.090818 +v 0.029647 -0.012112 -0.081072 +v 0.022953 -0.050268 -0.074395 +v -0.000426 -0.042293 -0.022314 +v -0.038583 -0.026488 -0.022312 +v -0.039557 0.011669 -0.022312 +v -0.027496 0.051486 -0.023865 +v -0.000426 0.062581 -0.023279 +v 0.037730 0.049826 -0.022315 +v 0.053535 0.011669 -0.022316 +v 0.037730 -0.026488 -0.022316 g Cylinder_Cylinder_Material.001 usemtl Material.001 s off @@ -152,30 +152,30 @@ f 45 46 38 f 44 45 37 f 43 44 36 o Cylinder.001 -v -0.001395 -0.110118 -0.020438 -v -0.001395 -0.128137 -0.134721 -v 0.029847 -0.097177 -0.020438 -v 0.042587 -0.109919 -0.134721 -v 0.042788 -0.065935 -0.020438 -v 0.060805 -0.065936 -0.134721 -v 0.029847 -0.034693 -0.020439 -v 0.042587 -0.021954 -0.134722 -v -0.001395 -0.021752 -0.020439 -v -0.001395 -0.003736 -0.134722 -v -0.032638 -0.034693 -0.020439 -v -0.045378 -0.021954 -0.134722 -v -0.045579 -0.065935 -0.020438 -v -0.063596 -0.065936 -0.134721 -v -0.032638 -0.097177 -0.020438 -v -0.045378 -0.109919 -0.134721 -v -0.001395 -0.128136 -0.039121 -v 0.042587 -0.109918 -0.039121 -v 0.060805 -0.065936 -0.039122 -v 0.042587 -0.021953 -0.039122 -v -0.001395 -0.003735 -0.039122 -v -0.045378 -0.021953 -0.039122 -v -0.063596 -0.065936 -0.039122 -v -0.045378 -0.109918 -0.039121 +v 0.000680 -0.050063 -0.044457 +v 0.000686 -0.068082 0.069826 +v -0.030562 -0.037122 -0.044455 +v -0.043296 -0.049864 0.069828 +v -0.043503 -0.005880 -0.044454 +v -0.061514 -0.005881 0.069829 +v -0.030562 0.025362 -0.044455 +v -0.043296 0.038101 0.069829 +v 0.000680 0.038303 -0.044456 +v 0.000686 0.056320 0.069827 +v 0.031923 0.025362 -0.044458 +v 0.044669 0.038101 0.069824 +v 0.044864 -0.005880 -0.044459 +v 0.062887 -0.005881 0.069823 +v 0.031923 -0.037122 -0.044458 +v 0.044669 -0.049864 0.069824 +v 0.000681 -0.068081 -0.025774 +v -0.043301 -0.049863 -0.025771 +v -0.061519 -0.005880 -0.025770 +v -0.043301 0.038102 -0.025771 +v 0.000681 0.056320 -0.025773 +v 0.044664 0.038102 -0.025775 +v 0.062882 -0.005880 -0.025776 +v 0.044664 -0.049863 -0.025776 g Cylinder.001_Cylinder.001_Material.000 usemtl Material.000 s off @@ -224,22 +224,22 @@ f 55 69 70 f 53 68 69 f 51 67 68 o Cylinder.002 -v -0.000141 -0.076097 -0.040510 -v -0.000141 -0.076100 -0.294521 -v 0.027999 -0.064441 -0.040510 -v 0.027999 -0.064444 -0.294521 -v 0.039655 -0.036301 -0.040510 -v 0.039655 -0.036304 -0.294521 -v 0.027999 -0.008161 -0.040511 -v 0.027999 -0.008164 -0.294521 -v -0.000141 0.003495 -0.040511 -v -0.000141 0.003492 -0.294522 -v -0.028281 -0.008161 -0.040511 -v -0.028281 -0.008164 -0.294521 -v -0.039937 -0.036301 -0.040510 -v -0.039937 -0.036304 -0.294521 -v -0.028281 -0.064441 -0.040510 -v -0.028281 -0.064444 -0.294521 +v -0.000573 -0.016042 -0.024385 +v -0.000560 -0.016045 0.229626 +v -0.028713 -0.004386 -0.024383 +v -0.028700 -0.004389 0.229628 +v -0.040369 0.023754 -0.024383 +v -0.040356 0.023751 0.229628 +v -0.028713 0.051894 -0.024383 +v -0.028700 0.051891 0.229628 +v -0.000573 0.063550 -0.024384 +v -0.000560 0.063547 0.229627 +v 0.027567 0.051894 -0.024386 +v 0.027580 0.051891 0.229625 +v 0.039223 0.023754 -0.024387 +v 0.039236 0.023751 0.229624 +v 0.027567 -0.004386 -0.024386 +v 0.027580 -0.004389 0.229625 g Cylinder.002_Cylinder.002_Material.001 usemtl Material.001 s off @@ -272,18 +272,18 @@ f 81 83 85 f 85 87 89 f 89 77 81 o Cube.001 -v -0.012509 -0.110251 -0.131221 -v -0.012509 -0.070036 -0.131221 -v -0.012509 -0.110251 -0.166845 -v -0.012509 -0.070036 -0.176763 -v 0.011934 -0.110251 -0.131221 -v 0.011934 -0.070036 -0.131221 -v 0.011934 -0.110251 -0.166845 -v 0.011934 -0.070036 -0.176763 -v -0.012509 -0.115668 -0.143661 -v -0.012509 -0.070036 -0.153992 -v 0.011934 -0.115668 -0.143661 -v 0.011934 -0.070036 -0.153992 +v 0.011799 -0.050196 0.066325 +v 0.011799 -0.009981 0.066325 +v 0.011801 -0.050196 0.101949 +v 0.011802 -0.009981 0.111867 +v -0.012643 -0.050196 0.066326 +v -0.012643 -0.009981 0.066326 +v -0.012641 -0.050196 0.101951 +v -0.012641 -0.009981 0.111869 +v 0.011800 -0.055613 0.078765 +v 0.011801 -0.009981 0.089096 +v -0.012642 -0.055613 0.078767 +v -0.012642 -0.009981 0.089098 g Cube.001_Cube.001_Material.000 usemtl Material.000 s off @@ -308,42 +308,42 @@ f 97 101 99 f 97 98 102 f 91 92 100 o Cube.002 -v -0.009458 -0.110967 -0.145988 -v -0.009458 -0.104704 0.001653 -v -0.009458 -0.113285 -0.136664 -v -0.009458 -0.113869 -0.001234 -v 0.008883 -0.110967 -0.145988 -v 0.008883 -0.104704 0.001653 -v 0.008883 -0.113285 -0.136664 -v 0.008883 -0.113869 -0.001234 -v -0.009458 -0.163779 -0.127156 -v -0.009458 -0.156391 -0.121012 -v 0.008883 -0.156391 -0.121012 -v 0.008883 -0.163779 -0.127156 -v -0.009458 -0.134501 -0.136397 -v 0.008883 -0.134501 -0.136397 -v 0.008883 -0.138516 -0.145126 -v -0.009458 -0.138516 -0.145126 -v -0.009458 -0.181773 -0.084442 -v -0.009458 -0.172181 -0.083877 -v 0.008883 -0.172181 -0.083877 -v 0.008883 -0.181773 -0.084442 -v -0.009458 -0.132024 0.015603 -v -0.009458 -0.134526 0.006325 -v 0.008883 -0.134526 0.006325 -v 0.008883 -0.132024 0.015603 -v -0.009458 -0.142144 0.003953 -v 0.008883 -0.142144 0.003953 -v 0.008883 -0.142359 0.013413 -v -0.009458 -0.142359 0.013413 -v -0.009458 -0.163832 -0.007926 -v 0.008883 -0.163832 -0.007926 -v 0.008883 -0.169465 -0.002494 -v -0.009458 -0.169465 -0.002494 -v -0.009458 -0.174870 -0.040072 -v 0.008883 -0.174870 -0.040072 -v 0.008883 -0.183512 -0.037639 -v -0.009458 -0.183512 -0.037639 +v 0.008749 -0.050911 0.081093 +v 0.008742 -0.044649 -0.066548 +v 0.008749 -0.053230 0.071768 +v 0.008742 -0.053814 -0.063661 +v -0.009591 -0.050911 0.081094 +v -0.009599 -0.044649 -0.066547 +v -0.009592 -0.053230 0.071769 +v -0.009599 -0.053814 -0.063660 +v 0.008748 -0.103724 0.062261 +v 0.008748 -0.096336 0.056117 +v -0.009593 -0.096336 0.056118 +v -0.009592 -0.103724 0.062262 +v 0.008749 -0.074446 0.071501 +v -0.009592 -0.074446 0.071502 +v -0.009592 -0.078461 0.080232 +v 0.008749 -0.078461 0.080231 +v 0.008746 -0.121718 0.019546 +v 0.008746 -0.112126 0.018982 +v -0.009595 -0.112126 0.018983 +v -0.009595 -0.121718 0.019547 +v 0.008741 -0.071969 -0.080498 +v 0.008742 -0.074470 -0.071221 +v -0.009599 -0.074470 -0.071220 +v -0.009600 -0.071969 -0.080497 +v 0.008742 -0.082089 -0.068848 +v -0.009599 -0.082089 -0.068847 +v -0.009600 -0.082304 -0.078308 +v 0.008741 -0.082304 -0.078308 +v 0.008742 -0.103777 -0.056970 +v -0.009599 -0.103777 -0.056969 +v -0.009599 -0.109410 -0.062400 +v 0.008742 -0.109410 -0.062401 +v 0.008744 -0.114815 -0.024823 +v -0.009597 -0.114815 -0.024822 +v -0.009597 -0.123457 -0.027256 +v 0.008744 -0.123457 -0.027257 g Cube.002_Cube.002_Material.002 usemtl Material.002 s off @@ -416,18 +416,18 @@ f 135 136 121 f 136 137 122 f 137 138 119 o Cube.003 -v -0.006951 -0.110378 -0.018757 -v -0.005296 -0.164689 -0.053883 -v 0.006375 -0.110379 -0.018756 -v 0.003874 -0.164690 -0.053882 -v -0.006950 -0.108206 -0.026581 -v -0.005296 -0.159427 -0.055762 -v 0.006376 -0.108206 -0.026579 -v 0.003875 -0.159428 -0.055762 -v -0.007374 -0.143919 -0.030534 -v 0.005952 -0.143920 -0.030533 -v 0.005953 -0.138900 -0.036915 -v -0.007373 -0.138900 -0.036916 +v 0.006236 -0.050323 -0.046138 +v 0.004583 -0.104634 -0.011012 +v -0.007090 -0.050324 -0.046139 +v -0.004588 -0.104635 -0.011012 +v 0.006235 -0.048151 -0.038315 +v 0.004582 -0.099372 -0.009133 +v -0.007090 -0.048151 -0.038315 +v -0.004588 -0.099373 -0.009132 +v 0.006659 -0.083864 -0.034361 +v -0.006666 -0.083865 -0.034361 +v -0.006667 -0.078845 -0.027979 +v 0.006659 -0.078844 -0.027979 g Cube.003_Cube.003_Material.002 usemtl Material.002 s off @@ -452,18 +452,18 @@ f 149 150 143 f 148 149 145 f 139 147 148 o Cube.004 -v -0.009356 -0.016243 -0.013791 -v -0.006530 0.012927 0.039965 -v 0.008487 -0.016243 -0.013792 -v 0.004235 0.012927 0.039965 -v -0.009355 -0.024125 -0.000703 -v -0.006529 0.004474 0.042437 -v 0.008488 -0.024124 -0.000704 -v 0.004236 0.004474 0.042437 -v -0.009923 0.004393 0.001909 -v 0.007920 0.004393 0.001908 -v 0.007921 -0.003931 0.014664 -v -0.009921 -0.003931 0.014665 +v 0.008641 0.043812 -0.051105 +v 0.005812 0.072982 -0.104861 +v -0.009202 0.043813 -0.051103 +v -0.004953 0.072982 -0.104860 +v 0.008639 0.035930 -0.064192 +v 0.005811 0.064529 -0.107332 +v -0.009204 0.035931 -0.064190 +v -0.004954 0.064529 -0.107332 +v 0.009206 0.064448 -0.066805 +v -0.008636 0.064448 -0.066803 +v -0.008638 0.056124 -0.079558 +v 0.009205 0.056124 -0.079561 g Cube.004_Cube.004_Material.000 usemtl Material.000 s off @@ -488,22 +488,22 @@ f 161 162 155 f 160 161 157 f 151 159 160 o Cube.005 -v 0.001794 0.013397 -0.280971 -v 0.008404 -0.001078 -0.280971 -v 0.001794 0.013397 -0.239773 -v 0.008404 -0.001078 -0.239773 -v -0.002632 0.013397 -0.280971 -v -0.008979 -0.001078 -0.280971 -v -0.002632 0.013397 -0.239773 -v -0.008979 -0.001078 -0.239773 -v -0.002343 0.006316 -0.239773 -v -0.002343 -0.001078 -0.239773 -v -0.002343 0.006316 -0.280971 -v -0.002343 -0.001078 -0.280971 -v 0.002003 0.006316 -0.239773 -v 0.002003 -0.001078 -0.280971 -v 0.002003 -0.001078 -0.239773 -v 0.002003 0.006316 -0.280971 +v -0.002470 0.077137 0.216076 +v -0.009079 0.062662 0.216076 +v -0.002472 0.077137 0.174878 +v -0.009082 0.062662 0.174879 +v 0.001956 0.077137 0.216076 +v 0.008303 0.062662 0.216075 +v 0.001954 0.077137 0.174878 +v 0.008301 0.062662 0.174878 +v 0.001665 0.070057 0.174878 +v 0.001665 0.062662 0.174878 +v 0.001667 0.070057 0.216076 +v 0.001667 0.062662 0.216076 +v -0.002681 0.070057 0.174878 +v -0.002679 0.062662 0.216076 +v -0.002681 0.062662 0.174878 +v -0.002679 0.070057 0.216076 g Cube.005_Cube.005_Material.000 usemtl Material.000 s off @@ -536,14 +536,14 @@ f 175 163 178 f 177 174 176 f 174 178 176 o fire_place_Cube.006 -v 0.002426 -0.031464 -0.288838 -v 0.002426 -0.036315 -0.288838 -v 0.002426 -0.031464 -0.283986 -v 0.002426 -0.036315 -0.283986 -v -0.002426 -0.031464 -0.288838 -v -0.002426 -0.036315 -0.288838 -v -0.002426 -0.031464 -0.283986 -v -0.002426 -0.036315 -0.283986 +v -0.003127 0.028591 0.223943 +v -0.003127 0.023740 0.223943 +v -0.003127 0.028591 0.219092 +v -0.003127 0.023740 0.219092 +v 0.001724 0.028591 0.223943 +v 0.001724 0.023740 0.223943 +v 0.001724 0.028591 0.219091 +v 0.001724 0.023740 0.219091 g fire_place_Cube.006_None usemtl None s off diff --git a/obj/rifle.obj b/obj/rifle.obj index 0fc9577..01cb57d 100644 --- a/obj/rifle.obj +++ b/obj/rifle.obj @@ -1,30 +1,30 @@ m 000 122 122 122 255 m 001 65 65 65 255 o Cube -v -0.000009 0.082987 -0.980972 -v 0.082987 0.000009 -0.980972 -v -0.000003 -0.054465 0.239402 -v 0.023923 -0.053682 0.257009 -v -0.082987 -0.000009 -0.980972 -v 0.000009 -0.082987 -0.980972 -v -0.023923 -0.053681 0.257014 -v 0.000003 -0.052874 0.275151 -v 0.000009 -0.080995 0.545116 -v -0.000009 0.086524 0.662508 -v -0.082987 -0.022335 0.603805 -v 0.082987 -0.022322 0.603819 -v 0.000009 -0.178469 0.506316 -v -0.000009 -0.266415 0.625854 -v -0.082987 -0.227338 0.561148 -v 0.082987 -0.227351 0.561162 -v -0.082987 -0.000009 0.506695 -v 0.082987 0.000009 0.506695 -v 0.000009 -0.082987 0.506695 -v -0.000009 0.082987 0.506695 -v 0.000009 -0.159592 0.361330 -v -0.000009 -0.247885 0.273893 -v -0.082987 -0.206522 0.314855 -v 0.082987 -0.206535 0.314842 +v 0.001885 0.082987 0.933810 +v -0.081111 0.000009 0.933814 +v 0.001827 -0.054465 -0.286563 +v -0.022099 -0.053682 -0.304169 +v 0.084863 -0.000009 0.933807 +v 0.001867 -0.082987 0.933810 +v 0.025747 -0.053681 -0.304177 +v 0.001820 -0.052874 -0.322313 +v 0.001802 -0.080995 -0.592278 +v 0.001816 0.086524 -0.709669 +v 0.084796 -0.022335 -0.650970 +v -0.081178 -0.022322 -0.650977 +v 0.001804 -0.178469 -0.553477 +v 0.001818 -0.266415 -0.673016 +v 0.084798 -0.227338 -0.608313 +v -0.081176 -0.227351 -0.608319 +v 0.084801 -0.000009 -0.553860 +v -0.081174 0.000009 -0.553853 +v 0.001804 -0.082987 -0.553857 +v 0.001823 0.082987 -0.553857 +v 0.001810 -0.159592 -0.408492 +v 0.001832 -0.247885 -0.321054 +v 0.084809 -0.206522 -0.362020 +v -0.081166 -0.206535 -0.362000 g Cube_Cube_Material.000 usemtl Material.000 s off @@ -73,14 +73,14 @@ f 16 14 22 f 13 16 24 f 15 23 22 o Cube.001_Cube.014 -v 0.059431 -0.022317 -0.504232 -v 0.059431 -0.171069 -0.483023 -v 0.059431 -0.022317 -0.174163 -v 0.059431 -0.212921 -0.174163 -v -0.059431 -0.022317 -0.504232 -v -0.059431 -0.171069 -0.483023 -v -0.059431 -0.022317 -0.174163 -v -0.059431 -0.212921 -0.174163 +v -0.057575 -0.022317 0.457073 +v -0.057576 -0.171069 0.435865 +v -0.057589 -0.022317 0.127004 +v -0.057589 -0.212921 0.127004 +v 0.061287 -0.022317 0.457068 +v 0.061286 -0.171069 0.435860 +v 0.061273 -0.022317 0.126999 +v 0.061273 -0.212921 0.126999 g Cube.001_Cube.014_Material.001 usemtl Material.001 s off @@ -97,14 +97,14 @@ f 30 25 26 f 31 25 29 f 28 30 26 o Cube.002_Cube.015 -v -0.040996 -0.039642 0.038206 -v -0.040996 -0.120081 0.017555 -v -0.040982 -0.039642 -0.177265 -v -0.040982 -0.148946 -0.177265 -v 0.040982 -0.039642 0.038215 -v 0.040982 -0.120081 0.017564 -v 0.040996 -0.039642 -0.177256 -v 0.040996 -0.148946 -0.177256 +v 0.042829 -0.039642 -0.085369 +v 0.042830 -0.120081 -0.064718 +v 0.042824 -0.039642 0.130102 +v 0.042824 -0.148946 0.130102 +v -0.039149 -0.039642 -0.085375 +v -0.039148 -0.120081 -0.064724 +v -0.039154 -0.039642 0.130096 +v -0.039154 -0.148946 0.130096 g Cube.002_Cube.015_Material.001 usemtl Material.001 s off @@ -121,14 +121,14 @@ f 38 33 34 f 39 33 37 f 40 34 36 o Cube.003_Cube.016 -v -0.026734 -0.307684 0.100429 -v -0.026734 -0.094102 0.003782 -v -0.026734 -0.311346 -0.011382 -v -0.026734 -0.112165 -0.101512 -v 0.026734 -0.307684 0.100429 -v 0.026734 -0.094102 0.003782 -v 0.026734 -0.311346 -0.011382 -v 0.026734 -0.112165 -0.101512 +v 0.028564 -0.307684 -0.147592 +v 0.028568 -0.094102 -0.050945 +v 0.028569 -0.311346 -0.035781 +v 0.028573 -0.112165 0.054349 +v -0.024904 -0.307684 -0.147590 +v -0.024900 -0.094102 -0.050943 +v -0.024899 -0.311346 -0.035779 +v -0.024895 -0.112165 0.054352 g Cube.003_Cube.016_Material.000 usemtl Material.000 s off @@ -145,14 +145,14 @@ f 46 42 41 f 47 45 41 f 44 42 46 o Cube.004_Cube.017 -v 0.043114 -0.113834 -0.468515 -v 0.043114 -0.290583 -0.453129 -v 0.043114 -0.141307 -0.198949 -v 0.043114 -0.320945 -0.198949 -v -0.043114 -0.113834 -0.468515 -v -0.043114 -0.290583 -0.453129 -v -0.043114 -0.141307 -0.198949 -v -0.043114 -0.320945 -0.198949 +v -0.041260 -0.113834 0.421355 +v -0.041261 -0.290583 0.405969 +v -0.041272 -0.141307 0.151790 +v -0.041272 -0.320945 0.151790 +v 0.044969 -0.113834 0.421352 +v 0.044968 -0.290583 0.405966 +v 0.044957 -0.141307 0.151786 +v 0.044957 -0.320945 0.151786 g Cube.004_Cube.017_Material.000 usemtl Material.000 s off @@ -169,14 +169,14 @@ f 54 49 50 f 55 49 53 f 52 54 50 o Cube.005_Cube.018 -v 0.000002 0.037245 -1.298118 -v 0.037245 -0.000002 -1.298118 -v 0.000002 0.037245 -0.965060 -v 0.037245 -0.000002 -0.965060 -v -0.037245 0.000002 -1.298118 -v -0.000002 -0.037245 -1.298118 -v -0.037245 0.000002 -0.965060 -v -0.000002 -0.037245 -0.965060 +v 0.001887 0.037245 1.250957 +v -0.035355 -0.000002 1.250958 +v 0.001873 0.037245 0.917899 +v -0.035369 -0.000002 0.917900 +v 0.039134 0.000002 1.250955 +v 0.001891 -0.037245 1.250957 +v 0.039120 0.000002 0.917897 +v 0.001877 -0.037245 0.917899 g Cube.005_Cube.018_Material.001 usemtl Material.001 s off @@ -193,14 +193,14 @@ f 62 57 58 f 63 57 61 f 60 62 58 o Cube.006_Cube.019 -v 0.000003 0.053070 -1.427776 -v 0.053070 -0.000003 -1.427776 -v 0.000003 0.053070 -1.284151 -v 0.053070 -0.000003 -1.284151 -v -0.053070 0.000003 -1.427776 -v -0.000003 -0.053070 -1.427776 -v -0.053070 0.000003 -1.284151 -v -0.000003 -0.053070 -1.284151 +v 0.001892 0.053070 1.380614 +v -0.051175 -0.000003 1.380616 +v 0.001886 0.053070 1.236989 +v -0.051181 -0.000003 1.236991 +v 0.054965 0.000003 1.380612 +v 0.001897 -0.053070 1.380614 +v 0.054959 0.000003 1.236987 +v 0.001891 -0.053070 1.236989 g Cube.006_Cube.019_Material.000 usemtl Material.000 s off @@ -217,30 +217,30 @@ f 70 65 66 f 71 65 69 f 68 70 66 o Cube.007_Cube.020 -v 0.000003 0.212243 -0.700428 -v 0.061770 0.150470 -0.700428 -v 0.000002 0.195325 0.010027 -v 0.044852 0.150471 0.010027 -v -0.061770 0.150476 -0.700428 -v -0.000003 0.088703 -0.700428 -v -0.044852 0.150475 0.010027 -v -0.000002 0.105621 0.010027 -v 0.000001 0.176931 -0.192956 -v 0.026458 0.150472 -0.192956 -v -0.026458 0.150474 -0.192956 -v -0.000001 0.124015 -0.192956 -v 0.000001 0.176931 -0.436202 -v -0.000001 0.124015 -0.436202 -v 0.026458 0.150472 -0.436202 -v -0.026458 0.150474 -0.436202 -v 0.044852 0.150471 -0.132386 -v -0.044852 0.150475 -0.132386 -v 0.000002 0.195325 -0.132386 -v -0.000002 0.105621 -0.132386 -v 0.000003 0.212243 -0.501794 -v -0.000003 0.088703 -0.501794 -v 0.061770 0.150470 -0.501794 -v -0.061770 0.150476 -0.501794 +v 0.001861 0.212243 0.653267 +v -0.059906 0.150470 0.653269 +v 0.001832 0.195325 -0.057189 +v -0.043018 0.150471 -0.057187 +v 0.063634 0.150476 0.653264 +v 0.001867 0.088703 0.653267 +v 0.046686 0.150475 -0.057190 +v 0.001836 0.105621 -0.057189 +v 0.001841 0.176931 0.145795 +v -0.024615 0.150472 0.145796 +v 0.028300 0.150474 0.145794 +v 0.001844 0.124015 0.145795 +v 0.001852 0.176931 0.389041 +v 0.001854 0.124015 0.389041 +v -0.024605 0.150472 0.389042 +v 0.028310 0.150474 0.389040 +v -0.043012 0.150471 0.085227 +v 0.046692 0.150475 0.085223 +v 0.001838 0.195325 0.085225 +v 0.001842 0.105621 0.085225 +v 0.001853 0.212243 0.454632 +v 0.001859 0.088703 0.454632 +v -0.059914 0.150470 0.454635 +v 0.063626 0.150476 0.454629 g Cube.007_Cube.020_Material.000 usemtl Material.000 s off @@ -289,14 +289,14 @@ f 86 95 87 f 88 93 96 f 86 96 94 o Cube.008_Cube.021 -v -0.008906 0.058733 -0.222896 -v -0.008906 0.136208 -0.222896 -v -0.008906 0.058733 -0.240245 -v -0.008906 0.136208 -0.240245 -v 0.008906 0.058733 -0.222896 -v 0.008906 0.136208 -0.222896 -v 0.008906 0.058733 -0.240245 -v 0.008906 0.136208 -0.240245 +v 0.010750 0.058733 0.175734 +v 0.010750 0.136208 0.175734 +v 0.010751 0.058733 0.193083 +v 0.010751 0.136208 0.193083 +v -0.007062 0.058733 0.175735 +v -0.007062 0.136208 0.175735 +v -0.007061 0.058733 0.193084 +v -0.007061 0.136208 0.193084 g Cube.008_Cube.021_Material.001 usemtl Material.001 s off @@ -313,14 +313,14 @@ f 102 98 97 f 103 101 97 f 100 98 102 o Cube.009_Cube.022 -v -0.008906 0.058733 -0.407410 -v -0.008906 0.136208 -0.407410 -v -0.008906 0.058733 -0.392721 -v -0.008906 0.136208 -0.392721 -v 0.008906 0.058733 -0.407410 -v 0.008906 0.136208 -0.407410 -v 0.008906 0.058733 -0.392721 -v 0.008906 0.136208 -0.392721 +v 0.010758 0.058733 0.360248 +v 0.010758 0.136208 0.360248 +v 0.010757 0.058733 0.345559 +v 0.010757 0.136208 0.345559 +v -0.007054 0.058733 0.360249 +v -0.007054 0.136208 0.360249 +v -0.007055 0.058733 0.345560 +v -0.007055 0.136208 0.345560 g Cube.009_Cube.022_Material.001 usemtl Material.001 s off @@ -337,14 +337,14 @@ f 110 105 106 f 111 105 109 f 108 110 106 o Cube.010_Cube.023 -v 0.031686 0.186333 -0.346382 -v 0.031686 0.122961 -0.346382 -v 0.031686 0.186333 -0.283010 -v 0.031686 0.122961 -0.283010 -v -0.031686 0.186333 -0.346382 -v -0.031686 0.122961 -0.346382 -v -0.031686 0.186333 -0.283010 -v -0.031686 0.122961 -0.283010 +v -0.029837 0.186333 0.299222 +v -0.029837 0.122961 0.299222 +v -0.029839 0.186333 0.235850 +v -0.029839 0.122961 0.235850 +v 0.033535 0.186333 0.299219 +v 0.033535 0.122961 0.299219 +v 0.033532 0.186333 0.235848 +v 0.033532 0.122961 0.235848 g Cube.010_Cube.023_Material.001 usemtl Material.001 s off @@ -361,14 +361,14 @@ f 118 113 114 f 119 113 117 f 116 118 114 o Cube.011_Cube.024 -v 0.013579 0.210064 -0.328275 -v 0.013579 0.182905 -0.328275 -v 0.013579 0.210064 -0.301117 -v 0.013579 0.182905 -0.301117 -v -0.013579 0.210064 -0.328275 -v -0.013579 0.182905 -0.328275 -v -0.013579 0.210064 -0.301117 -v -0.013579 0.182905 -0.301117 +v -0.011731 0.210064 0.281114 +v -0.011731 0.182905 0.281114 +v -0.011732 0.210064 0.253956 +v -0.011732 0.182905 0.253956 +v 0.015428 0.210064 0.281113 +v 0.015428 0.182905 0.281113 +v 0.015427 0.210064 0.253955 +v 0.015427 0.182905 0.253955 g Cube.011_Cube.024_Material.000 usemtl Material.000 s off @@ -385,14 +385,14 @@ f 126 121 122 f 127 121 125 f 124 126 122 o Cube.012_Cube.025 -v -0.051714 0.055509 0.009429 -v -0.051714 0.090038 0.009429 -v -0.051714 0.055509 -0.983019 -v -0.051714 0.090038 -0.983019 -v 0.051714 0.055509 0.009429 -v 0.051714 0.090038 0.009429 -v 0.051714 0.055509 -0.983019 -v 0.051714 0.090038 -0.983019 +v 0.053549 0.055509 -0.056592 +v 0.053549 0.090038 -0.056592 +v 0.053590 0.055509 0.935856 +v 0.053590 0.090038 0.935856 +v -0.049880 0.055509 -0.056588 +v -0.049880 0.090038 -0.056588 +v -0.049838 0.055509 0.935860 +v -0.049838 0.090038 0.935860 g Cube.012_Cube.025_Material.001 usemtl Material.001 s off @@ -409,14 +409,14 @@ f 134 130 129 f 135 133 129 f 132 130 134 o Cube.013_Cube.026 -v 0.031686 -0.040129 -0.873482 -v 0.031686 -0.103500 -0.873482 -v 0.031686 -0.040129 -0.810111 -v 0.031686 -0.103500 -0.810111 -v -0.031686 -0.040129 -0.873482 -v -0.031686 -0.103500 -0.873482 -v -0.031686 -0.040129 -0.810111 -v -0.031686 -0.103500 -0.810111 +v -0.029814 -0.040129 0.826322 +v -0.029814 -0.103500 0.826322 +v -0.029817 -0.040129 0.762951 +v -0.029817 -0.103500 0.762951 +v 0.033557 -0.040129 0.826319 +v 0.033557 -0.103500 0.826319 +v 0.033554 -0.040129 0.762948 +v 0.033554 -0.103500 0.762948 g Cube.013_Cube.026_Material.001 usemtl Material.001 s off @@ -433,14 +433,14 @@ f 142 137 138 f 143 137 141 f 140 142 138 o Cube.014_Cube.027 -v 0.024562 -0.091652 -0.860228 -v 0.173788 -0.385605 -0.860228 -v 0.024562 -0.091652 -0.823365 -v 0.173788 -0.385605 -0.823365 -v 0.010609 -0.098735 -0.860228 -v 0.159834 -0.392689 -0.860228 -v 0.010609 -0.098735 -0.823365 -v 0.159834 -0.392689 -0.823365 +v -0.022691 -0.091652 0.813067 +v -0.171917 -0.385605 0.813074 +v -0.022693 -0.091652 0.776205 +v -0.171919 -0.385605 0.776211 +v -0.008738 -0.098735 0.813067 +v -0.157964 -0.392689 0.813073 +v -0.008739 -0.098735 0.776204 +v -0.157965 -0.392689 0.776210 g Cube.014_Cube.027_Material.001 usemtl Material.001 s off @@ -457,14 +457,14 @@ f 150 145 146 f 151 145 149 f 148 150 146 o Cube.015_Cube.028 -v -0.011324 -0.089756 -0.860228 -v -0.123101 -0.399890 -0.860228 -v -0.011324 -0.089756 -0.823365 -v -0.123101 -0.399890 -0.823365 -v -0.026045 -0.084450 -0.860228 -v -0.137823 -0.394584 -0.860228 -v -0.026045 -0.084450 -0.823365 -v -0.137823 -0.394584 -0.823365 +v 0.013195 -0.089756 0.813066 +v 0.124972 -0.399890 0.813061 +v 0.013193 -0.089756 0.776203 +v 0.124970 -0.399890 0.776199 +v 0.027916 -0.084450 0.813065 +v 0.139693 -0.394584 0.813060 +v 0.027915 -0.084450 0.776203 +v 0.139692 -0.394584 0.776198 g Cube.015_Cube.028_Material.001 usemtl Material.001 s off @@ -481,22 +481,22 @@ f 158 153 154 f 159 153 157 f 156 158 154 o Cube.016_Cube.029 -v 0.023189 -0.192881 -0.184944 -v 0.023189 -0.206264 -0.184944 -v 0.023189 -0.198527 -0.056416 -v 0.023189 -0.210756 -0.050982 -v -0.023189 -0.192881 -0.184944 -v -0.023189 -0.206264 -0.184944 -v -0.023189 -0.198527 -0.056416 -v -0.023189 -0.210756 -0.050982 -v 0.023189 -0.203531 -0.139058 -v 0.023189 -0.216888 -0.139885 -v -0.023189 -0.203531 -0.139058 -v -0.023189 -0.216888 -0.139885 -v 0.023189 -0.219030 -0.074719 -v -0.023189 -0.205647 -0.074719 -v 0.023189 -0.205647 -0.074719 -v -0.023189 -0.219030 -0.074719 +v -0.021347 -0.192881 0.137784 +v -0.021347 -0.206264 0.137784 +v -0.021352 -0.198527 0.009256 +v -0.021352 -0.210756 0.003821 +v 0.025031 -0.192881 0.137782 +v 0.025031 -0.206264 0.137782 +v 0.025026 -0.198527 0.009254 +v 0.025026 -0.210756 0.003819 +v -0.021349 -0.203531 0.091898 +v -0.021348 -0.216888 0.092724 +v 0.025029 -0.203531 0.091896 +v 0.025029 -0.216888 0.092722 +v -0.021351 -0.219030 0.027559 +v 0.025027 -0.205647 0.027557 +v -0.021351 -0.205647 0.027559 +v 0.025027 -0.219030 0.027557 g Cube.016_Cube.029_Material.000 usemtl Material.000 s off @@ -529,18 +529,18 @@ f 167 175 174 f 164 176 173 f 170 175 173 o Cube.017_Cube.030 -v -0.004161 -0.181480 -0.137590 -v -0.009235 -0.125829 -0.097927 -v -0.004161 -0.186370 -0.129997 -v -0.009235 -0.136682 -0.081076 -v 0.004161 -0.181480 -0.137590 -v 0.009235 -0.125829 -0.097927 -v 0.004161 -0.186370 -0.129997 -v 0.009235 -0.136682 -0.081076 -v -0.009235 -0.154524 -0.116408 -v -0.009235 -0.165377 -0.099557 -v 0.009235 -0.165377 -0.099557 -v 0.009235 -0.154524 -0.116408 +v 0.006002 -0.181480 0.090428 +v 0.011074 -0.125829 0.050765 +v 0.006001 -0.186370 0.082835 +v 0.011073 -0.136682 0.033914 +v -0.002321 -0.181480 0.090428 +v -0.007397 -0.125829 0.050766 +v -0.002321 -0.186370 0.082835 +v -0.007397 -0.136682 0.033915 +v 0.011075 -0.154524 0.069247 +v 0.011074 -0.165377 0.052395 +v -0.007397 -0.165377 0.052396 +v -0.007396 -0.154524 0.069247 g Cube.017_Cube.030_Material.001 usemtl Material.001 s off @@ -565,14 +565,14 @@ f 183 188 187 f 186 183 187 f 185 179 186 o Cube.018_Cube.031 -v -0.002128 -0.002128 -1.377216 -v -0.002128 0.002128 -1.377216 -v -0.002128 -0.002128 -1.381471 -v -0.002128 0.002128 -1.381471 -v 0.002128 -0.002128 -1.377216 -v 0.002128 0.002128 -1.377216 -v 0.002128 -0.002128 -1.381471 -v 0.002128 0.002128 -1.381471 +v 0.004020 -0.002128 1.330054 +v 0.004020 0.002128 1.330054 +v 0.004020 -0.002128 1.334309 +v 0.004020 0.002128 1.334309 +v -0.000235 -0.002128 1.330054 +v -0.000235 0.002128 1.330054 +v -0.000235 -0.002128 1.334309 +v -0.000235 0.002128 1.334309 g Cube.018_Cube.031_None usemtl None s off diff --git a/obj/shotgun.obj b/obj/shotgun.obj index 55ce9d7..8965c6c 100644 --- a/obj/shotgun.obj +++ b/obj/shotgun.obj @@ -3,18 +3,18 @@ m 001 166 102 74 255 m 002 125 125 125 255 m 003 77 77 77 255 o Cube -v 0.037044 0.012938 0.018749 -v 0.037044 -0.100172 0.018749 -v 0.037044 0.052238 -0.328117 -v 0.037044 -0.100172 -0.328117 -v -0.037806 0.012938 0.018749 -v -0.037806 -0.100172 0.018749 -v -0.037806 0.052238 -0.328117 -v -0.037806 -0.100172 -0.328117 -v -0.037806 -0.100172 -0.070724 -v 0.037044 0.052238 -0.070724 -v -0.037806 0.052238 -0.070724 -v 0.037044 -0.100172 -0.070724 +v -0.030710 0.012938 -0.190583 +v -0.030710 -0.100172 -0.190583 +v -0.030710 0.052238 0.156284 +v -0.030710 -0.100172 0.156284 +v 0.044140 0.012938 -0.190583 +v 0.044140 -0.100172 -0.190583 +v 0.044140 0.052238 0.156284 +v 0.044140 -0.100172 0.156284 +v 0.044140 -0.100172 -0.101109 +v -0.030710 0.052238 -0.101109 +v 0.044140 0.052238 -0.101109 +v -0.030710 -0.100172 -0.101109 g Cube_Cube_Material.000 usemtl Material.000 s off @@ -39,14 +39,14 @@ f 9 12 2 f 9 11 7 f 10 11 5 o Cube.001_Cube.014 -v 0.034810 0.051727 -0.794523 -v 0.034810 -0.013340 -0.794523 -v 0.034810 0.051727 -0.323557 -v 0.034810 -0.013340 -0.323557 -v -0.035572 0.051727 -0.794523 -v -0.035572 -0.013340 -0.794523 -v -0.035572 0.051727 -0.323557 -v -0.035572 -0.013340 -0.323557 +v -0.028476 0.051727 0.622690 +v -0.028476 -0.013340 0.622690 +v -0.028476 0.051727 0.151723 +v -0.028476 -0.013340 0.151723 +v 0.041905 0.051727 0.622690 +v 0.041905 -0.013340 0.622690 +v 0.041906 0.051727 0.151723 +v 0.041906 -0.013340 0.151723 g Cube.001_Cube.014_Material.002 usemtl Material.002 s off @@ -63,14 +63,14 @@ f 18 13 14 f 19 13 17 f 16 18 14 o Cube.002_Cube.015 -v 0.020998 -0.031104 -0.445326 -v 0.020998 -0.073861 -0.445326 -v 0.020998 -0.031104 -0.322592 -v 0.020998 -0.073861 -0.322592 -v -0.021760 -0.031104 -0.445326 -v -0.021760 -0.073861 -0.445326 -v -0.021760 -0.031104 -0.322592 -v -0.021760 -0.073861 -0.322592 +v -0.014664 -0.031104 0.273492 +v -0.014664 -0.073861 0.273492 +v -0.014664 -0.031104 0.150758 +v -0.014664 -0.073861 0.150758 +v 0.028094 -0.031104 0.273492 +v 0.028094 -0.073861 0.273492 +v 0.028094 -0.031104 0.150758 +v 0.028094 -0.073861 0.150758 g Cube.002_Cube.015_Material.003 usemtl Material.003 s off @@ -87,14 +87,14 @@ f 26 21 22 f 27 21 25 f 24 26 22 o Cube.003_Cube.016 -v 0.045184 -0.006980 -0.679888 -v 0.045184 -0.095975 -0.679888 -v 0.045184 -0.006980 -0.434421 -v 0.045184 -0.095975 -0.434421 -v -0.045946 -0.006980 -0.679888 -v -0.045946 -0.095975 -0.679888 -v -0.045946 -0.006980 -0.434421 -v -0.045946 -0.095975 -0.434421 +v -0.038850 -0.006980 0.508055 +v -0.038850 -0.095975 0.508055 +v -0.038850 -0.006980 0.262587 +v -0.038850 -0.095975 0.262587 +v 0.052280 -0.006980 0.508055 +v 0.052280 -0.095975 0.508055 +v 0.052280 -0.006980 0.262587 +v 0.052280 -0.095975 0.262587 g Cube.003_Cube.016_Material.001 usemtl Material.001 s off @@ -111,14 +111,14 @@ f 34 29 30 f 35 29 33 f 32 34 30 o Cube.004_Cube.017 -v 0.020998 -0.031104 -0.783511 -v 0.020998 -0.073861 -0.783511 -v 0.020998 -0.031104 -0.670466 -v 0.020998 -0.073861 -0.670466 -v -0.021760 -0.031104 -0.783511 -v -0.021760 -0.073861 -0.783511 -v -0.021760 -0.031104 -0.670466 -v -0.021760 -0.073861 -0.670466 +v -0.014664 -0.031104 0.611678 +v -0.014664 -0.073861 0.611678 +v -0.014664 -0.031104 0.498633 +v -0.014664 -0.073861 0.498633 +v 0.028093 -0.031104 0.611678 +v 0.028093 -0.073861 0.611678 +v 0.028093 -0.031104 0.498633 +v 0.028093 -0.073861 0.498633 g Cube.004_Cube.017_Material.003 usemtl Material.003 s off @@ -135,18 +135,18 @@ f 42 37 38 f 43 37 41 f 40 42 38 o Cube.005_Cube.018 -v 0.034351 0.009276 0.015603 -v 0.037044 -0.201524 0.275558 -v 0.034351 -0.095286 0.017641 -v 0.037044 -0.205988 0.170012 -v -0.035113 0.009276 0.015603 -v -0.037806 -0.201524 0.275558 -v -0.035113 -0.095286 0.017641 -v -0.037806 -0.205988 0.170012 -v 0.037044 -0.072097 0.167426 -v -0.037806 -0.131249 0.104837 -v 0.037044 -0.131249 0.104837 -v -0.037806 -0.072097 0.167426 +v -0.028018 0.009276 -0.187437 +v -0.030710 -0.201524 -0.447391 +v -0.028018 -0.095286 -0.189475 +v -0.030710 -0.205988 -0.341846 +v 0.041447 0.009276 -0.187437 +v 0.044140 -0.201524 -0.447391 +v 0.041447 -0.095286 -0.189475 +v 0.044140 -0.205988 -0.341846 +v -0.030710 -0.072097 -0.339260 +v 0.044140 -0.131249 -0.276670 +v -0.030710 -0.131249 -0.276670 +v 0.044140 -0.072097 -0.339260 g Cube.005_Cube.018_Material.001 usemtl Material.001 s off @@ -171,14 +171,14 @@ f 46 48 55 f 50 56 54 f 52 54 55 o Cube.006_Cube.019 -v 0.044899 0.028561 -0.294426 -v 0.044899 -0.010358 -0.294426 -v 0.044899 0.028561 -0.157520 -v 0.044899 -0.010358 -0.157520 -v 0.033080 0.028561 -0.294426 -v 0.033080 -0.010358 -0.294426 -v 0.033080 0.028561 -0.157520 -v 0.033080 -0.010358 -0.157520 +v -0.038565 0.028561 0.122593 +v -0.038565 -0.010358 0.122593 +v -0.038565 0.028561 -0.014314 +v -0.038565 -0.010358 -0.014314 +v -0.026746 0.028561 0.122593 +v -0.026746 -0.010358 0.122593 +v -0.026746 0.028561 -0.014314 +v -0.026746 -0.010358 -0.014314 g Cube.006_Cube.019_Material.003 usemtl Material.003 s off @@ -195,22 +195,22 @@ f 62 57 58 f 63 57 61 f 60 62 58 o Cube.007_Cube.020 -v 0.012055 -0.101077 -0.034814 -v 0.012055 -0.101584 -0.058200 -v 0.012055 -0.166865 0.141715 -v 0.012055 -0.181229 0.151515 -v -0.021362 -0.101077 -0.034814 -v -0.021362 -0.101584 -0.058200 -v -0.021362 -0.166865 0.141715 -v -0.021362 -0.181229 0.151515 -v 0.012055 -0.179786 0.070147 -v 0.012055 -0.197009 0.065954 -v -0.021362 -0.179786 0.070147 -v -0.021362 -0.197009 0.065954 -v 0.012055 -0.146774 0.005371 -v -0.021362 -0.161731 -0.008146 -v 0.012055 -0.161731 -0.008146 -v -0.021362 -0.146774 0.005371 +v -0.005722 -0.101077 -0.137020 +v -0.005722 -0.101584 -0.113633 +v -0.005721 -0.166865 -0.313548 +v -0.005721 -0.181229 -0.323349 +v 0.027696 -0.101077 -0.137020 +v 0.027696 -0.101584 -0.113633 +v 0.027696 -0.166865 -0.313548 +v 0.027696 -0.181229 -0.323349 +v -0.005722 -0.179786 -0.241980 +v -0.005722 -0.197009 -0.237788 +v 0.027696 -0.179786 -0.241980 +v 0.027696 -0.197009 -0.237788 +v -0.005722 -0.146774 -0.177205 +v 0.027696 -0.161731 -0.163688 +v -0.005722 -0.161731 -0.163688 +v 0.027696 -0.146774 -0.177205 g Cube.007_Cube.020_Material.003 usemtl Material.003 s off @@ -243,14 +243,14 @@ f 74 78 79 f 75 77 80 f 75 78 76 o Cube.008_Cube.021 -v 0.025111 -0.079592 -0.752481 -v 0.025111 -0.079592 -0.701497 -v 0.025111 -0.002804 -0.752480 -v 0.025111 -0.002805 -0.701497 -v -0.025873 -0.079592 -0.752481 -v -0.025873 -0.079592 -0.701497 -v -0.025873 -0.002804 -0.752480 -v -0.025873 -0.002805 -0.701497 +v -0.018777 -0.079592 0.580647 +v -0.018777 -0.079592 0.529664 +v -0.018777 -0.002804 0.580647 +v -0.018777 -0.002805 0.529663 +v 0.032206 -0.079592 0.580647 +v 0.032206 -0.079592 0.529664 +v 0.032206 -0.002804 0.580647 +v 0.032206 -0.002805 0.529663 g Cube.008_Cube.021_Material.000 usemtl Material.000 s off @@ -267,14 +267,14 @@ f 86 81 82 f 87 81 85 f 84 86 82 o Cube.009_Cube.022 -v 0.002520 0.017297 -0.740018 -v 0.002520 0.012256 -0.740018 -v 0.002520 0.017297 -0.734978 -v 0.002520 0.012256 -0.734978 -v -0.002520 0.017297 -0.740018 -v -0.002520 0.012256 -0.740018 -v -0.002520 0.017297 -0.734978 -v -0.002520 0.012256 -0.734978 +v 0.003813 0.017297 0.568185 +v 0.003813 0.012256 0.568185 +v 0.003813 0.017297 0.563144 +v 0.003813 0.012256 0.563144 +v 0.008854 0.017297 0.568185 +v 0.008854 0.012256 0.568185 +v 0.008854 0.017297 0.563144 +v 0.008854 0.012256 0.563144 g Cube.009_Cube.022_None usemtl None s off diff --git a/weapon/Ak47.h b/weapon/Ak47.h index 417e546..393f39a 100644 --- a/weapon/Ak47.h +++ b/weapon/Ak47.h @@ -14,7 +14,7 @@ public: explicit Ak47() : Weapon(100, 30, 3.0, 0.1, 300, 2.0, ShooterConsts::AK47_FIRE_SOUND, ShooterConsts::AK47_RELOAD_SOUND, ObjectNameTag("ak47"), ShooterConsts::AK47_OBJ, - Vec3D{3, 3, 3}, Vec3D{-2.2, 1.0, 1.3},Vec3D{0, Consts::PI, 0}) {} + Vec3D{3, 3, 3}, Vec3D{-2.3, 0.8, 1.8},Vec3D{0, 0, 0}) {} }; diff --git a/weapon/Gold_Ak47.h b/weapon/Gold_Ak47.h index 891f684..69b6b93 100644 --- a/weapon/Gold_Ak47.h +++ b/weapon/Gold_Ak47.h @@ -13,8 +13,8 @@ public: explicit Gold_Ak47() : Weapon(200, 60, 1.5, 0.05, 600, 1.0, ShooterConsts::GOLD_AK47_FIRE_SOUND, ShooterConsts::GOLD_AK47_RELOAD_SOUND, ObjectNameTag("gold_ak47"), - ShooterConsts::GOLD_AK47_OBJ, Vec3D{3, 3, 3}, Vec3D{-2.2, 1.0, 1.3}, - Vec3D{0, Consts::PI, 0}) { + ShooterConsts::GOLD_AK47_OBJ, Vec3D{3, 3, 3}, Vec3D{-2.3, 0.8, 1.8}, + Vec3D{0, 0, 0}) { } }; diff --git a/weapon/Gun.h b/weapon/Gun.h index 9efa93b..ac44ea7 100644 --- a/weapon/Gun.h +++ b/weapon/Gun.h @@ -14,7 +14,7 @@ public: explicit Gun() : Weapon(30, 6, 2.0, 0.3, 800, 3.0, ShooterConsts::GUN_FIRE_SOUND, ShooterConsts::GUN_RELOAD_SOUND, ObjectNameTag("gun"), ShooterConsts::GUN_OBJ, Vec3D{3, 3, 3}, - Vec3D{-1.8, 1.3, 1.8}, Vec3D{0, Consts::PI, 0}) {} + Vec3D{-2.2, 1.0, 2.0}, Vec3D{0, 0, 0}) {} }; diff --git a/weapon/Rifle.h b/weapon/Rifle.h index 447fac8..9a339cb 100644 --- a/weapon/Rifle.h +++ b/weapon/Rifle.h @@ -14,7 +14,7 @@ public: explicit Rifle() : Weapon(5, 1, 1.0, 1.0, 30000, 0.5, ShooterConsts::RIFLE_FIRE_SOUND, ShooterConsts::RIFLE_RELOAD_SOUND, ObjectNameTag("rifle"), ShooterConsts::RIFLE_OBJ, Vec3D{3, 3, 3}, - Vec3D{-2.3, 1, 1.3},Vec3D{0, Consts::PI, 0}) {} + Vec3D{-2.6, 1, 1.5},Vec3D{0, 0, 0}) {} }; diff --git a/weapon/Shotgun.h b/weapon/Shotgun.h index 9f2ca4c..a431f2f 100644 --- a/weapon/Shotgun.h +++ b/weapon/Shotgun.h @@ -11,9 +11,10 @@ class Shotgun final : public Weapon { public: - explicit Shotgun(): Weapon(15, 1, 1.0, 1.0, 400, 5.0, ShooterConsts::SHOTGUN_FIRE_SOUND, - ShooterConsts::SHOTGUN_RELOAD_SOUND, ObjectNameTag("shotgun"), ShooterConsts::SHOTGUN_OBJ, - Vec3D{3, 3, 3}, Vec3D{-1.95, 0.8, 1.5}, Vec3D{0, Consts::PI, 0}) {} + explicit Shotgun() : Weapon(15, 1, 1.0, 1.0, 400, 5.0, ShooterConsts::SHOTGUN_FIRE_SOUND, + ShooterConsts::SHOTGUN_RELOAD_SOUND, ObjectNameTag("shotgun"), + ShooterConsts::SHOTGUN_OBJ, + Vec3D{3, 3, 3}, Vec3D{-2.1, 0.8, 1.9}, Vec3D{0, 0, 0}) {} std::map processFire(std::function rayCastFunction,