fix texture loading resizing
parent
aaea5d4406
commit
e34d016abb
Binary file not shown.
|
@ -2,19 +2,19 @@
|
||||||
2123 2512 1677649375551295411 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pfr/pfr.c.o dc7ddf024affda22
|
2123 2512 1677649375551295411 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pfr/pfr.c.o dc7ddf024affda22
|
||||||
2478 2696 1677649375735300670 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type42/type42.c.o b7bf5e77154bf28e
|
2478 2696 1677649375735300670 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type42/type42.c.o b7bf5e77154bf28e
|
||||||
2531 2592 1677649375631297699 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/builds/unix/ftsystem.c.o 646b9527782db911
|
2531 2592 1677649375631297699 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/builds/unix/ftsystem.c.o 646b9527782db911
|
||||||
3 1062 1677649714692179896 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
2 1068 1677858450888884841 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
||||||
2408 2478 1677649375515294382 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/svg/svg.c.o 3c521ba5d5506f6d
|
2408 2478 1677649375515294382 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/svg/svg.c.o 3c521ba5d5506f6d
|
||||||
3 1156 1677649714788182233 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
2 987 1677858450808882667 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
||||||
50 999 1673895013560650475 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/string.cpp.o cfdb4277170e1146
|
50 999 1673895013560650475 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/string.cpp.o cfdb4277170e1146
|
||||||
1881 1943 1677649374983279166 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftsynth.c.o f15a6ee99e365112
|
1881 1943 1677649374983279166 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftsynth.c.o f15a6ee99e365112
|
||||||
551 747 1677649373783244853 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/monitor.c.o 239e3c995f2fc57c
|
551 747 1677649373783244853 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/monitor.c.o 239e3c995f2fc57c
|
||||||
1300 1878 1677649374915277224 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o d9d07699ecf3c7f6
|
7 732 1677858115607779393 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o d9d07699ecf3c7f6
|
||||||
1810 1881 1677649374919277336 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftinit.c.o 9bf07f1afe4c5120
|
1810 1881 1677649374919277336 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftinit.c.o 9bf07f1afe4c5120
|
||||||
3 478 1677649373515237186 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 9b5b6b6b3f0368f8
|
3 469 1677858115343772228 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 9b5b6b6b3f0368f8
|
||||||
1710 1764 1677649374803274019 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftfstype.c.o e63d4e616c6a179c
|
1710 1764 1677649374803274019 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftfstype.c.o e63d4e616c6a179c
|
||||||
1348 2988 1677649376023308906 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o f6cc949795fe632a
|
1348 2988 1677649376023308906 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o f6cc949795fe632a
|
||||||
1610 1651 1677649374691270819 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbdf.c.o bee13becfa6b57c0
|
1610 1651 1677649374691270819 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbdf.c.o bee13becfa6b57c0
|
||||||
3 1168 1677649374203256861 CMakeFiles/FinalProject.dir/src/render/window.cpp.o fe3bf24074ba9c2f
|
4 1087 1677858115959788946 CMakeFiles/FinalProject.dir/src/render/window.cpp.o fe3bf24074ba9c2f
|
||||||
2453 2936 1677649375975307536 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type1/type1.c.o 41bca485020c6b18
|
2453 2936 1677649375975307536 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type1/type1.c.o 41bca485020c6b18
|
||||||
734 858 1677649373895248053 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/vulkan.c.o 7ac098ea2e755b71
|
734 858 1677649373895248053 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/vulkan.c.o 7ac098ea2e755b71
|
||||||
1775 1887 1677649374927277567 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftglyph.c.o c0170043ef27b5f5
|
1775 1887 1677649374927277567 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftglyph.c.o c0170043ef27b5f5
|
||||||
|
@ -23,15 +23,15 @@
|
||||||
1840 1892 1677649374931277679 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 6617c5fd2e75a2f9
|
1840 1892 1677649374931277679 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 6617c5fd2e75a2f9
|
||||||
858 1084 1677649374123254573 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_init.c.o 7a310a4749a2e05
|
858 1084 1677649374123254573 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_init.c.o 7a310a4749a2e05
|
||||||
1651 1775 1677649374815274363 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 8ce02b3a42c98959
|
1651 1775 1677649374815274363 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 8ce02b3a42c98959
|
||||||
0 98 1677790628743969595 build.ninja 190f84590f6ee728
|
0 98 1677987591612948962 build.ninja 190f84590f6ee728
|
||||||
2550 2591 1677649375631297699 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o b73c3b9b7d19e4d5
|
2550 2591 1677649375631297699 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o b73c3b9b7d19e4d5
|
||||||
1278 1809 1677649374847275277 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o 342a5daa6ca9681d
|
3 366 1677858170717275276 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o 342a5daa6ca9681d
|
||||||
1656 1710 1677649374747272417 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o c5d515ae6d477f99
|
1656 1710 1677649374747272417 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o c5d515ae6d477f99
|
||||||
1551 2408 1677649375443292323 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o fbb6e43e2ee99b37
|
1551 2408 1677649375443292323 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o fbb6e43e2ee99b37
|
||||||
2301 2550 1677649375587296441 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/raster/raster.c.o 4ad85cadbb69f690
|
2301 2550 1677649375587296441 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/raster/raster.c.o 4ad85cadbb69f690
|
||||||
403 551 1677649373583239133 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/init.c.o 6051295f860fb367
|
403 551 1677649373583239133 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/init.c.o 6051295f860fb367
|
||||||
2988 3059 1677649376087310736 libraries/BLT/libBLT.a b8f809e0bb7338ed
|
366 443 1677858170781277013 libraries/BLT/libBLT.a b8f809e0bb7338ed
|
||||||
1561 1734 1677649715364196256 FinalProject de45775e2c99866f
|
1615 1788 1677858451608904405 FinalProject de45775e2c99866f
|
||||||
1873 1924 1677649374963278597 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o ba3859c14ff3f825
|
1873 1924 1677649374963278597 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o ba3859c14ff3f825
|
||||||
1923 1959 1677649374999279626 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o c17349c766699177
|
1923 1959 1677649374999279626 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o c17349c766699177
|
||||||
1 49 1673895012612644820 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/queues.cpp.o 55504c9533707c50
|
1 49 1673895012612644820 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/queues.cpp.o 55504c9533707c50
|
||||||
|
@ -41,14 +41,14 @@
|
||||||
2187 2453 1677649375491293693 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o 3c5f25dbf5470a11
|
2187 2453 1677649375491293693 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o 3c5f25dbf5470a11
|
||||||
1060 1159 1677649374199256749 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/xkb_unicode.c.o 86b8813c62a6792d
|
1060 1159 1677649374199256749 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/xkb_unicode.c.o 86b8813c62a6792d
|
||||||
2033 2123 1677649375163284316 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/lzw/ftlzw.c.o a201a733bc3b4ec8
|
2033 2123 1677649375163284316 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/lzw/ftlzw.c.o a201a733bc3b4ec8
|
||||||
2 1060 1677649374099253889 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 74696c090eadc64c
|
3 967 1677858115839785692 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 74696c090eadc64c
|
||||||
1029 1503 1677649374539266469 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_window.c.o f99a7b64357948e7
|
1029 1503 1677649374539266469 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_window.c.o f99a7b64357948e7
|
||||||
1286 2165 1677649375203285458 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o 7528e7ecb90e9c26
|
1286 2165 1677649375203285458 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o 7528e7ecb90e9c26
|
||||||
2165 2996 1677649376035309249 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 9b8069e5249a1b7d
|
2165 2996 1677649376035309249 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 9b8069e5249a1b7d
|
||||||
1503 1580 1677649374615268643 libraries/glfw-3.3.8/src/libglfw3.a fd552f215cfdce3e
|
1503 1580 1677649374615268643 libraries/glfw-3.3.8/src/libglfw3.a fd552f215cfdce3e
|
||||||
1789 1840 1677649374879276194 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o 3ce33c8355865f1e
|
1789 1840 1677649374879276194 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o 3ce33c8355865f1e
|
||||||
2 1561 1677649715192192069 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
2 1615 1677858451436899731 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
||||||
2 1123 1677649714756181454 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
2 1021 1677858450844883647 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
||||||
1 1125 1673895013688651239 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/random.cpp.o 2e94f773455f509
|
1 1125 1673895013688651239 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/random.cpp.o 2e94f773455f509
|
||||||
478 734 1677649373771244508 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/input.c.o cb7dfd07cdb7c2ab
|
478 734 1677649373771244508 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/input.c.o cb7dfd07cdb7c2ab
|
||||||
1465 1789 1677649374827274708 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o 18383112b14888b9
|
1465 1789 1677649374827274708 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o 18383112b14888b9
|
||||||
|
@ -66,17 +66,17 @@
|
||||||
1943 2187 1677649375223286031 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cid/type1cid.c.o be0bd83f7173b535
|
1943 2187 1677649375223286031 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cid/type1cid.c.o be0bd83f7173b535
|
||||||
2310 2626 1677649375663298611 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sdf/sdf.c.o 38ad17921be0aede
|
2310 2626 1677649375663298611 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sdf/sdf.c.o 38ad17921be0aede
|
||||||
1821 1923 1677649374963278597 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftmm.c.o cf1be7fdfe3293b
|
1821 1923 1677649374963278597 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftmm.c.o cf1be7fdfe3293b
|
||||||
2 814 1677649714444173863 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
2 829 1677858450652878428 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
||||||
1168 1300 1677649374339260750 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/osmesa_context.c.o c49ca4e889b3908b
|
1168 1300 1677649374339260750 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/osmesa_context.c.o c49ca4e889b3908b
|
||||||
2 95 1677649373135226320 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o f3fe63e530ab7f66
|
2 95 1677649373135226320 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o f3fe63e530ab7f66
|
||||||
3 1028 1677649374067252971 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o c4b57a0cc73f7657
|
3 1021 1677790631988058212 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o c4b57a0cc73f7657
|
||||||
3521 3621 1677649376643326637 libraries/freetype-2.13.0/libfreetyped.a 3cbc64a6495debe0
|
3521 3621 1677649376643326637 libraries/freetype-2.13.0/libfreetyped.a 3cbc64a6495debe0
|
||||||
2116 2355 1677649375391290833 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pcf/pcf.c.o 310cd7429a066580
|
2116 2355 1677649375391290833 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pcf/pcf.c.o 310cd7429a066580
|
||||||
2248 2429 1677649375467293009 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9dd17fefb41a7747
|
2248 2429 1677649375467293009 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9dd17fefb41a7747
|
||||||
1233 1610 1677649374647269557 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o ac1bd7bf33d73c31
|
1233 1610 1677649374647269557 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o ac1bd7bf33d73c31
|
||||||
1829 1873 1677649374911277107 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftotval.c.o 2befc05d4fd3d014
|
1829 1873 1677649374911277107 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftotval.c.o 2befc05d4fd3d014
|
||||||
2 1277 1677649374315260064 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o ccad926a95c7d624
|
3 1282 1677858116155794267 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o ccad926a95c7d624
|
||||||
3 1522 1677649374559267041 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 3f3d3a73c649dbc9
|
3 1410 1677858116283797743 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 3f3d3a73c649dbc9
|
||||||
2512 2663 1677649375699299641 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/winfonts/winfnt.c.o 99de1f5432d0d5a2
|
2512 2663 1677649375699299641 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/winfonts/winfnt.c.o 99de1f5432d0d5a2
|
||||||
1878 2116 1677649375155284084 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftstroke.c.o b06d184e6ee0c3cf
|
1878 2116 1677649375155284084 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftstroke.c.o b06d184e6ee0c3cf
|
||||||
1580 1656 1677649374695270930 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbbox.c.o 8a62fa0cfa4d95cb
|
1580 1656 1677649374695270930 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbbox.c.o 8a62fa0cfa4d95cb
|
||||||
|
@ -85,61 +85,31 @@
|
||||||
1924 2248 1677649375287287862 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cache/ftcache.c.o 656d9fc7811ee06
|
1924 2248 1677649375287287862 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cache/ftcache.c.o 656d9fc7811ee06
|
||||||
1943 2531 1677649375567295868 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cff/cff.c.o 4c729d49aae7bc8
|
1943 2531 1677649375567295868 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cff/cff.c.o 4c729d49aae7bc8
|
||||||
1169 1298 1677649374335260638 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/linux_joystick.c.o afc8940b6e7eeae1
|
1169 1298 1677649374335260638 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/linux_joystick.c.o afc8940b6e7eeae1
|
||||||
3 465 1677790631432043023 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 9b5b6b6b3f0368f8
|
3 443 1677988339293715027 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o d9d07699ecf3c7f6
|
||||||
4 498 1677790631464043898 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o d9d07699ecf3c7f6
|
2 956 1677988339805729413 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o c4b57a0cc73f7657
|
||||||
498 580 1677790631544046084 libraries/BLT/libBLT.a b8f809e0bb7338ed
|
2 1025 1677988339877731436 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
||||||
2 915 1677790631884055371 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 74696c090eadc64c
|
2 1127 1677988339977734246 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
||||||
3 1021 1677790631988058212 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o c4b57a0cc73f7657
|
2 1173 1677988340025735595 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
||||||
3 1027 1677790631992058322 CMakeFiles/FinalProject.dir/src/render/window.cpp.o fe3bf24074ba9c2f
|
3 1335 1677988340185740090 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
||||||
4 1157 1677790632124061927 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
3 1564 1677988340413746495 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o f6cc949795fe632a
|
||||||
3 1162 1677790632128062037 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
1564 1661 1677988340489748630 libraries/BLT/libBLT.a b8f809e0bb7338ed
|
||||||
2 1178 1677790632144062473 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
2 1794 1677988340645753013 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
||||||
3 1229 1677790632196063895 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o ccad926a95c7d624
|
1794 1982 1677988340833758296 FinalProject de45775e2c99866f
|
||||||
3 1327 1677790632292066517 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
3 935 1677989107651003616 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
||||||
3 1334 1677790632300066736 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 3f3d3a73c649dbc9
|
2 1032 1677989107747006256 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
||||||
3 1713 1677790632680077116 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
3 1064 1677989107779007135 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
||||||
1713 1886 1677790632852081817 FinalProject de45775e2c99866f
|
3 1227 1677989107943011640 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
||||||
3 864 1677790670965122943 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
3 1604 1677989108319021968 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
||||||
3 1102 1677790671201129389 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
1604 1770 1677989108483026472 FinalProject de45775e2c99866f
|
||||||
3 1138 1677790671237130375 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
2 798 1677989145404040364 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
||||||
2 1230 1677790671329132886 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
2 909 1677989145516043438 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
||||||
3 1682 1677790671781145234 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
2 955 1677989145564044757 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
||||||
1682 1863 1677790671961150151 FinalProject de45775e2c99866f
|
2 1050 1677989145656047282 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
||||||
2 1032 1677791293181288951 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
2 1537 1677989146144060680 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
||||||
1032 1214 1677791293361293611 FinalProject de45775e2c99866f
|
1537 1708 1677989146316065402 FinalProject de45775e2c99866f
|
||||||
3 1076 1677791361903073015 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
2 894 1677989283775836473 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
||||||
1076 1250 1677791362075077492 FinalProject de45775e2c99866f
|
2 933 1677989283815837569 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
||||||
3 984 1677791452581439930 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
3 994 1677989283875839215 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
||||||
984 1155 1677791452749444327 FinalProject de45775e2c99866f
|
3 1071 1677989283951841299 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
||||||
3 906 1677817617106367150 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
2 1516 1677989284399853582 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 4b76c6f5e8fb67cf
|
||||||
3 996 1677817617198369167 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
1516 1691 1677989284571858296 FinalProject de45775e2c99866f
|
||||||
3 1002 1677817617202369254 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
|
||||||
3 1054 1677817617254370394 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1054 1222 1677817617422374078 FinalProject de45775e2c99866f
|
|
||||||
2 1026 1677817703300294190 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1027 1220 1677817703492298563 FinalProject de45775e2c99866f
|
|
||||||
3 1034 1677817827175179956 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1034 1219 1677817827359184331 FinalProject de45775e2c99866f
|
|
||||||
2 1015 1677818045080509531 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1015 1192 1677818045256513942 FinalProject de45775e2c99866f
|
|
||||||
3 810 1677818130326660944 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o 86aa0a8ddf11de85
|
|
||||||
2 887 1677818130402662873 CMakeFiles/FinalProject.dir/src/main.cpp.o aca4a00492403aa
|
|
||||||
3 952 1677818130466664503 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 2444998966663b23
|
|
||||||
3 1028 1677818130546666536 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1028 1201 1677818130714670806 FinalProject de45775e2c99866f
|
|
||||||
2 995 1677818850029628635 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
995 1166 1677818850197633162 FinalProject de45775e2c99866f
|
|
||||||
2 1016 1677818891302741586 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1016 1205 1677818891490746663 FinalProject de45775e2c99866f
|
|
||||||
2 977 1677818923283605026 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
977 1144 1677818923447609456 FinalProject de45775e2c99866f
|
|
||||||
2 1064 1677818967864810076 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1064 1230 1677818968028814515 FinalProject de45775e2c99866f
|
|
||||||
2 998 1677818977125060582 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
998 1174 1677818977297065238 FinalProject de45775e2c99866f
|
|
||||||
2 1024 1677819002997760825 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1024 1226 1677819003197766240 FinalProject de45775e2c99866f
|
|
||||||
2 999 1677819017922164972 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
999 1167 1677819018086169415 FinalProject de45775e2c99866f
|
|
||||||
2 1001 1677819303197915439 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o 6515e540120cf543
|
|
||||||
1002 1183 1677819303377920341 FinalProject de45775e2c99866f
|
|
||||||
|
|
|
@ -1,53 +1,16 @@
|
||||||
/opt/netbrains/clion/clion-2022.1.3/bin/cmake/linux/x64/bin/cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_MAKE_PROGRAM=/opt/netbrains/clion/clion-2022.1.3/bin/ninja/linux/x64/ninja -G Ninja -S "/home/brett/Documents/Brock/CS 3P98/Final Project" -B "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-debug"
|
/opt/netbrains/clion/clion-2022.1.3/bin/cmake/linux/x64/bin/cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_MAKE_PROGRAM=/opt/netbrains/clion/clion-2022.1.3/bin/ninja/linux/x64/ninja -G Ninja -S "/home/brett/Documents/Brock/CS 3P98/Final Project" -B "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-debug"
|
||||||
-- The C compiler identification is GNU 12.2.0
|
|
||||||
-- The CXX compiler identification is GNU 12.2.0
|
|
||||||
-- Detecting C compiler ABI info
|
|
||||||
-- Detecting C compiler ABI info - done
|
|
||||||
-- Check for working C compiler: /usr/bin/cc - skipped
|
|
||||||
-- Detecting C compile features
|
|
||||||
-- Detecting C compile features - done
|
|
||||||
-- Detecting CXX compiler ABI info
|
|
||||||
-- Detecting CXX compiler ABI info - done
|
|
||||||
-- Check for working CXX compiler: /usr/bin/c++ - skipped
|
|
||||||
-- Detecting CXX compile features
|
|
||||||
-- Detecting CXX compile features - done
|
|
||||||
Building for Debug
|
Building for Debug
|
||||||
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
|
|
||||||
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
|
|
||||||
-- Found Threads: TRUE
|
|
||||||
-- Using X11 for window creation
|
-- Using X11 for window creation
|
||||||
-- Found X11: /usr/include
|
|
||||||
-- Looking for XOpenDisplay in /usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so
|
|
||||||
-- Looking for XOpenDisplay in /usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so - found
|
|
||||||
-- Looking for gethostbyname
|
|
||||||
-- Looking for gethostbyname - found
|
|
||||||
-- Looking for connect
|
|
||||||
-- Looking for connect - found
|
|
||||||
-- Looking for remove
|
|
||||||
-- Looking for remove - found
|
|
||||||
-- Looking for shmat
|
|
||||||
-- Looking for shmat - found
|
|
||||||
-- Looking for IceConnectionNumber in ICE
|
|
||||||
-- Looking for IceConnectionNumber in ICE - found
|
|
||||||
Standard Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/filesystem.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/format.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/loader.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/logging.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/system.cpp
|
Standard Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/filesystem.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/format.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/loader.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/logging.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/system.cpp
|
||||||
Profiler Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/profiling/profiler.cpp
|
Profiler Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/profiling/profiler.cpp
|
||||||
Source: /home/brett/Documents/Brock/CS 3P98/Final Project
|
Source: /home/brett/Documents/Brock/CS 3P98/Final Project
|
||||||
Current Source: /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT
|
Current Source: /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT
|
||||||
BLT 3.3.8 Successfully included!
|
BLT Successfully included!
|
||||||
-- Found PkgConfig: /usr/bin/pkg-config (found version "1.8.1")
|
|
||||||
-- Found the following HarfBuzz libraries:
|
-- Found the following HarfBuzz libraries:
|
||||||
-- HarfBuzz (required): /usr/lib/x86_64-linux-gnu/libharfbuzz.so
|
-- HarfBuzz (required): /usr/lib/x86_64-linux-gnu/libharfbuzz.so
|
||||||
-- Found HarfBuzz: /usr/include/harfbuzz (found suitable version "6.0.0", minimum required is "2.0.0")
|
|
||||||
-- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.13")
|
|
||||||
-- Found PNG: /usr/lib/x86_64-linux-gnu/libpng.so (found version "1.6.39")
|
|
||||||
-- Could NOT find BZip2 (missing: BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
|
-- Could NOT find BZip2 (missing: BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
|
||||||
-- Checking for module 'bzip2'
|
-- Checking for module 'bzip2'
|
||||||
-- Package 'bzip2', required by 'virtual:world', not found
|
-- Package 'bzip2', required by 'virtual:world', not found
|
||||||
-- Found BrotliDec: /usr/include (found version "1.0.9")
|
|
||||||
-- Looking for unistd.h
|
|
||||||
-- Looking for unistd.h - found
|
|
||||||
-- Looking for fcntl.h
|
|
||||||
-- Looking for fcntl.h - found
|
|
||||||
-- Configuring done
|
-- Configuring done
|
||||||
-- Generating done
|
-- Generating done
|
||||||
-- Build files have been written to: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-debug
|
-- Build files have been written to: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-debug
|
||||||
|
|
Binary file not shown.
|
@ -1,3 +1,3 @@
|
||||||
Start testing: Mar 02 23:55 EST
|
Start testing: Mar 04 23:08 EST
|
||||||
----------------------------------------------------------
|
----------------------------------------------------------
|
||||||
End testing: Mar 02 23:55 EST
|
End testing: Mar 04 23:08 EST
|
||||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,53 +1,16 @@
|
||||||
/opt/netbrains/clion/clion-2022.1.3/bin/cmake/linux/x64/bin/cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAKE_PROGRAM=/opt/netbrains/clion/clion-2022.1.3/bin/ninja/linux/x64/ninja -G Ninja -S "/home/brett/Documents/Brock/CS 3P98/Final Project" -B "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-release"
|
/opt/netbrains/clion/clion-2022.1.3/bin/cmake/linux/x64/bin/cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAKE_PROGRAM=/opt/netbrains/clion/clion-2022.1.3/bin/ninja/linux/x64/ninja -G Ninja -S "/home/brett/Documents/Brock/CS 3P98/Final Project" -B "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-release"
|
||||||
-- The C compiler identification is GNU 12.2.0
|
|
||||||
-- The CXX compiler identification is GNU 12.2.0
|
|
||||||
-- Detecting C compiler ABI info
|
|
||||||
-- Detecting C compiler ABI info - done
|
|
||||||
-- Check for working C compiler: /usr/bin/cc - skipped
|
|
||||||
-- Detecting C compile features
|
|
||||||
-- Detecting C compile features - done
|
|
||||||
-- Detecting CXX compiler ABI info
|
|
||||||
-- Detecting CXX compiler ABI info - done
|
|
||||||
-- Check for working CXX compiler: /usr/bin/c++ - skipped
|
|
||||||
-- Detecting CXX compile features
|
|
||||||
-- Detecting CXX compile features - done
|
|
||||||
Building for Release
|
Building for Release
|
||||||
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
|
|
||||||
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
|
|
||||||
-- Found Threads: TRUE
|
|
||||||
-- Using X11 for window creation
|
-- Using X11 for window creation
|
||||||
-- Found X11: /usr/include
|
|
||||||
-- Looking for XOpenDisplay in /usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so
|
|
||||||
-- Looking for XOpenDisplay in /usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so - found
|
|
||||||
-- Looking for gethostbyname
|
|
||||||
-- Looking for gethostbyname - found
|
|
||||||
-- Looking for connect
|
|
||||||
-- Looking for connect - found
|
|
||||||
-- Looking for remove
|
|
||||||
-- Looking for remove - found
|
|
||||||
-- Looking for shmat
|
|
||||||
-- Looking for shmat - found
|
|
||||||
-- Looking for IceConnectionNumber in ICE
|
|
||||||
-- Looking for IceConnectionNumber in ICE - found
|
|
||||||
Standard Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/filesystem.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/format.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/loader.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/logging.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/system.cpp
|
Standard Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/filesystem.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/format.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/loader.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/logging.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/system.cpp
|
||||||
Profiler Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/profiling/profiler.cpp
|
Profiler Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/profiling/profiler.cpp
|
||||||
Source: /home/brett/Documents/Brock/CS 3P98/Final Project
|
Source: /home/brett/Documents/Brock/CS 3P98/Final Project
|
||||||
Current Source: /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT
|
Current Source: /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT
|
||||||
BLT 3.3.8 Successfully included!
|
BLT Successfully included!
|
||||||
-- Found PkgConfig: /usr/bin/pkg-config (found version "1.8.1")
|
|
||||||
-- Found the following HarfBuzz libraries:
|
-- Found the following HarfBuzz libraries:
|
||||||
-- HarfBuzz (required): /usr/lib/x86_64-linux-gnu/libharfbuzz.so
|
-- HarfBuzz (required): /usr/lib/x86_64-linux-gnu/libharfbuzz.so
|
||||||
-- Found HarfBuzz: /usr/include/harfbuzz (found suitable version "6.0.0", minimum required is "2.0.0")
|
|
||||||
-- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.13")
|
|
||||||
-- Found PNG: /usr/lib/x86_64-linux-gnu/libpng.so (found version "1.6.39")
|
|
||||||
-- Could NOT find BZip2 (missing: BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
|
-- Could NOT find BZip2 (missing: BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
|
||||||
-- Checking for module 'bzip2'
|
-- Checking for module 'bzip2'
|
||||||
-- Package 'bzip2', required by 'virtual:world', not found
|
-- Package 'bzip2', required by 'virtual:world', not found
|
||||||
-- Found BrotliDec: /usr/include (found version "1.0.9")
|
|
||||||
-- Looking for unistd.h
|
|
||||||
-- Looking for unistd.h - found
|
|
||||||
-- Looking for fcntl.h
|
|
||||||
-- Looking for fcntl.h - found
|
|
||||||
-- Configuring done
|
-- Configuring done
|
||||||
-- Generating done
|
-- Generating done
|
||||||
-- Build files have been written to: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-release
|
-- Build files have been written to: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-release
|
||||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -1,80 +1,92 @@
|
||||||
# ninja log v5
|
# ninja log v5
|
||||||
1069 1712 1676433233004230683 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pfr/pfr.c.o 36ee13ce7f760ef5
|
2323 3085 1677855183432425834 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pfr/pfr.c.o 36ee13ce7f760ef5
|
||||||
1779 2121 1676433233412242018 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type42/type42.c.o af1b1264db82aeae
|
3268 3715 1677855184064443416 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type42/type42.c.o af1b1264db82aeae
|
||||||
1834 1911 1676433233204236237 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/builds/unix/ftsystem.c.o 827aa9e59ce2e7a7
|
3412 3495 1677855183844437295 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/builds/unix/ftsystem.c.o 827aa9e59ce2e7a7
|
||||||
2 359 1676433231652193119 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o d042df377c55f1ff
|
3 1169 1677883858339218516 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o d042df377c55f1ff
|
||||||
1492 1561 1676433232856226570 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/svg/svg.c.o dc9fa4644e4bfeff
|
3085 3174 1677855183520428281 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/svg/svg.c.o dc9fa4644e4bfeff
|
||||||
3 1107 1676524425163572190 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c
|
3 1140 1677883858311217768 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c
|
||||||
415 481 1676433231772196453 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftsynth.c.o c94e1df207dca05f
|
2047 2124 1677855182472399126 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftsynth.c.o c94e1df207dca05f
|
||||||
1 268 1675879686057895775 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/monitor.c.o 3306a3caed247cee
|
467 677 1677855181024358840 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/monitor.c.o 3306a3caed247cee
|
||||||
3 594 1676524424651557917 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o 9999b1f01228dc1e
|
1945 2020 1677855182368396233 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftinit.c.o c79de44174f27a42
|
||||||
284 371 1676433231664193453 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftinit.c.o c79de44174f27a42
|
7 691 1677858183417620060 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o 9999b1f01228dc1e
|
||||||
2 374 1676524424431551785 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 67c82fe66fca827
|
3 697 1677858183421620170 CMakeFiles/FinalProject.dir/src/render/ui/debug.cpp.o 67c82fe66fca827
|
||||||
146 200 1676433231492188675 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftfstype.c.o c1571efbcaa8f933
|
1889 1929 1677855182276393672 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftfstype.c.o c1571efbcaa8f933
|
||||||
3 2002 1676473110932638542 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 3879c77c4691aa0a
|
3 2002 1676473110932638542 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 3879c77c4691aa0a
|
||||||
3 90 1676433231384185673 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbdf.c.o d55aaa7d5cd3d5c
|
1756 1820 1677855182168390667 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbdf.c.o d55aaa7d5cd3d5c
|
||||||
2 785 1676524424839563159 CMakeFiles/FinalProject.dir/src/render/window.cpp.o d3ff816bc92bb4a6
|
4 1104 1677858183829631248 CMakeFiles/FinalProject.dir/src/render/window.cpp.o d3ff816bc92bb4a6
|
||||||
1713 2505 1676433233796252686 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type1/type1.c.o e9ac3fb73828fd6d
|
3268 4060 1677855184408452986 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/type1/type1.c.o e9ac3fb73828fd6d
|
||||||
1 184 1675879685973893394 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/vulkan.c.o 726a0ce9066c22d2
|
677 798 1677855181148362288 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/vulkan.c.o 726a0ce9066c22d2
|
||||||
200 408 1676433231700194452 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftglyph.c.o 287c587d2b62e728
|
1895 2088 1677855182436398124 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftglyph.c.o 287c587d2b62e728
|
||||||
1 338 1675879686125897703 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/window.c.o f41ed544e41bb850
|
736 1052 1677855181400369299 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/window.c.o f41ed544e41bb850
|
||||||
482 1249 1676433232540217791 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bdf/bdf.c.o 4b769d5fae89194d
|
2106 2849 1677855183196419267 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bdf/bdf.c.o 4b769d5fae89194d
|
||||||
371 415 1676433231708194675 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 502fe0621b2db366
|
1993 2047 1677855182396397011 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpatent.c.o 502fe0621b2db366
|
||||||
2 417 1675879686205899971 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_init.c.o 84c854e192bd136
|
799 1141 1677855181488371749 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_init.c.o 84c854e192bd136
|
||||||
3 298 1676433231592191455 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 1beee6fba21a431a
|
1819 2119 1677855182468399014 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbitmap.c.o 1beee6fba21a431a
|
||||||
1835 1887 1676433233180235570 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o fdb7df678b36f40f
|
3421 3467 1677855183816436516 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftdebug.c.o fdb7df678b36f40f
|
||||||
2 560 1676432315606266426 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o 3b328e151712ca4
|
1697 3944 1677855184288449646 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o 4be5f2832180d492
|
||||||
90 153 1676433231444187341 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o be7252df658034eb
|
1821 1895 1677855182244392782 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftcid.c.o be7252df658034eb
|
||||||
2 2203 1676433233496244349 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbase.c.o 4be5f2832180d492
|
6 959 1677858183685627338 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/format.cpp.o 3b328e151712ca4
|
||||||
1254 1793 1676433233084232903 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/raster/raster.c.o f81177488ebd3ad
|
2672 3276 1677855183624431174 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/raster/raster.c.o f81177488ebd3ad
|
||||||
1 213 1675879686001894187 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/init.c.o 7363bcb2dba2054a
|
203 379 1677855180728350604 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/init.c.o 7363bcb2dba2054a
|
||||||
594 658 1676524424711559591 libraries/BLT/libBLT.a 163b10f2e7f6635
|
2113 2153 1677855182500399904 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o 7d125f3d19646cd0
|
||||||
1482 1608 1676524425663586129 FinalProject 1a926718972bddbe
|
2020 2085 1677855182432398012 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o 565b64bbd1fc7af5
|
||||||
408 468 1676433231760196120 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftpfr.c.o 565b64bbd1fc7af5
|
3894 4046 1677883861215295505 FinalProject 743e0d59f44b5ac0
|
||||||
518 559 1676433231852198676 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/bzip2/ftbzip2.c.o 7d125f3d19646cd0
|
959 1024 1677858183745628967 libraries/BLT/libBLT.a b8f809e0bb7338ed
|
||||||
240 342 1675879686133897930 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/posix_thread.c.o ed8a69d447bea26a
|
1359 3173 1677855183520428281 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o a4d3cad66687d105
|
||||||
1 1274 1676342960552073465 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/logging.cpp.o a4d3cad66687d105
|
1141 1230 1677855181576374196 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/posix_thread.c.o ed8a69d447bea26a
|
||||||
268 513 1675879686301902692 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/glx_context.c.o 3a83b8e61a7e27f1
|
2546 3420 1677855183768435180 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o d1c695600d3a7dfd
|
||||||
1182 2070 1676433233364240685 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pshinter/pshinter.c.o d1c695600d3a7dfd
|
1157 1382 1677855181728378425 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/glx_context.c.o 3a83b8e61a7e27f1
|
||||||
185 272 1675879686061895889 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/xkb_unicode.c.o b26e96d6509cc15d
|
1052 1131 1677855181480371526 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/xkb_unicode.c.o b26e96d6509cc15d
|
||||||
1009 1182 1676433232476216011 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/lzw/ftlzw.c.o d04e126e5d735f8b
|
2153 2323 1677855182672404689 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/lzw/ftlzw.c.o d04e126e5d735f8b
|
||||||
2 840 1676524424895564721 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518
|
2 946 1677858183673627013 CMakeFiles/FinalProject.dir/src/render/camera.cpp.o 5776e342ea508518
|
||||||
3 816 1675879686605911309 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_window.c.o 3c77d54154e66152
|
996 1698 1677855182044387219 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_window.c.o 3c77d54154e66152
|
||||||
2 1148 1676094325714020716 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o dba8b361d1594e59
|
2539 4386 1677855184732461998 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 2a71d88eed8a5228
|
||||||
1150 2917 1676433234208264129 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psaux/psaux.c.o 2a71d88eed8a5228
|
1357 2539 1677855182884410587 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/loader.cpp.o dba8b361d1594e59
|
||||||
816 896 1675879686681913464 libraries/glfw-3.3.8/src/libglfw3.a 4545fd6d0d1d5667
|
2 3894 1677883861059291329 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 245d855e300d9590
|
||||||
223 284 1676433231576191007 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o d760f2ca9797735d
|
1929 1988 1677855182336395340 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgxval.c.o d760f2ca9797735d
|
||||||
2 976 1676524425031568511 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb
|
1698 1756 1677855182100388775 libraries/glfw-3.3.8/src/libglfw3.a fd552f215cfdce3e
|
||||||
1 489 1675879686277902012 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/input.c.o b9b0555d1bde647a
|
2 1110 1677883858279216912 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb
|
||||||
490 862 1675879686649912557 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o 2100792179af25a6
|
379 735 1677855181084360508 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/input.c.o b9b0555d1bde647a
|
||||||
43 530 1676471928244043279 libraries/freetype-2.13.0/libfreetype.a f550ecbb3936aaae
|
5617 5711 1677855186044498497 libraries/freetype-2.13.0/libfreetype.a 2cada0509b693271
|
||||||
153 223 1676433231516189341 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgasp.c.o 6eb2c5578119b9c8
|
1528 1889 1677855182236392559 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt_block.cpp.o 2100792179af25a6
|
||||||
1 240 1675879686029894982 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/context.c.o 66a0481f161ec0b0
|
1894 1953 1677855182300394339 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftgasp.c.o 6eb2c5578119b9c8
|
||||||
1382 3837 1676433235128289688 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sfnt/sfnt.c.o f8f71756e461ba89
|
2834 5441 1677855185788491376 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sfnt/sfnt.c.o f8f71756e461ba89
|
||||||
882 1009 1676433232300211125 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/gzip/ftgzip.c.o a0a7cf4736cb9d
|
3 202 1677855180552345709 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/context.c.o 66a0481f161ec0b0
|
||||||
1391 1778 1676433233072232571 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/smooth/smooth.c.o 2bc4ae7d644f7cd3
|
2153 2319 1677855182668404578 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/gzip/ftgzip.c.o a0a7cf4736cb9d
|
||||||
213 298 1675879686085896568 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/posix_time.c.o 85b163330cb816e5
|
2849 3268 1677855183616430951 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/smooth/smooth.c.o 2bc4ae7d644f7cd3
|
||||||
2 311 1675879686097896910 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_monitor.c.o f704fd1b3f3f9ebf
|
925 1168 1677855181516372527 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/x11_monitor.c.o f704fd1b3f3f9ebf
|
||||||
273 531 1675879686321903260 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/egl_context.c.o b183bcb8286b3466
|
1131 1199 1677855181548373417 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/posix_time.c.o 85b163330cb816e5
|
||||||
1561 3840 1676433235132289800 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/truetype/truetype.c.o f922d14a41a03de2
|
1168 1371 1677855181720378205 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/egl_context.c.o b183bcb8286b3466
|
||||||
3 598 1676094325166005631 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o 3e0e238c32ed62ec
|
3174 5617 1677855185964496274 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/truetype/truetype.c.o f922d14a41a03de2
|
||||||
831 1286 1676433232580218901 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cid/type1cid.c.o 23bf561e9b90dd0
|
1382 1993 1677855182340395452 libraries/BLT/CMakeFiles/BLT.dir/src/blt/nbt/nbt.cpp.o 3e0e238c32ed62ec
|
||||||
1286 2036 1676433233328239682 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sdf/sdf.c.o 807c8e056b31c5d0
|
2139 2545 1677855182892410810 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cid/type1cid.c.o 23bf561e9b90dd0
|
||||||
299 456 1676433231748195786 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftmm.c.o 7b1dd129e6fb4981
|
2775 3535 1677855183884438408 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/sdf/sdf.c.o 807c8e056b31c5d0
|
||||||
3 613 1676524424671558477 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e
|
1953 2106 1677855182452398568 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftmm.c.o 7b1dd129e6fb4981
|
||||||
299 466 1675879686253901332 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/osmesa_context.c.o a913dd02c9ac6f97
|
2 831 1677883858003209523 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e
|
||||||
468 518 1676433231812197567 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o 9fabacfc2ff8811a
|
1199 1358 1677855181708377870 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/osmesa_context.c.o a913dd02c9ac6f97
|
||||||
1024 1391 1676433232684221791 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pcf/pcf.c.o 14518ecf856d21d0
|
3 996 1677855181344367742 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd
|
||||||
1249 1492 1676433232784224571 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9d8ecfaa201fc592
|
2088 2139 1677855182488399570 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftwinfnt.c.o 9fabacfc2ff8811a
|
||||||
2 409 1676094324978000454 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o 49e1226ae352c85c
|
2556 2834 1677855183180418823 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/psnames/psnames.c.o 9d8ecfaa201fc592
|
||||||
359 407 1676433231700194452 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftotval.c.o 1775fdea3e52c802
|
2319 2775 1677855183124417264 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/pcf/pcf.c.o 14518ecf856d21d0
|
||||||
2 1482 1676524425539582673 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o 2660a3bd1778e5e3
|
1230 1624 1677855181972385216 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/filesystem.cpp.o 49e1226ae352c85c
|
||||||
1793 1990 1676433233284238460 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/winfonts/winfnt.c.o e43948e4a6dbf2e9
|
1989 2044 1677855182392396899 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftotval.c.o 1775fdea3e52c802
|
||||||
2 1352 1676524425407578992 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 4bc61f357ca60822
|
3 1704 1677858184429647537 CMakeFiles/FinalProject.dir/src/render/gl.cpp.o 2660a3bd1778e5e3
|
||||||
408 882 1676433232176207678 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftstroke.c.o d23f15afb5e42f5b
|
3 1551 1677858184277643410 CMakeFiles/FinalProject.dir/src/render/ui/text.cpp.o 4bc61f357ca60822
|
||||||
3 146 1676433231440187230 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbbox.c.o 33ee4db3f35b92d3
|
3276 3499 1677855183848437406 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/winfonts/winfnt.c.o e43948e4a6dbf2e9
|
||||||
2 1986 1676433233276238237 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/autofit/autofit.c.o be86846738c7b3be
|
2044 2556 1677855182904411145 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftstroke.c.o d23f15afb5e42f5b
|
||||||
456 524 1676433231816197675 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/fttype1.c.o f2704e6735522163
|
1624 3576 1677855183924439521 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/autofit/autofit.c.o be86846738c7b3be
|
||||||
524 1150 1676433232440215012 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cache/ftcache.c.o 6a50d2c3764a714
|
1703 1818 1677855182168390667 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/ftbbox.c.o 33ee4db3f35b92d3
|
||||||
559 1833 1676433233124234017 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cff/cff.c.o 47495ad83245b5e7
|
2085 2153 1677855182500399904 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/base/fttype1.c.o f2704e6735522163
|
||||||
311 524 1675879686313903031 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/linux_joystick.c.o 3df40cb71360060f
|
2119 2672 1677855183020414370 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cache/ftcache.c.o 6a50d2c3764a714
|
||||||
|
2124 3412 1677855183760434957 libraries/freetype-2.13.0/CMakeFiles/freetype.dir/src/cff/cff.c.o 47495ad83245b5e7
|
||||||
|
1204 1349 1677855181696377535 libraries/glfw-3.3.8/src/CMakeFiles/glfw.dir/linux_joystick.c.o 3df40cb71360060f
|
||||||
|
3 462 1677989294608133429 libraries/BLT/CMakeFiles/BLT.dir/src/blt/std/system.cpp.o 9999b1f01228dc1e
|
||||||
|
3 872 1677989295016144613 CMakeFiles/FinalProject.dir/src/world/chunk/storage.cpp.o aba7285d6d94217e
|
||||||
|
3 971 1677989295116147354 CMakeFiles/FinalProject.dir/src/util/settings.cpp.o 67d0982a1f44b9dd
|
||||||
|
3 1201 1677989295344153603 CMakeFiles/FinalProject.dir/src/world/registry.cpp.o d042df377c55f1ff
|
||||||
|
3 1203 1677989295348153713 CMakeFiles/FinalProject.dir/src/world/chunk/world.cpp.o 7a550f9a4e0bfc9c
|
||||||
|
2 1430 1677989295576159964 CMakeFiles/FinalProject.dir/src/main.cpp.o 1ae001c7e5feebcb
|
||||||
|
3 2049 1677989296192176850 libraries/BLT/CMakeFiles/BLT.dir/src/blt/profiling/profiler.cpp.o 3879c77c4691aa0a
|
||||||
|
2049 2123 1677989296260178714 libraries/BLT/libBLT.a b8f809e0bb7338ed
|
||||||
|
2 3804 1677989302996363361 CMakeFiles/FinalProject.dir/src/render/textures.cpp.o 245d855e300d9590
|
||||||
|
3804 3953 1677989303148367528 FinalProject 743e0d59f44b5ac0
|
||||||
|
|
|
@ -1,53 +1,16 @@
|
||||||
/opt/netbrains/clion/clion-2022.1.3/bin/cmake/linux/x64/bin/cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_MAKE_PROGRAM=/opt/netbrains/clion/clion-2022.1.3/bin/ninja/linux/x64/ninja -G Ninja -S "/home/brett/Documents/Brock/CS 3P98/Final Project" -B "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-relwithdebinfo"
|
/opt/netbrains/clion/clion-2022.1.3/bin/cmake/linux/x64/bin/cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_MAKE_PROGRAM=/opt/netbrains/clion/clion-2022.1.3/bin/ninja/linux/x64/ninja -G Ninja -S "/home/brett/Documents/Brock/CS 3P98/Final Project" -B "/home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-relwithdebinfo"
|
||||||
-- The C compiler identification is GNU 12.2.0
|
|
||||||
-- The CXX compiler identification is GNU 12.2.0
|
|
||||||
-- Detecting C compiler ABI info
|
|
||||||
-- Detecting C compiler ABI info - done
|
|
||||||
-- Check for working C compiler: /usr/bin/cc - skipped
|
|
||||||
-- Detecting C compile features
|
|
||||||
-- Detecting C compile features - done
|
|
||||||
-- Detecting CXX compiler ABI info
|
|
||||||
-- Detecting CXX compiler ABI info - done
|
|
||||||
-- Check for working CXX compiler: /usr/bin/c++ - skipped
|
|
||||||
-- Detecting CXX compile features
|
|
||||||
-- Detecting CXX compile features - done
|
|
||||||
Building for Release
|
Building for Release
|
||||||
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
|
|
||||||
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
|
|
||||||
-- Found Threads: TRUE
|
|
||||||
-- Using X11 for window creation
|
-- Using X11 for window creation
|
||||||
-- Found X11: /usr/include
|
|
||||||
-- Looking for XOpenDisplay in /usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so
|
|
||||||
-- Looking for XOpenDisplay in /usr/lib/x86_64-linux-gnu/libX11.so;/usr/lib/x86_64-linux-gnu/libXext.so - found
|
|
||||||
-- Looking for gethostbyname
|
|
||||||
-- Looking for gethostbyname - found
|
|
||||||
-- Looking for connect
|
|
||||||
-- Looking for connect - found
|
|
||||||
-- Looking for remove
|
|
||||||
-- Looking for remove - found
|
|
||||||
-- Looking for shmat
|
|
||||||
-- Looking for shmat - found
|
|
||||||
-- Looking for IceConnectionNumber in ICE
|
|
||||||
-- Looking for IceConnectionNumber in ICE - found
|
|
||||||
Standard Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/filesystem.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/format.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/loader.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/logging.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/system.cpp
|
Standard Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/filesystem.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/format.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/loader.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/logging.cpp;/home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/std/system.cpp
|
||||||
Profiler Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/profiling/profiler.cpp
|
Profiler Files /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT/src/blt/profiling/profiler.cpp
|
||||||
Source: /home/brett/Documents/Brock/CS 3P98/Final Project
|
Source: /home/brett/Documents/Brock/CS 3P98/Final Project
|
||||||
Current Source: /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT
|
Current Source: /home/brett/Documents/Brock/CS 3P98/Final Project/libraries/BLT
|
||||||
BLT 3.3.8 Successfully included!
|
BLT Successfully included!
|
||||||
-- Found PkgConfig: /usr/bin/pkg-config (found version "1.8.1")
|
|
||||||
-- Found the following HarfBuzz libraries:
|
-- Found the following HarfBuzz libraries:
|
||||||
-- HarfBuzz (required): /usr/lib/x86_64-linux-gnu/libharfbuzz.so
|
-- HarfBuzz (required): /usr/lib/x86_64-linux-gnu/libharfbuzz.so
|
||||||
-- Found HarfBuzz: /usr/include/harfbuzz (found suitable version "6.0.0", minimum required is "2.0.0")
|
|
||||||
-- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.13")
|
|
||||||
-- Found PNG: /usr/lib/x86_64-linux-gnu/libpng.so (found version "1.6.39")
|
|
||||||
-- Could NOT find BZip2 (missing: BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
|
-- Could NOT find BZip2 (missing: BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
|
||||||
-- Checking for module 'bzip2'
|
-- Checking for module 'bzip2'
|
||||||
-- Package 'bzip2', required by 'virtual:world', not found
|
-- Package 'bzip2', required by 'virtual:world', not found
|
||||||
-- Found BrotliDec: /usr/include (found version "1.0.9")
|
|
||||||
-- Looking for unistd.h
|
|
||||||
-- Looking for unistd.h - found
|
|
||||||
-- Looking for fcntl.h
|
|
||||||
-- Looking for fcntl.h - found
|
|
||||||
-- Configuring done
|
-- Configuring done
|
||||||
-- Generating done
|
-- Generating done
|
||||||
-- Build files have been written to: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-relwithdebinfo
|
-- Build files have been written to: /home/brett/Documents/Brock/CS 3P98/Final Project/cmake-build-relwithdebinfo
|
||||||
|
|
Binary file not shown.
|
@ -1,3 +1,3 @@
|
||||||
Start testing: Feb 16 00:13 EST
|
Start testing: Mar 04 23:09 EST
|
||||||
----------------------------------------------------------
|
----------------------------------------------------------
|
||||||
End testing: Feb 16 00:13 EST
|
End testing: Mar 04 23:09 EST
|
||||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -99,10 +99,12 @@ namespace fp {
|
||||||
* @param attribute_number attribute position to bind
|
* @param attribute_number attribute position to bind
|
||||||
* @param coordinate_size size of this attribute (1 for float, 2 for vec2...)
|
* @param coordinate_size size of this attribute (1 for float, 2 for vec2...)
|
||||||
* @param type type to store. Use GL_FLOAT mostly
|
* @param type type to store. Use GL_FLOAT mostly
|
||||||
* @param stride stride will automatically be calculated using coordinate size (4 bytes is assumed!)
|
* @param stride stride how many bytes the COMPLETE data takes in the VBO, 0 will automatically assume packed data.
|
||||||
* @param offset offset into the data that this attribute is stored. Allows for weaving of data
|
* @param offset offset into the data that this attribute is stored. Allows for weaving of data
|
||||||
|
* @param repeated used to specify that this is the second+ time we've used this VBO to point to data, as a result it will be not be added
|
||||||
|
* to the attribute update list and MUST be updated using the original attribute number
|
||||||
*/
|
*/
|
||||||
void bindVBO(VBO* vbo, int attribute_number, int coordinate_size, GLenum type = GL_FLOAT, int stride = 0, long offset = 0);
|
void bindVBO(VBO* vbo, int attribute_number, int coordinate_size, GLenum type = GL_FLOAT, int stride = 0, long offset = 0, bool repeated = false);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Binds the VBO as if it was the element buffer (indices). Note: calling this more than once is not supported.
|
* Binds the VBO as if it was the element buffer (indices). Note: calling this more than once is not supported.
|
||||||
|
|
|
@ -10,11 +10,12 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <stb/stb_image.h>
|
#include <stb/stb_image.h>
|
||||||
#include "stb/stb_image_resize.h"
|
|
||||||
#include <util/settings.h>
|
#include <util/settings.h>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <render/gl.h>
|
#include <render/gl.h>
|
||||||
|
#include "stb/stb_image_resize.h"
|
||||||
|
|
||||||
|
|
||||||
namespace fp::texture {
|
namespace fp::texture {
|
||||||
|
|
||||||
|
@ -29,24 +30,45 @@ namespace fp::texture {
|
||||||
* @param path path to the texture file
|
* @param path path to the texture file
|
||||||
* @param name reference name for this texture. If empty the texture will use path as its identifier
|
* @param name reference name for this texture. If empty the texture will use path as its identifier
|
||||||
*/
|
*/
|
||||||
explicit file_texture(const std::string& path, const std::string& name = ""): m_Name(name.empty() ? path : name), m_Path(path) {}
|
explicit file_texture(const std::string& path, const std::string& name = ""):
|
||||||
|
m_Name(name.empty() ? path : name), m_Path(path) {}
|
||||||
|
|
||||||
static file_texture* load(file_texture*& texture) {
|
static file_texture* load(file_texture*& texture) {
|
||||||
texture->m_Data = stbi_load(texture->m_Path.c_str(), &texture->width, &texture->height, &texture->channels, 0);
|
// we want to load every texture as if it has transparency,
|
||||||
|
// otherwise textures won't be correctly resized and loaded to the gpu
|
||||||
|
constexpr int channel_count = 4;
|
||||||
|
texture->m_Data = stbi_load(
|
||||||
|
texture->m_Path.c_str(), &texture->width, &texture->height,
|
||||||
|
&texture->channels, channel_count
|
||||||
|
);
|
||||||
|
texture->channels = channel_count;
|
||||||
return texture;
|
return texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
static file_texture* resize(file_texture* texture, int target_width, int target_height) {
|
static file_texture* resize(
|
||||||
|
file_texture* texture, int target_width, int target_height
|
||||||
|
) {
|
||||||
if (target_width == texture->width && target_height == texture->height)
|
if (target_width == texture->width && target_height == texture->height)
|
||||||
return texture;
|
return texture;
|
||||||
// since stb is a c lib we must use malloc, otherwise we'd have to deal with using the right free on destruction
|
// since we will be replacing the loaded data pointer, is it wise to use the allocator
|
||||||
auto* output_Data = (unsigned char*) malloc(target_width * target_height * texture->channels);
|
// that matches with what stb image uses, which is malloc, since we unload with stbi_image_free -> (free)
|
||||||
|
auto* output_Data = (unsigned char*) malloc(
|
||||||
stbir_resize_uint8(
|
target_width * target_height * texture->channels
|
||||||
texture->m_Data, texture->width, texture->height, texture->width * texture->channels, output_Data, target_width,
|
|
||||||
target_height, target_width * texture->channels, texture->channels
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// resize the texture
|
||||||
|
if (stbir_resize_uint8(
|
||||||
|
// input
|
||||||
|
texture->m_Data, texture->width, texture->height, 0,
|
||||||
|
// output
|
||||||
|
output_Data, target_width, target_height, 0,
|
||||||
|
// channels
|
||||||
|
texture->channels
|
||||||
|
)) {
|
||||||
|
BLT_WARN("Error resizing block texture image!");
|
||||||
|
}
|
||||||
|
|
||||||
|
// free up the old data
|
||||||
stbi_image_free(texture->m_Data);
|
stbi_image_free(texture->m_Data);
|
||||||
texture->m_Data = output_Data;
|
texture->m_Data = output_Data;
|
||||||
texture->width = target_width;
|
texture->width = target_width;
|
||||||
|
@ -87,8 +109,12 @@ namespace fp::texture {
|
||||||
GLint textureColorMode;
|
GLint textureColorMode;
|
||||||
int m_width, m_height;
|
int m_width, m_height;
|
||||||
|
|
||||||
gl_texture(int width, int height, GLint bind_type = GL_TEXTURE_2D, GLint color_mode = GL_RGBA):
|
gl_texture(
|
||||||
m_width(width), m_height(height), textureBindType(bind_type), textureColorMode(color_mode) {
|
int width, int height, GLint bind_type = GL_TEXTURE_2D,
|
||||||
|
GLint color_mode = GL_RGBA
|
||||||
|
):
|
||||||
|
m_width(width), m_height(height), textureBindType(bind_type),
|
||||||
|
textureColorMode(color_mode) {
|
||||||
glGenTextures(1, &textureID);
|
glGenTextures(1, &textureID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -122,20 +148,25 @@ namespace fp::texture {
|
||||||
return textureID;
|
return textureID;
|
||||||
}
|
}
|
||||||
|
|
||||||
~gl_texture() {
|
virtual ~gl_texture() {
|
||||||
glDeleteTextures(1, &textureID);
|
glDeleteTextures(1, &textureID);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct gl_texture2D : public gl_texture {
|
struct gl_texture2D : public gl_texture {
|
||||||
public:
|
public:
|
||||||
gl_texture2D(int width, int height, GLint colorMode = GL_RGBA): gl_texture(width, height, GL_TEXTURE_2D, colorMode) {
|
gl_texture2D(int width, int height, GLint colorMode = GL_RGBA):
|
||||||
|
gl_texture(width, height, GL_TEXTURE_2D, colorMode) {
|
||||||
bind();
|
bind();
|
||||||
glTexStorage2D(textureBindType, std::stoi(fp::settings::get("MIPMAP_LEVELS")), colorMode, width, height);
|
glTexStorage2D(
|
||||||
|
textureBindType, std::stoi(fp::settings::get("MIPMAP_LEVELS")), colorMode,
|
||||||
|
width, height
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void upload(
|
void upload(
|
||||||
void* data, GLint dataColorMode = GL_RGBA, int level = 0, int x_offset = 0, int y_offset = 0, int sub_width = -1,
|
void* data, GLint dataColorMode = GL_RGBA, int level = 0, int x_offset = 0,
|
||||||
|
int y_offset = 0, int sub_width = -1,
|
||||||
int sub_height = -1
|
int sub_height = -1
|
||||||
) const {
|
) const {
|
||||||
if (sub_width < 0)
|
if (sub_width < 0)
|
||||||
|
@ -143,7 +174,10 @@ namespace fp::texture {
|
||||||
if (sub_height < 0)
|
if (sub_height < 0)
|
||||||
sub_height = m_height;
|
sub_height = m_height;
|
||||||
bind();
|
bind();
|
||||||
glTexSubImage2D(textureBindType, level, x_offset, y_offset, sub_width, sub_height, dataColorMode, GL_UNSIGNED_BYTE, data);
|
glTexSubImage2D(
|
||||||
|
textureBindType, level, x_offset, y_offset, sub_width, sub_height,
|
||||||
|
dataColorMode, GL_UNSIGNED_BYTE, data
|
||||||
|
);
|
||||||
unbind();
|
unbind();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,15 +190,17 @@ namespace fp::texture {
|
||||||
protected:
|
protected:
|
||||||
int m_layers;
|
int m_layers;
|
||||||
public:
|
public:
|
||||||
gl_texture2D_array(int width, int height, int layers, GLint colorMode = GL_RGBA):
|
gl_texture2D_array(int width, int height, int layers, GLint colorMode = GL_RGBA8):
|
||||||
gl_texture(width, height, GL_TEXTURE_2D_ARRAY, colorMode), m_layers(layers) {
|
gl_texture(width, height, GL_TEXTURE_2D_ARRAY, colorMode), m_layers(layers) {
|
||||||
bind();
|
bind();
|
||||||
glTexStorage3D(textureBindType, std::stoi(fp::settings::get("MIPMAP_LEVELS")), colorMode, width, height, layers);
|
// 3 mipmaps is about good since anything smaller is probably useless (32x32(0) -> 16x16(1) -> 8x8(2))
|
||||||
|
glTexStorage3D(textureBindType, 3, colorMode, width, height, layers);
|
||||||
BLT_DEBUG("Creating 2D Texture Array with ID: %d", textureID);
|
BLT_DEBUG("Creating 2D Texture Array with ID: %d", textureID);
|
||||||
}
|
}
|
||||||
|
|
||||||
void upload(
|
void upload(
|
||||||
void* data, int index, GLint dataColorMode = GL_RGBA, int level = 0, int x_offset = 0, int y_offset = 0, int sub_width = -1,
|
void* data, int index, GLint dataColorMode = GL_RGBA, int level = 0,
|
||||||
|
int x_offset = 0, int y_offset = 0, int sub_width = -1,
|
||||||
int sub_height = -1
|
int sub_height = -1
|
||||||
) const {
|
) const {
|
||||||
if (sub_width < 0)
|
if (sub_width < 0)
|
||||||
|
@ -172,7 +208,10 @@ namespace fp::texture {
|
||||||
if (sub_height < 0)
|
if (sub_height < 0)
|
||||||
sub_height = m_height;
|
sub_height = m_height;
|
||||||
bind();
|
bind();
|
||||||
glTexSubImage3D(textureBindType, level, x_offset, y_offset, index, sub_width, sub_height, 1, dataColorMode, GL_UNSIGNED_BYTE, data);
|
glTexSubImage3D(
|
||||||
|
textureBindType, level, x_offset, y_offset, index, sub_width, sub_height, 1,
|
||||||
|
dataColorMode, GL_UNSIGNED_BYTE, data
|
||||||
|
);
|
||||||
unbind();
|
unbind();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -196,12 +235,15 @@ namespace fp::texture {
|
||||||
palette() = default;
|
palette() = default;
|
||||||
|
|
||||||
void generateGLTexture() {
|
void generateGLTexture() {
|
||||||
delete texture_array;
|
|
||||||
auto texture_size = std::stoi(fp::settings::get("TEXTURE_SIZE"));
|
auto texture_size = std::stoi(fp::settings::get("TEXTURE_SIZE"));
|
||||||
texture_array = new gl_texture2D_array(texture_size, texture_size, (int) textures.size());
|
texture_array = new gl_texture2D_array(
|
||||||
|
texture_size, texture_size, (int) textures.size());
|
||||||
texture_array->bind();
|
texture_array->bind();
|
||||||
for (const auto t : textures) {
|
for (const auto t : textures) {
|
||||||
texture_array->upload(t->data(), textureIndices[t->getName()].i, t->getChannels() == 4 ? GL_RGBA : GL_RGB);
|
texture_array->upload(
|
||||||
|
t->data(), textureIndices[t->getName()].i,
|
||||||
|
t->getChannels() == 4 ? GL_RGBA : GL_RGB
|
||||||
|
);
|
||||||
BLT_TRACE("Loaded texture %s", t->getName().c_str());
|
BLT_TRACE("Loaded texture %s", t->getName().c_str());
|
||||||
}
|
}
|
||||||
texture_array->setDefaults();
|
texture_array->setDefaults();
|
||||||
|
@ -226,6 +268,8 @@ namespace fp::texture {
|
||||||
}
|
}
|
||||||
|
|
||||||
~palette() {
|
~palette() {
|
||||||
|
for (auto* t : textures)
|
||||||
|
delete t;
|
||||||
delete texture_array;
|
delete texture_array;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,12 +6,16 @@ precision mediump float;
|
||||||
|
|
||||||
out vec4 FragColor;
|
out vec4 FragColor;
|
||||||
|
|
||||||
|
in vec2 uv;
|
||||||
|
|
||||||
|
uniform mediump sampler2DArray texturep_palette;
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
/** if (gl_fragcoord * gl_fragcoord < vec2(5, 5))
|
/** if (gl_fragcoord * gl_fragcoord < vec2(5, 5))
|
||||||
FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
|
FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
|
||||||
else
|
else
|
||||||
discard;*/
|
discard;*/
|
||||||
FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
|
FragColor = texture(texturep_palette, vec3(uv, 0.0f));
|
||||||
}
|
}
|
||||||
|
|
||||||
")";
|
")";
|
||||||
|
|
|
@ -5,6 +5,9 @@
|
||||||
precision mediump float;
|
precision mediump float;
|
||||||
|
|
||||||
layout (location = 0) in vec3 vertex;
|
layout (location = 0) in vec3 vertex;
|
||||||
|
layout (location = 1) in vec2 texture_coord;
|
||||||
|
|
||||||
|
out vec2 uv;
|
||||||
|
|
||||||
uniform mat4 translation;
|
uniform mat4 translation;
|
||||||
|
|
||||||
|
@ -18,8 +21,9 @@ layout (std140) uniform StandardMatrices
|
||||||
mat4 orthographic;
|
mat4 orthographic;
|
||||||
};
|
};
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
gl_Position = projection * view * translation * vec4(vertex.x, vertex.y, vertex.z, 1.0);
|
gl_Position = projection * view * translation * vec4(vertex.x, vertex.y, vertex.z, 1.0);
|
||||||
|
uv = texture_coord;
|
||||||
}
|
}
|
||||||
|
|
||||||
")";
|
")";
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
// size of the chunk in number of blocks
|
// size of the chunk in number of blocks
|
||||||
constexpr int CHUNK_SIZE = 32;
|
constexpr int CHUNK_SIZE = 32;
|
||||||
const int CHUNK_SHIFT = (int)(log(CHUNK_SIZE) / log(2));
|
const int CHUNK_SHIFT = (int) (log(CHUNK_SIZE) / log(2));
|
||||||
// size that the base vertex arrays are assumed to be (per face)
|
// size that the base vertex arrays are assumed to be (per face)
|
||||||
constexpr int VTX_ARR_SIZE = 4;
|
constexpr int VTX_ARR_SIZE = 4;
|
||||||
|
|
||||||
|
@ -59,6 +59,7 @@ namespace fp {
|
||||||
// since OpenGL allows us to specify attributes based on offsets from the same VBO.
|
// since OpenGL allows us to specify attributes based on offsets from the same VBO.
|
||||||
typedef struct {
|
typedef struct {
|
||||||
float x, y, z;
|
float x, y, z;
|
||||||
|
float u, v;
|
||||||
} vertex;
|
} vertex;
|
||||||
|
|
||||||
namespace _static {
|
namespace _static {
|
||||||
|
@ -88,13 +89,15 @@ namespace fp {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static inline bool f_equal(float v1, float v2) {
|
||||||
|
return v1 >= v2 - EPSILON && v1 <= v2 + EPSILON;
|
||||||
|
}
|
||||||
|
|
||||||
struct vertex_equality {
|
struct vertex_equality {
|
||||||
inline bool operator()(const vertex& p1, const vertex& p2) const {
|
inline bool operator()(const vertex& p1, const vertex& p2) const {
|
||||||
return p1.x >= p2.x - EPSILON && p1.x <= p2.x + EPSILON && p1.y >= p2.y - EPSILON && p1.y <= p2.y + EPSILON && p1.z >= p2.z - EPSILON && p1.z <= p2.z + EPSILON;
|
return f_equal(p1.x, p2.x) && f_equal(p1.y, p2.y) && f_equal(p1.z, p2.z) &&
|
||||||
|
f_equal(p1.u, p2.u) && f_equal(p1.v, p2.v);
|
||||||
}
|
}
|
||||||
// inline bool operator()(const vertex& p1, const vertex& p2) const {
|
|
||||||
// return p1.x == p2.x && p1.y == p2.y && p1.z == p2.z;
|
|
||||||
// }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,10 @@ namespace fp {
|
||||||
|
|
||||||
// since they both use the same amount of memory we will only store the vertices and draw with drawArrays, since it is less complex.
|
// since they both use the same amount of memory we will only store the vertices and draw with drawArrays, since it is less complex.
|
||||||
// set up the VBOs which will be later updated when the mesh is generated.
|
// set up the VBOs which will be later updated when the mesh is generated.
|
||||||
chunk_vao->bindVBO(new VBO(ARRAY_BUFFER, nullptr, 0), 0, 3, GL_FLOAT, 3 * sizeof(float), 0);
|
auto vbo = new VBO(ARRAY_BUFFER, nullptr, 0);
|
||||||
|
auto data_size = 3 * sizeof(float) + 2 * sizeof(float);
|
||||||
|
chunk_vao->bindVBO(vbo, 0, 3, GL_FLOAT, (int)data_size, 0);
|
||||||
|
chunk_vao->bindVBO(vbo, 1, 2, GL_FLOAT, (int)data_size, 3 * sizeof(float), true);
|
||||||
chunk_vao->bindElementVBO(new VBO(ELEMENT_BUFFER, nullptr, 0));
|
chunk_vao->bindElementVBO(new VBO(ELEMENT_BUFFER, nullptr, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,9 +50,10 @@ namespace fp::registry {
|
||||||
void textureInit();
|
void textureInit();
|
||||||
void setupTextureLoaderThreads(int count = 8);
|
void setupTextureLoaderThreads(int count = 8);
|
||||||
void generateTexturePalette();
|
void generateTexturePalette();
|
||||||
|
void cleanup();
|
||||||
|
|
||||||
block_properties get(block_type id);
|
block_properties get(block_type id);
|
||||||
unsigned int getTextureID(const std::string& name);
|
unsigned int getTextureID();
|
||||||
texture::texture_index getTextureIndex(const std::string& name);
|
texture::texture_index getTextureIndex(const std::string& name);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 61ae482e5d7dcf6a472a841645998f0e42b423bd
|
Subproject commit bd89abb2f3da1e04d8fae667db2866675ae2280c
|
|
@ -29,7 +29,7 @@ void loop(){
|
||||||
world->update();
|
world->update();
|
||||||
world->render(*chunk_shader);
|
world->render(*chunk_shader);
|
||||||
|
|
||||||
fp::text::drawText("Hello There", 0, 0, fp::text::FONT_18, {0,0,0, 1.0});
|
//fp::text::drawText("Hello There", 0, 0, fp::text::FONT_18, {0,0,0, 1.0});
|
||||||
|
|
||||||
fp::camera::update();
|
fp::camera::update();
|
||||||
fp::debug::render();
|
fp::debug::render();
|
||||||
|
@ -82,11 +82,13 @@ int main() {
|
||||||
loop();
|
loop();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
BLT_PRINT_ORDERED("Chunk Generator", blt::logging::TRACE, true, true);
|
BLT_PRINT_PROFILE("Chunk Generator", blt::logging::TRACE, true);
|
||||||
|
|
||||||
delete(chunk_shader);
|
delete(chunk_shader);
|
||||||
delete(world);
|
delete(world);
|
||||||
|
|
||||||
|
/** !! MUST BE CALLED HERE OTHERWISE glDeleteTextures WILL BE CALLED AFTER THE GL CONTEXT IS DESTROYED! !! **/
|
||||||
|
fp::registry::cleanup();
|
||||||
fp::text::destroy();
|
fp::text::destroy();
|
||||||
fp::window::close();
|
fp::window::close();
|
||||||
fp::settings::save("settings.txt");
|
fp::settings::save("settings.txt");
|
||||||
|
|
|
@ -72,7 +72,7 @@ namespace fp {
|
||||||
glDeleteVertexArrays(1, &vaoID);
|
glDeleteVertexArrays(1, &vaoID);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VAO::bindVBO(VBO* vbo, int attribute_number, int coordinate_size, GLenum type, int stride, long offset) {
|
void VAO::bindVBO(VBO* vbo, int attribute_number, int coordinate_size, GLenum type, int stride, long offset, bool repeated) {
|
||||||
bind();
|
bind();
|
||||||
vbo->bind();
|
vbo->bind();
|
||||||
|
|
||||||
|
@ -82,7 +82,8 @@ namespace fp {
|
||||||
glEnableVertexAttribArray(attribute_number);
|
glEnableVertexAttribArray(attribute_number);
|
||||||
|
|
||||||
// since attribute number must be unique we can use it to reference the VBO if we need to update it.
|
// since attribute number must be unique we can use it to reference the VBO if we need to update it.
|
||||||
VBOs.insert({attribute_number, vbo});
|
if (!repeated)
|
||||||
|
VBOs.insert({attribute_number, vbo});
|
||||||
}
|
}
|
||||||
|
|
||||||
void VAO::bindElementVBO(VBO* vbo) {
|
void VAO::bindElementVBO(VBO* vbo) {
|
||||||
|
@ -172,7 +173,7 @@ namespace fp {
|
||||||
|
|
||||||
glGetProgramInfoLog(programID, log_length + 1, nullptr, infoLog.buffer);
|
glGetProgramInfoLog(programID, log_length + 1, nullptr, infoLog.buffer);
|
||||||
BLT_ERROR("--- --- --- --- --- --- --- --- ---");
|
BLT_ERROR("--- --- --- --- --- --- --- --- ---");
|
||||||
BLT_ERROR("Unable to link program of ID: %", programID);
|
BLT_ERROR("Unable to link program of ID: %d", programID);
|
||||||
BLT_ERROR(vertex_source);
|
BLT_ERROR(vertex_source);
|
||||||
BLT_ERROR(fragment_source);
|
BLT_ERROR(fragment_source);
|
||||||
BLT_ERROR(geometry_source);
|
BLT_ERROR(geometry_source);
|
||||||
|
|
|
@ -13,8 +13,7 @@ std::unordered_map<std::string, std::string> properties;
|
||||||
|
|
||||||
// will be overwritten if the file has something different.
|
// will be overwritten if the file has something different.
|
||||||
void write_default_values(){
|
void write_default_values(){
|
||||||
properties["TEXTURE_SIZE"] = std::to_string(32);
|
properties["TEXTURE_SIZE"] = std::to_string(128);
|
||||||
properties["MIPMAP_LEVELS"] = std::to_string(3);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void fp::settings::load(const std::string& file) {
|
void fp::settings::load(const std::string& file) {
|
||||||
|
@ -36,15 +35,18 @@ void fp::settings::load(const std::string& file) {
|
||||||
auto& value = blt::string::trim(split_line[1]);
|
auto& value = blt::string::trim(split_line[1]);
|
||||||
|
|
||||||
properties[property] = value;
|
properties[property] = value;
|
||||||
|
BLT_TRACE("Loading property %s with value %s", property.c_str(), value.c_str());
|
||||||
}
|
}
|
||||||
} catch (std::exception& e) {}
|
} catch (std::exception& e) {
|
||||||
|
BLT_WARN("Unable to read %s settings file!", file.c_str());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void fp::settings::save(const std::string& file) {
|
void fp::settings::save(const std::string& file) {
|
||||||
std::ofstream output {file};
|
std::ofstream output {file};
|
||||||
output.exceptions(std::ios::failbit | std::ios::badbit);
|
output.exceptions(std::ios::failbit | std::ios::badbit);
|
||||||
for (const auto& property : properties){
|
for (const auto& property : properties){
|
||||||
output << property.first << " = " << property.second;
|
output << property.first << " = " << property.second << "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,40 +9,40 @@
|
||||||
constexpr float scale = 0.5f;
|
constexpr float scale = 0.5f;
|
||||||
|
|
||||||
const fp::vertex x_positive_vertices[VTX_ARR_SIZE] = {
|
const fp::vertex x_positive_vertices[VTX_ARR_SIZE] = {
|
||||||
{scale, scale, scale}, // +x top right
|
{scale, scale, scale, 1, 1}, // +x top right
|
||||||
{scale, scale, -scale}, // +x bottom right
|
{scale, scale, -scale, 1, 0}, // +x bottom right
|
||||||
{scale, -scale, -scale}, // +x bottom left
|
{scale, -scale, -scale, 0, 0}, // +x bottom left
|
||||||
{scale, -scale, scale} // +x top left
|
{scale, -scale, scale, 0, 1} // +x top left
|
||||||
};
|
};
|
||||||
const fp::vertex x_negative_vertices[VTX_ARR_SIZE] = {
|
const fp::vertex x_negative_vertices[VTX_ARR_SIZE] = {
|
||||||
{-scale, scale, scale}, // -x top right
|
{-scale, scale, scale, 1, 1}, // -x top right
|
||||||
{-scale, scale, -scale}, // -x bottom right
|
{-scale, scale, -scale, 1, 0}, // -x bottom right
|
||||||
{-scale, -scale, -scale}, // -x bottom left
|
{-scale, -scale, -scale, 0, 0}, // -x bottom left
|
||||||
{-scale, -scale, scale} // -x top left
|
{-scale, -scale, scale, 0, 1} // -x top left
|
||||||
};
|
};
|
||||||
const fp::vertex y_positive_vertices[VTX_ARR_SIZE] = {
|
const fp::vertex y_positive_vertices[VTX_ARR_SIZE] = {
|
||||||
{scale, scale, scale}, // +y top right
|
{scale, scale, scale, 1, 1}, // +y top right
|
||||||
{-scale, scale, scale}, // +y bottom right
|
{-scale, scale, scale, 1, 0}, // +y bottom right
|
||||||
{-scale, scale, -scale}, // +y bottom left
|
{-scale, scale, -scale, 0, 0}, // +y bottom left
|
||||||
{scale, scale, -scale}, // +y top left
|
{scale, scale, -scale, 0, 1}, // +y top left
|
||||||
};
|
};
|
||||||
const fp::vertex y_negative_vertices[VTX_ARR_SIZE] = {
|
const fp::vertex y_negative_vertices[VTX_ARR_SIZE] = {
|
||||||
{scale, -scale, scale}, // -y top right
|
{scale, -scale, scale, 1, 1}, // -y top right
|
||||||
{-scale, -scale, scale}, // -y bottom right
|
{-scale, -scale, scale, 1, 0}, // -y bottom right
|
||||||
{-scale, -scale, -scale}, // -y bottom left
|
{-scale, -scale, -scale, 0, 0}, // -y bottom left
|
||||||
{scale, -scale, -scale}, // -y top left
|
{scale, -scale, -scale, 0, 1}, // -y top left
|
||||||
};
|
};
|
||||||
const fp::vertex z_positive_vertices[VTX_ARR_SIZE] = {
|
const fp::vertex z_positive_vertices[VTX_ARR_SIZE] = {
|
||||||
{scale, scale, scale}, // +z top right
|
{scale, scale, scale, 1, 1}, // +z top right
|
||||||
{scale, -scale, scale}, // +z bottom right
|
{scale, -scale, scale, 1, 0}, // +z bottom right
|
||||||
{-scale, -scale, scale}, // +z bottom left
|
{-scale, -scale, scale, 0, 0}, // +z bottom left
|
||||||
{-scale, scale, scale}, // +z top left
|
{-scale, scale, scale, 0, 1}, // +z top left
|
||||||
};
|
};
|
||||||
const fp::vertex z_negative_vertices[VTX_ARR_SIZE] = {
|
const fp::vertex z_negative_vertices[VTX_ARR_SIZE] = {
|
||||||
{scale, scale, -scale}, // -z top right
|
{scale, scale, -scale, 1, 1}, // -z top right
|
||||||
{scale, -scale, -scale}, // -z bottom right
|
{scale, -scale, -scale, 1, 0}, // -z bottom right
|
||||||
{-scale, -scale, -scale}, // -z bottom left
|
{-scale, -scale, -scale, 0, 0}, // -z bottom left
|
||||||
{-scale, scale, -scale}, // -z top left
|
{-scale, scale, -scale, 0, 1}, // -z top left
|
||||||
};
|
};
|
||||||
|
|
||||||
// indices are the same on all axis but are flipped between negative / positive as a result of back-face culling.
|
// indices are the same on all axis but are flipped between negative / positive as a result of back-face culling.
|
||||||
|
@ -74,9 +74,12 @@ void fp::mesh_storage::addFace(fp::face face, const block_pos& pos) {
|
||||||
|
|
||||||
// generate translated vertices
|
// generate translated vertices
|
||||||
for (int i = 0; i < VTX_ARR_SIZE; i++) {
|
for (int i = 0; i < VTX_ARR_SIZE; i++) {
|
||||||
translated_face_vertices[i].x = face_vertices[i].x + (float) pos.x;
|
// first copy all the information over, since there is extra information we need to preserve like index and UV / normal
|
||||||
translated_face_vertices[i].y = face_vertices[i].y + (float) pos.y;
|
translated_face_vertices[i] = face_vertices[i];
|
||||||
translated_face_vertices[i].z = face_vertices[i].z + (float) pos.z;
|
// then we can apply the translation, since the face_vertex value is already there we can add the translation raw
|
||||||
|
translated_face_vertices[i].x += (float) pos.x;
|
||||||
|
translated_face_vertices[i].y += (float) pos.y;
|
||||||
|
translated_face_vertices[i].z += (float) pos.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (unsigned int face_index : face_indices) {
|
for (unsigned int face_index : face_indices) {
|
||||||
|
|
|
@ -15,8 +15,8 @@ void fp::world::generateFullMesh(mesh_storage* mesh, fp::chunk* chunk) {
|
||||||
for (int j = 0; j < CHUNK_SIZE; j++) {
|
for (int j = 0; j < CHUNK_SIZE; j++) {
|
||||||
for (int k = 0; k < CHUNK_SIZE; k++) {
|
for (int k = 0; k < CHUNK_SIZE; k++) {
|
||||||
auto block = chunk->storage->get({i, j, k});
|
auto block = chunk->storage->get({i, j, k});
|
||||||
// opaque visibility is always 0. Non-zero values (true) are what we care about since opaque blocks are completely hidden
|
// The main chunk mesh can handle opaque and transparent textures. (Transparency will be discarded)
|
||||||
if (!fp::registry::get(block).visibility) {
|
if (fp::registry::get(block).visibility <= registry::TRANSPARENT_TEXTURE) {
|
||||||
if (fp::registry::get(chunk->storage->getBounded(outside, {i - 1, j, k})).visibility && !outside)
|
if (fp::registry::get(chunk->storage->getBounded(outside, {i - 1, j, k})).visibility && !outside)
|
||||||
mesh->addFace(X_NEG, {i, j, k});
|
mesh->addFace(X_NEG, {i, j, k});
|
||||||
if (fp::registry::get(chunk->storage->getBounded(outside, {i + 1, j, k})).visibility && !outside)
|
if (fp::registry::get(chunk->storage->getBounded(outside, {i + 1, j, k})).visibility && !outside)
|
||||||
|
@ -42,7 +42,7 @@ inline void checkEdgeFaces(
|
||||||
fp::mesh_storage* mesh, fp::chunk* chunk, fp::chunk* neighbour, fp::face face, const fp::block_pos& pos, const fp::block_pos& neighbour_pos
|
fp::mesh_storage* mesh, fp::chunk* chunk, fp::chunk* neighbour, fp::face face, const fp::block_pos& pos, const fp::block_pos& neighbour_pos
|
||||||
) {
|
) {
|
||||||
auto block = chunk->storage->get(pos);
|
auto block = chunk->storage->get(pos);
|
||||||
if (!fp::registry::get(block).visibility) {
|
if (fp::registry::get(block).visibility <= fp::registry::TRANSPARENT_TEXTURE) {
|
||||||
if (fp::registry::get(neighbour->storage->get(neighbour_pos)).visibility)
|
if (fp::registry::get(neighbour->storage->get(neighbour_pos)).visibility)
|
||||||
mesh->addFace(face, pos);
|
mesh->addFace(face, pos);
|
||||||
}
|
}
|
||||||
|
@ -101,6 +101,9 @@ void fp::world::update() {
|
||||||
void fp::world::render(fp::shader& shader) {
|
void fp::world::render(fp::shader& shader) {
|
||||||
shader.use();
|
shader.use();
|
||||||
|
|
||||||
|
glActiveTexture(GL_TEXTURE0);
|
||||||
|
glBindTexture(GL_TEXTURE_2D_ARRAY, fp::registry::getTextureID());
|
||||||
|
|
||||||
for (const auto& chunk_pair : chunk_storage) {
|
for (const auto& chunk_pair : chunk_storage) {
|
||||||
auto chunk = chunk_pair.second;
|
auto chunk = chunk_pair.second;
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
std::unordered_map<fp::block_type, fp::registry::block_properties> blocks;
|
std::unordered_map<fp::block_type, fp::registry::block_properties> blocks;
|
||||||
|
|
||||||
fp::texture::palette base_palette;
|
fp::texture::palette* base_palette;
|
||||||
|
|
||||||
std::mutex palette_mutex {};
|
std::mutex palette_mutex {};
|
||||||
std::mutex main_mutex {};
|
std::mutex main_mutex {};
|
||||||
|
@ -41,12 +41,12 @@ void fp::registry::registerTexture(fp::texture::file_texture* texture) {
|
||||||
BLT_TRACE("Queued texture %s", texture->getName().c_str());
|
BLT_TRACE("Queued texture %s", texture->getName().c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int fp::registry::getTextureID(const std::string& name) {
|
unsigned int fp::registry::getTextureID() {
|
||||||
return base_palette.getTextureID();
|
return base_palette->getTextureID();
|
||||||
}
|
}
|
||||||
|
|
||||||
fp::texture::texture_index fp::registry::getTextureIndex(const std::string& name) {
|
fp::texture::texture_index fp::registry::getTextureIndex(const std::string& name) {
|
||||||
return base_palette.getTexture(name);
|
return base_palette->getTexture(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
void fp::registry::generateTexturePalette() {
|
void fp::registry::generateTexturePalette() {
|
||||||
|
@ -57,7 +57,7 @@ void fp::registry::generateTexturePalette() {
|
||||||
BLT_INFO("Finished loading all textures!");
|
BLT_INFO("Finished loading all textures!");
|
||||||
delete texture_queue;
|
delete texture_queue;
|
||||||
delete[] texture_loader_threads;
|
delete[] texture_loader_threads;
|
||||||
base_palette.generateGLTexture();
|
base_palette->generateGLTexture();
|
||||||
BLT_INFO("Palette generated!");
|
BLT_INFO("Palette generated!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ void fp::registry::setupTextureLoaderThreads(int count) {
|
||||||
auto t = texture::file_texture::resize(texture::file_texture::load(top), texture_size, texture_size);
|
auto t = texture::file_texture::resize(texture::file_texture::load(top), texture_size, texture_size);
|
||||||
|
|
||||||
std::scoped_lock<std::mutex> lock(palette_mutex);
|
std::scoped_lock<std::mutex> lock(palette_mutex);
|
||||||
base_palette.registerTexture(t);
|
base_palette->registerTexture(t);
|
||||||
BLT_TRACE("Loaded file %s", t->getName().c_str());
|
BLT_TRACE("Loaded file %s", t->getName().c_str());
|
||||||
}
|
}
|
||||||
std::scoped_lock<std::mutex> lock{completion_mutex};
|
std::scoped_lock<std::mutex> lock{completion_mutex};
|
||||||
|
@ -96,4 +96,9 @@ void fp::registry::setupTextureLoaderThreads(int count) {
|
||||||
|
|
||||||
void fp::registry::textureInit() {
|
void fp::registry::textureInit() {
|
||||||
texture_queue = new std::queue<fp::texture::file_texture*>();
|
texture_queue = new std::queue<fp::texture::file_texture*>();
|
||||||
|
base_palette = new texture::palette();
|
||||||
|
}
|
||||||
|
|
||||||
|
void fp::registry::cleanup() {
|
||||||
|
delete base_palette;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue