From 0c6b0bc28e3516743cda1e62750372ef70308cfd Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Sat, 17 Sep 2022 12:07:39 +0200 Subject: [PATCH] =?utf8?q?Add=20bl=C3=A5haj?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Created by [twitter.com/IsabelleDotJpeg](https://twitter.com/IsabelleDotJpeg) --- "narcissus/data/bl\303\245haj.mtl" | 10 + "narcissus/data/bl\303\245haj.obj" | 977 +++++++++++++++++++++++++++++ "narcissus/data/bl\303\245haj.png" | Bin 0 -> 8862 bytes narcissus/src/main.rs | 119 ++-- 4 files changed, 1051 insertions(+), 55 deletions(-) create mode 100644 "narcissus/data/bl\303\245haj.mtl" create mode 100644 "narcissus/data/bl\303\245haj.obj" create mode 100644 "narcissus/data/bl\303\245haj.png" diff --git "a/narcissus/data/bl\303\245haj.mtl" "b/narcissus/data/bl\303\245haj.mtl" new file mode 100644 index 0000000..a1d854a --- /dev/null +++ "b/narcissus/data/bl\303\245haj.mtl" @@ -0,0 +1,10 @@ +newmtl Blåhaj +Ns 225.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd blåhaj.png diff --git "a/narcissus/data/bl\303\245haj.obj" "b/narcissus/data/bl\303\245haj.obj" new file mode 100644 index 0000000..0c5da9a --- /dev/null +++ "b/narcissus/data/bl\303\245haj.obj" @@ -0,0 +1,977 @@ +mtllib blåhaj.mtl +o Blåhaj +v -0.513672 0.477227 -0.487855 +v 0.101348 1.145127 -0.448955 +v 0.321097 0.969551 -0.396203 +v 0.290456 0.070505 -0.304060 +v 0.695866 -0.140460 -0.287407 +v 1.346310 -0.618434 -0.211921 +v 1.397743 -0.585071 -0.202461 +v -1.394655 1.405304 -0.659389 +v 0.500909 1.185633 -0.370190 +v 0.816441 0.335292 -0.358545 +v 0.132425 0.176289 -0.359488 +v 0.759247 0.290431 -0.347384 +v 1.130525 -0.252491 -0.249706 +v 1.165361 -0.016181 -0.245199 +v 1.382198 -0.163773 -0.203984 +v 1.613403 0.161917 -0.165239 +v 1.762753 0.114832 -0.139172 +v -1.022862 1.612946 -0.582463 +v 0.295581 1.205686 -0.400898 +v 0.202856 0.990160 -0.281962 +v 0.473640 0.635851 -0.343627 +v 0.877805 0.121704 -0.211098 +v -0.148832 1.223855 -0.436048 +v -0.721265 1.529708 -0.533413 +v -0.980803 0.792280 -0.576703 +v 0.128809 0.275253 -0.076610 +v 0.680725 -0.109638 -0.220780 +v 0.306368 0.536874 -0.062072 +v -1.353977 1.196646 -0.645581 +v -1.291000 1.582837 -0.645620 +v -0.376604 0.499755 -0.174481 +v -0.804048 1.386206 -0.241745 +v -0.139656 1.040884 -0.120274 +v -0.842712 0.803758 -0.253919 +v -1.107182 1.088119 -0.295826 +v -1.126454 1.315278 -0.298987 +v -0.416076 0.690944 -0.072647 +v -0.798298 1.196549 -0.144272 +v -0.177471 0.898461 -0.034039 +v -0.708015 0.868516 -0.128512 +v -0.896793 0.760708 -0.089954 +v -0.437961 0.459449 -0.005359 +v -0.753841 0.803125 0.029935 +v -0.616831 0.564260 0.139010 +v -0.716222 0.646515 0.148231 +v -0.601215 0.609184 0.160815 +v -0.583240 1.473795 -0.641733 +v -0.964535 0.794871 -0.707813 +v -0.256922 1.290885 -0.585181 +v -0.670076 0.594652 -0.656782 +v -0.098607 1.217722 -0.557744 +v -0.490569 0.476045 -0.625673 +v 0.063689 1.193024 -0.529618 +v -0.304107 0.380354 -0.593358 +v 0.369015 0.841932 -0.476703 +v 0.000000 0.226583 -0.540655 +v 0.490768 0.657438 -0.455603 +v 0.177920 0.171909 -0.509821 +v 0.609316 0.498471 -0.435058 +v 0.307872 0.071943 -0.487300 +v 0.712328 0.358604 -0.417206 +v 0.469293 -0.018792 -0.459325 +v 0.847254 0.212591 -0.393822 +v 0.650478 -0.106666 -0.427925 +v 0.969917 0.092877 -0.372565 +v 0.814752 -0.171993 -0.399455 +v 1.098834 0.021344 -0.350223 +v 0.970459 -0.215738 -0.372471 +v 1.180638 0.019605 -0.336046 +v 1.112221 -0.270739 -0.347903 +v 1.410525 0.101982 -0.296205 +v 1.421314 -0.190659 -0.294336 +v 1.631845 0.205940 -0.257850 +v 1.588972 -0.037597 -0.265280 +v 1.752482 0.226307 -0.236943 +v 1.739030 0.056585 -0.239274 +v 1.837107 0.204510 -0.222277 +v 1.816547 0.114541 -0.225840 +v 1.869906 0.157819 -0.216593 +v 1.192469 -0.467054 -0.333995 +v 1.411708 -0.411759 -0.296000 +v 1.292515 -0.615039 -0.316657 +v 1.427498 -0.572308 -0.293264 +v 1.345521 -0.700101 -0.307471 +v 1.432081 -0.659492 -0.292470 +v 1.376050 -0.729371 -0.302180 +v 1.421653 -0.707190 -0.294277 +v -0.761753 1.555354 -0.672670 +v -1.129588 0.981260 -0.736417 +v -0.915410 1.602294 -0.699299 +v -1.252799 1.103611 -0.757770 +v -1.071297 1.614315 -0.726315 +v -1.345704 1.217310 -0.773871 +v -1.185237 1.600895 -0.746061 +v -1.373569 1.338073 -0.778700 +v -1.273591 1.581941 -0.761374 +v -1.359707 1.454011 -0.776298 +v 0.248914 1.286714 -0.497517 +v 0.378305 0.987426 -0.475093 +v 0.411180 1.295118 -0.469396 +v 0.465986 1.109555 -0.459898 +v 0.527362 1.269528 -0.449261 +v 0.542995 1.174291 -0.446552 +v 0.595585 1.256260 -0.437438 +v 0.609783 1.224493 -0.434977 +v 0.782048 0.367820 -0.405123 +v 0.839494 0.295114 -0.395167 +v 0.825461 0.367566 -0.397599 +v 0.847777 0.332287 -0.393732 +v -0.465949 0.477227 -0.763227 +v 0.134572 1.131882 -0.599543 +v 0.371960 0.903724 -0.556602 +v 0.197223 0.169511 -0.666393 +v 1.164171 -0.252539 -0.436033 +v 1.647258 0.158815 -0.351837 +v 1.378417 -0.618434 -0.397183 +v 1.430033 -0.585071 -0.388784 +v -1.353277 1.405304 -0.898149 +v 0.375879 1.042471 -0.567178 +v 0.325372 1.205686 -0.572799 +v 0.830108 0.335292 -0.437411 +v 0.511330 0.638265 -0.566565 +v 0.781242 0.290013 -0.467346 +v 1.179564 -0.010585 -0.431807 +v 1.414883 -0.163773 -0.392581 +v 1.795054 0.114832 -0.325556 +v -0.977280 1.612946 -0.845480 +v 0.544755 1.194055 -0.520308 +v 0.278076 0.990160 -0.716001 +v 0.941607 0.118043 -0.555198 +v -0.083864 1.214213 -0.676285 +v -0.676766 1.529708 -0.790182 +v -1.310325 1.196646 -0.897463 +v -0.935735 0.792280 -0.836751 +v 0.450893 0.536059 -0.886713 +v 0.760643 -0.138189 -0.585728 +v -1.251033 1.582837 -0.876235 +v -0.231301 0.499683 -1.012397 +v -0.656574 1.386206 -1.092697 +v 0.274293 0.265534 -0.927535 +v 0.009948 1.040884 -0.983515 +v -0.701575 0.807694 -1.094951 +v -0.960229 1.088119 -1.143775 +v -0.979441 1.315278 -1.147283 +v -0.226899 0.685402 -1.121229 +v -0.618360 1.196549 -1.182551 +v 0.005668 0.897699 -1.076725 +v -0.528616 0.868818 -1.167037 +v -0.692833 0.760708 -1.266845 +v -0.232292 0.459449 -1.192109 +v -0.517875 0.803125 -1.331638 +v -0.352151 0.564260 -1.388249 +v -0.442642 0.646515 -1.430377 +v -0.330108 0.609184 -1.403527 +vt 0.625330 0.143403 +vt 0.658445 0.124408 +vt 0.624013 0.200651 +vt 0.990716 0.589020 +vt 0.966159 0.581131 +vt 0.996827 0.555363 +vt 0.502189 0.954105 +vt 0.505948 0.982298 +vt 0.451646 0.945813 +vt 0.627160 0.093605 +vt 0.418993 0.937994 +vt 0.414665 0.966085 +vt 0.400551 0.934063 +vt 0.631341 0.006301 +vt 0.660360 0.000423 +vt 0.629700 0.049073 +vt 0.350544 0.282011 +vt 0.378198 0.316758 +vt 0.349109 0.330593 +vt 0.388162 0.932934 +vt 0.883200 0.931219 +vt 0.898668 0.949748 +vt 0.883312 0.949096 +vt 0.353316 0.121756 +vt 0.389800 0.142834 +vt 0.351643 0.176375 +vt 0.882784 0.973289 +vt 0.854365 0.977751 +vt 0.882572 0.920890 +vt 0.622342 0.738821 +vt 0.661532 0.816979 +vt 0.624220 0.786943 +vt 0.469432 0.845635 +vt 0.483257 0.858220 +vt 0.468829 0.855653 +vt 0.624083 0.299966 +vt 0.659898 0.307249 +vt 0.621388 0.351539 +vt 0.360989 0.041164 +vt 0.396072 0.063440 +vt 0.356102 0.078724 +vt 0.626586 0.826377 +vt 0.435967 0.838245 +vt 0.467713 0.842688 +vt 0.434196 0.862717 +vt 0.826493 0.526367 +vt 0.860094 0.526273 +vt 0.827576 0.543349 +vt 0.826493 0.452269 +vt 0.860913 0.470126 +vt 0.826041 0.482807 +vt 0.435967 0.885722 +vt 0.453973 0.891755 +vt 0.439846 0.900826 +vt 0.849666 0.170791 +vt 0.841745 0.084642 +vt 0.952907 0.078470 +vt 0.374973 0.408696 +vt 0.415398 0.443676 +vt 0.372884 0.486082 +vt 0.959580 0.720492 +vt 0.951697 0.798935 +vt 0.912973 0.747024 +vt 0.672209 0.261514 +vt 0.758163 0.309282 +vt 0.489397 0.551720 +vt 0.393171 0.556814 +vt 0.689288 0.126948 +vt 0.218719 0.718047 +vt 0.134018 0.753678 +vt 0.104744 0.541273 +vt 0.042952 0.361542 +vt 0.092956 0.374659 +vt 0.215653 0.221039 +vt 0.170309 0.250413 +vt 0.180460 0.115857 +vt 0.657475 0.667397 +vt 0.753361 0.625230 +vt 0.918403 0.548140 +vt 0.942709 0.557990 +vt 0.951524 0.600165 +vt 0.040634 0.839054 +vt 0.044556 0.837767 +vt 0.041603 0.836825 +vt 0.639862 0.935377 +vt 0.630940 0.965289 +vt 0.658907 0.932934 +vt 0.674371 0.137246 +vt 0.505948 0.982298 +vt 0.963197 0.597326 +vt 0.991519 0.631614 +vt 0.882784 0.900280 +vt 0.898403 0.881541 +vt 0.885504 0.864373 +vt 0.964629 0.448203 +vt 0.995501 0.432985 +vt 0.964842 0.422654 +vt 0.994213 0.659673 +vt 0.414665 0.966086 +vt 0.618426 0.569585 +vt 0.659918 0.508898 +vt 0.618333 0.508235 +vt 0.885504 0.957616 +vt 0.898384 0.948530 +vt 0.965556 0.410896 +vt 0.660595 -0.000060 +vt 0.378985 0.319260 +vt 0.372640 0.827080 +vt 0.401226 0.826293 +vt 0.375469 0.808152 +vt 0.619455 0.448548 +vt 0.389800 0.142834 +vt 0.471110 0.866632 +vt 0.483257 0.858220 +vt 0.565802 0.947126 +vt 0.933128 0.663956 +vt 0.920492 0.667761 +vt 0.934021 0.673637 +vt 0.661532 0.816979 +vt 0.853639 0.886837 +vt 0.882784 0.864372 +vt 0.668909 0.306138 +vt 0.396072 0.063440 +vt 0.613281 0.939128 +vt 0.467713 0.842688 +vt 0.623391 0.253481 +vt 0.965556 0.543349 +vt 0.995374 0.540892 +vt 0.963851 0.494541 +vt 0.860094 0.526273 +vt 0.369791 0.662381 +vt 0.384261 0.686618 +vt 0.365385 0.614972 +vt 0.860914 0.470126 +vt 0.453973 0.891755 +vt 0.952941 0.078441 +vt 0.961933 0.035254 +vt 0.841745 0.084642 +vt 0.415398 0.443676 +vt 0.374973 0.408696 +vt 0.372884 0.486082 +vt 0.867019 0.796088 +vt 0.937325 0.790617 +vt 0.912973 0.747024 +vt 0.489700 0.552446 +vt 0.393098 0.556884 +vt 0.134329 0.755598 +vt 0.189257 0.845380 +vt 0.220383 0.706825 +vt 0.901949 0.718982 +vt 0.961313 0.697559 +vt 0.105711 0.541948 +vt 0.757081 0.309561 +vt 0.093203 0.375171 +vt 0.042952 0.361542 +vt 0.064557 0.150736 +vt 0.116942 0.194662 +vt 0.124760 0.088981 +vt 0.170289 0.250234 +vt 0.215096 0.219436 +vt 0.180460 0.115857 +vt 0.088711 0.002435 +vt 0.146307 0.004447 +vt 0.753444 0.626844 +vt 0.657475 0.667397 +vt 0.490952 0.158111 +vt 0.220442 0.378064 +vt 0.174124 0.350301 +vt 0.202571 0.534959 +vt 0.745671 0.902251 +vt 0.741267 0.952410 +vt 0.768948 0.976605 +vt 0.951800 0.288159 +vt 0.977483 0.324616 +vt 0.988781 0.256596 +vt 0.942709 0.557990 +vt 0.918403 0.548140 +vt 0.951524 0.600165 +vt 0.630940 0.965289 +vt 0.995501 0.432985 +vt 0.995026 0.540717 +vt 0.971778 0.653302 +vt 0.424020 0.744855 +vt 0.375946 0.766544 +vt 0.373410 0.718110 +vt 0.383936 0.686491 +vt 0.659918 0.508898 +vt 0.618829 0.671054 +vt 0.898403 0.881541 +vt 0.401430 0.827363 +vt 0.400129 0.967568 +vt 0.375156 0.935628 +vt 0.430174 0.831325 +vt 0.422161 0.895489 +vt 0.403002 0.873682 +vt 0.406318 0.832406 +vt 0.996827 0.682701 +vt 0.920572 0.649199 +vt 0.934021 0.646724 +vt 0.920492 0.667761 +vt 0.484351 0.838062 +vt 0.471110 0.831143 +vt 0.853639 0.886864 +vt 0.360430 0.560754 +vt 0.354112 0.501435 +vt 0.394831 0.062112 +vt 0.365846 0.017513 +vt 0.402646 0.003745 +vt 0.827533 0.426351 +vt 0.856128 0.426209 +vt 0.728672 0.031965 +vt 0.742101 0.025332 +vt 0.788312 0.145203 +vt 0.961933 0.035254 +vt 0.189367 0.844990 +vt 0.126138 0.817793 +vt 0.874136 0.794721 +vt 0.124760 0.088981 +vt 0.146307 0.004447 +vt 0.190873 0.034994 +vt 0.753830 0.466752 +vt 0.484938 0.364658 +vt 0.064557 0.150736 +vt 0.116942 0.194662 +vt 0.202493 0.537282 +vt 0.071096 0.021684 +vt 0.088711 0.002435 +vt 0.490952 0.158111 +vt 0.173810 0.347627 +vt 0.758611 0.731126 +vt 0.768948 0.976605 +vt 0.745671 0.902251 +vt 0.823832 0.890239 +vt 0.823829 0.978030 +vt 0.358223 0.841639 +vt 0.403002 0.831143 +vt 0.403002 0.883636 +vt 0.349109 0.889925 +vt 0.220442 0.378064 +vt 0.850332 0.233279 +vt 0.897486 0.233218 +vt 0.896779 0.391742 +vt 0.849664 0.389781 +vt 0.741267 0.952410 +vt 0.951800 0.288159 +vt 0.988781 0.256596 +vt 0.977483 0.324616 +vt 0.951524 0.646724 +vt 0.900260 0.622502 +vt 0.802328 0.288593 +vt 0.799266 0.336212 +vt 0.050734 0.938690 +vt 0.051791 0.954523 +vt 0.086935 0.952930 +vt 0.087317 0.937852 +vt 0.985658 0.360507 +vt 0.976228 0.350736 +vt 0.087419 0.928737 +vt 0.049630 0.931359 +vt 0.086480 0.919888 +vt 0.046587 0.924976 +vt 0.052434 0.906111 +vt 0.084861 0.905509 +vt 0.056455 0.897587 +vt 0.082574 0.897890 +vt 0.059586 0.889752 +vt 0.083183 0.890974 +vt 0.062372 0.882905 +vt 0.082670 0.883136 +vt 0.064609 0.874775 +vt 0.081564 0.874653 +vt 0.066147 0.867676 +vt 0.080015 0.867285 +vt 0.077857 0.860710 +vt 0.065702 0.861437 +vt 0.076469 0.854382 +vt 0.063762 0.858461 +vt 0.065845 0.845087 +vt 0.054993 0.852062 +vt 0.055918 0.842513 +vt 0.045615 0.846455 +vt 0.048659 0.839245 +vt 0.041882 0.842583 +vt 0.074479 0.840455 +vt 0.081958 0.847082 +vt 0.085125 0.840159 +vt 0.080191 0.836274 +vt 0.083390 0.834147 +vt 0.087056 0.836341 +vt 0.085458 0.833448 +vt 0.087419 0.834586 +vt 0.083903 0.963052 +vt 0.053072 0.962768 +vt 0.055058 0.969341 +vt 0.082278 0.970230 +vt 0.058426 0.975209 +vt 0.080238 0.976124 +vt 0.061730 0.978997 +vt 0.076334 0.979843 +vt 0.071590 0.981955 +vt 0.064618 0.981743 +vt 0.046679 0.909052 +vt 0.038484 0.920435 +vt 0.039889 0.908653 +vt 0.034184 0.914798 +vt 0.035541 0.907346 +vt 0.032306 0.910051 +vt 0.031137 0.907303 +vt 0.031995 0.906078 +vt 0.061664 0.876911 +vt 0.060312 0.880610 +vt 0.060049 0.877450 +vt 0.059256 0.879045 +vt 0.971065 0.567078 +vt 0.960971 0.724493 +vt 0.423568 0.746327 +vt 0.400129 0.967568 +vt 0.975438 0.659444 +vt 0.432486 0.831221 +vt 0.425249 0.899189 +vt 0.920572 0.649199 +vt 0.854464 0.980908 +vt 0.484351 0.838062 +vt 0.394831 0.062111 +vt 0.402646 0.003745 +vt 0.856128 0.426209 +vt 0.788478 0.145439 +vt 0.846410 0.173899 +vt 0.728672 0.031965 +vt 0.742101 0.025332 +vt 0.964998 0.808390 +vt 0.190873 0.034994 +vt 0.126138 0.817793 +vt 0.753830 0.466720 +vt 0.484938 0.364658 +vt 0.071096 0.021684 +vt 0.758611 0.731126 +vt 0.823829 0.978030 +vt 0.823831 0.890276 +vt 0.358223 0.841639 +vt 0.349109 0.889925 +vt 0.403002 0.883636 +vt 0.403002 0.831143 +vt 0.896778 0.391773 +vt 0.897486 0.233218 +vt 0.850332 0.233279 +vt 0.849664 0.389781 +vt 0.900260 0.622502 +vt 0.951524 0.646724 +vt 0.802328 0.288593 +vt 0.799266 0.336212 +vt 0.976228 0.350736 +vt 0.985658 0.360507 +vn -0.4237 -0.9023 -0.0801 +vn 0.8144 -0.0584 0.5774 +vn 0.9122 -0.0427 0.4076 +vn -0.3507 -0.9300 -0.1104 +vn 0.9467 0.0527 0.3176 +vn -0.3869 -0.8910 0.2377 +vn 0.3994 0.9090 0.1190 +vn 0.8467 -0.2037 0.4915 +vn 0.0069 0.6847 0.7288 +vn 0.4080 0.9117 0.0493 +vn -0.3668 0.8849 0.2869 +vn -0.7005 -0.7125 -0.0408 +vn -0.1028 0.7783 0.6194 +vn -0.2840 -0.9571 -0.0581 +vn 0.0799 0.9967 -0.0174 +vn -0.7548 -0.6382 -0.1515 +vn -0.2180 0.8976 0.3833 +vn -0.2033 0.9784 -0.0381 +vn -0.9638 0.1202 -0.2380 +vn 0.4267 0.3986 0.8118 +vn -0.1798 0.0106 0.9837 +vn 0.5139 0.7617 0.3945 +vn -0.2383 -0.0064 0.9712 +vn -0.5983 -0.7587 0.2578 +vn 0.6986 0.4351 0.5680 +vn -0.2621 -0.8972 0.3555 +vn 0.2750 0.7823 0.5588 +vn -0.4531 -0.7983 0.3966 +vn 0.1391 -0.1594 0.9774 +vn -0.4513 -0.8446 0.2881 +vn 0.3569 0.4126 0.8380 +vn -0.5270 -0.3780 0.7612 +vn -0.7210 -0.6092 0.3301 +vn 0.3440 -0.5041 0.7922 +vn -0.1708 0.0000 0.9853 +vn 0.6382 -0.7570 -0.1398 +vn -0.4179 -0.9016 -0.1117 +vn 0.9961 -0.0427 -0.0769 +vn -0.3591 -0.9311 -0.0647 +vn 0.7851 -0.5223 -0.3329 +vn 0.0824 0.7189 -0.6902 +vn -0.6186 -0.4547 -0.6408 +vn 0.6491 -0.7574 -0.0716 +vn 0.9984 0.0527 0.0195 +vn -0.5358 -0.8380 -0.1031 +vn 0.7167 0.2706 -0.6427 +vn -0.4366 -0.5798 -0.6879 +vn -0.2849 -0.8916 -0.3521 +vn 0.4158 0.9091 0.0248 +vn 0.9627 -0.2037 -0.1779 +vn 0.0723 0.9510 -0.3006 +vn 0.2519 0.6935 -0.6750 +vn -0.4429 -0.8924 -0.0869 +vn 0.4008 0.9117 0.0909 +vn 0.8210 0.4866 -0.2986 +vn 0.6772 -0.6972 -0.2351 +vn 0.9061 -0.1872 -0.3794 +vn -0.6734 -0.7125 -0.1972 +vn -0.3086 0.8291 -0.4663 +vn 0.1116 0.7783 -0.6179 +vn -0.2903 -0.9567 -0.0211 +vn 0.0694 0.9967 0.0433 +vn 0.5073 -0.8490 0.1478 +vn -0.7618 -0.6382 -0.1114 +vn -0.0707 0.8870 -0.4563 +vn -0.6018 -0.7963 -0.0620 +vn -0.7723 -0.3531 -0.5281 +vn -0.2042 0.9784 -0.0325 +vn 0.7669 0.5954 0.2396 +vn -0.9877 0.1202 -0.1002 +vn 0.6750 0.3986 -0.6209 +vn 0.1747 -0.0015 -0.9846 +vn 0.6946 0.7191 -0.0192 +vn 0.2345 0.0391 -0.9713 +vn 0.8489 0.4356 -0.2993 +vn 0.3175 -0.1121 -0.9416 +vn -0.3990 0.6408 0.6558 +vn 0.4279 -0.1971 -0.8820 +vn -0.3890 -0.8215 -0.4169 +vn 0.6208 0.4146 -0.6654 +vn 0.0559 0.4367 -0.8979 +vn -0.2397 -0.3769 -0.8947 +vn -0.4549 0.3624 -0.8135 +vn -0.5687 -0.6097 -0.5521 +vn 0.3118 0.8664 -0.3902 +vn -0.0881 -0.5021 -0.8603 +vn 0.3703 0.6162 -0.6952 +vn -0.3983 0.3446 -0.8500 +vn 0.5905 -0.5041 -0.6302 +vn 0.5540 -0.7570 0.3464 +vn -0.7819 -0.4323 0.4492 +vn 0.4635 0.8813 0.0920 +vn 0.7277 -0.6130 0.3078 +vn 0.9682 0.0539 0.2445 +vn 0.6800 0.6955 0.2323 +vn -0.5491 -0.8323 -0.0765 +vn -0.1547 0.7189 0.6776 +vn -0.2575 -0.9660 0.0237 +vn -0.7982 -0.4547 0.3952 +vn 0.4497 0.8903 0.0722 +vn 0.5446 -0.7322 0.4089 +vn -0.0251 0.6599 0.7509 +vn 0.1883 -0.5773 0.7945 +vn 0.2305 0.9501 0.2104 +vn -0.5393 -0.8380 -0.0832 +vn 0.4248 0.2571 0.8680 +vn -0.6427 -0.5798 0.5008 +vn 0.5078 -0.7663 0.3937 +vn -0.0426 0.9320 0.3600 +vn -0.4463 -0.8924 -0.0672 +vn 0.5132 -0.1156 0.8505 +vn -0.7219 -0.6794 -0.1314 +vn -0.2719 0.6256 0.7312 +vn -0.4359 -0.8995 0.0288 +vn 0.2540 0.9594 0.1226 +vn 0.6726 0.4866 0.5575 +vn -0.4125 0.8798 0.2364 +vn 0.5586 -0.6972 0.4493 +vn 0.7256 -0.1872 0.6622 +vn 0.8809 0.4717 0.0379 +vn 0.5274 -0.8490 0.0315 +vn -0.5607 -0.8221 -0.0985 +vn -0.1237 0.9911 0.0498 +vn 0.5204 -0.7859 0.3340 +vn 0.7608 0.6164 0.2029 +vn -0.9753 -0.2073 -0.0767 +vn 0.0646 0.6614 0.7473 +vn -0.8433 0.5314 -0.0806 +vn -0.4677 -0.8833 -0.0307 +vn -0.9055 -0.3535 0.2345 +vn -0.1779 -0.0031 0.9840 +vn 0.8018 0.5960 0.0432 +vn 0.6709 0.4046 0.6214 +vn -0.1815 0.0080 0.9834 +vn -0.1707 0.0040 0.9853 +vn 0.0619 -0.0609 0.9962 +vn -0.1476 0.0037 0.9890 +vn -0.8181 -0.0904 0.5680 +vn 0.7661 0.6322 0.1162 +vn -0.5650 -0.7740 0.2857 +vn -0.4432 -0.8538 0.2732 +vn 0.5790 0.5980 0.5542 +vn 0.3402 0.8179 0.4640 +vn -0.2495 0.4367 0.8643 +vn 0.1475 -0.1544 0.9769 +vn -0.2552 0.7119 0.6543 +vn -0.7021 0.3624 0.6130 +vn 0.3420 0.8098 0.4767 +vn 0.4326 0.4716 0.7684 +vn -0.1757 0.0067 0.9844 +vn 0.1623 0.8664 0.4723 +vn -0.7179 -0.6214 0.3137 +vn -0.0325 -0.0840 0.9959 +vn 0.4074 0.7497 0.5216 +vn -0.4674 0.8715 0.1483 +vn -0.4248 -0.0530 0.9037 +vn 0.0807 0.4765 0.8755 +vn -0.3719 -0.4950 0.7852 +vn -0.4643 -0.8079 -0.3631 +vn 0.1147 0.6162 0.7792 +vn -0.6612 0.3446 0.6664 +vn 0.8398 0.0768 0.5375 +vn -0.5645 -0.8252 -0.0177 +vn -0.2173 -0.3641 0.9057 +vn 0.9985 -0.0473 -0.0291 +vn -0.1567 0.6215 -0.7676 +vn -0.5854 -0.4330 -0.6854 +vn 0.4641 0.8824 0.0776 +vn 0.9940 0.0539 0.0956 +vn 0.7191 0.6947 0.0134 +vn -0.5428 -0.8323 -0.1127 +vn -0.2349 -0.9646 -0.1197 +vn 0.4569 0.8869 0.0679 +vn 0.2280 0.6613 -0.7146 +vn 0.4447 -0.5773 -0.6848 +vn 0.6651 -0.7251 -0.1784 +vn 0.3116 0.9333 -0.1786 +vn 0.7772 -0.1114 -0.6193 +vn -0.7240 -0.6794 -0.1192 +vn -0.2832 0.9175 -0.2793 +vn -0.0103 0.6246 -0.7809 +vn -0.4029 -0.8994 -0.1693 +vn 0.2804 0.9594 -0.0300 +vn 0.8425 0.4942 0.2141 +vn -0.0997 0.9911 -0.0885 +vn 0.6024 -0.7859 -0.1394 +vn 0.7835 0.6171 0.0722 +vn -0.9442 -0.2073 -0.2560 +vn 0.3077 0.6613 -0.6841 +vn -0.8212 0.5314 -0.2079 +vn -0.4482 -0.8706 -0.2029 +vn 0.1676 0.0050 -0.9858 +vn 0.8524 0.4570 -0.2542 +vn 0.1705 -0.0037 -0.9854 +vn 0.1202 -0.0347 -0.9921 +vn -0.5792 -0.0904 -0.8101 +vn 0.4546 -0.0134 -0.8906 +vn 0.7602 0.6320 0.1504 +vn 0.4451 0.7928 -0.4163 +vn -0.4360 -0.7732 -0.4606 +vn -0.3331 -0.8531 -0.4015 +vn 0.7312 0.5976 -0.3288 +vn 0.4734 0.8212 -0.3187 +vn 0.4660 -0.1733 -0.8677 +vn -0.0201 0.7119 -0.7020 +vn 0.4838 0.8104 -0.3306 +vn 0.6661 0.4709 -0.5784 +vn 0.1662 0.0090 -0.9861 +vn -0.5708 -0.6202 -0.5381 +vn 0.3072 -0.0930 -0.9471 +vn 0.5592 0.7498 -0.3538 +vn -0.3820 0.8695 -0.3133 +vn -0.0960 -0.0529 -0.9940 +vn 0.3706 0.4763 -0.7974 +vn -0.5599 -0.8070 0.1878 +vn 0.9716 0.0495 -0.2316 +vn -0.5376 -0.8252 -0.1733 +vn 0.1002 -0.3641 -0.9260 +usemtl Blåhaj +s off +f 64/1/1 5/2/1 62/3/1 +f 99/4/2 3/5/2 55/6/2 +f 72/7/3 15/8/3 81/9/3 +f 66/10/4 5/2/4 64/1/4 +f 83/11/5 7/12/5 85/13/5 +f 70/14/6 13/15/6 68/16/6 +f 49/17/7 23/18/7 51/19/7 +f 85/13/8 7/12/8 87/20/8 +f 102/21/9 9/22/9 104/23/9 +f 88/24/10 24/25/10 47/26/10 +f 69/27/11 14/28/11 71/29/11 +f 89/30/12 29/31/12 91/32/12 +f 106/33/13 10/34/13 108/35/13 +f 58/36/14 11/37/14 56/38/14 +f 92/39/15 18/40/15 90/41/15 +f 91/32/16 29/31/16 93/42/16 +f 73/43/17 16/44/17 75/45/17 +f 96/46/18 30/47/18 94/48/18 +f 95/49/19 8/50/19 97/51/19 +f 77/52/20 17/53/20 79/54/20 +f 14/55/21 15/56/21 16/57/21 +f 2/58/22 20/59/22 3/60/22 +f 2/61/23 3/62/23 19/63/23 +f 11/37/24 4/64/24 26/65/24 +f 20/59/25 28/66/25 21/67/25 +f 5/2/26 13/15/26 27/68/26 +f 2/58/27 23/18/27 20/59/27 +f 4/64/28 27/68/28 26/65/28 +f 27/69/29 22/70/29 28/71/29 +f 5/2/30 27/68/30 4/64/30 +f 33/72/31 39/73/31 28/71/31 +f 34/74/32 40/75/32 35/76/32 +f 25/77/33 34/78/33 29/31/33 +f 46/79/34 44/80/34 42/81/34 +f 77/82/35 78/83/35 79/84/35 +f 78/85/36 126/86/36 79/87/36 +f 136/88/37 64/1/37 62/3/37 +f 125/89/38 72/7/38 81/9/38 +f 136/88/39 66/10/39 64/1/39 +f 99/4/40 119/90/40 101/91/40 +f 100/92/41 120/93/41 98/94/41 +f 82/95/42 116/96/42 84/97/42 +f 101/91/43 119/90/43 103/98/43 +f 117/99/44 83/11/44 85/13/44 +f 50/100/45 110/101/45 52/102/45 +f 105/103/46 128/104/46 104/23/46 +f 84/97/47 116/96/47 86/105/47 +f 114/106/48 70/14/48 68/16/48 +f 131/107/49 49/17/49 51/19/49 +f 117/99/50 85/13/50 87/20/50 +f 69/108/51 124/109/51 67/110/51 +f 128/104/52 102/21/52 104/23/52 +f 52/102/53 110/101/53 54/111/53 +f 132/112/54 88/24/54 47/26/54 +f 109/113/55 121/114/55 108/35/55 +f 72/7/56 125/89/56 74/115/56 +f 107/116/57 121/117/57 109/118/57 +f 133/119/58 89/30/58 91/32/58 +f 115/120/59 71/29/59 73/121/59 +f 121/114/60 106/33/60 108/35/60 +f 113/122/61 58/36/61 56/38/61 +f 127/123/62 92/39/62 90/41/62 +f 74/115/63 125/89/63 76/124/63 +f 133/119/64 91/32/64 93/42/64 +f 115/125/65 73/43/65 75/45/65 +f 113/122/66 60/126/66 58/36/66 +f 70/127/67 114/128/67 80/129/67 +f 137/130/68 96/46/68 94/48/68 +f 61/131/69 123/132/69 59/133/69 +f 118/134/70 95/49/70 97/51/70 +f 126/135/71 77/52/71 79/54/71 +f 115/136/72 126/137/72 125/138/72 +f 129/139/73 111/140/73 112/141/73 +f 128/142/74 119/143/74 120/144/74 +f 135/145/75 129/139/75 122/146/75 +f 130/147/76 114/148/76 136/149/76 +f 2/61/77 19/63/77 98/150/77 53/151/77 +f 130/147/78 136/149/78 135/152/78 +f 113/122/79 140/153/79 136/88/79 +f 147/154/80 141/155/80 135/152/80 +f 139/156/81 146/157/81 144/158/81 +f 148/159/82 142/160/82 143/161/82 +f 137/162/83 144/158/83 118/163/83 +f 142/164/84 134/165/84 133/119/84 +f 132/112/85 139/166/85 127/123/85 +f 138/167/86 145/168/86 140/169/86 +f 154/170/87 153/171/87 151/172/87 +f 151/173/88 153/174/88 149/175/88 +f 152/176/89 154/177/89 150/178/89 +f 78/85/90 79/87/90 17/179/90 +f 6/180/91 13/181/91 80/129/91 82/95/91 +f 23/18/92 49/17/92 47/26/92 24/25/92 +f 9/182/93 3/5/93 99/4/93 101/91/93 +f 7/12/94 83/11/94 81/9/94 15/8/94 +f 22/183/95 65/184/95 63/185/95 12/186/95 +f 1/187/96 25/77/96 48/188/96 50/100/96 +f 100/92/97 98/94/97 19/189/97 +f 5/2/98 66/10/98 68/16/98 13/15/98 +f 82/95/99 84/97/99 6/180/99 +f 14/190/100 67/110/100 65/184/100 22/183/100 +f 101/91/101 103/98/101 9/182/101 +f 9/22/102 102/21/102 100/92/102 19/189/102 +f 6/191/103 86/192/103 87/20/103 7/12/103 +f 23/193/104 2/194/104 53/195/104 51/196/104 +f 50/100/105 52/102/105 1/187/105 +f 105/103/106 104/23/106 9/22/106 +f 84/97/107 86/105/107 6/180/107 +f 103/98/108 105/197/108 9/182/108 +f 69/108/109 67/110/109 14/190/109 +f 52/102/110 54/111/110 1/187/110 +f 12/198/111 63/199/111 107/116/111 10/200/111 +f 29/31/112 89/30/112 48/188/112 25/77/112 +f 12/201/113 10/34/113 106/33/113 61/202/113 +f 1/187/114 54/111/114 56/38/114 11/37/114 +f 24/25/115 88/24/115 90/41/115 18/40/115 +f 109/113/116 108/35/116 10/34/116 +f 16/203/117 73/121/117 71/29/117 14/28/117 +f 72/7/118 74/115/118 15/8/118 +f 107/116/119 109/118/119 10/200/119 +f 21/67/120 57/204/120 55/205/120 3/60/120 +f 74/115/121 76/124/121 15/8/121 +f 11/37/122 58/36/122 60/126/122 4/64/122 +f 18/206/123 92/39/123 94/207/123 30/208/123 +f 17/179/124 15/8/124 76/124/124 78/85/124 +f 21/67/125 12/186/125 59/133/125 57/204/125 +f 8/50/126 95/49/126 93/209/126 29/210/126 +f 17/53/127 77/52/127 75/45/127 16/44/127 +f 30/47/128 96/46/128 97/51/128 8/50/128 +f 4/64/129 60/126/129 62/3/129 5/2/129 +f 70/127/130 80/129/130 13/181/130 +f 6/211/131 7/212/131 15/56/131 13/213/131 +f 61/131/132 59/133/132 12/186/132 +f 3/60/133 20/59/133 21/67/133 +f 14/55/134 13/213/134 15/56/134 +f 16/57/135 15/56/135 17/214/135 +f 13/215/136 14/216/136 22/70/136 27/69/136 +f 19/63/137 3/62/137 9/217/137 +f 36/218/138 8/219/138 29/220/138 35/76/138 +f 12/186/139 21/67/139 22/183/139 +f 34/78/140 25/77/140 1/187/140 31/221/140 +f 26/65/141 31/221/141 1/187/141 11/37/141 +f 21/67/142 28/66/142 22/183/142 +f 23/18/143 33/222/143 20/59/143 +f 32/223/144 36/218/144 38/224/144 +f 26/225/145 27/69/145 28/71/145 +f 36/218/146 32/223/146 18/226/146 30/227/146 +f 30/227/147 8/219/147 36/218/147 +f 32/228/148 33/222/148 23/18/148 24/25/148 +f 20/59/149 33/222/149 28/66/149 +f 39/73/150 38/224/150 40/75/150 37/229/150 +f 24/25/151 18/40/151 32/228/151 +f 29/31/152 34/78/152 35/230/152 +f 26/225/153 28/71/153 39/73/153 37/229/153 +f 43/231/154 46/232/154 37/233/154 40/234/154 +f 41/235/155 43/236/155 40/237/155 34/238/155 +f 38/224/156 36/218/156 35/76/156 40/75/156 +f 38/224/157 39/73/157 33/72/157 32/223/157 +f 31/239/158 26/225/158 37/229/158 +f 41/240/159 34/241/159 31/242/159 42/243/159 +f 46/232/160 43/231/160 45/244/160 +f 43/245/161 41/246/161 45/247/161 +f 42/81/162 31/248/162 37/249/162 46/79/162 +f 45/250/163 41/240/163 42/243/163 44/251/163 +f 49/252/35 47/253/35 48/254/35 50/255/35 +f 44/256/164 46/257/164 45/247/164 +f 52/258/35 51/259/35 49/252/35 50/255/35 +f 54/260/35 53/261/35 51/259/35 52/258/35 +f 55/262/35 53/261/35 54/260/35 56/263/35 +f 57/264/35 55/262/35 56/263/35 58/265/35 +f 59/266/35 57/264/35 58/265/35 60/267/35 +f 61/268/35 59/266/35 60/267/35 62/269/35 +f 63/270/35 61/268/35 62/269/35 64/271/35 +f 65/272/35 63/270/35 64/271/35 66/273/35 +f 68/274/35 67/275/35 65/272/35 66/273/35 +f 70/276/35 69/277/35 67/275/35 68/274/35 +f 72/278/35 71/279/35 69/277/35 70/276/35 +f 74/280/35 73/281/35 71/279/35 72/278/35 +f 76/282/35 75/283/35 73/281/35 74/280/35 +f 78/83/35 77/82/35 75/283/35 76/282/35 +f 81/284/35 72/278/35 70/276/35 80/285/35 +f 82/286/35 83/287/35 81/284/35 80/285/35 +f 85/288/35 83/287/35 82/286/35 84/289/35 +f 87/290/35 85/288/35 84/289/35 86/291/35 +f 89/292/35 48/254/35 47/253/35 88/293/35 +f 90/294/35 91/295/35 89/292/35 88/293/35 +f 92/296/35 93/297/35 91/295/35 90/294/35 +f 94/298/35 95/299/35 93/297/35 92/296/35 +f 97/300/35 95/299/35 94/298/35 96/301/35 +f 99/302/35 98/303/35 53/261/35 55/262/35 +f 101/304/35 100/305/35 98/303/35 99/302/35 +f 103/306/35 102/307/35 100/305/35 101/304/35 +f 104/308/35 102/307/35 103/306/35 105/309/35 +f 107/310/35 106/311/35 61/268/35 63/270/35 +f 109/312/35 108/313/35 106/311/35 107/310/35 +f 99/4/165 55/6/165 112/314/165 119/90/165 +f 111/315/166 53/151/166 98/150/166 120/144/166 +f 116/96/167 82/95/167 80/129/167 114/128/167 +f 47/26/168 49/17/168 131/107/168 132/112/168 +f 81/9/169 83/11/169 117/99/169 125/89/169 +f 63/185/170 65/184/170 130/316/170 123/132/170 +f 110/101/171 50/100/171 48/188/171 134/165/171 +f 68/16/172 66/10/172 136/88/172 114/106/172 +f 65/184/173 67/110/173 124/109/173 130/316/173 +f 100/92/174 102/21/174 128/104/174 120/93/174 +f 87/20/175 86/192/175 116/317/175 117/99/175 +f 128/318/176 105/197/176 103/98/176 119/90/176 +f 131/319/177 51/196/177 53/195/177 111/320/177 +f 107/116/178 63/199/178 123/321/178 121/117/178 +f 48/188/179 89/30/179 133/119/179 134/165/179 +f 69/27/180 71/29/180 115/120/180 124/322/180 +f 123/323/181 61/202/181 106/33/181 121/114/181 +f 56/38/182 54/111/182 110/101/182 113/122/182 +f 90/41/183 88/24/183 132/112/183 127/123/183 +f 55/205/184 57/204/184 122/146/184 112/141/184 +f 94/207/185 92/39/185 127/324/185 137/325/185 +f 126/86/186 78/85/186 76/124/186 125/89/186 +f 122/146/187 57/204/187 59/133/187 123/132/187 +f 93/209/188 95/49/188 118/134/188 133/326/188 +f 75/45/189 77/52/189 126/135/189 115/125/189 +f 97/51/190 96/46/190 137/130/190 118/134/190 +f 62/3/191 60/126/191 113/122/191 136/88/191 +f 125/138/192 114/327/192 124/328/192 115/136/192 +f 122/146/193 129/139/193 112/141/193 +f 116/329/194 114/327/194 125/138/194 117/330/194 +f 119/143/195 112/331/195 111/315/195 120/144/195 +f 133/332/196 118/163/196 144/158/196 143/161/196 +f 130/147/197 124/333/197 114/148/197 +f 130/316/198 122/146/198 123/132/198 +f 111/140/199 129/139/199 131/107/199 +f 110/101/200 134/165/200 142/164/200 138/334/200 +f 140/153/201 113/122/201 110/101/201 138/334/201 +f 130/316/202 135/145/202 122/146/202 +f 129/139/203 141/335/203 131/107/203 +f 135/152/204 136/149/204 140/169/204 +f 144/158/205 137/162/205 127/336/205 139/156/205 +f 139/166/206 132/112/206 131/107/206 141/335/206 +f 135/145/207 141/335/207 129/139/207 +f 148/159/208 146/157/208 147/154/208 145/168/208 +f 143/337/209 142/164/209 133/119/209 +f 140/169/210 145/168/210 147/154/210 135/152/210 +f 151/172/211 148/338/211 145/339/211 154/170/211 +f 149/340/212 142/341/212 148/342/212 151/343/212 +f 143/161/213 144/158/213 146/157/213 148/159/213 +f 146/157/214 139/156/214 141/155/214 147/154/214 +f 138/344/215 142/345/215 149/346/215 150/347/215 +f 145/348/216 138/349/216 150/178/216 154/177/216 +f 150/347/217 149/346/217 153/350/217 152/351/217 +f 153/174/218 154/352/218 152/353/218 diff --git "a/narcissus/data/bl\303\245haj.png" "b/narcissus/data/bl\303\245haj.png" new file mode 100644 index 0000000000000000000000000000000000000000..5f890071befd347fa091c9e4032756c6baf397e1 GIT binary patch literal 8862 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 L!tj-WYs~)vB<%hE literal 0 HcmV?d00001 diff --git a/narcissus/src/main.rs b/narcissus/src/main.rs index 993f700..da83693 100644 --- a/narcissus/src/main.rs +++ b/narcissus/src/main.rs @@ -1,5 +1,5 @@ use narcissus_app::{create_app, Event, Window, WindowDesc}; -use narcissus_core::cstr; +use narcissus_core::{cstr, Image}; use narcissus_gpu::{ create_vulkan_device, ClearValue, Device, FrameToken, GraphicsPipelineDesc, GraphicsPipelineLayout, LoadOp, MemoryLocation, Pipeline, RenderingAttachment, RenderingDesc, @@ -7,60 +7,6 @@ use narcissus_gpu::{ TextureViewDesc, ThreadToken, Viewport, }; -fn render_window( - device: &dyn Device, - frame_token: &FrameToken, - thread_token: &mut ThreadToken, - pipeline: Pipeline, - window: Window, -) { - let (width, height, swapchain_image) = - device.acquire_swapchain(&frame_token, window, TextureFormat::BGRA8_SRGB); - - let mut command_buffer_token = device.request_command_buffer(&frame_token, thread_token); - device.cmd_begin_rendering( - &mut command_buffer_token, - &RenderingDesc { - x: 0, - y: 0, - width, - height, - color_attachments: &[RenderingAttachment { - texture: swapchain_image, - load_op: LoadOp::Clear(ClearValue::ColorF32([0.392157, 0.584314, 0.929412, 1.0])), - store_op: StoreOp::Store, - }], - depth_attachment: None, - stencil_attachment: None, - }, - ); - device.cmd_bind_pipeline(&mut command_buffer_token, pipeline); - device.cmd_set_scissors( - &mut command_buffer_token, - &[Scissor { - x: 0, - y: 0, - width, - height, - }], - ); - device.cmd_set_viewports( - &mut command_buffer_token, - &[Viewport { - x: 0.0, - y: 0.0, - width: width as f32, - height: height as f32, - min_depth: 0.0, - max_depth: 1.0, - }], - ); - device.cmd_draw(&mut command_buffer_token, 3, 1, 0, 0); - device.cmd_end_rendering(&mut command_buffer_token); - - device.submit(command_buffer_token); -} - pub fn main() { let app = create_app(); @@ -101,6 +47,16 @@ pub fn main() { }) .collect::>(); + let blåhaj = std::fs::read("narcissus/data/blåhaj.png").unwrap(); + let blåhaj = Image::from_buffer(&blåhaj).unwrap(); + + println!( + "loaded blåhaj width: {}, height: {}, components: {}", + blåhaj.width(), + blåhaj.height(), + blåhaj.components() + ); + let texture = device.create_texture(&TextureDesc { memory_location: MemoryLocation::PreferDevice, usage: TextureUsageFlags::SAMPLED, @@ -162,3 +118,56 @@ pub fn main() { device.end_frame(frame_token); } } + +fn render_window( + device: &dyn Device, + frame_token: &FrameToken, + thread_token: &mut ThreadToken, + pipeline: Pipeline, + window: Window, +) { + let (width, height, swapchain_image) = + device.acquire_swapchain(frame_token, window, TextureFormat::BGRA8_SRGB); + let mut command_buffer_token = device.request_command_buffer(frame_token, thread_token); + device.cmd_begin_rendering( + &mut command_buffer_token, + &RenderingDesc { + x: 0, + y: 0, + width, + height, + color_attachments: &[RenderingAttachment { + texture: swapchain_image, + load_op: LoadOp::Clear(ClearValue::ColorF32([0.392157, 0.584314, 0.929412, 1.0])), + store_op: StoreOp::Store, + }], + depth_attachment: None, + stencil_attachment: None, + }, + ); + device.cmd_bind_pipeline(&mut command_buffer_token, pipeline); + device.cmd_set_scissors( + &mut command_buffer_token, + &[Scissor { + x: 0, + y: 0, + width, + height, + }], + ); + device.cmd_set_viewports( + &mut command_buffer_token, + &[Viewport { + x: 0.0, + y: 0.0, + width: width as f32, + height: height as f32, + min_depth: 0.0, + max_depth: 1.0, + }], + ); + device.cmd_draw(&mut command_buffer_token, 3, 1, 0, 0); + device.cmd_end_rendering(&mut command_buffer_token); + + device.submit(command_buffer_token); +} -- 2.49.0