diff --git a/README.md b/README.md index e12db38..347d7b4 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,8 @@ To get a local copy up and running, follow these simple steps. * Python: utility scripts * [Tracy](https://github.com/wolfpld/tracy) v0.7: profiling * [glslc](https://github.com/KhronosGroup/glslang): build vk shaders -* [Compressonator](https://github.com/GPUOpen-Tools/compressonator): build textures +* Imagemagick: build textures (convert jpg to png) +* [Compressonator](https://github.com/GPUOpen-Tools/compressonator): build textures (compress dds) ### Installation @@ -123,8 +124,8 @@ GLSL="glslValidator -V" ./compile.sh # Other glslang compiler 6. Rebuild textures ```sh cd resource/textures-src -./merge # combine grey images to RGBA -Compressonator -fd BC3 -mipsize +./compile.sh # Build all texture dds +./merge.py # Combine grey images to RGB ``` diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds index f600699..0ebd337 100644 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds +++ b/resource/content/textures/1024-realistic/sky/Space_orange.cube.back.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fd54c449bc229fbd57280512ac6aeb119b54bb3054ac514b7528b4d2ff5c655 -size 4194432 +oid sha256:1f8ed6b4fa492bf72bf46a6bc1ff6973b911afbc08614bf5791f1ff8f1adcfe9 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds index 57bf717..470f953 100644 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds +++ b/resource/content/textures/1024-realistic/sky/Space_orange.cube.bottom.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4444f53118159700c14f087f79adbf8dcb9cad9f226754bcccd3b333b1bff81d -size 4194432 +oid sha256:6d73ff5750e59f06b7186e358c36218e6594517e4eea8774c27cfd059dfcde03 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds index 810f6e6..4b6e1a1 100644 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds +++ b/resource/content/textures/1024-realistic/sky/Space_orange.cube.front.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1da5776f1366c898d5756b2783e05b178cb30cec9d3a0e3a6e3655e029333e55 -size 4194432 +oid sha256:ef6792f621bedadcabb0b17541542122434dbd165b030d033cf400468d018eb3 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds index 46726df..cc36c52 100644 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds +++ b/resource/content/textures/1024-realistic/sky/Space_orange.cube.left.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78231dce3899a4e5f5c10a1c66fc43c94514cd399fbf3710da5b1d23a31e2d6b -size 4194432 +oid sha256:3bee314bcc1c526fdd129e9d68dcd1afa39509c5ce687662ac43f1511549f738 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds index 6778e27..2bf32bf 100644 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds +++ b/resource/content/textures/1024-realistic/sky/Space_orange.cube.right.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:523baab6de1a1f6d4363846eab51f2509de93bfe620543b32315bee415b87d8e -size 4194432 +oid sha256:9ee9c9f770b5d33472f7ece3403a15f03f4101fa7f2a465ad436af5e959a034a +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds b/resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds index faa3e2e..9f2ed5e 100644 --- a/resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds +++ b/resource/content/textures/1024-realistic/sky/Space_orange.cube.top.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e15416db6f86acb1763b10140e438a34dd153f6641aa197f80ec0bb804bafb2 -size 4194432 +oid sha256:82b193ef39f91d13d29b935a728c358e2e03bdfcc60f0194451f8c565240daf5 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds index 7ee8488..1c9c1cb 100644 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds +++ b/resource/content/textures/1024-realistic/sky/Space_tray.cube.back.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb1b47421b69fb2e8d246b38a7de446c5ee10fd9ffaefeb3391696904ad0a7c9 -size 4194432 +oid sha256:38e46c80ffecea7f26804cbbc008f568a2564eaff1d9e73062ed8c81fe5d3637 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds index f5a1496..2e4b981 100644 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds +++ b/resource/content/textures/1024-realistic/sky/Space_tray.cube.bottom.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd6db84541f50fe93a13602d206efb2136a35be179891da0b80d8f8e74337d5c -size 4194432 +oid sha256:ef01cf95e5649e60510887b0040aa827e6aeb4122e286127f5d5e891257081f1 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds index 6992b6f..7802f28 100644 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds +++ b/resource/content/textures/1024-realistic/sky/Space_tray.cube.front.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1f9890d0af5955b7bac158ca09405911375b0173fba9ec046497bf216d6b463 -size 4194432 +oid sha256:bd00b04383dc2a423b19bce634fc62e433a0b6cb457aa88660493868d06909c6 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds index bb8da05..695985e 100644 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds +++ b/resource/content/textures/1024-realistic/sky/Space_tray.cube.left.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcab679a2a87ba9511a03f032e7684f3f99d9c1e4e697581bd85241feb920dde -size 4194432 +oid sha256:1228dabd508018b642c5af3fea31eadba10885f1a21da730f090b1a327759f85 +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds index 7cc7595..3af9529 100644 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds +++ b/resource/content/textures/1024-realistic/sky/Space_tray.cube.right.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffd236562926ebe444087cc6c0e976b4b8ba5a97685d0aa89198f595120166e1 -size 4194432 +oid sha256:68054a30a4f24cf5e225418578e714ac426fd71f90437a98d73811338cd8812d +size 5592560 diff --git a/resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds b/resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds index 0442851..6d821cb 100644 --- a/resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds +++ b/resource/content/textures/1024-realistic/sky/Space_tray.cube.top.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:486be225a432b1d6e884015fc6c109b9208fb38c50fc454457e8374e2c7dfb5f -size 4194432 +oid sha256:8d39e36898cbecbe9b78020130c07c6f6d437d874a3b2db8427ee3d21329e90b +size 5592560 diff --git a/resource/content/textures/1024-realistic/terrain/Alien.dds b/resource/content/textures/1024-realistic/terrain/Alien.dds index 24fbc8c..46f1651 100644 --- a/resource/content/textures/1024-realistic/terrain/Alien.dds +++ b/resource/content/textures/1024-realistic/terrain/Alien.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a79859a016510c20dc15285012ace5a0657e941c980a2c84bd6d70d65a436f6 -size 1048704 +oid sha256:e3746a93556f518dca765f4e94e9fddd6724e97e5dec6e827f156e7725f226d9 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Alien.hos.dds b/resource/content/textures/1024-realistic/terrain/Alien.hos.dds index 57585c4..f038388 100644 --- a/resource/content/textures/1024-realistic/terrain/Alien.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Alien.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db6332c0cd5c8cdd919ae08e2b6bc5cf31b7f248405b906d7689ee32f199a4b2 -size 1048704 +oid sha256:74d9215bc08c400632cbfaa9dbe637adb23b57a629ac0d7457d8823da45df385 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Alien.nrm.dds b/resource/content/textures/1024-realistic/terrain/Alien.nrm.dds index 6f8fd30..b979ba9 100644 --- a/resource/content/textures/1024-realistic/terrain/Alien.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Alien.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62ce0a1447a120d89634bc7e32a739c335663fcd06c1099ffcacb649cb4d1746 -size 1048704 +oid sha256:07d09e1eea9dcd49f3fc1fb426b1a71d7d7d26e087f1e3b24c4335f1ece23865 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Debug.dds b/resource/content/textures/1024-realistic/terrain/Debug.dds index 5f6ad92..3235c4b 100644 --- a/resource/content/textures/1024-realistic/terrain/Debug.dds +++ b/resource/content/textures/1024-realistic/terrain/Debug.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f130e36d53de76fbf6fae4ca9de4b989f36db10672cab6da0eeabc191dfe4cac -size 1048704 +oid sha256:5f5ac0255f7583f405964822f7d4d71391d4b04c3345fdf72f267b5889df04bc +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Debug.hos.dds b/resource/content/textures/1024-realistic/terrain/Debug.hos.dds index 026a1c7..cc4ed58 100644 --- a/resource/content/textures/1024-realistic/terrain/Debug.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Debug.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e74a2ce717b565edd5317b0b9685df606cbad92f17383c649a5bf75b1cb961ce -size 1048704 +oid sha256:7004e5401c8f5d006178218e4da678ba8deea3b24c9097019575e8e99de01dba +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Debug.nrm.dds b/resource/content/textures/1024-realistic/terrain/Debug.nrm.dds index 480a0a5..a4d5fd2 100644 --- a/resource/content/textures/1024-realistic/terrain/Debug.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Debug.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c6df3aaf87a08b7025eeabd3111f529ac44a2b891ad715e0ecd2dea59206eb4 -size 1048704 +oid sha256:fd19462b9c1267bc916e3902056cd0ec3a8a475c1a2fbce4a26531041acc2bc3 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Dirt.dds b/resource/content/textures/1024-realistic/terrain/Dirt.dds index 1bcb0a2..af87851 100644 --- a/resource/content/textures/1024-realistic/terrain/Dirt.dds +++ b/resource/content/textures/1024-realistic/terrain/Dirt.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69444d3db964a27fa5ffde6389d0ab2dbe91e4bbb905ac2b9b978982228b1df6 -size 1048704 +oid sha256:bbda6a47fa6abe84cc377877c839047e24762cc9521146069447937d886fea59 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Dirt.hos.dds b/resource/content/textures/1024-realistic/terrain/Dirt.hos.dds index b7c792e..261b1de 100644 --- a/resource/content/textures/1024-realistic/terrain/Dirt.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Dirt.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abb84b422b92858ef55ebf3f4285e50447abdfe29a827de66cb4d1bd59b9340f -size 1048704 +oid sha256:0e31fdba9e704cec22c76ef1a39db39f033fe451c41707527fa2863602204882 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds b/resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds index c0e6a74..7cf5efa 100644 --- a/resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Dirt.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b89ad95b35721212b99f94b3af14fbb38c98009dbfb1531319dd27003b28467a -size 1048704 +oid sha256:e6227089c1e96694eed7c240c2fc3532cb4e773cc38f1df7e6c29369015cae0f +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Forest_grass.dds b/resource/content/textures/1024-realistic/terrain/Forest_grass.dds index be90b81..36ed6a9 100644 --- a/resource/content/textures/1024-realistic/terrain/Forest_grass.dds +++ b/resource/content/textures/1024-realistic/terrain/Forest_grass.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cfac92a20194c64c4f15ae450ac0768784d4ee868755d9870623138c6ea9159 -size 1048704 +oid sha256:456dc34a01415e7136b2ad182a118fe9e9db296b72c3ed4ab05f9273858dc1d1 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds b/resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds index 6a9e0bc..5316024 100644 --- a/resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Forest_grass.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea82b1148a9e725e0541ee8b85ec4a65bb485783cda44f3ca39a826d3b3b9db8 -size 1048704 +oid sha256:e084995a1850626dacaa7871728eafa7d34712ba7e8297a93c93cc433d34f6f3 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds b/resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds index 1139298..64bebb9 100644 --- a/resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Forest_grass.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64d351b664ff668bd26babfb6d2793aedb742e34c451d5ce0d0cb6fcd9ae59b3 -size 1048704 +oid sha256:e45f12a30bf7d143a49f67846f2990407c39a4b73666b04aea00de2ff11af148 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Grass.dds b/resource/content/textures/1024-realistic/terrain/Grass.dds index a55039a..e6de24e 100644 --- a/resource/content/textures/1024-realistic/terrain/Grass.dds +++ b/resource/content/textures/1024-realistic/terrain/Grass.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22d7d28384450137d30b000368baae4406381de1dee10b062de5c1218936080f -size 1048704 +oid sha256:f0905a0c3d9d42409b08cc3df082cdd71d6467f2535ccbf5a416deb76a1bd796 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Grass.hos.dds b/resource/content/textures/1024-realistic/terrain/Grass.hos.dds index 0487e0d..aadf8e7 100644 --- a/resource/content/textures/1024-realistic/terrain/Grass.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Grass.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d43a62ae9090215a05f818a4db0c1e4f7863bdcd45ca11108baea917d0bd209 -size 1048704 +oid sha256:5a38e11fea7980ac705b5b3202dfcb57257ca054558073f2f6ae586f129c4f94 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Grass.nrm.dds b/resource/content/textures/1024-realistic/terrain/Grass.nrm.dds index cb0bfd0..579a8e0 100644 --- a/resource/content/textures/1024-realistic/terrain/Grass.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Grass.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a73fdd80ae8de9d46d804b2ddec1cde4f64afefc428420af51cf31c35dee9d17 -size 1048704 +oid sha256:28b1cf7f562ba3977c9a2cf0bd8640cd4cc25ea1f524b4cf5fad1d890a085f36 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Mapl.dds b/resource/content/textures/1024-realistic/terrain/Mapl.dds index b623ff1..5221284 100644 --- a/resource/content/textures/1024-realistic/terrain/Mapl.dds +++ b/resource/content/textures/1024-realistic/terrain/Mapl.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fce11b776238550452ea5a11786474ae0e6d5cac7e5875c65664981aff53bd7 +oid sha256:d0ab0275e5255dc2de17bef66cb6cfb9502227f724f1c9f20e2864e3042dc95f size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Mapl.hos.dds b/resource/content/textures/1024-realistic/terrain/Mapl.hos.dds index e51f3d9..e84a3fc 100644 --- a/resource/content/textures/1024-realistic/terrain/Mapl.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Mapl.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfcaff4f2b5214428627f300f32023a7c5542c33c05d8c12ab27675daee7ceba -size 1048704 +oid sha256:bd1199027cb4c33d6fd2bf4b65187e1445d91109208588c0d71f63e1dec5ee2e +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds b/resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds index 308931d..0365650 100644 --- a/resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Mapl.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1614985369e9df288908976fa38410c05b26280545bcbe242f4baa554f23025 -size 1048704 +oid sha256:a55658f694ac9ef149c6204fc37c30b931b6c22adf773fe0ed90598c7e48bf0b +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Plain_grass.dds b/resource/content/textures/1024-realistic/terrain/Plain_grass.dds index 81f7bf5..1c4afd7 100644 --- a/resource/content/textures/1024-realistic/terrain/Plain_grass.dds +++ b/resource/content/textures/1024-realistic/terrain/Plain_grass.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b104afbdbf2173c56b20116db3c2ea13bcba75a8bd7c72a28a659d4112572072 -size 1048704 +oid sha256:37b2990a7b8668eb24743f3de9107f8da21c12f554819270163e1417b092dabe +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds b/resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds index 40a552a..a352a2b 100644 --- a/resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Plain_grass.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a82b9cb70fecc39d57258864bb769075a242b66ca0a917c78ea374ca0c0d791 -size 1048704 +oid sha256:c0a64c9b6abd94df66ab92fd318528e5393cda17d27ebb48169573f1400d6140 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds b/resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds index 1dc9ad4..acf93ce 100644 --- a/resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Plain_grass.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bdf6df70263ac3ef82f4b389b7424093827671e81bb8099ec72fc8b25bc982d -size 1048704 +oid sha256:1ea753f09ae1958645cc5665769b82710bca1f838a56e656ac7aa8bf30d0942a +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Rough_rock.dds b/resource/content/textures/1024-realistic/terrain/Rough_rock.dds index 630d680..1a32ca0 100644 --- a/resource/content/textures/1024-realistic/terrain/Rough_rock.dds +++ b/resource/content/textures/1024-realistic/terrain/Rough_rock.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe2f37aa6253890e323b07518822d8bdc483cc39d58ba29e18b35829dcc33a5c -size 1048704 +oid sha256:f48c2f33019d92fca6522371ceb2e12e18a4c95e4acbe1709f80ba5c317a7f51 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds b/resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds index a055ada..582f43f 100644 --- a/resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Rough_rock.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5256820e852b724692b88c6ce5733bc41e8e55f8d968df5850462f00ca9398cc -size 1048704 +oid sha256:ca559a33ae867b9eca1da8a5b0ada2a4005b3d745fe2ac96709c8040a24b3177 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds b/resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds index 803beab..ff1a195 100644 --- a/resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Rough_rock.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b34778ed63a82c4c07180009f97950f3dc23d087f32d11dca0b81d53eda9a061 -size 1048704 +oid sha256:315f1b5d2fba7f3d4dbbbc58f39a79c8ed26bf7eabe3d468e5d3c26c0eec15d6 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Sand.dds b/resource/content/textures/1024-realistic/terrain/Sand.dds index c8f4d78..ef15687 100644 --- a/resource/content/textures/1024-realistic/terrain/Sand.dds +++ b/resource/content/textures/1024-realistic/terrain/Sand.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3afe9674850f624a77474eb1f27921c528a7949a02d1937285c4cfe078a6a73e -size 1048704 +oid sha256:c2c61d04d82392a262525c50c5bf9a9e652475cd21855ed87391326462743451 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Sand.hos.dds b/resource/content/textures/1024-realistic/terrain/Sand.hos.dds index d13f472..11d12c0 100644 --- a/resource/content/textures/1024-realistic/terrain/Sand.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Sand.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72e48c5ad7a0c92168a2c13e3721ba9279fdab82d7188be7c3c70faec67cf4c3 -size 1048704 +oid sha256:0da92c8c23a96ebe5693b84dbdb2e82470d660c876070599864f5657ce10a2ed +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Sand.nrm.dds b/resource/content/textures/1024-realistic/terrain/Sand.nrm.dds index 4d7413e..3d7647a 100644 --- a/resource/content/textures/1024-realistic/terrain/Sand.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Sand.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30e4ed3026647ee7575703d5fef1dca66af5660dcc15b4a1bad240a6c4023913 -size 1048704 +oid sha256:03421b82aade4b1fccd86fb2ff1ed73ebc6d7cc9e9f2d71198b96ab2dc243ef7 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Seaside_rock.dds b/resource/content/textures/1024-realistic/terrain/Seaside_rock.dds index 9382d31..fde5671 100644 --- a/resource/content/textures/1024-realistic/terrain/Seaside_rock.dds +++ b/resource/content/textures/1024-realistic/terrain/Seaside_rock.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:875d43e2192b25ba5fa6a9607950a5282c268848c293677fe23e85fe94e84528 -size 1048704 +oid sha256:17b6772516b9bf40ec889f08a1bd43735ee3c118026c4741c5f4e5c06770c576 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds b/resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds index b9de769..6a10169 100644 --- a/resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Seaside_rock.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3efbe5419441546ce214fb79509f7ffd1b4105e0d31bf40dc873c2225821cf81 -size 1048704 +oid sha256:c0530388436d98277dfbe625957c1dc14085996509ef5fee1251071a5ab3fd04 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds b/resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds index c5e5463..e738a7e 100644 --- a/resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Seaside_rock.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f360245d73f5737aa8dff728b553760420eb9116f8ee36f6cadb4e6ab96134a -size 1048704 +oid sha256:f130534922b6100c1a4dfeff2b209b26d6ed4d1fc083de948c51242257fe59d9 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_path.dds b/resource/content/textures/1024-realistic/terrain/Stone_path.dds index 2d3afc4..7c2698c 100644 --- a/resource/content/textures/1024-realistic/terrain/Stone_path.dds +++ b/resource/content/textures/1024-realistic/terrain/Stone_path.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac21ae446b9006facb81a21ea5566917055fadc653d5d1a6e890f8c31f4d9b01 -size 1048704 +oid sha256:e2b2915dca03c423cccf5a00fe6bcd2444050032732c1f8b6f1362f1247c0ef1 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds b/resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds index 154c64b..0cb17f3 100644 --- a/resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Stone_path.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99c0e99f47ee435a64395ea65f6d877a6eab8fa9d77befec743b3803c86c7d90 -size 1048704 +oid sha256:4bdbf44603414f942ae75fbabeb6f4c1f7b0ae585c3bdb5c83736f145acc9feb +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds b/resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds index 80f92cc..18dad84 100644 --- a/resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Stone_path.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02ab85bd417d44798b20a973667c67bff5193eb3ffdf162b9b5c6ec03859786e -size 1048704 +oid sha256:3b9828898ce81ba656edf3dfdb7f688bde399d01e91b40fbd96c063a04a1ab06 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_wall.dds b/resource/content/textures/1024-realistic/terrain/Stone_wall.dds index 491b182..ab69a39 100644 --- a/resource/content/textures/1024-realistic/terrain/Stone_wall.dds +++ b/resource/content/textures/1024-realistic/terrain/Stone_wall.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78e98bf6288c5efca200b2872387b64f0de29640a4ee655ffedad0d2e2afddc0 -size 1048704 +oid sha256:a767281a4a7cd91457e2b5b0b7044fac880841abcfbd38629042150745d6ead9 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds b/resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds index d457378..ab84b02 100644 --- a/resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Stone_wall.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab7294df605ff45eef10908b997ab000ebf5aa76adec7b2e18c3784360868073 -size 1048704 +oid sha256:b25ce0cdfac335f679816090c5068e7d042e78454eeabbb0bd17a496dae0c50a +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds b/resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds index e92f0ec..bff683f 100644 --- a/resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Stone_wall.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c1a379b40f247b4c6c0bc65ad58de29ff580798fd284f1968e61684aba37946 -size 1048704 +oid sha256:b120f02a46f138d891b492560a07ccaf8263a97543b439d48470e69c5807ca5d +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Water.dds b/resource/content/textures/1024-realistic/terrain/Water.dds index 85aff92..1aa6d00 100644 --- a/resource/content/textures/1024-realistic/terrain/Water.dds +++ b/resource/content/textures/1024-realistic/terrain/Water.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:638b703aed3d5c720c163571cb10d8634ec5d09c60047a25cd843840666316c4 -size 1048704 +oid sha256:25c3fd194677d94d5b790b0226dbbc09331603493bb8ed4b51d76fad0653d598 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Water.hos.dds b/resource/content/textures/1024-realistic/terrain/Water.hos.dds index 3efce6b..6b0b6dd 100644 --- a/resource/content/textures/1024-realistic/terrain/Water.hos.dds +++ b/resource/content/textures/1024-realistic/terrain/Water.hos.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55b481b473d73dcb876f1222ea6d38aeb19801c09c32496e33080d82bfde7ba6 -size 1048704 +oid sha256:fd9e0916bd54e6cd8b8b7397531aeff715d32efcb2eb8e1edab24027520abcf4 +size 1398256 diff --git a/resource/content/textures/1024-realistic/terrain/Water.nrm.dds b/resource/content/textures/1024-realistic/terrain/Water.nrm.dds index 814f0e1..4a141c1 100644 --- a/resource/content/textures/1024-realistic/terrain/Water.nrm.dds +++ b/resource/content/textures/1024-realistic/terrain/Water.nrm.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a707c0088f890ced619c67cba882ff068a3cbd9cf3ec013f2ccef10d22201b53 -size 1048704 +oid sha256:15d595e7aa1477fd6cf63d28e856ab85c30d13b4c0580eb1d732b22bd6e7df0d +size 1398256 diff --git a/resource/content/textures/ui/Aim.dds b/resource/content/textures/ui/Aim.dds index 5c34c61..668e249 100644 --- a/resource/content/textures/ui/Aim.dds +++ b/resource/content/textures/ui/Aim.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c2fa0277f042e6227d01413595c800ffb2abb1012a29a01faa90f5d352d6b7c +oid sha256:591a72137cd29d30aac33acbe8888f6be8922b11e5e67490367524a328c5d1b7 size 4224 diff --git a/resource/textures-src/1024-realistic/Debug_COLOR.jpg b/resource/textures-src/1024-realistic/Debug_COLOR.jpg new file mode 100644 index 0000000..5342918 --- /dev/null +++ b/resource/textures-src/1024-realistic/Debug_COLOR.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eec6f135e4719eeab3621496e0f51378ebd1a870b299b5cbf9e46019a5b7cb9 +size 47386 diff --git a/resource/textures-src/1024-realistic/Debug_HOS.png b/resource/textures-src/1024-realistic/Debug_HOS.png new file mode 100644 index 0000000..8f908de --- /dev/null +++ b/resource/textures-src/1024-realistic/Debug_HOS.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ff6e759f241098037854b42fb5889d56a90ecc09996570dc1589e99f13ce44 +size 13750 diff --git a/resource/textures-src/1024-realistic/Debug_NORM.jpg b/resource/textures-src/1024-realistic/Debug_NORM.jpg new file mode 100644 index 0000000..c288da6 --- /dev/null +++ b/resource/textures-src/1024-realistic/Debug_NORM.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e102c07ff028ae98b0b202df1dabfc4daf7aa4f6da9fec76bb1c1d0912ac7e77 +size 26308 diff --git a/resource/textures-src/1024-realistic/Rough_rock_019_HOS.jpg b/resource/textures-src/1024-realistic/Rough_rock_019_HOS.jpg new file mode 100644 index 0000000..0d665e4 --- /dev/null +++ b/resource/textures-src/1024-realistic/Rough_rock_019_HOS.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bedb4b0b699a1f29627d88604d5ce88575a628835cbf028ca7315e01fce1b840 +size 307056 diff --git a/resource/textures-src/1024-realistic/Sand_005_hos.jpg b/resource/textures-src/1024-realistic/Sand_005_hos.jpg new file mode 100644 index 0000000..b66408c --- /dev/null +++ b/resource/textures-src/1024-realistic/Sand_005_hos.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e0b025d0f78763d17558fda0e63eacba0be4724fc3461907e2651f61919a5ef +size 613491 diff --git a/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Base_Color.png b/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Base_Color.png index 8a668e1..321c058 100644 --- a/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Base_Color.png +++ b/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Base_Color.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89ae74d1335db5c533010d516e559e063b7e250f61215ed698becbc1ac45e22c -size 1922899 +oid sha256:5b8fe01ea0e13651c896b27cdc7c7e88278a72b155c155355aa3f85104348277 +size 1952690 diff --git a/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_HOS.png b/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_HOS.png new file mode 100644 index 0000000..c24c56a --- /dev/null +++ b/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_HOS.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4852e2113bfa0ec25fbd2d0c6e1a58047e86c715f84ca4a8ab3effddcf6d172d +size 832768 diff --git a/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Normal.png b/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Normal.png index 83ffce9..908dbb4 100644 --- a/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Normal.png +++ b/resource/textures-src/1024-realistic/Seaside_rocks_01_1K_Normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:feef31ab823e3708931aa9662b37c1c0acad15d0bc3dde86b3d42db68bcba571 -size 1205659 +oid sha256:4ff27636d4367ee4c97015a29e579603bd8ef4f6062f3b746f9a913444f5d397 +size 1119371 diff --git a/resource/textures-src/1024-realistic/Stone_Wall_008_HOS.jpg b/resource/textures-src/1024-realistic/Stone_Wall_008_HOS.jpg new file mode 100644 index 0000000..d2f3f59 --- /dev/null +++ b/resource/textures-src/1024-realistic/Stone_Wall_008_HOS.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccc9ddab89b67b4b2e67f70b40189c4d917b214eb624a44094c69a25a6014ad6 +size 313747 diff --git a/resource/textures-src/1024-realistic/index.txt b/resource/textures-src/1024-realistic/index.txt new file mode 100644 index 0000000..1afd4ba --- /dev/null +++ b/resource/textures-src/1024-realistic/index.txt @@ -0,0 +1,51 @@ +Abstract_006_COLOR.jpg terrain/Alien.dds +Abstract_006_HOS.png terrain/Alien.hos.dds +Abstract_006_NORM.jpg terrain/Alien.nrm.dds +Debug_COLOR.jpg terrain/Debug.dds +Debug_HOS.png terrain/Debug.hos.dds +Debug_NORM.jpg terrain/Debug.nrm.dds +Dirt_003_COLOR.png terrain/Dirt.dds +Dirt_003_HOS.png terrain/Dirt.hos.dds +Dirt_003_NRM.png terrain/Dirt.nrm.dds +Ground_Forest_003_baseColor.jpg terrain/Forest_grass.dds +Ground_Forest_003_hos.jpg terrain/Forest_grass.hos.dds +Ground_Forest_003_normal.jpg terrain/Forest_grass.nrm.dds +Grass_001_COLOR.jpg terrain/Grass.dds +Grass_001_HOS.jpg terrain/Grass.hos.dds +Grass_001_NORM.jpg terrain/Grass.nrm.dds +Bark_005_baseColor.jpg terrain/Mapl.dds +Bark_005_HOS.png terrain/Mapl.hos.dds +Bark_005_normal.jpg terrain/Mapl.nrm.dds +Ground_Forest_002_baseColor.jpg terrain/Plain_grass.dds +Ground_Forest_002_hos.jpg terrain/Plain_grass.hos.dds +Ground_Forest_002_normal.jpg terrain/Plain_grass.nrm.dds +Rough_rock_019_COLOR.jpg terrain/Rough_rock.dds +Rough_rock_019_HOS.jpg terrain/Rough_rock.hos.dds +Rough_rock_019_NRM.jpg terrain/Rough_rock.nrm.dds +Sand_005_baseColor.jpg terrain/Sand.dds +Sand_005_hos.jpg terrain/Sand.hos.dds +Sand_005_normal.jpg terrain/Sand.nrm.dds +Seaside_rocks_01_1K_Base_Color.png terrain/Seaside_rock.dds +Seaside_rocks_01_1K_HOS.png terrain/Seaside_rock.hos.dds +Seaside_rocks_01_1K_Normal.png terrain/Seaside_rock.nrm.dds +Stone_Path_004_baseColor.jpg terrain/Stone_path.dds +Stone_Path_004_HOS.jpg terrain/Stone_path.hos.dds +Stone_Path_004_normal.jpg terrain/Stone_path.nrm.dds +Stone_Wall_008_COLOR.jpg terrain/Stone_wall.dds +Stone_Wall_008_HOS.jpg terrain/Stone_wall.hos.dds +Stone_Wall_008_NORM.jpg terrain/Stone_wall.nrm.dds +Water_002_COLOR.jpg terrain/Water.dds +Water_002_HOS.jpg terrain/Water.hos.dds +Water_002_NORM.jpg terrain/Water.nrm.dds +Space_orange.cube.back.png sky/Space_orange.cube.back.dds +Space_orange.cube.bottom.png sky/Space_orange.cube.bottom.dds +Space_orange.cube.front.png sky/Space_orange.cube.front.dds +Space_orange.cube.left.png sky/Space_orange.cube.left.dds +Space_orange.cube.right.png sky/Space_orange.cube.right.dds +Space_orange.cube.top.png sky/Space_orange.cube.top.dds +Space_tray.cube.back.png sky/Space_tray.cube.back.dds +Space_tray.cube.bottom.png sky/Space_tray.cube.bottom.dds +Space_tray.cube.front.png sky/Space_tray.cube.front.dds +Space_tray.cube.left.png sky/Space_tray.cube.left.dds +Space_tray.cube.right.png sky/Space_tray.cube.right.dds +Space_tray.cube.top.png sky/Space_tray.cube.top.dds diff --git a/resource/textures-src/compile.sh b/resource/textures-src/compile.sh new file mode 100755 index 0000000..e62f320 --- /dev/null +++ b/resource/textures-src/compile.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +TARGETDIR="$BASEDIR/../content/textures" +TMPDIR=$(mktemp -d -t dds.build.XXX) +CP=${CP:="CompressonatorCLI"} +PACK=${PACK:="1024-realistic"} + +function compile { + tmp="$TMPDIR/$(basename -- $1).png" + convert -colorspace SRGB -- "$BASEDIR/$1" $tmp + $CP -fd BC3 -miplevels $3 $tmp "$TARGETDIR/$2" &> /dev/null + rm $tmp + echo $2 +} +compile "Aim.png" "ui/Aim.dds" 1 + +while read from to +do + if [ -f "$BASEDIR/$PACK/$from" ]; then + compile "$PACK/$from" "$PACK/$to" 20 + else + echo "File not found: $from" >&2 + exit 1 + fi + +done < "$BASEDIR/$PACK/index.txt" + +rmdir $TMPDIR +echo "Done" \ No newline at end of file diff --git a/src/client/render/api/Images.hpp b/src/client/render/api/Images.hpp index 0de2166..f0d9557 100644 --- a/src/client/render/api/Images.hpp +++ b/src/client/render/api/Images.hpp @@ -3,6 +3,7 @@ #include "common.hpp" #include #include +#include namespace render { @@ -75,7 +76,7 @@ public: int samples = 1, bool optimal = true): properties(props), layout(layout), usage(usage), aspect(aspect), samples(samples), optimal(optimal) { - assert(samples > 0 && (ceil(log2(n)) == floor(log2(n))) && "Samples must be pow2"); + assert(samples > 0 && (std::ceil(std::log2(samples)) == std::floor(std::log2(samples))) && "Samples must be pow2"); } Layout layout; Usage usage; @@ -110,7 +111,7 @@ public: }; /// Only supports dds files - /// DXT1(BC1) DXT3(BC2) DXT5(BC3) + /// DXT3(BC2) DXT5(BC3) static _FORCE_INLINE_ std::unique_ptr LoadFromFile(const std::string &path, const sampling &props) { assert(loadFunc != nullptr && "Uninitialized renderer"); return loadFunc(path, props); diff --git a/src/client/render/vk/Allocator.cpp b/src/client/render/vk/Allocator.cpp index 7eaa551..ab8cfb0 100644 --- a/src/client/render/vk/Allocator.cpp +++ b/src/client/render/vk/Allocator.cpp @@ -260,24 +260,23 @@ void Allocator::transitionImageLayout(VkImage image, VkFormat format, VkImageLay void Allocator::copyBufferToImage(VkBuffer src, VkImage dest, uint32_t width, uint32_t height, uint32_t mipLevels) { beginCmd(transferBuffer); - + VkDeviceSize offset = 0; std::vector regions{mipLevels}; for (size_t i = 0; i < mipLevels; i++) { - regions[i].bufferOffset = offset; - regions[i].bufferRowLength = std::max(1, width >> i); - regions[i].bufferImageHeight = std::max(1, height >> i); - regions[i].imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; regions[i].imageSubresource.mipLevel = i; regions[i].imageSubresource.baseArrayLayer = 0; regions[i].imageSubresource.layerCount = 1; regions[i].imageOffset = {0, 0, 0}; - regions[i].imageExtent = {regions[i].bufferRowLength, regions[i].bufferImageHeight, 1}; + regions[i].imageExtent = {width >> i, height >> i, 1}; - //NOTE: may fail without width % 4 && height % 4 - offset += regions[i].imageExtent.height * regions[i].imageExtent.width * regions[i].imageExtent.depth; + regions[i].bufferOffset = offset; + regions[i].bufferRowLength = std::max(4, regions[i].imageExtent.width); + regions[i].bufferImageHeight = std::max(4, regions[i].imageExtent.height); + + offset += regions[i].bufferRowLength * regions[i].bufferImageHeight; } vkCmdCopyBufferToImage(transferBuffer, src, dest, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, mipLevels, regions.data()); diff --git a/src/client/render/vk/Pipeline.cpp b/src/client/render/vk/Pipeline.cpp index f0cf3b8..74c9395 100644 --- a/src/client/render/vk/Pipeline.cpp +++ b/src/client/render/vk/Pipeline.cpp @@ -216,7 +216,7 @@ Pipeline::Pipeline(VkDevice device, const PhysicalDeviceInfo &info, const render multisampling.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; multisampling.rasterizationSamples = info.samples; //MAYBE: add option - multisampling.sampleShadingEnable = hasSamples; + multisampling.sampleShadingEnable = info.features.sampleRateShading && hasSamples; multisampling.minSampleShading = .2f; multisampling.pSampleMask = nullptr; multisampling.alphaToCoverageEnable = VK_FALSE; diff --git a/src/client/render/vk/Renderer.cpp b/src/client/render/vk/Renderer.cpp index e358429..bfaa714 100644 --- a/src/client/render/vk/Renderer.cpp +++ b/src/client/render/vk/Renderer.cpp @@ -372,6 +372,7 @@ bool Renderer::Load(Window& window, const renderOptions& opt, int samples) { VkPhysicalDeviceFeatures deviceFeatures{}; deviceFeatures.geometryShader = physicalInfo.features.geometryShader; deviceFeatures.samplerAnisotropy = physicalInfo.features.samplerAnisotropy; + deviceFeatures.sampleRateShading = physicalInfo.features.sampleRateShading; std::vector extensions(requiredExtensions); extensions.insert(extensions.end(), physicalInfo.optionalExtensions.begin(), physicalInfo.optionalExtensions.end());