diff --git a/.gitattributes b/.gitattributes index 8a282d2..619cd29 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,3 +10,4 @@ *.khe filter=lfs diff=lfs merge=lfs -text *.7z filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text +*.xcf filter=lfs diff=lfs merge=lfs -text diff --git a/deploy/data/leather-normal.jpg b/deploy/data/leather-normal.jpg new file mode 100644 index 0000000..a0a89ad --- /dev/null +++ b/deploy/data/leather-normal.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2744d10d39572868f161f77fee1e6c6114348b31bd735d0535119d956df330e +size 442368 diff --git a/deploy/data/leather.jpg b/deploy/data/leather.jpg index 929af90..a759ddb 100644 --- a/deploy/data/leather.jpg +++ b/deploy/data/leather.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdfb67810a152660d7ddaa702e1bf8ead86cefe3f44cef45f97b34f2f8d8e00b -size 9673 +oid sha256:5d2bc01b2b7aaf394acb0ec5338516465e1c9e2780cd8452330f5d287c6a271e +size 90112 diff --git a/deploy/data/skybox/craterlake_bk.tga b/deploy/data/skybox/craterlake_bk.tga deleted file mode 100644 index ac7bff3..0000000 --- a/deploy/data/skybox/craterlake_bk.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e916551b97b12ebd31228fe8ccc06523cc7ac98eee1daa76032b8fee1b0cee11 -size 769437 diff --git a/deploy/data/skybox/craterlake_dn.tga b/deploy/data/skybox/craterlake_dn.tga deleted file mode 100644 index 0c3146e..0000000 --- a/deploy/data/skybox/craterlake_dn.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47a24fd77edac34fbd9b9031754624e1fca3c047830b0820654b74e202969891 -size 757939 diff --git a/deploy/data/skybox/craterlake_ft.tga b/deploy/data/skybox/craterlake_ft.tga deleted file mode 100644 index 10dfccb..0000000 --- a/deploy/data/skybox/craterlake_ft.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7b25f9cfdaa42f9ea37596e07edc120df9261c0c695ab3cead68d7c646c2a73 -size 737349 diff --git a/deploy/data/skybox/craterlake_lf.tga b/deploy/data/skybox/craterlake_lf.tga deleted file mode 100644 index e7224de..0000000 --- a/deploy/data/skybox/craterlake_lf.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1d5aee7e0a4041674f1ce844fbfd194972e6968002e05570c098e65530c862b -size 766552 diff --git a/deploy/data/skybox/craterlake_rt.tga b/deploy/data/skybox/craterlake_rt.tga deleted file mode 100644 index f415f14..0000000 --- a/deploy/data/skybox/craterlake_rt.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:037b77efe579a762a1acc920388d4da1d16658893179502324ee89598eb69cff -size 704063 diff --git a/deploy/data/skybox/craterlake_up.tga b/deploy/data/skybox/craterlake_up.tga deleted file mode 100644 index cdd495e..0000000 --- a/deploy/data/skybox/craterlake_up.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc2c22f138ad728700079827f0202a91dcd7c5be10d683c887c0b2970def5d95 -size 626448 diff --git a/deploy/data/skybox/irradiance/output_iem_negx.tga b/deploy/data/skybox/irradiance/output_iem_negx.tga new file mode 100644 index 0000000..69ca94d --- /dev/null +++ b/deploy/data/skybox/irradiance/output_iem_negx.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1baaa3242ba7698b15abc9aaf5c7c3204e58292f59228824279fa52cdb89b05 +size 49196 diff --git a/deploy/data/skybox/irradiance/output_iem_negy.tga b/deploy/data/skybox/irradiance/output_iem_negy.tga new file mode 100644 index 0000000..9afc39c --- /dev/null +++ b/deploy/data/skybox/irradiance/output_iem_negy.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f4b359239337835920df3a5daccce444dcf460042b98d2fa3939fe9547b8b80 +size 49196 diff --git a/deploy/data/skybox/irradiance/output_iem_negz.tga b/deploy/data/skybox/irradiance/output_iem_negz.tga new file mode 100644 index 0000000..7348027 --- /dev/null +++ b/deploy/data/skybox/irradiance/output_iem_negz.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4121e8341bfab6af25dfdb1c7a53fe21fd43f2096dc36418c0d6829575b609a +size 49196 diff --git a/deploy/data/skybox/irradiance/output_iem_posx.tga b/deploy/data/skybox/irradiance/output_iem_posx.tga new file mode 100644 index 0000000..1f6f314 --- /dev/null +++ b/deploy/data/skybox/irradiance/output_iem_posx.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7e278b2b3ca38f5dd9cd23e8f515414c164674f423a0647d370235691de6392 +size 49196 diff --git a/deploy/data/skybox/irradiance/output_iem_posy.tga b/deploy/data/skybox/irradiance/output_iem_posy.tga new file mode 100644 index 0000000..1867640 --- /dev/null +++ b/deploy/data/skybox/irradiance/output_iem_posy.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00b22806b3a4c783ef2940a41b737e3cc3514f61c132d572570b667cec9fe267 +size 49196 diff --git a/deploy/data/skybox/irradiance/output_iem_posz.tga b/deploy/data/skybox/irradiance/output_iem_posz.tga new file mode 100644 index 0000000..3041e53 --- /dev/null +++ b/deploy/data/skybox/irradiance/output_iem_posz.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc714292c57032f7b2240406895e1ac615e4a6712e20d8eea7bf6bda9f06fe80 +size 49196 diff --git a/deploy/data/skybox/negx.jpg b/deploy/data/skybox/negx.jpg new file mode 100644 index 0000000..e504e3d --- /dev/null +++ b/deploy/data/skybox/negx.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6efcbf14235195b091b931afe485161faec35e00387d09f26f95bc11a7576d7f +size 984770 diff --git a/deploy/data/skybox/negy.jpg b/deploy/data/skybox/negy.jpg new file mode 100644 index 0000000..771b5ce --- /dev/null +++ b/deploy/data/skybox/negy.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebfc03ca277689fa7599d13bd68e87504f6a5a567096b87ca3bd275612ef110c +size 920695 diff --git a/deploy/data/skybox/negz.jpg b/deploy/data/skybox/negz.jpg new file mode 100644 index 0000000..ac6ee27 --- /dev/null +++ b/deploy/data/skybox/negz.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01b5ffa6298bbf3ce0c18ac64a6a0f26fc41b9e0f97f621c0e1ce24912571335 +size 969866 diff --git a/deploy/data/skybox/posx.jpg b/deploy/data/skybox/posx.jpg new file mode 100644 index 0000000..201d031 --- /dev/null +++ b/deploy/data/skybox/posx.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a0859370df4e5c0344b4aac3b3d560a2c2028e3d39157a5b4b9c73a13558c2f +size 828251 diff --git a/deploy/data/skybox/posy.jpg b/deploy/data/skybox/posy.jpg new file mode 100644 index 0000000..ed70687 --- /dev/null +++ b/deploy/data/skybox/posy.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64d1fe87044df58be2684c6e23d22bb26bade269967b696c329fd2aa8f1e9c15 +size 441172 diff --git a/deploy/data/skybox/posz.jpg b/deploy/data/skybox/posz.jpg new file mode 100644 index 0000000..6421671 --- /dev/null +++ b/deploy/data/skybox/posz.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f54c2adf921ff84237b09192cb4264ea61702930f5c7359b13561f4b19ee08e1 +size 874231 diff --git a/deploy/data/skybox/radiance/output_pmrem_negx_0_256x256.tga b/deploy/data/skybox/radiance/output_pmrem_negx_0_256x256.tga new file mode 100644 index 0000000..56d7f05 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negx_0_256x256.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:333fecf8797a6544af2e52322d1eb008157dd85e94e6f79db041a6ba4f9336d2 +size 196652 diff --git a/deploy/data/skybox/radiance/output_pmrem_negx_1_128x128.tga b/deploy/data/skybox/radiance/output_pmrem_negx_1_128x128.tga new file mode 100644 index 0000000..c561a7c --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negx_1_128x128.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08f71d708e9d5d59a494950c75449dc28c67b6506d870402f8a666cf7a997efe +size 49196 diff --git a/deploy/data/skybox/radiance/output_pmrem_negx_2_64x64.tga b/deploy/data/skybox/radiance/output_pmrem_negx_2_64x64.tga new file mode 100644 index 0000000..1e7a584 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negx_2_64x64.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c25024509999c76ad9efe170738e1483ea17ca2db9b8524e052956eeeaaedbf +size 12332 diff --git a/deploy/data/skybox/radiance/output_pmrem_negx_3_32x32.tga b/deploy/data/skybox/radiance/output_pmrem_negx_3_32x32.tga new file mode 100644 index 0000000..d8c189b --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negx_3_32x32.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7097ad8a89a6f3af9647f700f0d26ac087840e52a84099510e1b80fb003fa84d +size 3116 diff --git a/deploy/data/skybox/radiance/output_pmrem_negx_4_16x16.tga b/deploy/data/skybox/radiance/output_pmrem_negx_4_16x16.tga new file mode 100644 index 0000000..7de3845 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negx_4_16x16.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a7a2b4e2292d84840020583caa71c402ca126ae6428351fda4f035327487090 +size 812 diff --git a/deploy/data/skybox/radiance/output_pmrem_negx_5_8x8.tga b/deploy/data/skybox/radiance/output_pmrem_negx_5_8x8.tga new file mode 100644 index 0000000..80c89cb --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negx_5_8x8.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b56b99b2544af4ee9d59c8a8dba10187da143f25402b3acdb139995ff52cbfd +size 236 diff --git a/deploy/data/skybox/radiance/output_pmrem_negx_6_4x4.tga b/deploy/data/skybox/radiance/output_pmrem_negx_6_4x4.tga new file mode 100644 index 0000000..9bce9fd --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negx_6_4x4.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:416310b4a3f4d37ed6504457bb8190d20b5272d75c12eb1413a5bae8cd74c48e +size 92 diff --git a/deploy/data/skybox/radiance/output_pmrem_negy_0_256x256.tga b/deploy/data/skybox/radiance/output_pmrem_negy_0_256x256.tga new file mode 100644 index 0000000..21133c0 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negy_0_256x256.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:373f8428acfefda452bf911c1ebfb2f350df3209b1e4b282992fa10105588c60 +size 196652 diff --git a/deploy/data/skybox/radiance/output_pmrem_negy_1_128x128.tga b/deploy/data/skybox/radiance/output_pmrem_negy_1_128x128.tga new file mode 100644 index 0000000..74a846d --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negy_1_128x128.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5af91cbc5db96a8b88bb4e551d0ba0dea7bb5bf45b8c1c72c1653de7286427fa +size 49196 diff --git a/deploy/data/skybox/radiance/output_pmrem_negy_2_64x64.tga b/deploy/data/skybox/radiance/output_pmrem_negy_2_64x64.tga new file mode 100644 index 0000000..6206388 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negy_2_64x64.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2377e72db989c13092b75a315578e6db558fc3b321457d4de4c15df97abc7540 +size 12332 diff --git a/deploy/data/skybox/radiance/output_pmrem_negy_3_32x32.tga b/deploy/data/skybox/radiance/output_pmrem_negy_3_32x32.tga new file mode 100644 index 0000000..6878a7f --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negy_3_32x32.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e651764a88659811d324142561ac6aa1af3f7715101ecde0d4f6bf543c0e903a +size 3116 diff --git a/deploy/data/skybox/radiance/output_pmrem_negy_4_16x16.tga b/deploy/data/skybox/radiance/output_pmrem_negy_4_16x16.tga new file mode 100644 index 0000000..2bbef15 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negy_4_16x16.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a3ada5ab96b4527391564c32623de9edacaf3e9b09bd85bd5124a3c55825ae6 +size 812 diff --git a/deploy/data/skybox/radiance/output_pmrem_negy_5_8x8.tga b/deploy/data/skybox/radiance/output_pmrem_negy_5_8x8.tga new file mode 100644 index 0000000..c864964 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negy_5_8x8.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b72bde41cea39f7bb135c7e8a417b77c18d43adcc22d5c6b25cd70dd6eda69f +size 236 diff --git a/deploy/data/skybox/radiance/output_pmrem_negy_6_4x4.tga b/deploy/data/skybox/radiance/output_pmrem_negy_6_4x4.tga new file mode 100644 index 0000000..a3910e1 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negy_6_4x4.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bf3ffc2ea6e6c26aeae7c5604ed5faa2e34c645c0dd93008a7de2a6cec15019 +size 92 diff --git a/deploy/data/skybox/radiance/output_pmrem_negz_0_256x256.tga b/deploy/data/skybox/radiance/output_pmrem_negz_0_256x256.tga new file mode 100644 index 0000000..455fc22 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negz_0_256x256.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e45c458624b60f6643b792bae38d9fdb0e2ce09e0017e57413cac6d088526a6 +size 196652 diff --git a/deploy/data/skybox/radiance/output_pmrem_negz_1_128x128.tga b/deploy/data/skybox/radiance/output_pmrem_negz_1_128x128.tga new file mode 100644 index 0000000..0483d03 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negz_1_128x128.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93dc1b44a9e8c4d97936a3d6905f1f05487c9d7f40a06b1671aea4b63687629f +size 49196 diff --git a/deploy/data/skybox/radiance/output_pmrem_negz_2_64x64.tga b/deploy/data/skybox/radiance/output_pmrem_negz_2_64x64.tga new file mode 100644 index 0000000..a3174e4 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negz_2_64x64.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88ab3af933739bbaa9249e0280fef5133e9880c72cb8ffd37bc9dacc4c71b691 +size 12332 diff --git a/deploy/data/skybox/radiance/output_pmrem_negz_3_32x32.tga b/deploy/data/skybox/radiance/output_pmrem_negz_3_32x32.tga new file mode 100644 index 0000000..5aec11c --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negz_3_32x32.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d421cb3efd11a343e14d2a6554c68c70c8f6dbb290bfe6bf360d63d052a5823 +size 3116 diff --git a/deploy/data/skybox/radiance/output_pmrem_negz_4_16x16.tga b/deploy/data/skybox/radiance/output_pmrem_negz_4_16x16.tga new file mode 100644 index 0000000..9aad878 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negz_4_16x16.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:947ea79f3e73b0abf28be86765cd856a6fb563aabe32c5da5d501b20dac95d7a +size 812 diff --git a/deploy/data/skybox/radiance/output_pmrem_negz_5_8x8.tga b/deploy/data/skybox/radiance/output_pmrem_negz_5_8x8.tga new file mode 100644 index 0000000..743272d --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negz_5_8x8.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d28cbd7ebddab169c2173978c9c81e74061b224e5855b199ca6537bf3a239e70 +size 236 diff --git a/deploy/data/skybox/radiance/output_pmrem_negz_6_4x4.tga b/deploy/data/skybox/radiance/output_pmrem_negz_6_4x4.tga new file mode 100644 index 0000000..beeece3 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_negz_6_4x4.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d472dfce75085ff25ba3e23829f23d2447b247b78c615ad8cec10da04169558 +size 92 diff --git a/deploy/data/skybox/radiance/output_pmrem_posx_0_256x256.tga b/deploy/data/skybox/radiance/output_pmrem_posx_0_256x256.tga new file mode 100644 index 0000000..143116e --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posx_0_256x256.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60be6c064bcb36d3d762547e8698e5f68f084071a3ed66721c915afc9a8e6f21 +size 196652 diff --git a/deploy/data/skybox/radiance/output_pmrem_posx_1_128x128.tga b/deploy/data/skybox/radiance/output_pmrem_posx_1_128x128.tga new file mode 100644 index 0000000..e6031ed --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posx_1_128x128.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c277d76ba3899b71db2e4eae36a23188db4537aaeeaa8332c2e2a3332458a5fd +size 49196 diff --git a/deploy/data/skybox/radiance/output_pmrem_posx_2_64x64.tga b/deploy/data/skybox/radiance/output_pmrem_posx_2_64x64.tga new file mode 100644 index 0000000..73a94cc --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posx_2_64x64.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29e252f5dc01e7268af321662d983fd04ae034ff95c87da1a84352b6c39cea8a +size 12332 diff --git a/deploy/data/skybox/radiance/output_pmrem_posx_3_32x32.tga b/deploy/data/skybox/radiance/output_pmrem_posx_3_32x32.tga new file mode 100644 index 0000000..461cc00 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posx_3_32x32.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6329d770f72439a9972be6c7924f62815894a21dd64fcb5d9655319a32d01f1 +size 3116 diff --git a/deploy/data/skybox/radiance/output_pmrem_posx_4_16x16.tga b/deploy/data/skybox/radiance/output_pmrem_posx_4_16x16.tga new file mode 100644 index 0000000..db6e89d --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posx_4_16x16.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0f067a63e0a07bb3b46d1aa41b7e9af4bc9c9a646d891390c12dceb4789fcf3 +size 812 diff --git a/deploy/data/skybox/radiance/output_pmrem_posx_5_8x8.tga b/deploy/data/skybox/radiance/output_pmrem_posx_5_8x8.tga new file mode 100644 index 0000000..6205fe1 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posx_5_8x8.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7013ee41b72266d21185a7dd0a9befa330687db228b13e63a4a08b9f4b1016ec +size 236 diff --git a/deploy/data/skybox/radiance/output_pmrem_posx_6_4x4.tga b/deploy/data/skybox/radiance/output_pmrem_posx_6_4x4.tga new file mode 100644 index 0000000..ae7a1eb --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posx_6_4x4.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea743089b0a17b78595995eda9a52e2915585c22bb1489b00a72c0a8bd4e53e6 +size 92 diff --git a/deploy/data/skybox/radiance/output_pmrem_posy_0_256x256.tga b/deploy/data/skybox/radiance/output_pmrem_posy_0_256x256.tga new file mode 100644 index 0000000..51b4a61 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posy_0_256x256.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d5beee5ddf88e9adeba84cb7210e6855f8f8cbb9b902afdf4dbd06419a53537 +size 196652 diff --git a/deploy/data/skybox/radiance/output_pmrem_posy_1_128x128.tga b/deploy/data/skybox/radiance/output_pmrem_posy_1_128x128.tga new file mode 100644 index 0000000..4074cbb --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posy_1_128x128.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0449d6dbafc88beb246817625317893b9926ee9cf10860b3a10ddf43d239f2b +size 49196 diff --git a/deploy/data/skybox/radiance/output_pmrem_posy_2_64x64.tga b/deploy/data/skybox/radiance/output_pmrem_posy_2_64x64.tga new file mode 100644 index 0000000..c76b178 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posy_2_64x64.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f1808e3adc6abfbab52e9d972cccd9ffd04f4903ebd3e794d628bdd62030e2a +size 12332 diff --git a/deploy/data/skybox/radiance/output_pmrem_posy_3_32x32.tga b/deploy/data/skybox/radiance/output_pmrem_posy_3_32x32.tga new file mode 100644 index 0000000..5f5972c --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posy_3_32x32.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f4eac30e58b0dc2d05d392b8fe3c4019012e41a8745bbdf104903490efec650 +size 3116 diff --git a/deploy/data/skybox/radiance/output_pmrem_posy_4_16x16.tga b/deploy/data/skybox/radiance/output_pmrem_posy_4_16x16.tga new file mode 100644 index 0000000..ab82d2e --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posy_4_16x16.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb236d64b7e41e297e6b5553c9660fcee9eaf6dde03da8f642102dff163b7cf0 +size 812 diff --git a/deploy/data/skybox/radiance/output_pmrem_posy_5_8x8.tga b/deploy/data/skybox/radiance/output_pmrem_posy_5_8x8.tga new file mode 100644 index 0000000..7070c7f --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posy_5_8x8.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f742960ac07dba64a8ca5fc8e1b8c73565e175b8e35b19ad61a316cd48fb4ab5 +size 236 diff --git a/deploy/data/skybox/radiance/output_pmrem_posy_6_4x4.tga b/deploy/data/skybox/radiance/output_pmrem_posy_6_4x4.tga new file mode 100644 index 0000000..81b6fb0 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posy_6_4x4.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18d6f1b5259741b319bfea4736da0832448beb1e02dcdbff108bd87125f2ae31 +size 92 diff --git a/deploy/data/skybox/radiance/output_pmrem_posz_0_256x256.tga b/deploy/data/skybox/radiance/output_pmrem_posz_0_256x256.tga new file mode 100644 index 0000000..b93407a --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posz_0_256x256.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10d29620fed7c07a8106501d3079f917e64b66447850f3f3d89069f9e0a4be72 +size 196652 diff --git a/deploy/data/skybox/radiance/output_pmrem_posz_1_128x128.tga b/deploy/data/skybox/radiance/output_pmrem_posz_1_128x128.tga new file mode 100644 index 0000000..48a81fc --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posz_1_128x128.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28b757b41ad55e7b008e599832063c3e206f14b3d1cd10c3c1e531ef08b03f54 +size 49196 diff --git a/deploy/data/skybox/radiance/output_pmrem_posz_2_64x64.tga b/deploy/data/skybox/radiance/output_pmrem_posz_2_64x64.tga new file mode 100644 index 0000000..95ba362 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posz_2_64x64.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4032c4118ba7c21636405a9cd70d82e210de016090b155be5f5546b637c6abb4 +size 12332 diff --git a/deploy/data/skybox/radiance/output_pmrem_posz_3_32x32.tga b/deploy/data/skybox/radiance/output_pmrem_posz_3_32x32.tga new file mode 100644 index 0000000..01a4eef --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posz_3_32x32.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ad4a9a7848931af6d42719cc8ee1f6347a8f20621e4e14b7519c4ae072ad202 +size 3116 diff --git a/deploy/data/skybox/radiance/output_pmrem_posz_4_16x16.tga b/deploy/data/skybox/radiance/output_pmrem_posz_4_16x16.tga new file mode 100644 index 0000000..6ddfa87 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posz_4_16x16.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd569691d35e6968f8a0baa4326b4ca4af2602880ad879d0b853fee97124c101 +size 812 diff --git a/deploy/data/skybox/radiance/output_pmrem_posz_5_8x8.tga b/deploy/data/skybox/radiance/output_pmrem_posz_5_8x8.tga new file mode 100644 index 0000000..8f4b803 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posz_5_8x8.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1251d21c9e3f07f0f1c27c09b17be7b5aeaae51d60809a4432007d5f5ca6463c +size 236 diff --git a/deploy/data/skybox/radiance/output_pmrem_posz_6_4x4.tga b/deploy/data/skybox/radiance/output_pmrem_posz_6_4x4.tga new file mode 100644 index 0000000..d64d8c6 --- /dev/null +++ b/deploy/data/skybox/radiance/output_pmrem_posz_6_4x4.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6b1b62b71cb4d758b1f0712a227e23795346d94ccd101b57a4a31be9ac044ff +size 92 diff --git a/deploy/data/skybox/skybox.xcf b/deploy/data/skybox/skybox.xcf new file mode 100644 index 0000000..234c122 Binary files /dev/null and b/deploy/data/skybox/skybox.xcf differ diff --git a/deploy/data/slipperystonework_albedo.png b/deploy/data/slipperystonework_albedo.png new file mode 100644 index 0000000..25807b0 --- /dev/null +++ b/deploy/data/slipperystonework_albedo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:162ceea8b3cc087aa4bcb25db70a88b433649e6e8a7f491ba50cc2581585bf47 +size 7314341 diff --git a/deploy/data/slipperystonework_metallic.png b/deploy/data/slipperystonework_metallic.png new file mode 100644 index 0000000..fa88b15 --- /dev/null +++ b/deploy/data/slipperystonework_metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16ab4394f49880fe64b2a6405592a0325367f184d4829d8219612aef91c05f18 +size 15009 diff --git a/deploy/data/slipperystonework_normal.png b/deploy/data/slipperystonework_normal.png new file mode 100644 index 0000000..c88630f --- /dev/null +++ b/deploy/data/slipperystonework_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce7fa8504ccc7ef77e9dcb16bd1e1043797de43783dfbe472bf52ffb6e65da56 +size 7533234 diff --git a/deploy/data/slipperystonework_roughness.png b/deploy/data/slipperystonework_roughness.png new file mode 100644 index 0000000..6bd8a2c --- /dev/null +++ b/deploy/data/slipperystonework_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c3f730b52ba57e9b5f64490b27a702b38222d043264d3e414722dbe5bac6bd1 +size 4799103 diff --git a/deploy/data/steel.jpg b/deploy/data/steel.jpg deleted file mode 100644 index d57cafc..0000000 --- a/deploy/data/steel.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40ba8f1ef59a9cfda99149b0aca367e9211f130da99a9fdfc547cedfa1a4bcb4 -size 6474 diff --git a/deploy/data/streakedmetal_albedo.png b/deploy/data/streakedmetal_albedo.png new file mode 100644 index 0000000..2cecab1 --- /dev/null +++ b/deploy/data/streakedmetal_albedo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c21a445fb923a8c0afe279135470f1da0290dd43b4f0ebcdcad458374fcb536 +size 1335112 diff --git a/deploy/data/streakedmetal_metallic.png b/deploy/data/streakedmetal_metallic.png new file mode 100644 index 0000000..fb50e22 --- /dev/null +++ b/deploy/data/streakedmetal_metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07f3c88595d842cf1cd40d4c9bebb4e82e97ae850d9a80500d4fd56a785e902b +size 19626 diff --git a/deploy/data/streakedmetal_roughness.png b/deploy/data/streakedmetal_roughness.png new file mode 100644 index 0000000..a1bd67c --- /dev/null +++ b/deploy/data/streakedmetal_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c7f0e3e6fc1725c71257cf4192792ef03c79d98cf0fa515189dadb04bb785cd +size 2982336 diff --git a/deploy/data/sword.mtl b/deploy/data/sword.mtl index 88e8262..c2fa908 100644 --- a/deploy/data/sword.mtl +++ b/deploy/data/sword.mtl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21173927cb0e81a2acbc0e4e8382293c08d8e633f47caa3ce76f870b56b6d561 -size 129 +oid sha256:076919d060d12a120970903fea60f4ee9979602fd7eb705b1e9d4bc78024a583 +size 227 diff --git a/deploy/data/woodframe_albedo.png b/deploy/data/woodframe_albedo.png new file mode 100644 index 0000000..b4d73c6 --- /dev/null +++ b/deploy/data/woodframe_albedo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bad25466e6184902ee2c2ec7d47f8ae112943d3c92fca387a5b41da0b42a2a5 +size 6976127 diff --git a/deploy/data/woodframe_metallic.png b/deploy/data/woodframe_metallic.png new file mode 100644 index 0000000..68da9ea --- /dev/null +++ b/deploy/data/woodframe_metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:289e65cf6fa41d6c00a62cde57ffb20dbe5f1de6b3e6a3ef4d8a7de8f41524bd +size 15007 diff --git a/deploy/data/woodframe_normal.png b/deploy/data/woodframe_normal.png new file mode 100644 index 0000000..984fed4 --- /dev/null +++ b/deploy/data/woodframe_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25c6e56846639f176e8d9ef756b5df8329cba6cd0117812dc79dfa2892ccf560 +size 6869334 diff --git a/deploy/data/woodframe_roughness.png b/deploy/data/woodframe_roughness.png new file mode 100644 index 0000000..532fb92 --- /dev/null +++ b/deploy/data/woodframe_roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f714f443197a22e6f7148004b344f0081f9c7667b85429472d38b9190af43d79 +size 1822076 diff --git a/src/guitools.cpp b/src/guitools.cpp index 5a95aae..3fd8d50 100644 --- a/src/guitools.cpp +++ b/src/guitools.cpp @@ -8,6 +8,7 @@ #include #include +#include #include @@ -48,7 +49,7 @@ void GuiTools::materialGui() options += "None\n"; meshes.push_back(nullptr); int i = 1; - for(SceneIterator* geometryIt = getEngine().getScene()->getGeometry(); geometryIt->isValid(); geometryIt->next()) + for(SceneIterator* geometryIt = m_scene->getGeometry(); geometryIt->isValid(); geometryIt->next()) { options += geometryIt->getItem()->mesh->getName(); options += '\n'; @@ -91,3 +92,9 @@ void GuiTools::toggleMaterialEditor() { m_materialEditorEnabled = !m_materialEditorEnabled; } + +void GuiTools::toggleRenderingPipelineGui() +{ + DeferredPipeline* pipeline = dynamic_cast(m_scene->getPipeline()); + pipeline->toggleDebugGui(); +} diff --git a/src/guitools.h b/src/guitools.h index 685175a..ded58ef 100644 --- a/src/guitools.h +++ b/src/guitools.h @@ -20,6 +20,7 @@ public: void materialGui(); void togglePicker(); void toggleMaterialEditor(); + void toggleRenderingPipelineGui(); }; #endif // GUITOOLS_H diff --git a/src/sparrowshell/scriptnode.cpp b/src/sparrowshell/scriptnode.cpp index 74ba8d7..9214b24 100644 --- a/src/sparrowshell/scriptnode.cpp +++ b/src/sparrowshell/scriptnode.cpp @@ -21,7 +21,7 @@ ScriptNode::ScriptNode() LUA_SET_FUN(clear); LUA_SET_FUN(picker); LUA_SET_FUN(materialEditor); -// m_script["engine"] = getEngine(); + LUA_SET_FUN(rendering); m_script.new_usertype("Engine", "time",&Engine::getTime @@ -99,3 +99,7 @@ void ScriptNode::picker(){ void ScriptNode::materialEditor(){ this->getEngine().getGuiTools()->toggleMaterialEditor(); } + +void ScriptNode::rendering(){ + this->getEngine().getGuiTools()->toggleRenderingPipelineGui(); +} diff --git a/src/sparrowshell/scriptnode.h b/src/sparrowshell/scriptnode.h index 2410cba..1f1d48b 100644 --- a/src/sparrowshell/scriptnode.h +++ b/src/sparrowshell/scriptnode.h @@ -24,7 +24,7 @@ public: void testfunc(int, float,float,float); void picker(); void materialEditor(); - + void rendering(); }; #endif // SCRIPTNODE_H diff --git a/src/test/main.cpp b/src/test/main.cpp index 49854ca..69eaa16 100644 --- a/src/test/main.cpp +++ b/src/test/main.cpp @@ -90,6 +90,8 @@ void generateTerrain(SceneTree *scene, btDiscreteDynamicsWorld *world) TestGen gen; PBRMaterial *mat = new PBRMaterial(); mat->albedo = glm::vec3(0.1f, 0.4f, 0.2f); + mat->metallic = 0.2f; + mat->roughness = 0.95f; for(int x=-3; x<3; ++x) for(int y=-2; y<2; ++y) @@ -202,8 +204,8 @@ public: scene->getRootObject()->addChild(potator); //lighting - Texture* skyboxTexture = RESOURCE_GET(Texture, "skybox"); - Texture* ambientTexture = RESOURCE_GET(Texture, "ambient"); + Texture* skyboxTexture = RESOURCE_GET(Texture, "radiance"); + Texture* ambientTexture = RESOURCE_GET(Texture, "irradiance"); LightNode *ambientLight = new LightNode(new AmbientLight(ambientTexture, skyboxTexture)); DeferredPipeline* pipeline = dynamic_cast(scene->getPipeline()); @@ -322,14 +324,33 @@ int main(){ AmbientLight::setBrdfLut(new Texture(img, false)); delete img; Image * imgs[6]; - imgs[0] = Loader::loadImage("skybox/craterlake_rt.tga", 24, false); // right - imgs[1] = Loader::loadImage("skybox/craterlake_lf.tga", 24, false); // left - imgs[2] = Loader::loadImage("skybox/craterlake_up.tga", 24, false); // top - imgs[3] = Loader::loadImage("skybox/craterlake_dn.tga", 24, false); // bottom - imgs[4] = Loader::loadImage("skybox/craterlake_ft.tga", 24, false); // front - imgs[5] = Loader::loadImage("skybox/craterlake_bk.tga", 24, false); // back + imgs[0] = Loader::loadImage("skybox/posx.jpg", 24, false); // right + imgs[1] = Loader::loadImage("skybox/negx.jpg", 24, false); // left + imgs[2] = Loader::loadImage("skybox/posy.jpg", 24, false); // top + imgs[3] = Loader::loadImage("skybox/negy.jpg", 24, false); // bottom + imgs[4] = Loader::loadImage("skybox/posz.jpg", 24, false); // front + imgs[5] = Loader::loadImage("skybox/negz.jpg", 24, false); // back RESOURCE_ADD(new Texture(imgs), Texture, "skybox"); - RESOURCE_ADD(new Texture(imgs), Texture, "ambient"); + for(int i=0; i<6; ++i) + delete imgs[i]; + + imgs[0] = Loader::loadImage("skybox/irradiance/output_iem_posx.tga", 24, false); // right + imgs[1] = Loader::loadImage("skybox/irradiance/output_iem_negx.tga", 24, false); // left + imgs[2] = Loader::loadImage("skybox/irradiance/output_iem_posy.tga", 24, false); // top + imgs[3] = Loader::loadImage("skybox/irradiance/output_iem_negy.tga", 24, false); // bottom + imgs[4] = Loader::loadImage("skybox/irradiance/output_iem_posz.tga", 24, false); // front + imgs[5] = Loader::loadImage("skybox/irradiance/output_iem_negz.tga", 24, false); // back + RESOURCE_ADD(new Texture(imgs, false), Texture, "irradiance"); + for(int i=0; i<6; ++i) + delete imgs[i]; + + imgs[0] = Loader::loadImage("skybox/radiance/output_pmrem_posx_0_256x256.tga", 24, false); // right + imgs[1] = Loader::loadImage("skybox/radiance/output_pmrem_negx_0_256x256.tga", 24, false); // left + imgs[2] = Loader::loadImage("skybox/radiance/output_pmrem_posy_0_256x256.tga", 24, false); // top + imgs[3] = Loader::loadImage("skybox/radiance/output_pmrem_negy_0_256x256.tga", 24, false); // bottom + imgs[4] = Loader::loadImage("skybox/radiance/output_pmrem_posz_0_256x256.tga", 24, false); // front + imgs[5] = Loader::loadImage("skybox/radiance/output_pmrem_negz_0_256x256.tga", 24, false); // back + RESOURCE_ADD(new Texture(imgs), Texture, "radiance"); for(int i=0; i<6; ++i) delete imgs[i]; diff --git a/src/test/potator.cpp b/src/test/potator.cpp index 965463e..40efa6f 100644 --- a/src/test/potator.cpp +++ b/src/test/potator.cpp @@ -66,14 +66,18 @@ Potator::Potator(PlayerCharacterNode * player, m_cubeMesh->addTriangle(id+7, id+5, id+6); } - Image* wood = Loader::loadImage("woodbox.jpg", 24); PBRMaterial *mat = new PBRMaterial(); - mat->setTexture(PBRMaterial::ALBEDO_SLOT, new Texture(wood), "wood_texture"); - mat->roughness = 0.8f; - mat->metallic = 0.1f; + Image* img = Loader::loadImage("woodframe_albedo.png", 24); + mat->setTexture(PBRMaterial::ALBEDO_SLOT, new Texture(img)); + img = Loader::loadImage("woodframe_metallic.png", 8); + mat->setTexture(PBRMaterial::METALLIC_SLOT, new Texture(img)); + img = Loader::loadImage("woodframe_roughness.png", 8); + mat->setTexture(PBRMaterial::ROUGHNESS_SLOT, new Texture(img)); + img = Loader::loadImage("woodframe_normal.png", 24); + mat->setTexture(PBRMaterial::NORMALS_SLOT, new Texture(img)); m_cubeMesh->setMaterial(mat); - + m_cubeMesh->computeTangents(); m_cubeMesh->initGL(); btVector3 halfExtents(s.x+PHYSICS_OFFSET, s.y+PHYSICS_OFFSET, s.z+PHYSICS_OFFSET); @@ -83,13 +87,19 @@ Potator::Potator(PlayerCharacterNode * player, // creating sphere mat = new PBRMaterial(); - mat->albedo = glm::vec3(0.1f); - mat->roughness = 0.1f; - mat->metallic = 0.9f; + img = Loader::loadImage("slipperystonework_albedo.png", 24); + mat->setTexture(PBRMaterial::ALBEDO_SLOT, new Texture(img)); + img = Loader::loadImage("slipperystonework_metallic.png", 8); + mat->setTexture(PBRMaterial::METALLIC_SLOT, new Texture(img)); + img = Loader::loadImage("slipperystonework_roughness.png", 8); + mat->setTexture(PBRMaterial::ROUGHNESS_SLOT, new Texture(img)); + img = Loader::loadImage("slipperystonework_normal.png", 24); + mat->setTexture(PBRMaterial::NORMALS_SLOT, new Texture(img)); SphereGenerator sphereGen; - m_sphereMesh = sphereGen.generateGeodesicMesh(mat, 2, sphereRadius); + m_sphereMesh = sphereGen.generateParametricMesh(mat, 20, 20, sphereRadius); m_sphereMesh->computeNormals(); + m_sphereMesh->computeTangents(); m_sphereMesh->mergeVertices(); m_sphereMesh->initGL();