From ecb52a9374abd360b7e42d242545434fc8dae45e Mon Sep 17 00:00:00 2001 From: cinnaboot Date: Sun, 14 Oct 2018 01:05:00 -0400 Subject: [PATCH] adding entity positioning and scaling --- data/SPIDBOT1.dae | 269 ------------------------------------------- data/default.fs | 1 - src/entity.h | 18 +++ src/gooey.cpp | 1 + src/hexgame.cpp | 22 ++-- src/mesh.cpp | 3 +- src/render_group.cpp | 10 +- src/renderer.cpp | 13 +-- 8 files changed, 49 insertions(+), 288 deletions(-) delete mode 100644 data/SPIDBOT1.dae diff --git a/data/SPIDBOT1.dae b/data/SPIDBOT1.dae deleted file mode 100644 index 9f1d5da..0000000 --- a/data/SPIDBOT1.dae +++ /dev/null @@ -1,269 +0,0 @@ - - - - - Blender User - Blender 2.79.0 commit date:2018-05-26, commit time:21:51, hash:32432d91bbe - - 2018-08-27T14:24:50 - 2018-08-27T14:24:50 - - Z_UP - - - - - - - - - 0 0 0 1 - - - 0 0 0 1 - - - 0.08713512 0.08202124 0.07617471 1 - - - 0.04229935 0.04543915 0.1309524 1 - - - 10 - - - 1 - - - - - - 1 - - - - 1 - - - - - - - 0.36 0.36 0.36 1 - - - 0 0 0 1 - - - 0.5382113 0.1826475 0 1 - - - 0.05698176 0.06121143 0.1764069 1 - - - 10 - - - 1 - - - - - - 1 - - - - 1 - - - - - - - 0.844 0.844 0.844 1 - - - 0 0 0 1 - - - 1 0 0.06809378 1 - - - 0.05698176 0.06121143 0.1764069 1 - - - 10 - - - 1 - - - - - - 1 - - - - 1 - - - - - - - 0 0 0 1 - - - 0 0 0 1 - - - 0.2395431 0.2254845 0.2094118 1 - - - 0.04229935 0.04543915 0.1309524 1 - - - 10 - - - 1 - - - - - - 1 - - - - 1 - - - - - - - - - - - - - - - - - - - - - -1 0.1261382 -1 -1 1 -1 -1 0.1261382 0.6193761 -1.058071 0.995059 0.4120782 -0.8792549 0.1261382 0.4968214 -0.8792549 0.1261382 -0.8774453 -0.8792549 0.03338193 0.4968214 -0.8792549 0.03338193 -0.8774453 -0.9965732 0.03338193 0.6123608 -0.9965732 0.03338193 -0.9929848 -0.9024806 -0.7737899 0.4843949 -0.8289238 -0.7737899 -0.9293937 -0.3735129 -0.7737899 0.3442677 -0.3735129 -0.7737899 -0.1737403 -0.3439505 -0.7737899 0.3032691 -0.3439505 -0.7737899 -0.1327416 -0.2074496 -1.1183 0.3032691 -0.2074496 -1.1183 -0.1327416 -0.1285144 -1.1183 0.2547314 -0.1285144 -1.1183 -0.08420389 -0.1285144 -1.049283 0.2547314 -0.1285144 -1.049283 -0.08420389 -0.9988461 0.3481529 -0.8549982 -0.9988461 0.7979902 -0.8549982 -0.9988461 0.3481529 -0.326351 -0.9988461 0.7979902 -0.326351 -0.9977273 -0.1426627 -0.3372511 -0.9977273 -0.1426627 -0.8613181 -0.9977273 -0.55817 -0.3372511 -0.9977273 -0.55817 -0.8613181 -0.9988461 0.4238779 -0.7660064 -0.9988461 0.7222651 -0.7660064 -0.9988461 0.4238779 -0.4153428 -0.9988461 0.7222651 -0.4153428 -0.9977273 -0.2126086 -0.4254719 -0.9977273 -0.2126086 -0.7730973 -0.9977273 -0.488224 -0.4254719 -0.9977273 -0.488224 -0.7730973 -1.089193 0.4238779 -0.772197 -1.089193 0.7222651 -0.772197 -1.266088 0.4238779 -0.4694218 -1.266088 0.7222651 -0.4694218 -1.264203 -0.2126086 -0.4793434 -1.08884 -0.2126086 -0.7794954 -1.264203 -0.488224 -0.4793434 -1.08884 -0.488224 -0.7794954 -1.112156 0.4626132 -0.7328921 -1.112156 0.6835299 -0.7328921 -1.243125 0.4626132 -0.5087267 -1.243125 0.6835299 -0.5087267 -1.241439 -0.2483878 -0.5183078 -1.111605 -0.2483878 -0.740531 -1.241439 -0.4524449 -0.5183078 -1.111605 -0.4524449 -0.740531 -1.039146 0.4626132 -0.6902361 -1.039146 0.6835299 -0.6902361 -1.170115 0.4626132 -0.4660707 -1.170115 0.6835299 -0.4660707 -1.168429 -0.2483878 -0.4756518 -1.038595 -0.2483878 -0.697875 -1.168429 -0.4524449 -0.4756518 -1.038595 -0.4524449 -0.697875 -1.063011 0.5028671 -0.6493903 -1.063011 0.643276 -0.6493903 -1.146251 0.5028671 -0.5069165 -1.146251 0.643276 -0.5069165 -1.144771 -0.2855696 -0.5161437 -1.062252 -0.2855696 -0.6573831 -1.144771 -0.4152631 -0.5161437 -1.062252 -0.4152631 -0.6573831 -1.272966 0.5028671 -1.005602 -1.272469 0.6426107 -1.021471 -1.437681 0.5028671 -0.9957745 -1.437681 0.643276 -0.9957745 -1.435849 -0.2855696 -1.004427 -1.272561 -0.2855696 -1.014169 -1.435849 -0.4152631 -1.004427 -1.26559 -0.4152631 -1.041121 -1.218367 0.3755943 -1.126436 -1.208054 0.7567269 -1.456127 -1.681693 0.3755943 -1.098792 -1.681692 0.7705488 -1.098792 -1.678567 -0.1680097 -1.107522 -1.219256 -0.1680097 -1.134926 -1.678567 -0.5328229 -1.107522 -1.127266 -0.5328229 -1.490619 -1.073776 0.5158559 -2.027607 -1.073776 0.6302874 -2.027607 -1.208017 0.5158559 -2.019597 -1.208017 0.6302874 -2.019597 -1.206317 -0.297567 -2.028242 -1.073239 -0.297567 -2.036182 -1.206317 -0.4032655 -2.028242 -1.073239 -0.4032655 -2.036182 -0.1072808 -0.7460432 -0.800859 -0.6936946 -0.7460432 -0.800859 -0.1072808 -0.7460432 -0.4261291 -0.4087011 -0.7460432 -0.4261291 -0.1801154 -0.9449908 -0.7393761 -0.5741004 -0.9449908 -0.7393761 -0.1801154 -0.9449908 -0.487612 -0.3826261 -0.9449908 -0.487612 -0.222926 -0.9449908 -0.7032378 -0.5038056 -0.9449908 -0.7032378 -0.222926 -0.9449908 -0.5237503 -0.3672998 -0.9449908 -0.5237503 -0.222926 -0.7817394 -0.7032378 -0.5038056 -0.7817394 -0.7032378 -0.222926 -0.7817394 -0.5237503 -0.3672998 -0.7817394 -0.5237503 -0.2692691 -0.7817394 -0.6641176 -0.4277104 -0.7817394 -0.6641176 -0.2692691 -0.7817394 -0.5628705 -0.3507089 -0.7817394 -0.5628705 -0.2692367 -1.508536 -0.8906874 -0.4161799 -1.482384 -0.8095123 -0.2650004 -1.406575 -0.6559997 -0.3442167 -1.411974 -0.6656673 -0.132559 -1.655278 -0.3431315 -0.808157 0.298307 0.5988975 -0.843281 0.8238653 0.4735154 -0.8175868 0.312725 0.7227545 -0.8527109 0.8382832 0.5973724 -0.8993463 1.168395 -0.842874 -0.945378 1.164479 0.2764418 1 0.1261382 -1 1 1 -1 0 0.1261382 -0.8774453 0 0.1261382 0.4968214 1 0.1261382 0.6193761 1.058071 0.995059 0.4120782 0.8792549 0.1261382 0.4968214 0.8792549 0.1261382 -0.8774453 0 0.9999945 0.6193796 0 1 -1 0 0.1261382 0.6193761 0 0.1261382 -1 0 0.03338193 -0.8774453 0 0.03338193 0.4968214 0.8792549 0.03338193 0.4968214 0.8792549 0.03338193 -0.8774453 0 0.03338193 -0.9929848 0 0.03338193 0.6123608 0.9965732 0.03338193 0.6123608 0.9965732 0.03338193 -0.9929848 0 -0.7737899 -0.9929848 0 -0.7737899 0.6123608 0.9024806 -0.7737899 0.4843949 0.8289238 -0.7737899 -0.9293937 0 -0.7737899 -0.1737403 0 -0.7737899 0.3442677 0.3735129 -0.7737899 0.3442677 0.3735129 -0.7737899 -0.1737403 0 -0.7737899 -0.1327416 0 -0.7737899 0.3032691 0.3439505 -0.7737899 0.3032691 0.3439505 -0.7737899 -0.1327416 0 -1.1183 -0.1327416 0 -1.1183 0.3032691 0.2074496 -1.1183 0.3032691 0.2074496 -1.1183 -0.1327416 0 -1.1183 -0.08420389 0 -1.1183 0.2547314 0.1285144 -1.1183 0.2547314 0.1285144 -1.1183 -0.08420389 0 -1.049283 -0.08420389 0 -1.049283 0.2547314 0.1285144 -1.049283 0.2547314 0.1285144 -1.049283 -0.08420389 0.9988461 0.3481529 -0.8549982 0.9988461 0.7979902 -0.8549982 0.9988461 0.3481529 -0.326351 0.9988461 0.7979902 -0.326351 0.9977273 -0.1426627 -0.3372511 0.9977273 -0.1426627 -0.8613181 0.9977273 -0.55817 -0.3372511 0.9977273 -0.55817 -0.8613181 0.9988461 0.4238779 -0.7660064 0.9988461 0.7222651 -0.7660064 0.9988461 0.4238779 -0.4153428 0.9988461 0.7222651 -0.4153428 0.9977273 -0.2126086 -0.4254719 0.9977273 -0.2126086 -0.7730973 0.9977273 -0.488224 -0.4254719 0.9977273 -0.488224 -0.7730973 1.089193 0.4238779 -0.772197 1.089193 0.7222651 -0.772197 1.266088 0.4238779 -0.4694218 1.266088 0.7222651 -0.4694218 1.264203 -0.2126086 -0.4793434 1.08884 -0.2126086 -0.7794954 1.264203 -0.488224 -0.4793434 1.08884 -0.488224 -0.7794954 1.112156 0.4626132 -0.7328921 1.112156 0.6835299 -0.7328921 1.243125 0.4626132 -0.5087267 1.243125 0.6835299 -0.5087267 1.241439 -0.2483878 -0.5183078 1.111605 -0.2483878 -0.740531 1.241439 -0.4524449 -0.5183078 1.111605 -0.4524449 -0.740531 1.039146 0.4626132 -0.6902361 1.039146 0.6835299 -0.6902361 1.170115 0.4626132 -0.4660707 1.170115 0.6835299 -0.4660707 1.168429 -0.2483878 -0.4756518 1.038595 -0.2483878 -0.697875 1.168429 -0.4524449 -0.4756518 1.038595 -0.4524449 -0.697875 1.063011 0.5028671 -0.6493903 1.063011 0.643276 -0.6493903 1.146251 0.5028671 -0.5069165 1.146251 0.643276 -0.5069165 1.144771 -0.2855696 -0.5161437 1.062252 -0.2855696 -0.6573831 1.144771 -0.4152631 -0.5161437 1.062252 -0.4152631 -0.6573831 1.272966 0.5028671 -1.005602 1.272469 0.6426107 -1.021471 1.437681 0.5028671 -0.9957745 1.437681 0.643276 -0.9957745 1.435849 -0.2855696 -1.004427 1.272561 -0.2855696 -1.014169 1.435849 -0.4152631 -1.004427 1.26559 -0.4152631 -1.041121 1.218367 0.3755943 -1.126436 1.208054 0.7567269 -1.456127 1.681693 0.3755943 -1.098792 1.681692 0.7705488 -1.098792 1.678567 -0.1680097 -1.107522 1.219256 -0.1680097 -1.134926 1.678567 -0.5328229 -1.107522 1.127266 -0.5328229 -1.490619 1.073776 0.5158559 -2.027607 1.073776 0.6302874 -2.027607 1.208017 0.5158559 -2.019597 1.208017 0.6302874 -2.019597 1.206317 -0.297567 -2.028242 1.073239 -0.297567 -2.036182 1.206317 -0.4032655 -2.028242 1.073239 -0.4032655 -2.036182 0.1072808 -0.7460432 -0.800859 0.6936946 -0.7460432 -0.800859 0.1072808 -0.7460432 -0.4261291 0.4087011 -0.7460432 -0.4261291 0.1801154 -0.9449908 -0.7393761 0.5741004 -0.9449908 -0.7393761 0.1801154 -0.9449908 -0.487612 0.3826261 -0.9449908 -0.487612 0.222926 -0.9449908 -0.7032378 0.5038056 -0.9449908 -0.7032378 0.222926 -0.9449908 -0.5237503 0.3672998 -0.9449908 -0.5237503 0.222926 -0.7817394 -0.7032378 0.5038056 -0.7817394 -0.7032378 0.222926 -0.7817394 -0.5237503 0.3672998 -0.7817394 -0.5237503 0.2692691 -0.7817394 -0.6641176 0.4277104 -0.7817394 -0.6641176 0.2692691 -0.7817394 -0.5628705 0.3507089 -0.7817394 -0.5628705 0.2692367 -1.508536 -0.8906874 0.4161799 -1.482384 -0.8095123 0.2650004 -1.406575 -0.6559997 0.3442167 -1.411974 -0.6656673 0.132559 -1.655278 -0.3431315 0.808157 0.298307 0.5988975 0.843281 0.8238653 0.4735154 0 0.8268505 0.5988997 0 0.298307 0.5988975 0.8175868 0.312725 0.7227545 0.8527109 0.8382832 0.5973724 0 0.8412684 0.7227568 0 0.312725 0.7227545 0.8993463 1.168395 -0.842874 0.945378 1.164479 0.2764418 0 1.168391 0.440764 0 1.168395 -0.842874 -0.7933835 1.168158 -0.6975957 -0.8282833 1.165189 0.1510328 -0.1115287 1.168155 0.2756165 -0.1115287 1.168158 -0.6975957 -0.7930586 1.024525 -0.6978239 -0.8279584 1.021556 0.1508046 -0.1112037 1.024522 0.2753883 -0.1112037 1.024525 -0.6978239 - - - - - - - - - - -0.3513388 -0.7248651 -0.5925637 -0.9644798 -0.2635893 0.017304 -0.8797543 -0.299396 -0.3693161 -0.301503 -0.9045396 -0.301503 0 -0.7071526 -0.707061 0.4472014 -0.8944334 0 0 -0.6639944 0.7477376 0.2182121 -0.4364241 0.8728789 -0.301503 -0.9045396 0.301503 0 0.3346984 0.9423254 -0.398058 0.3972035 0.8269096 0 0.7442404 0.6679119 -0.3906463 0.8645493 -0.3161489 -0.7476937 0.3680635 0.5527056 -0.4350847 0.8584805 0.2715007 -0.5785502 -0.576658 -0.5768411 -0.6487066 0.3425424 -0.6795915 -0.301503 0.9045396 0.301503 -0.301503 0.9045396 -0.301503 -0.5964493 0.5073924 0.6219334 -0.5753216 0.550082 -0.6053222 0.2182121 0.4364241 0.8728789 0.4472014 0.8944334 0 -0.9998738 -0.008301198 -0.01355057 -0.9999932 0.001770079 0.003234982 0 0.6934886 -0.7204676 0 0.6811637 0.7321313 0.01519834 -0.9991272 -0.03891152 -0.5556259 -0.6442527 0.5255649 0 -0.7241547 -0.6896377 0 -0.6768198 0.7361487 -0.2599644 -0.9419515 -0.2124762 0 -1 0 0 -0.9084367 0.4180225 0 -0.8944334 0.4472014 0.09546238 -0.9799851 0.1746889 -0.4496402 -0.6618407 0.5998255 -0.4496402 -0.6618407 -0.5998255 0 -0.4472014 0.8944334 -0.2599644 -0.9419515 0.2124762 0.301503 -0.9045396 0.301503 0 -0.7071068 0.7071068 0 -0.7071068 -0.7071068 0.5773503 -0.5773503 -0.5773503 0.5773503 -0.5773503 0.5773503 0.301503 -0.9045396 -0.301503 -0.9251227 0.2525143 0.2835215 -0.9251227 -0.2525143 0.2835215 -0.9999914 0.002288937 -0.003479182 -0.8969312 0.319781 -0.3053759 -0.5630472 -0.5368618 0.6282971 -0.9999931 -0.001983702 0.003173947 -0.9997175 -0.01290959 0.0199595 -0.9974252 -0.05926805 -0.04037672 -0.9251379 0.2524879 0.2834957 -0.7548672 -0.5619845 0.3381551 -0.9251379 -0.2524879 0.2834957 -0.3717579 -0.6053847 -0.7037795 -0.8969312 -0.319781 -0.3053759 -0.8971233 -0.3193265 -0.3052875 -0.8971233 0.3193265 -0.3052875 -0.3722996 -0.6054942 -0.7033987 -0.9331129 -0.3014954 -0.1959613 -0.3722996 0.6054942 -0.7033987 -0.3717579 0.6053847 -0.7037795 -0.7548307 -0.5619801 0.338244 -0.7548672 0.5619845 0.3381551 -0.6289034 0.3014964 -0.7166453 -0.7897455 0.5773624 0.2072559 -0.9331129 0.3014954 -0.1959613 -0.7548307 0.5619801 0.338244 -0.6289034 -0.3014964 -0.7166453 -0.2072559 0.5773624 -0.7897455 -0.9436473 0.1857081 -0.2739385 -0.9436473 -0.1857081 -0.2739385 -0.5818776 0.4457013 -0.6802712 -0.2072559 -0.5773624 -0.7897455 -0.7897455 -0.5773624 0.2072559 -0.3368985 0.5400325 0.7712745 -0.3565852 -0.4924257 0.7939545 -0.5818549 -0.4471111 -0.6793648 -0.3321425 -0.576908 0.7462296 0.692188 -0.7051284 0.15385 -0.5818481 0.446343 -0.6798757 -0.5818697 -0.4457257 -0.6802619 0.6878732 0.7211697 0.08212727 -0.6972396 0.6470357 0.3085482 -0.3575968 0.5095533 0.7826111 -0.7061635 -0.6368228 0.3094997 0.6804262 0.685584 0.2588336 0.7045019 -0.6527416 0.2785779 0.6767956 -0.7341413 0.0546295 0.6047312 0.5299294 -0.5945378 0.6060728 0.7196943 0.3386976 -0.4338045 -0.5522813 -0.7118983 -0.7260752 -0.6233181 0.2903263 0.6415407 -0.6956509 0.3232576 0.5885592 0.8073195 0.04281812 -0.4384765 0.5297304 -0.7260332 0.6390711 -0.5142477 -0.5719594 -0.441617 -0.5268275 -0.7262418 0.6065134 -0.4971621 -0.6204608 0.6476516 0.5003956 -0.5745882 -0.4340742 0.5567309 -0.7082586 -0.7288889 0.6204239 0.2894741 0.4646559 -0.7398483 -0.4865382 0.4646559 -0.7398483 0.4865382 -0.09052115 -0.9400343 0.3288487 0.1559823 -0.9631476 -0.2191261 0.100805 -0.9818648 -0.1605617 -0.5784017 -0.7660648 -0.2803502 -0.5773503 -0.5773503 0.5773503 -0.5773503 -0.5773503 -0.5773503 0.22563 -0.9677706 0.1118536 -0.303907 -0.7370921 0.6036025 0.3585724 -0.8802405 -0.3108095 0.2650563 -0.9193807 0.2906616 0.7478592 -0.5506478 0.3708015 0.2529747 -0.821977 -0.5102526 0.3487179 -0.619458 -0.7033261 0.7572427 0.3831687 0.5289285 -0.2543134 -0.9625639 -0.09378433 -0.8588083 -0.3689457 -0.3554258 0.3425497 -0.4117372 -0.8444716 -0.2233979 -0.856603 0.4651072 -0.6842705 0.009674549 0.7291642 0.3771229 -0.4164618 0.8272472 -0.6570411 0.6409882 0.396776 -0.3710254 -0.1934019 0.9082599 -0.5935382 -0.5059785 0.6258581 0 -0.6196314 0.7848929 0 0.7414628 0.6709941 0 -0.6649793 0.7468619 2.44155e-4 0.9174108 -0.3979414 -0.2489122 0.9235936 -0.2915776 1.52594e-4 0.9153205 0.4027263 0 0.3666238 -0.9303693 0.3513388 -0.7248651 -0.5925637 0.9644798 -0.2635893 0.017304 0.5556259 -0.6442527 0.5255649 0.5630472 -0.5368618 0.6282971 0.398058 0.3972035 0.8269096 0.7476937 0.3680635 0.5527056 0.3904049 0.864769 -0.3158459 0.4348394 0.8586918 0.2712253 0.5785502 -0.576658 -0.5768411 0.6487066 0.3425424 -0.6795915 0.301503 0.9045396 0.301503 0.301503 0.9045396 -0.301503 0.5964493 0.5073924 0.6219334 0.5753216 0.550082 -0.6053222 0.9998738 -0.008301198 -0.01355057 -0.01519834 -0.9991272 -0.03891152 0.2599644 -0.9419515 -0.2124762 0.2599644 -0.9419515 0.2124762 -0.09546238 -0.9799851 0.1746889 -0.100805 -0.9818648 -0.1605617 0.4496402 -0.6618407 0.5998255 0.4496402 -0.6618407 -0.5998255 0.9251227 0.2525143 0.2835215 0.9997175 -0.01290959 0.0199595 0.9999914 0.002288937 -0.003479182 0.8969312 0.319781 -0.3053759 0.8797543 -0.299396 -0.3693161 0.9999932 0.001770079 0.003234982 0.9974252 -0.05926805 -0.04037672 0.7548672 -0.5619845 0.3381551 0.9251379 0.2524879 0.2834957 0.9251379 -0.2524879 0.2834957 0.3717579 -0.6053847 -0.7037795 0.9251227 -0.2525143 0.2835215 0.8969312 -0.319781 -0.3053759 0.9999931 -0.001983702 0.003173947 0.8971233 -0.3193265 -0.3052875 0.8971233 0.3193265 -0.3052875 0.9331129 -0.3014954 -0.1959613 0.3722996 -0.6054942 -0.7033987 0.3722996 0.6054942 -0.7033987 0.3717579 0.6053847 -0.7037795 0.7548307 0.5619801 0.338244 0.7548307 -0.5619801 0.338244 0.7897455 0.5773624 0.2072559 0.6289034 0.3014964 -0.7166453 0.9331129 0.3014954 -0.1959613 0.6289034 -0.3014964 -0.7166453 0.7548672 0.5619845 0.3381551 0.2072559 0.5773624 -0.7897455 0.9436473 0.1857081 -0.2739385 0.2072559 -0.5773624 -0.7897455 0.5818776 0.4457013 -0.6802712 0.7897455 -0.5773624 0.2072559 0.9436473 -0.1857081 -0.2739385 0.3368985 0.5400325 0.7712745 0.5818549 -0.4471111 -0.6793648 0.3321425 -0.576908 0.7462296 0.5818481 0.446343 -0.6798757 0.5818697 -0.4457257 -0.6802619 0.6972396 0.6470357 0.3085482 -0.6878732 0.7211697 0.08212727 0.7061635 -0.6368228 0.3094997 0.3575968 0.5095533 0.7826111 -0.6804262 0.685584 0.2588336 -0.7045019 -0.6527416 0.2785779 0.3565852 -0.4924257 0.7939545 -0.6047312 0.5299294 -0.5945378 -0.6767956 -0.7341413 0.0546295 -0.6060728 0.7196943 0.3386976 0.4338045 -0.5522813 -0.7118983 0.7260752 -0.6233181 0.2903263 -0.6415407 -0.6956509 0.3232576 -0.692188 -0.7051284 0.15385 0.7288889 0.6204239 0.2894741 -0.6390711 -0.5142477 -0.5719594 0.4384765 0.5297304 -0.7260332 0.441617 -0.5268275 -0.7262418 -0.6065134 -0.4971621 -0.6204608 -0.5885592 0.8073195 0.04281812 0.4340742 0.5567309 -0.7082586 -0.4646559 -0.7398483 -0.4865382 -0.4646559 -0.7398483 0.4865382 0.09052115 -0.9400343 0.3288487 -0.1559823 -0.9631476 -0.2191261 0.5784017 -0.7660648 -0.2803502 0.303907 -0.7370921 0.6036025 -0.22563 -0.9677706 0.1118536 -0.2529747 -0.821977 -0.5102526 -0.3585724 -0.8802405 -0.3108095 -0.2650563 -0.9193807 0.2906616 -0.7478592 -0.5506478 0.3708015 -0.3487179 -0.619458 -0.7033261 -0.7572427 0.3831687 0.5289285 -0.3425497 -0.4117372 -0.8444716 0.2543134 -0.9625639 -0.09378433 0.2233979 -0.856603 0.4651072 0.8588083 -0.3689457 -0.3554258 0.6842705 0.009674549 0.7291642 -0.3771229 -0.4164618 0.8272472 0.3710254 -0.1934019 0.9082599 0.6570411 0.6409882 0.396776 0.5935382 -0.5059785 0.6258581 -0.3029091 0.903661 0.302726 -0.5312476 0.5675349 -0.6290311 0.3006709 0.8996016 0.3167237 0.3542104 0.8903787 -0.2859381 0.6298043 0.5872905 -0.5083665 -0.5783154 0.5755992 0.5781323 0.5636618 0.5785858 0.5895117 -0.6476516 0.5003956 -0.5745882 - - - - - - - - - - - - - - -

