cc
2 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Lasse Öörni
|
dfd8939840 |
Squashed commit of the following:
commit 5de699c5399847dfad99a58323590f88436e1f68
Merge: d80b1d9 97c5fbf
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Sun Jul 24 18:28:50 2016 +0100
Merge pull request #4 from hdunderscore/tweaks2
Tweaks2
commit 97c5fbfe515a1c1ae86b059d86694a9f2c053ce6
Author: hdunderscore <hdunderscore@gmail.com>
Date: Sun Jul 24 22:50:11 2016 +1000
- Removed inconsistency with roughness input.
- Switched to a different mip map selection method for the IBL.
- Extended the angelscript PBR sample to include a slider for ambient HDR scaling.
- Removed an extra diffuse factor in lighting output.
commit d80b1d9b3c00a04e837324af1546f407311803fd
Merge: 53603fd 7f77574
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Fri Jul 22 23:00:59 2016 +0100
Merge branch 'pulls/2'
commit 7f775749a9229f5b8f1d313a2c72a88acc001b11
Merge: 53603fd b339da6
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Fri Jul 22 22:57:26 2016 +0100
Tweaks
# Conflicts:
# bin/CoreData/Shaders/GLSL/Lighting.glsl
# bin/CoreData/Shaders/HLSL/Lighting.hlsl
# bin/Data/Scenes/PBRExample.xml
commit 53603fd7165fb90c485d6fd85e2d4c41e3e86213
Merge: f88b484 a21746f
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Wed Jul 20 22:52:41 2016 +0100
Merge remote-tracking branch 'origin/master'
commit f88b48441965d5dbcee8667282e879c93bc31577
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Wed Jul 20 22:49:43 2016 +0100
Fixed Inverse Square falloff and correction mistake with output color
commit a21746f5e2b540e4dae952e181d000dd8e8101f4
Merge: 89688e8 c33f75a
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Wed Jul 20 22:28:17 2016 +0100
Merge pull request #3 from 1vanK/master
Modify PBR example
commit c33f75a78369760ace1f817e9c8ed288a0418a30
Author: 1vanK <1vanK@users.noreply.github.com>
Date: Thu Jul 21 00:16:05 2016 +0300
Labels
commit efa757e0ee39daf4a4e03714828677e79ae5e4e2
Author: 1vanK <1vanK@users.noreply.github.com>
Date: Wed Jul 20 17:14:06 2016 +0300
Dynamic material in PBR example
commit b339da6fc992e49d1e4139d836654c8ce6befa24
Author: hdunderscore <hdunderscore@gmail.com>
Date: Thu Jul 21 00:09:47 2016 +1000
- Adjusted light falloff.
- Enabled HDR rendering in PBRMaterials.cpp
commit b233da5ccad3c1898a1f459bbc59459be525a16f
Author: 1vanK <1vanK@users.noreply.github.com>
Date: Wed Jul 20 14:25:59 2016 +0300
Remove unnecessary texture
commit ede652fcf39135350725c7eda5c6c9324ffb0c0a
Author: hdunderscore <hdunderscore@gmail.com>
Date: Wed Jul 20 15:49:27 2016 +1000
Added missing xml's.
commit fd1b187f09f4478bd32375e4ca13900b6ec59f49
Author: hdunderscore <hdunderscore@gmail.com>
Date: Wed Jul 20 15:13:47 2016 +1000
Minor fix to diffuse ibl calculation.
commit 1cee2d27e8abd69fe6f77d41e2a0d27dcac8624b
Author: hdunderscore <hdunderscore@gmail.com>
Date: Wed Jul 20 10:55:58 2016 +1000
Changed the hdr scaling to be more versatile.
commit 35623b758b1e199116b1ba9594afeb3d1ecef7ba
Author: hdunderscore <hdunderscore@gmail.com>
Date: Wed Jul 20 09:27:46 2016 +1000
- Fixed gamma correction
- Added fake hdr to IBL and skybox which can be controlled via the zone ambient colour alpha channel.
commit 89688e81424eea030e5329cbd9d59b094ee02183
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Tue Jul 19 21:17:30 2016 +0100
Renived unlicenced files
commit 70f39b0a40b50f317aef101ce29950185a2ee7e3
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Tue Jul 19 14:21:38 2016 +0100
Removed gamma correction from PBR demo
commit 451f45c4d2ed360179640af31eabdf74b3673c6f
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Tue Jul 19 14:20:32 2016 +0100
Added legacy BRDF for GL
commit 87316006297df9dda94178f7ab81f663862553a8
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Tue Jul 19 14:17:02 2016 +0100
Added diffuse ibl and legacy features
commit 9f0fb0eaca4a53e49caf65661edfb9d85fe1b880
Merge: 1883a4c 4230e43
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Tue Jul 19 10:36:08 2016 +0100
Merge remote-tracking branch 'origin/master'
commit 1883a4c42f228306dd723098869281a7025b5987
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Tue Jul 19 10:34:47 2016 +0100
Changed model on the demo scene
commit 4230e4328d6ef47808a85f1b231f5116d8b99437
Merge: 900f203 607ab5c
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Tue Jul 19 00:07:17 2016 +0100
Merge pull request #1 from Modanung/typo-fix
Changed n to m in PBR example scene
commit 607ab5c414749f3d2dd85f2b7c441525b94a8fa3
Author: Frode Lindeijer <frode@lindeijer.nl>
Date: Tue Jul 19 00:41:34 2016 +0200
Changed n to m in PBR example scene
commit 900f20316da833868e6274aa7e7de01502a2a357
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Mon Jul 18 22:19:17 2016 +0100
Fixed reverted changes
commit 49cc201a1e0956db82b1103d23b3a4059cacd374
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Mon Jul 18 21:58:36 2016 +0100
PBR Rewrite
commit 262e18c71c08a5bade990f6ead0fd356732c38ee
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Mon Jul 18 21:48:28 2016 +0100
Complete rewrite of PBR
commit b97469b2ab73deca0613d1963500f223a5956bf9
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Sun Jul 17 09:49:52 2016 +0100
Dissabled nolonger needed post processed gamma correction
commit 6e4ec5b4cdaba58678a21b8a90138eb2b8a5e9d4
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Sun Jul 17 09:48:53 2016 +0100
Fixed rendering issue in DirectX
commit fd57ed2bea5caad1fff65e35abfe65b227ddb13a
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Sat Jul 16 21:39:48 2016 +0100
Fixed Spelling errors
commit 3dad639d48aee0d4d3a17ecd8d35f732b796d938
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Sat Jul 16 21:35:09 2016 +0100
Made GGX distrabution physically correct
commit ffda95b2df1e042d8cef611add06989c5a0fd862
Author: joshua Nuttall <dragoncastjosh@live.com>
Date: Sat Jul 16 21:20:20 2016 +0100
Removed redundent textures
commit 283f389951b0e29a2f3a6b445dfc3cab0e59920c
Merge: 7bbb0f6
|
||
|
Lasse Öörni
|
2e44b0b350 |
Squashed commit of the following:
commit 8197605c1c6c660c71727db8472bf9a9ac2ae76d
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 23:55:05 2016 +0300
Convert cubemap to DDS.
commit a06cf912e3a106f66137241722c7fd49c1805e2b
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 23:42:56 2016 +0300
Fix D3D11 crash if trying to assign color texture as a depth stencil or vice versa. Remove mistaken assignment of the 4th rendertarget output from PBRDeferredHWDepth.xml.
commit de765127b10c8cef45689fd8117875930af7031a
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 23:17:37 2016 +0300
Add possibility to configure default material technique in Renderer.
commit d876a081932f423a42adcc1371a6fac622e8d585
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 23:10:32 2016 +0300
Refer to Utilities/Rotator.as script in the PBR scene.
commit 9e4078c9a1cfa4be040a523d3b51aaf55a332c40
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 23:06:00 2016 +0300
Readd deleted Flare.dds.
commit 1f606cc883e89e15e32272f6d47877c6e511b74b
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 22:31:04 2016 +0300
Remove NinjaSnowWar copypasta.
commit 745937646f3638a208e58c3cce76df7afbab8416
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 22:11:28 2016 +0300
Separate skybox2 material. Remove unused materials. Fix typo in material name.
commit 258d0325d4bed282f28d8ec8364ee64700e4f025
Author: Lasse Öörni <loorni@gmail.com>
Date: Thu Apr 14 22:04:48 2016 +0300
Squashed commit of the following:
commit a329abe9a2a0f77dcb415bafd15c6e309261e7cc
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Thu Apr 14 15:08:26 2016 +0100
removed white space
commit 434b1d8599ce2d0828acfc2939b94b33cd821fad
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Thu Apr 14 15:06:36 2016 +0100
Updated Licence
commit f89a2369c83791c43762ca2b34f8b3aeeb562b24
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Thu Apr 14 15:03:57 2016 +0100
Converted texture formats
commit 028cd1da4d7ac226e1943a70abfd6037912c86b0
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Thu Apr 14 14:55:31 2016 +0100
Updated Licence
commit ecc288b3cbc046a678bbc2d0df408b2f29220b30
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Wed Apr 13 00:02:34 2016 +0100
Added basic licence
commit ce34c0496e80043e3e79f4273468a66463ed13cb
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Tue Apr 12 14:00:52 2016 +0100
Cleaned Up Data and Reverted Default Technique
commit a9e08bbd3a4f08c09baa477a0ce06cef517d506e
Merge: 53c53ae d009f11
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Sat Apr 9 11:10:30 2016 +0100
Merge pull request #11 from hdunderscore/typoFix_Metallic
Fix metallic typo
commit 53c53aec4c1d935b31cbc0ce5eac93faaa5b9f89
Merge: 851487e 9c1d728
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Sat Apr 9 11:08:17 2016 +0100
Merge pull request #10 from cosmy1/patch-10
Remove extra float casts
commit d009f11865dfdf9634fa9c297f2cc339164724de
Author: hdunderscore <hdunderscore@gmail.com>
Date: Sat Apr 9 15:07:44 2016 +1000
Fix metallic typo
commit 9c1d728be919a74dfee8973b146f312121daed9e
Author: cosmy1 <cosmy_rulezz@hotmail.it>
Date: Sat Apr 9 04:50:36 2016 +0200
Remove extra float casts
commit 851487ea63c181eb45c5988eb71dd526e2c12852
Merge: 3142270 8edbae9
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Fri Apr 8 19:32:06 2016 +0100
Merge pull request #9 from hdunderscore/PBRChangesR
Updates to IBL
commit 8edbae92c5e454727126c444b49075ef07e36ab8
Author: hdunderscore <hdunderscore@gmail.com>
Date: Fri Apr 8 20:01:33 2016 +1000
- Updated glsl shaders
- Fixed a potential bug with direct lighting.
- Introduced a new define 'PBRFAST' that will allow the IBL to take a short-cut for significantly higher frame-rate, but lower quality.
commit e63a5d4faedb22710f28dbfdff3705fdfb3b1d22
Author: hdunderscore <hdunderscore@gmail.com>
Date: Fri Apr 8 10:06:18 2016 +1000
Fixed a divide-by-zero in the CookTorranceBRDF, which was causing a visual issue in DX11.
commit 37d30d906c93ebb2e4165f91db5adc7e7893edc4
Author: hdunderscore <hdunderscore@gmail.com>
Date: Fri Apr 8 00:30:26 2016 +1000
Fixed specular IBL energy conservation.
commit 4643342079dce76c3b26ac101745e49cabad7b68
Author: hdunderscore <hdunderscore@gmail.com>
Date: Thu Apr 7 21:27:16 2016 +1000
- Exposed tangents and bi-tangents to the IBL.
- Removed unused calculations in deferred first pass.
- Added a simpler image sampling calculation.
commit b7ea9b89fe455d8e9c62fc3a1dd441a8860c9708
Author: hdunderscore <hdunderscore@gmail.com>
Date: Wed Apr 6 22:44:09 2016 +1000
- Fixed a few errors in the BRDF functions
- Fixed the specular calculations
- Small code refactor to allow for more consistency and easier experimentation.
- Implemented the ImageSampling algorithm as described in Epic's 2013 paper, with improvements.
- Implemented a true working deferred renderer.
- Updated the concrete normal map (reversed the direction).
- Changed the sRGB setting of the diffuse textures and cubemap, to perform calculations in linear space.
- Added post-process effects to the PBR sample.
commit 314227053b26c6ba70d7de32b2c5894d60d25784
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Wed Apr 6 01:35:52 2016 +0100
Missing OpenGL changes (reverted from commit 4169cfca4abe7b23b5f2a84aa391992fe22e3a8b)
commit 9cd441c413f4742bca3889d3cdf9f2c290462e3d
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Wed Apr 6 01:27:42 2016 +0100
- Fix Metallic typo
- Fix HLSL specular metallic bug
- Fix indentation.
- Fix BRDF typo.
- Fix sample scene material to use normal maps.
- Revert IBL Importance sample to use Epic described method.
- Removed incorrect application of split sum on top of importance sample method.
- Added diffuse IBL calculation. (reverted from commit 143379cee9968588974879e1ce53123f45d8741a)
commit 143379cee9968588974879e1ce53123f45d8741a
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Wed Apr 6 01:10:37 2016 +0100
- Fix Metallic typo
- Fix HLSL specular metallic bug
- Fix indentation.
- Fix BRDF typo.
- Fix sample scene material to use normal maps.
- Revert IBL Importance sample to use Epic described method.
- Removed incorrect application of split sum on top of importance sample method.
- Added diffuse IBL calculation.
commit fbba0f389b571d0b3814254c16b05279bfd29a58
Merge: 4169cfc c9ba2ec
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Tue Apr 5 14:03:40 2016 +0100
Merge pull request #5 from cosmy1/patch-6
Update BDRF.hlsl
commit 4169cfca4abe7b23b5f2a84aa391992fe22e3a8b
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Mon Apr 4 22:55:56 2016 +0100
Missing OpenGL changes
commit 62491b160cd356cdf4bc292815862fbdea2be22a
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Mon Apr 4 22:54:50 2016 +0100
Fixed OpenGL PBR
commit a453cfea1a061900c9de604b5d422d5915cf1712
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Mon Apr 4 02:37:53 2016 +0100
Fixed IBL function taking metallic
commit e33efba25b455a6c77679941c489619a02fa1098
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Mon Apr 4 02:35:28 2016 +0100
Improve IBL and fixed specular color
commit 4c7058f1c41bbed32c96df550cb93a14b17ec07d
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Sat Apr 2 01:43:18 2016 +0100
Fixed HLSL
commit 9d095a14ac64e34fa2c016e4503b2b076e64b025
Merge: 2de2597 0a9ea24
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Sun Apr 3 14:22:46 2016 +0100
Merge pull request #6 from cosmy1/patch-8
Update PBRExample.xml
commit 2de259781a588c80117744892083065fbe5bb5c8
Merge: 92ab68c 12bd826
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Sat Apr 2 20:51:30 2016 +0100
Merge pull request #4 from cosmy1/patch-4
Update IBL.glsl
commit 92ab68ce3b94a092ad96d9cd0e577d1b7fedf61c
Merge: 295a23e e1f5ac2
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Sat Apr 2 20:51:05 2016 +0100
Merge pull request #3 from cosmy1/patch-3
Update BRDF.glsl
commit 0a9ea24b6681bac8e3deab58081ee9462b6ada31
Author: cosmy1 <cosmy_rulezz@hotmail.it>
Date: Sat Apr 2 11:54:33 2016 +0200
Update PBRExample.xml
commit c9ba2ec10f34da559c6148cb0d8d9cbc2ca62ff0
Author: cosmy1 <cosmy_rulezz@hotmail.it>
Date: Sat Apr 2 11:50:30 2016 +0200
Update BDRF.hlsl
commit 12bd826c73092b8e96782c91b9cc7d925e77708f
Author: cosmy1 <cosmy_rulezz@hotmail.it>
Date: Sat Apr 2 11:47:29 2016 +0200
Update IBL.glsl
commit e1f5ac27606295bf81c07d3d46fda1dae6f191a7
Author: cosmy1 <cosmy_rulezz@hotmail.it>
Date: Sat Apr 2 11:43:37 2016 +0200
Update BRDF.glsl
commit 295a23e96f3dcdf05aac8d4e9057e8e6c67b3607
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Sat Apr 2 00:19:01 2016 +0100
Updated Example
commit 9b105230ecd33082bb82a8963057d635ffbe41ac
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Sat Apr 2 00:15:55 2016 +0100
Fixed IBL and indentation
commit 185d31b6a0af7d084e7305d783e407d354274cac
Merge: 6b7b5be dad5c04
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Fri Apr 1 23:55:46 2016 +0100
Merge pull request #2 from cosmy1/patch-2
Update BRDF.glsl
commit dad5c042fc3272accbb9c26f2e17214ece66ebf8
Author: cosmy1 <cosmy_rulezz@hotmail.it>
Date: Sat Apr 2 00:39:35 2016 +0200
Update BRDF.glsl
commit 6b7b5bee9c56304aa92a4009d15282b6456d77c6
Merge: a5b6b93 c398e82
Author: dragonCASTjosh <NUT13000804@students.wnc.ac.uk>
Date: Fri Apr 1 23:34:40 2016 +0100
Merge pull request #1 from cosmy1/patch-1
Fix whitespaces in Material
commit c398e82153ac0d0ab2b29f61d4345d747be3d40c
Author: cosmy1 <cosmy_rulezz@hotmail.it>
Date: Sat Apr 2 00:33:27 2016 +0200
Fix whitespaces in Material
commit a5b6b93b96a053f304b7326b4fa3930d60195051
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Fri Apr 1 21:33:52 2016 +0100
fixed indentation
commit 5b402e75092e680975435384ecb8b0af0292139d
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Fri Apr 1 21:32:35 2016 +0100
Fixed issue with deletion of wrong values
commit 4ca39ec5bfb905621de8c80999cf640a8ad6d5e0
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Fri Apr 1 21:28:59 2016 +0100
removed nolonger needed licence
commit d2ab0f9a048d594d7115c41c2dbea2ce2d39e31b
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Fri Apr 1 21:28:18 2016 +0100
Improve PBR and moved forward PBR into new shader
commit cdaae6e2cf234f28cef90f244e2e24e6b7d0d915
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Fri Apr 1 21:26:57 2016 +0100
Removed remaining area lighting and fixed pbr in deferred rendering
commit 6fca9d3b98fc2cacea2a11129eb1fc69a7e2fd2f
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Fri Apr 1 13:19:48 2016 +0100
Replaced data folder with one from mater to avoid commit revert errors
commit 543c30f0b3b035df13ce09cc127117fb160bfe5f
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date: Thu Mar 31 20:52:47 2016 +0100
Complete PBR work
|