11 0 28 1 29 2 127 5 135 6 128 7 6 17 5 3 7 18 8 19 7 18 9 20 4 8 138 21 128 7 137 22 128 7 138 21 7 18 127 5 137 22 141 25 138 21 142 26 141 25 7 18 137 22 6 17 142 26 138 21 13 27 10 28 11 0 11 0 141 25 145 29 142 26 10 28 146 30 15 31 12 32 13 27 149 33 146 30 150 34 96 35 145 29 149 33 146 30 12 32 150 34 16 36 15 31 17 37 153 32 150 34 154 38 15 31 149 33 153 32 150 34 14 39 154 38 19 40 16 36 17 37 154 38 16 36 158 41 17 37 153 32 157 42 20 43 19 40 21 44 19 40 157 42 161 41 158 41 18 45 162 42 21 44 161 41 165 41 18 45 166 42 162 42 28 1 34 46 36 47 34 46 27 48 35 49 9 20 29 2 27 48 26 52 9 20 27 48 10 28 26 52 28 1 33 54 40 55 32 56 36 47 45 57 37 58 29 2 36 47 37 58 29 2 35 49 27 48 38 61 47 62 39 63 45 57 51 62 43 64 37 58 43 64 35 49 30 59 39 63 31 60 43 64 34 46 35 49 34 46 44 65 36 47 33 54 39 63 41 66 32 56 38 61 30 59 52 67 61 68 53 69 48 67 54 68 46 69 51 62 42 70 43 64 44 65 50 71 52 67 41 66 47 62 49 71 40 55 46 69 38 61 44 65 53 69 45 57 41 66 48 67 40 55 60 72 66 73 68 74 67 75 58 76 59 77 49 71 56 72 48 67 53 69 59 77 51 62 46 69 55 77 47 62 59 77 50 71 51 62 50 71 60 72 52 67 49 71 55 77 57 76 57 76 63 83 65 73 56 72 62 84 54 68 60 72 69 80 61 68 57 76 64 74 56 72 61 68 67 75 59 77 55 77 62 84 63 83 89 98 86 99 88 94 92 100 91 92 93 101 98 105 96 35 100 106 97 107 11 0 95 108 13 27 96 35 149 33 95 108 145 29 94 109 102 8 100 106 104 3 99 110 94 109 98 105 97 107 100 106 96 35 99 110 97 107 95 108 106 111 104 3 108 112 103 113 101 114 99 110 103 113 98 105 102 8 101 114 104 3 100 106 110 115 108 112 112 116 107 117 102 8 106 111 105 118 108 112 104 3 109 119 103 113 107 117 109 119 112 116 108 112 111 121 109 119 107 117 111 121 106 111 110 115 116 120 117 125 118 126 122 127 119 128 121 129 272 131 121 129 273 132 273 132 119 128 269 130 268 11 122 127 272 131 148 137 175 138 147 139 132 45 139 147 140 148 140 148 143 149 144 150 138 21 131 40 128 7 127 5 140 148 137 22 141 25 140 148 144 150 142 26 139 147 138 21 152 152 147 139 151 32 141 25 148 137 145 29 142 26 147 139 143 149 156 153 151 32 155 154 243 155 145 29 241 156 146 30 151 32 147 139 156 153 159 157 160 158 149 33 156 153 153 32 150 34 155 154 151 32 164 8 159 157 163 3 154 38 159 157 155 154 153 32 160 158 157 42 164 8 167 112 168 111 157 42 164 8 161 41 158 41 163 3 159 157 161 41 168 111 165 41 166 42 163 3 162 42 175 138 181 159 173 160 174 161 181 159 182 162 144 150 176 163 148 137 144 150 173 160 174 161 147 139 173 160 143 149 187 166 180 167 179 168 192 169 183 170 184 171 176 163 183 170 175 138 182 162 176 163 174 161 194 175 185 176 186 177 198 175 192 169 190 178 190 178 184 171 182 162 186 177 177 173 178 174 190 178 181 159 189 179 191 180 181 159 183 170 180 167 186 177 178 174 185 176 179 168 177 173 208 181 199 182 200 183 201 181 195 182 193 183 198 175 189 179 197 184 191 180 197 184 189 179 188 185 194 175 186 177 193 183 187 166 185 176 200 183 191 180 192 169 195 182 188 185 187 166 207 186 213 187 205 188 214 189 205 188 213 187 203 186 196 184 195 182 206 190 200 183 198 175 202 190 193 183 194 175 206 190 197 184 205 188 207 186 197 184 199 182 196 184 202 190 194 175 204 188 210 195 202 190 209 196 203 186 201 181 216 193 207 186 208 181 211 191 204 188 203 186 214 189 208 181 206 190 202 190 209 196 201 181 233 212 236 213 235 207 238 204 239 214 240 215 243 155 245 218 247 219 148 137 244 220 242 221 243 155 152 152 149 33 145 29 242 221 241 156 247 219 249 40 251 45 241 156 246 222 245 218 247 219 244 220 243 155 246 222 244 220 248 223 251 45 253 44 255 43 250 224 248 223 252 225 245 218 250 224 249 40 251 45 248 223 247 219 255 43 257 226 259 227 249 40 254 228 253 44 255 43 252 225 251 45 250 224 256 229 254 228 259 227 256 229 255 43 258 232 256 229 260 233 253 44 258 232 257 226 263 230 265 236 264 235 266 237 271 238 270 239 270 239 272 131 273 132 273 132 266 237 270 239 268 11 271 238 267 141 283 244 285 245 282 246 11 0 10 28 28 1 127 5 136 4 135 6 6 17 4 8 5 3 8 19 6 17 7 18 4 8 6 17 138 21 137 22 127 5 128 7 7 18 5 3 127 5 141 25 137 22 138 21 141 25 9 20 7 18 6 17 8 19 142 26 13 27 12 32 10 28 11 0 9 20 141 25 142 26 8 19 10 28 15 31 14 39 12 32 149 33 145 29 146 30 96 35 94 109 145 29 146 30 10 28 12 32 16 36 14 39 15 31 153 32 149 33 150 34 15 31 13 27 149 33 150 34 12 32 14 39 19 40 18 45 16 36 154 38 14 39 16 36 17 37 15 31 153 32 20 43 18 45 19 40 19 40 17 37 157 42 158 41 16 36 18 45 21 44 19 40 161 41 18 45 20 43 166 42 28 1 26 52 34 46 34 46 26 52 27 48 9 20 11 0 29 2 26 52 8 19 9 20 10 28 8 19 26 52 33 54 41 66 40 55 36 47 44 65 45 57 29 2 28 1 36 47 29 2 37 58 35 49 38 61 46 69 47 62 45 57 53 69 51 62 37 58 45 57 43 64 30 59 38 61 39 63 43 64 42 70 34 46 34 46 42 70 44 65 33 54 31 60 39 63 32 56 40 55 38 61 52 67 60 72 61 68 48 67 56 72 54 68 51 62 50 71 42 70 44 65 42 70 50 71 41 66 39 63 47 62 40 55 48 67 46 69 44 65 52 67 53 69 41 66 49 71 48 67 60 72 58 76 66 73 67 75 66 73 58 76 49 71 57 76 56 72 53 69 61 68 59 77 46 69 54 68 55 77 59 77 58 76 50 71 50 71 58 76 60 72 49 71 47 62 55 77 57 76 55 77 63 83 56 72 64 74 62 84 60 72 68 74 69 80 57 76 65 73 64 74 61 68 69 80 67 75 55 77 54 68 62 84 89 98 87 102 86 99 92 100 90 103 91 92 98 105 94 109 96 35 97 107 13 27 11 0 13 27 97 107 96 35 95 108 11 0 145 29 102 8 98 105 100 106 99 110 95 108 94 109 97 107 101 114 100 106 99 110 101 114 97 107 106 111 102 8 104 3 103 113 105 118 101 114 103 113 99 110 98 105 101 114 105 118 104 3 110 115 106 111 108 112 107 117 103 113 102 8 105 118 109 119 108 112 109 119 105 118 103 113 109 119 113 124 112 116 111 121 113 124 109 119 111 121 107 117 106 111 122 127 120 10 119 128 272 131 122 127 121 129 273 132 121 129 119 128 268 11 120 10 122 127 148 137 176 163 175 138 132 45 131 40 139 147 140 148 139 147 143 149 138 21 139 147 131 40 127 5 132 45 140 148 141 25 137 22 140 148 142 26 143 149 139 147 152 152 148 137 147 139 141 25 144 150 148 137 142 26 146 30 147 139 156 153 152 152 151 32 243 155 149 33 145 29 146 30 150 34 151 32 156 153 155 154 159 157 149 33 152 152 156 153 150 34 154 38 155 154 164 8 160 158 159 157 154 38 158 41 159 157 153 32 156 153 160 158 164 8 163 3 167 112 157 42 160 158 164 8 158 41 162 42 163 3 161 41 164 8 168 111 166 42 167 112 163 3 175 138 183 170 181 159 174 161 173 160 181 159 144 150 174 161 176 163 144 150 143 149 173 160 147 139 175 138 173 160 187 166 188 185 180 167 192 169 191 180 183 170 176 163 184 171 183 170 182 162 184 171 176 163 194 175 193 183 185 176 198 175 200 183 192 169 190 178 192 169 184 171 186 177 185 176 177 173 190 178 182 162 181 159 191 180 189 179 181 159 180 167 188 185 186 177 185 176 187 166 179 168 208 181 207 186 199 182 201 181 203 186 195 182 198 175 190 178 189 179 191 180 199 182 197 184 188 185 196 184 194 175 193 183 195 182 187 166 200 183 199 182 191 180 195 182 196 184 188 185 207 186 215 191 213 187 214 189 206 190 205 188 203 186 204 188 196 184 206 190 208 181 200 183 202 190 201 181 193 183 206 190 198 175 197 184 207 186 205 188 197 184 196 184 204 188 202 190 204 188 212 187 210 195 209 196 211 191 203 186 216 193 215 191 207 186 211 191 212 187 204 188 214 189 216 193 208 181 202 190 210 195 209 196 233 212 234 247 236 213 238 204 237 217 239 214 243 155 241 156 245 218 148 137 152 152 244 220 243 155 244 220 152 152 145 29 148 137 242 221 247 219 245 218 249 40 241 156 242 221 246 222 247 219 248 223 244 220 246 222 242 221 244 220 251 45 249 40 253 44 250 224 246 222 248 223 245 218 246 222 250 224 251 45 252 225 248 223 255 43 253 44 257 226 249 40 250 224 254 228 255 43 256 229 252 225 250 224 252 225 256 229 259 227 260 233 256 229 258 232 254 228 256 229 253 44 254 228 258 232 266 237 267 141 271 238 270 239 271 238 272 131 273 132 269 130 266 237 268 11 272 131 271 238 283 244 284 241 285 245

- - - - -

5 3 136 4 127 5 135 6 4 8 128 7 133 9 120 10 268 11 123 12 3 13 124 14 4 8 0 15 5 3 1 16 136 4 0 15 0 15 24 23 22 24 3 13 24 23 2 50 1 16 22 24 23 51 1 16 25 53 3 13 23 51 33 54 25 53 24 23 30 59 22 24 25 53 32 56 24 23 22 24 31 60 23 51 71 85 81 86 73 78 74 87 84 88 76 81 85 91 91 92 83 93 81 86 88 94 80 95 72 79 78 96 70 90 77 82 84 88 85 91 72 79 81 86 80 95 77 82 83 93 75 89 71 85 78 96 79 97 83 93 74 87 75 89 79 97 86 99 87 102 90 103 83 93 91 92 82 104 92 100 84 88 79 97 89 98 81 86 78 96 88 94 86 99 85 91 92 100 93 101 120 10 2 50 119 128 119 128 135 6 269 130 277 133 280 134 276 135 134 136 123 12 277 133 124 14 133 9 276 135 136 4 132 45 127 5 135 6 131 40 129 140 133 9 267 141 130 142 130 142 274 143 275 144 125 145 131 40 132 45 136 4 126 146 125 145 125 145 171 151 129 140 171 151 130 142 129 140 126 146 169 164 125 145 172 165 126 146 130 142 180 167 170 172 172 165 177 173 171 151 169 164 179 168 172 165 171 151 178 174 169 164 170 172 228 197 218 198 220 192 231 199 221 200 223 194 238 204 232 205 230 206 235 207 228 197 227 208 225 209 219 203 217 202 224 210 231 199 223 194 219 203 228 197 220 192 230 206 224 210 222 201 218 198 225 209 217 202 230 206 221 200 229 211 226 216 233 212 225 209 230 206 237 217 238 204 239 214 229 211 231 199 236 213 226 216 228 197 225 209 235 207 227 208 232 205 239 214 231 199 129 140 267 141 266 237 135 6 266 237 269 130 275 144 277 133 276 135 134 136 274 143 126 146 133 9 275 144 276 135 281 240 284 241 280 134 123 12 281 240 277 133 280 134 124 14 276 135 278 242 124 14 279 243 282 246 279 243 283 244 281 240 282 246 285 245 284 241 279 243 280 134 5 3 0 15 136 4 135 6 2 50 4 8 133 9 3 13 120 10 123 12 1 16 3 13 4 8 2 50 0 15 1 16 134 136 136 4 0 15 2 50 24 23 3 13 25 53 24 23 1 16 0 15 22 24 1 16 23 51 25 53 23 51 31 60 33 54 24 23 32 56 30 59 25 53 33 54 32 56 22 24 30 59 31 60 71 85 79 97 81 86 74 87 82 104 84 88 85 91 93 101 91 92 81 86 89 98 88 94 72 79 80 95 78 96 77 82 76 81 84 88 72 79 73 78 81 86 77 82 85 91 83 93 71 85 70 90 78 96 83 93 82 104 74 87 79 97 78 96 86 99 90 103 82 104 83 93 82 104 90 103 92 100 79 97 87 102 89 98 78 96 80 95 88 94 85 91 84 88 92 100 120 10 3 13 2 50 119 128 2 50 135 6 277 133 281 240 280 134 134 136 1 16 123 12 124 14 3 13 133 9 136 4 125 145 132 45 135 6 128 7 131 40 133 9 268 11 267 141 130 142 126 146 274 143 125 145 129 140 131 40 136 4 134 136 126 146 125 145 169 164 171 151 171 151 172 165 130 142 126 146 170 172 169 164 172 165 170 172 126 146 180 167 178 174 170 172 177 173 179 168 171 151 179 168 180 167 172 165 178 174 177 173 169 164 228 197 226 216 218 198 231 199 229 211 221 200 238 204 240 215 232 205 235 207 236 213 228 197 225 209 227 208 219 203 224 210 232 205 231 199 219 203 227 208 228 197 230 206 232 205 224 210 218 198 226 216 225 209 230 206 222 201 221 200 226 216 234 247 233 212 230 206 229 211 237 217 239 214 237 217 229 211 236 213 234 247 226 216 225 209 233 212 235 207 232 205 240 215 239 214 129 140 130 142 267 141 135 6 129 140 266 237 275 144 274 143 277 133 134 136 277 133 274 143 133 9 130 142 275 144 281 240 285 245 284 241 123 12 278 242 281 240 280 134 279 243 124 14 278 242 123 12 124 14 282 246 278 242 279 243 281 240 278 242 282 246 284 241 283 244 279 243

- - - - -

20 43 165 41 166 42 165 41 167 112 166 42 20 43 21 44 165 41 165 41 168 111 167 112

- - - - -

64 74 73 78 72 79 69 80 76 81 77 82 69 80 75 89 67 75 63 83 70 90 71 85 74 87 67 75 75 89 66 73 76 81 68 74 63 83 73 78 65 73 62 84 72 79 70 90 116 120 110 115 112 116 115 122 110 115 114 123 113 124 116 120 112 116 117 125 111 121 115 122 118 126 114 123 116 120 118 126 115 122 114 123 118 126 117 125 115 122 211 191 220 192 212 187 216 193 223 194 215 191 222 201 216 193 214 189 210 195 217 202 209 196 214 189 221 200 222 201 223 194 213 187 215 191 220 192 210 195 212 187 209 196 219 203 211 191 263 230 257 226 261 231 257 226 262 234 261 231 263 230 260 233 259 227 258 232 264 235 262 234 265 236 263 230 261 231 265 236 261 231 262 234 265 236 262 234 264 235 64 74 65 73 73 78 69 80 68 74 76 81 69 80 77 82 75 89 63 83 62 84 70 90 74 87 66 73 67 75 66 73 74 87 76 81 63 83 71 85 73 78 62 84 64 74 72 79 116 120 114 123 110 115 115 122 111 121 110 115 113 124 117 125 116 120 117 125 113 124 111 121 211 191 219 203 220 192 216 193 224 210 223 194 222 201 224 210 216 193 210 195 218 198 217 202 214 189 213 187 221 200 223 194 221 200 213 187 220 192 218 198 210 195 209 196 217 202 219 203 263 230 259 227 257 226 257 226 258 232 262 234 263 230 264 235 260 233 258 232 260 233 264 235

- - - 1 - - - - - - 7.31643e-7 -1 0 3.498849 1 7.31643e-7 -1.04805e-13 -2.422869 1.16596e-13 -1.86265e-9 0.9999999 1.781841 0 0 0 1 - - Bone Bone_003 Bone_010 Bone_012 Bone_004 Bone_006 Bone_008 Bone_013 Bone_014 Bone_015 Bone_016 Bone_017 Bone_018 Bone_001 Bone_005 Bone_007 Bone_002 Bone_009 Bone_011 - - - - - - - - 0.01745241 1.21778e-7 -0.9998477 1.132576 0.9998476 -5.12097e-7 0.01745235 -2.903548 -5.96046e-7 -1 -1.32248e-7 -2.409732 0 0 0 1 -0.01744747 4.05768e-4 0.9998475 -1.131617 -0.02325016 -0.9997296 0 -2.318798 0.9995774 -0.02324652 0.01745212 -3.958515 0 0 0 1 -0.01745289 -0.8874925 0.4604912 -3.645368 -2.10945e-7 -0.4605615 -0.8876276 -0.5741661 0.9998475 -0.01549166 0.008037984 -3.920644 0 0 0 1 -0.01745289 -0.9579665 -0.2863487 -3.428317 2.44007e-7 0.2863923 -0.9581122 1.726997 0.9998475 -0.01672172 -0.004998087 -3.916856 0 0 0 1 0.01743328 2.72382e-4 0.9998479 -1.267387 -0.01562219 0.9998781 0 2.470104 -0.9997259 -0.01561981 0.01743537 3.823551 0 0 0 1 -0.01745295 -0.8844344 -0.4663382 -0.4941253 2.98023e-7 0.4664093 -0.8845689 1.653345 0.9998478 -0.01543849 -0.008139908 -3.874562 0 0 0 1 -0.01745289 -0.9629974 0.2689449 -1.095418 -1.78814e-7 -0.268986 -0.9631438 0.4122786 0.9998477 -0.01680976 0.004694402 -3.885058 0 0 0 1 -0.01616895 -0.00656861 0.9998477 -1.153388 0.3763762 -0.9264667 0 -3.694078 0.9263257 0.376319 0.01745229 -2.711219 0 0 0 1 4.9141e-4 -0.01744556 0.9998477 -1.251289 0.9996035 0.02815717 0 -3.963613 -0.02815282 0.9994512 0.01745247 2.897514 0 0 0 1 0.01191812 -0.01274967 0.9998477 -1.29449 0.7305274 0.6828833 0 -1.6976 -0.6827793 0.7304161 0.01745265 5.372462 0 0 0 1 0.01416343 -0.01019769 0.9998478 -1.27992 0.5843052 0.8115339 0 -0.3133848 -0.8114104 0.5842162 0.01745271 4.537711 0 0 0 1 2.56687e-4 -0.01745063 0.9998478 -1.238047 0.9998918 0.01470333 0 -4.074849 -0.01470124 0.9997395 0.01745247 2.138901 0 0 0 1 -0.01250416 -0.01217514 0.9998478 -1.163887 0.6976158 -0.7164721 0 -4.94793 0.7163628 0.6975094 0.01745241 -2.10976 0 0 0 1 0.01693975 -0.0168333 0.9997148 -1.272147 0.03115218 0.9993817 0.01629984 2.299137 -0.9993712 0.03086715 0.01745373 2.935258 0 0 0 1 -0.01745271 -0.9058561 -0.4232255 -0.586416 2.38419e-7 0.42329 -0.9059941 1.624266 0.9998478 -0.01581221 -0.00738734 -2.929701 0 0 0 1 -0.01745295 -0.9629972 0.268945 -1.124419 0 -0.2689859 -0.9631439 0.3906706 0.9998476 -0.0168097 0.004694461 -2.939091 0 0 0 1 -0.0178399 0.01245307 0.9997632 -1.10135 0.03106236 -0.9994331 0.01300323 -2.513314 0.9993582 0.03128695 0.01744276 -2.826731 0 0 0 1 -0.01745289 -0.8874927 0.4604914 -3.658177 -2.36323e-7 -0.4605618 -0.8876277 -0.5751579 0.9998477 -0.01549184 0.008037805 -2.983318 0 0 0 1 -0.01745301 -0.9579668 -0.2863487 -3.442815 3.43658e-7 0.2863923 -0.9581125 1.723814 0.9998475 -0.01672202 -0.004998207 -2.979559 0 0 0 1 - - - - - - - - 0.09661608 0.3009127 0.6024712 0.05178111 0.03929328 0.9089255 0.07334202 0.1710867 0.01098698 0.1438414 0.09078067 0.07311159 0.4368504 0.08285313 0.05101263 0.02856922 0.1091035 0.7284615 0.08401191 0.2108384 0.01780098 0.1583501 0.09990799 0.05927264 0.3698177 0.1175614 0.3715614 0.5108772 0.08379352 0.2452668 0.02065145 0.1859571 0.1188364 0.04592114 0.2995734 0.1101881 0.5149965 0.3748154 0.0709517 0.2509778 0.01575553 0.2406355 0.1585677 0.0285173 0.2345942 0.08662158 0.6204931 0.2928853 0.06662184 0.2561092 0.06019926 0.4081047 0.09278231 0.05278664 0.06339591 0.8470538 0.05076545 0.1021807 0.1363681 0.240766 0.1484307 0.2356758 0.1071052 0.1259851 0.005668997 0.005556643 0.1485416 0.02148234 0.4362387 0.3163954 0.07178515 0.1360002 0.2205678 0.1514682 0.2300103 0.1163707 0.1400983 0.005484223 0.02349543 0.1730027 0.04703313 0.3850002 0.2767508 0.09391772 7.99933e-4 0.1054499 0.1731151 0.1484878 0.1765473 0.1367105 0.1841905 0.07549858 0.05561167 0.1484014 0.09158599 0.2173625 0.2224253 0.1699858 0.09462708 0.09995764 0.1656754 0.1476094 0.1683098 0.1420461 0.1907047 0.08569669 0.05833452 0.1415578 0.09847313 0.186322 0.2236418 0.1801432 0.1115274 0.09838455 0.1625809 0.1483752 0.1626874 0.1424382 0.1933978 0.09213566 0.05902069 0.135637 0.1009396 0.1692424 0.2253189 0.1820748 0.1277663 0.05970859 0.1707376 0.7686166 9.37147e-4 0.01504814 0.01629179 0.9686599 0.05652755 0.1441356 0.02452701 0.003565609 0.7605906 0.01065343 0.02749109 0.02721464 0.02958196 0.9157123 0.0457322 0.6592963 0.003842532 0.07862108 0.05022948 0.1622784 0.05389761 0.756906 0.009420692 0.1797757 0.861082 0.09127998 0.02708113 0.02055686 0.9315335 0.03642654 0.03203994 0.02012419 0.09904164 0.8645293 0.01630496 0.008606135 0.9778035 0.01359033 0.01312816 0.0831604 0.8644922 0.03921908 0.008847355 0.9597769 0.0313757 0.003191173 0.8338356 0.0347191 0.03257769 0.002173781 0.09350264 0.01445502 0.8458009 0.02810472 0.1116393 0.9309378 0.02246004 0.03948211 0.007119953 0.9724385 0.008656322 0.01890516 0.06919187 0.8680666 0.06274157 0.9389984 0.06100153 0.01808559 0.7564185 0.2254958 0.7685834 0.2314167 0.7301201 0.2456248 0.02425491 0.8527348 0.07134342 0.07592165 0.7618649 0.2381351 0.9326773 0.06275707 0.004565596 0.04913794 0.8701414 0.08072066 0.9188717 0.08112835 0.007579088 0.7442116 0.2482091 0.7461735 0.2538265 0.7190901 0.2679879 0.01292192 0.8511386 0.09299629 0.05586504 0.7407999 0.2592001 0.9172201 0.08277976 0.9279255 0.07207441 0.9285647 0.07143527 0.6531882 0.3468118 0.638445 0.361555 0.6199796 0.3800203 0.9075217 0.09247827 0.6324341 0.367566 0.9352339 0.0647661 0.9163613 0.08363866 0.9130454 0.08695459 0.609838 0.3901619 0.5889159 0.4110841 0.5766436 0.4233564 0.8881433 0.1118568 0.5893348 0.4106652 0.9219641 0.07803595 0.002177953 0.9368641 0.06095784 0.996459 0.003541052 0.9726722 0.02732771 1 0.9663437 0.03365623 0.940626 0.05937397 0.9999914 8.58961e-6 0.9877488 0.01225125 0.1981396 0.8018603 0.07047945 0.9295205 0.5146611 0.4853389 0.5197164 0.4802837 0.517057 0.482943 0.2112564 0.7887436 0.5313611 0.4686389 0.06908524 0.9309147 1 1 1 1 1 1 1 1 0.00567466 0.0845254 0.6583514 0.1512186 0.1002299 0.6755431 0.1210914 0.2033654 0.09817314 0.5408833 0.2172904 0.1417632 0.001889944 0.1300299 0.1799527 0.6898189 1.98383e-4 0.08614176 0.3899 0.4681748 0.05578345 0.3505309 0.1877408 0.4617283 0.0581153 0.2342351 0.665347 0.04230254 0.09191161 0.1416384 0.76645 0.09177321 0.3294895 0.5413635 0.0373736 0.2587 0.2052698 0.5360303 0.06211245 0.2226879 0.6918683 0.02333134 0.08019179 0.1244511 0.7953572 0.003414094 0.1958723 0.8007136 0.0894593 0.2350881 0.6641558 0.01129668 0.1845813 0.8154187 0.04724347 0.9527565 0.06664299 0.9315823 0.001774787 0.02739548 0.1143567 0.8300554 0.02819228 0.0580275 0.9419724 1 0.07762509 0.891807 0.03056788 0.1042534 0.8446739 0.05107259 0.1859448 0.7515279 0.06252717 0.1802322 0.7382897 0.08147817 0.0608052 0.9391948 0.09390753 0.1225737 0.01836854 0.1024795 0.06100511 0.1100141 0.4916514 0.08749192 0.0620836 0.04759037 0.001277863 0.1250395 0.6765166 0.09608525 0.1084971 0.01831048 0.09056454 0.05264919 0.1417384 0.492155 0.09027028 0.06707704 0.00146085 0.05553036 0.006675422 0.132206 0.6467799 0.07596915 0.07644897 0.8475818 0.09709101 0.02583694 0.01164138 0.1284077 0.7370229 0.09573572 0.2961425 0.6081218 0.03893518 0.9441329 0.01693183 0.9919518 0.004008054 0.004040181 0.3018036 0.1175819 0.1271705 0.09337878 0.08795034 0.0802918 0.191823 0.06988137 0.005921483 0.2079377 0.1107624 0.0825954 0.3923969 0.1305046 0.06032508 0.06444483 0.007181346 0.6896669 0.1783818 0.0819177 0.01314502 0.2512747 0.1224364 0.09105771 0.3288145 0.1113538 0.117022 0.3693087 0.5136693 0.1214068 0.02009874 0.238422 0.6200724 0.3461739 0.3335605 0.3202655 0.2443664 0.08811515 0.09754323 0.06951355 0.06385797 0.1128141 0.3237894 0.8912378 0.05521756 0.05354458 0.9626886 0.005016148 0.005095481 0.0271998 0.2927101 0.1311351 0.1409292 0.1043586 0.09905964 0.07178407 0.1600231 0.08214223 0.01663345 0.2916209 0.001352906 0.1427176 0.1078972 0.2641099 0.0935257 0.1101763 0.5112077 0.3786159 0.5804714 0.07281339 0.07251328 0.1519054 0.02925956 0.04719102 0.04584574 0.3803725 0.1288422 0.1430922 0.09120267 0.08446013 0.05797451 0.1140556 0.06961745 0.01317888 0.3104473 0.1814112 0.1429884 0.2055115 0.07684528 0.08723527 0.6138537 0.298911 0.05827718 0.04933279 0.04462486 0.6143931 0.05058461 0.160986 0.02180123 0.2651122 0.2460275 0.2667446 0.09225368 0.02344197 0.09907436 0.007345497 0.07106584 0.06462478 0.5298402 0.03718817 0.1809712 0.05448347 0.06182616 0.8238414 0.0281288 0.0877366 0.06029307 0.186728 0.04059028 0.2637611 0.1166154 0.3301045 0.06220054 0.1687896 0.1982334 0.2178199 0.1237905 0.06613409 0.1996573 0.02557492 0.1371225 0.1474353 0.3217914 0.1026852 0.02783125 0.2167729 0.0463615 0.008218407 0.05673229 0.1617124 0.06284296 0.007668256 0.6149462 0.08787935 0.2095023 0.06539726 0.2338433 0.1247028 0.2980729 0.06848126 0.1462209 0.1812357 0.1991633 0.1288117 0.07307392 0.234548 0.03694635 0.1353608 0.1504555 0.2830225 0.1121655 0.03486973 0.2324433 0.05168241 0.02566754 0.07468289 0.1776777 0.07841527 0.02877789 0.531033 0.08374553 0.05339038 0.1494984 0.1025786 0.1731486 0.1642602 0.2295207 0.1276028 0.1078091 0.1632599 0.1665304 0.1505705 0.118201 0.2086979 0.08493101 0.1061975 0.1530988 0.1884557 0.1367265 0.1003451 0.2263727 0.08880341 0.05761647 0.1231012 0.1350273 0.1335958 0.1171916 0.3028472 0.1306202 0.05679214 0.1419904 0.1060476 0.1634163 0.1698485 0.2179203 0.1439846 0.1046503 0.1618426 0.1627811 0.1509507 0.1230327 0.2057546 0.0909878 0.10062 0.1533758 0.1726074 0.1417103 0.1118922 0.222243 0.09755098 0.06078386 0.1294487 0.1270318 0.141249 0.1327548 0.2611148 0.147617 0.05919486 0.1316214 0.1076188 0.1508827 0.1667726 0.2022811 0.1816285 0.1023087 0.1609683 0.1587739 0.1494987 0.1279552 0.2012274 0.09926766 0.09889417 0.154224 0.1654775 0.1439619 0.1181893 0.216538 0.102715 0.06051599 0.1274979 0.1195651 0.1399492 0.1379267 0.2336356 0.1809092 0.05865007 0.1690673 0.7722826 0.01236224 0.02266204 0.9649757 0.05376321 0.1514734 0.007584452 0.7450425 0.04213643 0.02206164 0.0488823 0.8603032 0.06875282 0.04978257 0.6853618 0.06435734 0.03977167 0.1607266 0.05563545 0.7572942 0.1870703 0.005161225 0.8431204 0.07852703 0.01970911 0.05348211 0.8947623 0.04108685 0.009083688 0.05506694 0.0202341 0.1004984 0.8792674 0.01420325 0.9857967 0.0120483 0.0900045 0.8946249 0.003322243 0.02141612 0.9581025 0.02048146 0.007579684 0.8753334 0.02051872 0.09656816 0.01851677 0.8631559 0.1183273 0.9478073 0.02914094 0.02305167 0.9593095 0.006564319 0.03412604 2.01837e-4 0.07248008 0.927318 0.001290142 0.9987098 0.02756583 0.9724342 1 0.96823 0.03177005 0.9170259 0.08297413 1 0.9838706 0.01612943 0.05346423 0.9465358 1 0.01612192 0.983878 1 0.9793382 0.02066177 0.9381656 0.06183433 1 0.9929351 0.007064878 0.996963 0.003037035 0.997479 0.002521038 1 1 1 0.9799133 0.01876693 0.001319646 1 1 0.9817619 0.01823812 0.9813247 0.01867532 1 1 1 0.963361 0.03663897 1 0.9956455 0.004354476 0.006447136 0.9294307 0.06412214 0.9933513 0.006648659 0.9721172 0.02788275 1 0.9678422 0.03215777 0.01699686 0.9070422 0.07596099 1 0.9714321 0.02856791 0.1791442 0.8208558 0.0653969 0.9346031 0.5152361 0.4847639 0.521647 0.4783529 0.5190685 0.4809314 0.2013151 0.7986848 0.5339305 0.4660695 0.06135439 0.9386455 1 1 1 1 1 1 1 1 0.003274679 0.01641803 0.06901043 0.300459 0.008090794 0.4936118 0.109135 0.6509796 0.04629498 0.1935242 0.1092011 0.06988179 0.03374558 0.1548559 0.03949266 0.6003313 0.1016928 0.1338339 0.01251357 0.7012323 0.1524202 0.07159495 0.1550207 0.3509911 0.4223932 0.3238549 0.04795843 0.2256324 0.402554 0.01076608 0.04039061 0.09402245 0.3695632 0.4852576 0.02450281 0.1527468 0.8227503 0.07626479 0.1190781 0.3104981 0.494159 0.2309213 0.04882794 0.2202478 0.5000028 0.0410211 0.07631802 0.3136568 0.5690041 0.04654598 0.1734736 0.7799804 0.006592988 0.1912912 0.8021157 0.06999683 0.1652688 0.7647342 0.2388457 0.7611543 0.2024595 0.7975404 0.02696639 0.9730336 0.05563068 0.9443693 0.02069163 0.9793084 1 0.4626818 0.5373182 0.5608901 0.4391099 0.82308 0.17692 0.6901921 0.3098078 0.2359521 0.7640479 0.08956217 0.01043671 0.1489558 0.08046466 0.05560159 0.4047353 0.2102435 0.07351708 0.07653015 0.02460759 0.5790634 0.2462816 0.1194618 0.00891751 0.0297082 0.005159258 0.2217311 0.615022 0.2296103 0.06921607 0.077892 0.05531907 0.04889941 0.1359217 0.3831413 0.09174746 0.009658455 0.1324755 0.07180392 0.04357552 0.3939037 0.2568353 0.07880008 0.08300578 0.03267103 7.53314e-4 0.5358753 0.2688944 0.1240656 0.01822948 0.03757911 0.01056849 0.003160715 0.2062534 0.600143 0.186978 0.06000196 0.06880515 0.04521763 0.03527599 0.1499459 0.4537752 0.05797338 0.8833279 0.05869865 0.06225895 0.03884083 0.714794 0.1841061 0.136421 0.009920656 0.2719287 0.5817295 0.3413391 0.3698457 0.2888152 0.1090907 0.1153549 0.7755543 0.1126062 0.01324546 0.003688156 0.1485058 0.7219542 0.1804341 0.007796883 0.2843843 0.5273846 0.37348 0.3950375 0.2314826 0.1204354 0.1280454 0.7515191 0.1250609 0.005839526 8.41953e-4 0.1643407 0.7039168 0.1814912 0.02157688 0.01561212 0.007990598 0.2702613 0.5030678 0.4196911 0.4312187 0.1490902 - - - - - - - - - - - - - - 3 3 7 5 7 3 7 3 7 3 7 3 7 6 7 7 7 7 7 7 7 7 4 3 6 4 6 4 4 3 4 3 4 3 6 4 4 3 3 2 3 2 3 3 2 3 3 2 3 2 3 3 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 2 2 1 2 2 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 5 3 5 4 4 3 4 3 4 3 4 3 3 4 2 2 3 4 2 1 3 3 3 3 2 7 6 7 7 3 5 3 3 3 7 7 5 7 3 4 3 7 3 4 7 8 3 7 7 7 3 7 7 7 4 6 7 7 7 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 3 3 5 4 5 3 5 4 3 2 4 3 4 3 3 3 3 2 2 1 2 2 1 2 2 1 2 1 2 2 1 2 2 2 1 1 1 3 1 1 2 2 1 1 1 2 1 2 3 2 2 1 2 3 1 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 7 4 6 4 4 4 5 3 4 4 4 3 3 3 2 2 2 2 2 1 2 2 2 2 2 7 5 6 7 7 6 7 7 3 4 4 3 3 5 4 3 3 5 6 3 - 0 0 1 1 16 2 0 3 13 4 16 5 0 6 1 7 4 8 7 9 8 10 13 11 16 12 0 13 1 14 7 15 13 16 16 17 0 18 1 19 4 20 7 21 8 22 13 23 16 24 0 25 1 26 16 27 0 28 1 29 4 30 7 31 8 32 13 33 16 34 0 35 1 36 16 37 0 38 1 39 4 40 7 41 8 42 13 43 16 44 0 45 1 46 16 47 0 48 1 49 4 50 7 51 8 52 10 53 16 54 1 55 7 56 8 57 0 58 1 59 4 60 7 61 8 62 10 63 16 64 0 65 1 66 4 67 7 68 8 69 10 70 0 71 1 72 4 73 7 74 8 75 10 76 11 77 0 78 1 79 4 80 7 81 8 82 10 83 11 84 0 85 1 86 4 87 7 88 8 89 10 90 11 91 0 92 1 93 4 94 7 95 8 96 10 97 11 98 0 99 1 100 4 101 7 102 8 103 10 104 11 105 0 106 1 107 4 108 7 109 8 110 10 111 11 112 0 113 1 114 4 115 7 116 8 117 10 118 11 119 0 120 1 121 4 122 7 123 8 124 10 125 11 126 0 127 1 128 16 129 17 130 0 131 1 132 16 133 0 134 1 135 7 136 13 137 16 138 17 139 0 140 1 141 13 142 16 143 0 144 1 145 2 146 7 147 8 148 16 149 0 150 1 151 2 152 16 153 1 154 7 155 8 156 16 157 1 158 8 159 16 160 0 161 1 162 16 163 17 164 1 165 16 166 17 167 0 168 1 169 16 170 17 171 1 172 16 173 17 174 0 175 1 176 2 177 7 178 8 179 16 180 0 181 1 182 2 183 16 184 1 185 2 186 7 187 16 188 1 189 2 190 16 191 1 192 16 193 17 194 16 195 17 196 1 197 16 198 17 199 16 200 17 201 1 202 2 203 16 204 1 205 2 206 16 207 1 208 2 209 1 210 2 211 16 212 1 213 16 214 17 215 16 216 17 217 1 218 16 219 17 220 16 221 17 222 1 223 2 224 16 225 1 226 2 227 16 228 1 229 2 230 1 231 2 232 16 233 17 234 16 235 17 236 16 237 17 238 16 239 17 240 1 241 2 242 1 243 2 244 1 245 2 246 1 247 2 248 16 249 17 250 16 251 17 252 16 253 17 254 16 255 17 256 1 257 2 258 1 259 2 260 1 261 2 262 1 263 2 264 16 265 17 266 18 267 17 268 18 269 17 270 18 271 17 272 2 273 3 274 2 275 3 276 2 277 3 278 2 279 3 280 17 281 18 282 17 283 18 284 17 285 18 286 17 287 18 288 2 289 3 290 2 291 3 292 2 293 3 294 2 295 3 296 18 297 18 298 18 299 18 300 3 301 3 302 3 303 3 304 0 305 1 306 7 307 8 308 10 309 1 310 7 311 8 312 1 313 7 314 8 315 10 316 11 317 1 318 7 319 8 320 10 321 1 322 7 323 8 324 10 325 1 326 7 327 8 328 1 329 7 330 8 331 10 332 1 333 7 334 8 335 1 336 7 337 8 338 10 339 1 340 7 341 8 342 1 343 7 344 8 345 10 346 1 347 7 348 8 349 1 350 7 351 8 352 1 353 7 354 8 355 9 356 7 357 8 358 7 359 8 360 7 361 8 362 9 363 1 364 7 365 8 366 9 367 7 368 8 369 8 370 8 371 9 372 12 373 8 374 9 375 12 376 8 377 9 378 12 379 8 380 9 381 12 382 8 383 9 384 0 385 1 386 4 387 7 388 8 389 13 390 16 391 0 392 1 393 7 394 8 395 13 396 16 397 0 398 1 399 4 400 7 401 8 402 13 403 16 404 0 405 1 406 4 407 7 408 8 409 13 410 16 411 0 412 13 413 16 414 0 415 1 416 7 417 13 418 16 419 0 420 4 421 13 422 0 423 13 424 16 425 0 426 13 427 16 428 0 429 1 430 4 431 7 432 10 433 13 434 16 435 0 436 1 437 4 438 10 439 11 440 13 441 16 442 0 443 4 444 10 445 13 446 16 447 0 448 1 449 4 450 10 451 11 452 13 453 16 454 0 455 4 456 13 457 0 458 4 459 13 460 16 461 0 462 13 463 16 464 0 465 1 466 4 467 7 468 10 469 13 470 16 471 0 472 13 473 16 474 0 475 1 476 4 477 7 478 0 479 1 480 4 481 7 482 10 483 13 484 16 485 0 486 1 487 4 488 7 489 10 490 11 491 13 492 16 493 0 494 4 495 13 496 0 497 1 498 4 499 7 500 10 501 13 502 16 503 0 504 1 505 4 506 7 507 10 508 13 509 16 510 0 511 1 512 4 513 10 514 11 515 13 516 16 517 0 518 4 519 13 520 0 521 1 522 4 523 7 524 8 525 10 526 11 527 0 528 1 529 4 530 7 531 8 532 10 533 16 534 0 535 1 536 4 537 7 538 10 539 11 540 13 541 4 542 7 543 10 544 11 545 1 546 4 547 7 548 8 549 10 550 11 551 0 552 1 553 4 554 7 555 8 556 10 557 11 558 0 559 1 560 4 561 7 562 8 563 10 564 11 565 0 566 1 567 4 568 7 569 8 570 10 571 11 572 1 573 4 574 7 575 8 576 10 577 11 578 0 579 1 580 4 581 7 582 8 583 10 584 11 585 0 586 1 587 4 588 7 589 8 590 10 591 11 592 0 593 1 594 4 595 7 596 8 597 10 598 11 599 0 600 1 601 4 602 7 603 8 604 10 605 11 606 0 607 1 608 4 609 7 610 8 611 10 612 11 613 0 614 1 615 4 616 7 617 8 618 10 619 11 620 0 621 1 622 4 623 7 624 8 625 10 626 11 627 0 628 1 629 4 630 7 631 8 632 10 633 11 634 0 635 1 636 4 637 7 638 8 639 10 640 11 641 0 642 1 643 4 644 7 645 8 646 10 647 11 648 0 649 1 650 4 651 7 652 8 653 10 654 11 655 0 656 1 657 4 658 7 659 8 660 10 661 11 662 0 663 1 664 4 665 7 666 8 667 10 668 11 669 0 670 1 671 4 672 7 673 8 674 10 675 11 676 0 677 1 678 4 679 7 680 8 681 10 682 11 683 0 684 4 685 13 686 0 687 4 688 13 689 0 690 4 691 10 692 13 693 16 694 0 695 4 696 13 697 16 698 0 699 4 700 10 701 11 702 13 703 0 704 4 705 13 706 0 707 4 708 10 709 11 710 13 711 4 712 10 713 11 714 13 715 0 716 4 717 13 718 4 719 13 720 0 721 4 722 13 723 16 724 4 725 13 726 16 727 0 728 4 729 10 730 13 731 0 732 4 733 13 734 4 735 10 736 13 737 4 738 10 739 13 740 0 741 4 742 13 743 4 744 13 745 4 746 13 747 13 748 4 749 13 750 4 751 13 752 4 753 4 754 13 755 4 756 13 757 13 758 4 759 13 760 13 761 4 762 13 763 4 764 13 765 4 766 4 767 13 768 13 769 14 770 13 771 14 772 13 773 13 774 4 775 4 776 5 777 13 778 4 779 4 780 13 781 14 782 13 783 14 784 13 785 13 786 4 787 4 788 5 789 4 790 4 791 5 792 13 793 14 794 15 795 14 796 15 797 14 798 15 799 14 800 5 801 6 802 4 803 5 804 6 805 5 806 5 807 6 808 14 809 15 810 14 811 15 812 14 813 15 814 14 815 15 816 5 817 6 818 5 819 6 820 5 821 6 822 5 823 6 824 15 825 15 826 15 827 15 828 6 829 6 830 6 831 6 832 0 833 1 834 4 835 7 836 8 837 10 838 11 839 4 840 7 841 10 842 11 843 1 844 4 845 7 846 8 847 10 848 11 849 4 850 7 851 10 852 11 853 4 854 7 855 10 856 11 857 4 858 7 859 10 860 11 861 1 862 4 863 7 864 10 865 11 866 4 867 10 868 11 869 4 870 7 871 10 872 11 873 4 874 7 875 10 876 11 877 4 878 7 879 10 880 11 881 4 882 10 883 11 884 7 885 10 886 11 887 4 888 10 889 11 890 10 891 11 892 10 893 11 894 10 895 11 896 10 897 11 898 10 899 11 900 11 901 11 902 12 903 11 904 12 905 11 906 12 907 11 908 12 909 11 910 12 911 0 912 1 913 4 914 10 915 11 916 13 917 16 918 0 919 4 920 10 921 13 922 16 923 0 924 1 925 4 926 7 927 13 928 16 929 0 930 1 931 4 932 7 933 10 934 13 935 16 936 0 937 1 938 4 939 10 940 11 941 13 942 16 943 0 944 4 945 10 946 11 947 13 948 16 949 0 950 1 951 4 952 7 953 10 954 13 955 16 956 0 957 1 958 4 959 7 960 10 961 13 962 16 963 0 964 13 965 16 966 0 967 4 968 13 969 16 970 0 971 4 972 13 973 16 974 0 975 13 976 16 977 0 978 13 979 16 980 0 981 1 982 7 983 13 984 16 985 0 986 4 987 13 988 16 989 0 990 13 991 16 992 0 993 13 994 16 995 0 996 1 997 7 998 13 999 16 1000 0 1001 4 1002 7 1003 10 1004 13 1005 16 1006 0 1007 13 1008 16 1009 - - - - - - - - 1.34547e-7 -0.01745242 -0.9998476 -0.5879308 1 7.59917e-8 1.32248e-7 -0.01313472 1.43937e-7 -0.9998476 0.01745238 0.6258667 0 0 0 1 - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/default.fs b/data/default.fs index 460a4a8..7d87f03 100644 --- a/data/default.fs +++ b/data/default.fs @@ -22,6 +22,5 @@ void main() brightness = clamp(brightness, 0, 1); color = brightness * fragmentColor; - //color = vec3(255, 255, 255); } diff --git a/src/entity.h b/src/entity.h index 2742e19..f30efe8 100644 --- a/src/entity.h +++ b/src/entity.h @@ -1,6 +1,9 @@ #pragma once +#include +#include + #include "mesh.h" #include "render_group.h" @@ -9,9 +12,24 @@ struct render_group; struct Entity { + glm::mat4 world_transform; + glm::vec3 scale; + glm::vec3 translation; + glm::vec4 rotation; // maybe use quaternion for this one meMeshGroup mesh_group; render_group* ren_group; //TODO: more entity properties: sound, gameplay info }; +inline void +entityTranslate(Entity* e, int x, int y, int z) +{ + e->world_transform = glm::translate(e->world_transform, glm::vec3(x, y, z)); +} + +inline void +entityScale(Entity* e, float sx, float sy, float sz) +{ + //mi->model_transform = glm::scale(glm::mat4(1), glm::vec3(100, 100, 100)); +} diff --git a/src/gooey.cpp b/src/gooey.cpp index 3fb719d..f4fd52c 100644 --- a/src/gooey.cpp +++ b/src/gooey.cpp @@ -84,6 +84,7 @@ renderGooey(SDL_Handles &handles, HexDrawMode &mode, bool &is_debug, ImGui::Text("is_selecting"); ImGui::SameLine(); ImGui::TextUnformatted(is_selecting ? "true" : "false"); + ImGui::SetNextTreeNodeOpen(true); if (ImGui::CollapsingHeader("Camera Position")) { ImGui::Text("x: %f", camera_pos.x); ImGui::Text("y: %f", camera_pos.y); diff --git a/src/hexgame.cpp b/src/hexgame.cpp index a76a37c..04c5889 100644 --- a/src/hexgame.cpp +++ b/src/hexgame.cpp @@ -6,12 +6,13 @@ // - lighting // - add light struct // - pass all lights to render groups/shaders every frame -// - maybe use more than one model in a scene // - map generation // - pathfinding // - assimp animation // - replace aixlog with custom logging iostream? // - fix vector normalization in renderer.cpp when moving in 2 directions +// - may be fixed?? need to test by examining camera position between frames +// and compare the distance // - add prefix to interface function names for eg) gooey.h, renderer.h // - move hex logic to new file to leave only init glue in a main.cpp // - move SDL input callbacks somewhere too? @@ -19,7 +20,6 @@ // - actually don't need to save the vertex/normal buffers after passing // to opengl // - replace calls to malloc/free with safe(r) function in util.h -// - also need to make a macro that works with malloc void * and c++ // - add cpu perforcmace counters in render loop // - check for memory leaks w/ valgrind //----------------------------------------------------------------------------- @@ -550,12 +550,15 @@ int main(int argc, char* argv[]) game_state* g = g_game_state; g->entities = (Entity*) std::calloc(1000, sizeof(Entity)); - const char* test_file1 = "../data/animated.block.dae"; - const char* test_file2 = "../data/catepillar.dae"; meMeshGroup mg1, mg2; - if (meLoadFromFile(test_file1, mg1)) { - g->entities[g->entity_count].mesh_group = mg1; + // TODO: store these meMeshGroups serperately from entities to re-use them, + // and to make initializing easier, eg) appling translation has to happen after + // rgInitEntity() called from renderer createScene() + if (meLoadFromFile("../data/animated.block.dae", mg1)) { + Entity& e = g->entities[0]; + e.mesh_group = mg1; + e.scale = glm::vec3(100,100,100); g->entity_count++; } else { @@ -563,8 +566,11 @@ int main(int argc, char* argv[]) return 1; } - if (meLoadFromFile(test_file2, mg2)) { - g->entities[g->entity_count].mesh_group = mg2; + if (meLoadFromFile("../data/catepillar.dae", mg2)) { + Entity& e = g->entities[1]; + e.mesh_group = mg2; + e.scale = glm::vec3(10,10,10); + e.translation = glm::vec3(640, 500, 0); g->entity_count++; } else { diff --git a/src/mesh.cpp b/src/mesh.cpp index 2d681a7..172826d 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -81,8 +81,7 @@ meMeshInfo* copyMeshInfo(const aiScene* scene, aiMesh* mesh) { meMeshInfo* mi = (meMeshInfo*) std::calloc(1, sizeof(meMeshInfo)); - // TODO: using hard coded model transform for now - mi->model_transform = glm::scale(glm::mat4(1), glm::vec3(100, 100, 100)); + mi->model_transform = glm::mat4(1); // allocate buffers for vertex and index data from mesh mi->num_vertices = mesh->mNumVertices; diff --git a/src/render_group.cpp b/src/render_group.cpp index 3e0fb5e..b7fa836 100644 --- a/src/render_group.cpp +++ b/src/render_group.cpp @@ -115,6 +115,11 @@ rgInitEntity(Entity* e) rg->use_normals = e->mesh_group.use_normals; uint num_meshes = rg->num_objects = e->mesh_group.num_meshes; + // apply translation/rotation/scaling + e->world_transform = glm::mat4(1.0); + e->world_transform = glm::translate(e->world_transform, e->translation); + e->world_transform = glm::scale(e->world_transform, e->scale); + rg->render_objects = (render_object**) std::calloc(num_meshes, sizeof(render_object*)); for (uint i = 0; i < num_meshes; i++) @@ -325,9 +330,12 @@ drawRenderObject(render_group* rg, render_object* ro, // draw if (rg->draw_indexed) { glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ro->index_buffer.buffer_id); + // TODO: find out why rg->draw_mode isn't being preserved as GL_TRIANGLES + //glDrawElements(rg->draw_mode, ro->index_buffer.buffer_len, GL_UNSIGNED_INT, 0); glDrawElements(GL_TRIANGLES, ro->index_buffer.buffer_len, GL_UNSIGNED_INT, 0); } else { - glDrawArrays(rg->draw_mode, 0, ro->vertex_buffer.buffer_len / 3); + //glDrawArrays(rg->draw_mode, 0, ro->vertex_buffer.buffer_len / 3); + glDrawArrays(GL_TRIANGLES, 0, ro->vertex_buffer.buffer_len / 3); } // cleanup diff --git a/src/renderer.cpp b/src/renderer.cpp index fa85773..8bf9ca1 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -105,7 +105,7 @@ addTexture(SDL_Handles &handles, const char * path) if (!image) { LOG(ERROR) << "IMG_Load: " << IMG_GetError() << "\n"; - return 1; + return false; } GLuint tex_id; @@ -451,6 +451,9 @@ createScene(std::vector* hexes, Entity* entities, uint32 entity_count) rgInitEntity(&entities[i]); entities[i].ren_group->shader = sp; } + + //mi->model_transform = glm::scale(glm::mat4(1), glm::vec3(100, 100, 100)); + //entityTranslate(&g_game_state->entities[1], 640, 500, 0); #else if (!rgInitEntity(&entities[0])) { LOG(ERROR) << "Error initialzing entity\n"; @@ -464,7 +467,7 @@ createScene(std::vector* hexes, Entity* entities, uint32 entity_count) //g_test_light.light_ID = glGetUniformLocation(g_entity_render_group.program_id, "light_position"); if (entities[0].ren_group != nullptr) { g_test_light.light_ID = glGetUniformLocation(entities[0].ren_group->shader.program_id, "light_position"); - g_test_light.position = glm::vec3(640, 500, 400); // above center of hexgrid + g_test_light.position = glm::vec3(800, 300, 400); // above center of hexgrid g_test_light.direction = glm::vec3(0, 0, 0) - g_test_light.position; // back towards test entity g_test_light.color = glm::vec3(1.f, 1.f, 1.f); g_test_light.intensity = 1.f; @@ -585,12 +588,8 @@ renderFrame(std::vector *hexes, Entity* entities, uint32 entity_count) // entities for (uint i = 0; i < entity_count; i++) { - - // TODO: find a way to store model xform on the meMeshGroup object - glm::mat4 model_transform = entities[i].mesh_group.meshes[0]->model_transform; - rgDraw( - entities[i].ren_group, model_transform, m_view, m_projection, + entities[i].ren_group, entities[i].world_transform , m_view, m_projection, g_test_light.position, g_test_light.light_ID ); }