townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,836 Commits 3 Branches 3 Tags 168 MiB
upstream-octree
Commit Graph

96 Commits

Author SHA1 Message Date
TEDERIs
4116acb500
Remove unused gamma variable (#2667) 
* Remove unused gamma variable

* Remove unused variables in GLSL
 2020-07-23 12:48:39 +03:00
gleblebedev
0c65934c04
Ambient occlusion in PBR techniques (#2660) 
* Ambient occlusion in PBR techniques

* AO to modulate IBL

* AO texture coord fix
 2020-07-15 15:32:06 +03:00
gleblebedev
c4a8e9b098
Vegetation shader and technique bugfixes (#2659) 
* Vegetation shader and technique bugfixes

* GLSL bug fix for vegetation shader

* pivot fixed

* Shaders fixed

* Text formatting
 2020-07-14 04:08:32 +03:00
Katekov Anton
d103e6ffa7
Fix vegetation shader for vsm shadows (#2658) 2020-07-07 14:02:06 +03:00
gleblebedev
609f7de618
New PBR techniques. New PBR terrain shader. Skybox shader fixed. (#2655) 
* New PBR techniques. New PBR terrain shader. Skybox shader fixed.

* Bug fix in original terrain and missing techniques.

* PR cleanup

* Skybox.glsl cleanup

* Terrain added to PBR sample
 2020-07-02 11:19:43 +03:00
Lisandro Bruzzo
a42a299877 Update Vegetation.glsl 2017-09-18 23:34:37 -03:00
Lasse Öörni
c2c1d06cd2 Remove unused IBL code which requires tangents / bitangents, and do not require tangents for IBL / non-normalmapped. Fix PBR techniques so that VS also refers to NORMALMAP define when necessary, since that is now required to trigger the tangent calculation. Closes #2072. 2017-08-16 11:26:51 +03:00
dragonCASTjosh
5498140d84 Fixed dark artifact in PBR 2017-06-13 16:03:26 +01:00
dragonCASTjosh
eebc9f04c3 Fixed sphere light issue 2017-06-13 06:01:59 +01:00
dragonCASTjosh
b782b86b2d OpenGL PBR fixes 2017-06-13 05:32:46 +01:00
Simon Flores
3173c6199c Update Transform.glsl 
let the user define the number of outputs for advanced rendering effects such as subsurface scattering
 2017-03-29 23:08:31 -04:00
hdunderscore
25612d6e72 Bugfix for vegetation shader and instancing. 2017-02-23 14:17:44 +11:00
Lasse Öörni
7d06916bc5 Remove semicolon from shader transform (iModelMatrix) macros, as it should instead be part of the statement where the macro is being used. Closes #1829. 2017-02-20 21:14:27 +02:00
Lasse Öörni
314a3af082 Fix artifacts in SDF text effects when supersampling is off. 2017-01-10 11:46:03 +02:00
1vanK
51c6fb5e2d SDF supersampling 2017-01-08 16:56:32 +03:00
Lasse Öörni
8b4ddd5289 Use ALPHAMAP shader define in Text shader to differentiate between alpha texture (TTF) and RGBA (bitmap fonts). Closes #1750. 2017-01-07 19:09:05 +02:00
Lasse Öörni
3e4ca7ae33 Move VSM shadow z/w divide to pixel shader so that e.g. shadowed point lights will work much better. Related to #1716. 2016-12-17 01:27:51 +02:00
Lasse Öörni
d7cf72563c Fix recent shader change for GLES. 2016-11-19 22:28:37 +02:00
Lasse Öörni
ade01f61af Remove isAreaLight variable completely from Light class, as it's unused. Some cleanup / comment changes. Fix PBRDeferred GLSL shader. 2016-11-18 10:03:23 +02:00
Lasse Öörni
b8d55583f7 Squashed commit of the following: 
commit a384431cd1ce230630d6a4522022de919cb55ac9
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Thu Nov 10 00:16:26 2016 +0000

    Fixed typing and style errors

commit d4f8ca2eeed2b0196b46bd391e96a511594dc738
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Thu Nov 10 00:14:02 2016 +0000

    Removed isAreaLight from attibutes

commit 62d50f3ba94d9c665358dcd7377730d968fde7be
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Mon Nov 7 22:53:45 2016 +0000

    Added documentation on area lighting options

commit 53e5844bee5caccc2a37f0dcdac3b8d4a984dd62
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 17:15:14 2016 +0000

    Fixd spacing

commit 5afa4ec59c1ecd2aa4892d4854e3b954af9cc73f
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 06:00:19 2016 +0000

    Fixed materials under deferred and light position in the scene

commit 314bc5847a44979b89f46a0272fcf5cd0f04e866
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 05:14:27 2016 +0000

    Fixed Deferred rendering

commit bde3560de71ab5a33c9cc3a4ee40029567cca5bf
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 03:26:54 2016 +0000

    Area lighting, improved IBL and improved attenuation for OpenGL

commit 52be0fc67626a9c8901091445be52bdbe99657d1
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Sat Nov 5 01:23:53 2016 +0000

    Intergrated Area ligthing with the editor, and improved texture quality

commit 5044bebe3d8799dee687ca676334f4493586d376
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Mon Oct 24 09:25:15 2016 +0100

    Tube lighting HLSL

commit f3849a93d1812345b21918a7418d12c8d3e1e3dd
Author: dragonCASTjosh <dragonCASTjosh@gmail.com>
Date:   Mon Oct 24 09:01:10 2016 +0100

    Improve IBL

commit 210bfaebb40ed977eb46f0f6f91b3b6a49ec25a7
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Thu Sep 15 12:32:15 2016 +0100

    Made sphere lights closer to epics paper

commit c186870e9e79de9572b5302019598ac059af58cf
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Thu Sep 15 11:57:39 2016 +0100

    Added sphere light and beginning of tube lights
 2016-11-18 02:02:05 +02:00
Lasse Öörni
f1cb469a34 Fix getting world-space tangent for billboards. Closes #1678. 2016-11-09 22:57:34 +02:00
Lasse Öörni
d7f0c06644 Fix mistakenly disabled depth test in "shrinking" soft particle techniques. Remove unnecessary abs() function in soft particle shaders when on the "shrinking" path. 2016-11-03 20:45:26 +02:00
Lasse Öörni
fe65264301 Added "expanding" option for soft particles, which requires hardware depth test off. Improve soft particles documentation on the renderpath page. Closes #1623. 2016-10-28 22:19:37 +03:00
Lasse Öörni
5804347ab2 Reverse saturation fix also for GLSL. 2016-10-28 12:46:32 +03:00
Lasse Öörni
861a85fb1f Separate unlit particle shaders & techniques for optional soft particle support. Soft particles versions of renderpaths. Soft particle shaders adapted from work by 1vanK & MonkeyFirst (https://github.com/1vanK/Urho3DSoftParticles). Fix Shadow shader failing for billboards. Fix ForwardHWDepth renderpath unnecessarily rendering depth in a separate pass. Closes #1623. 2016-10-28 08:36:50 +03:00
Lasse Öörni
7658ad39c7 Remove commented out shader code. 2016-09-29 20:49:40 +03:00
Lasse Öörni
08b083b323 Tightening of shadow related function signatures on GLES. Related to #1607. 2016-09-22 16:33:43 +03:00
Lasse Öörni
90efa3b976 Specify high precision for water shader varyings on GLES to fix shaky reflection/refraction texture sampling. Closes #1593. 2016-09-17 00:26:32 +03:00
Lasse Öörni
97eba580b5 Fix implicit conversion in normal offset shadow calculations. Closes #1586. 2016-09-15 16:35:33 +03:00
golden
5f7ef278be fix skydome glsl error 2016-09-11 13:27:47 +08:00
Lasse Öörni
9d5380bc10 Remove extraneous f from GLSL code to satisfy the compiler. 2016-08-29 19:25:49 +03:00
Lasse Öörni
06b0dbba76 Fix compile errors in PBR shaders on GLES. Fix mismatches in PBR techniques where IBL compile define would be present for pixel shader but not vertex shader (causes shader linking error) 2016-07-25 15:28:48 +03:00
dragonCASTjosh
1c5ce961da Revert mip selection method 2016-07-25 02:02:00 +03:00
Lasse Öörni
77cabf9bff Remove "PS" from Roughness & Metallic uniform names. 2016-07-25 01:39:15 +03:00
Lasse Öörni
6ca0aafd27 Use cAmbientColor.rgb where necessary. 2016-07-25 01:31:51 +03:00
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 ca6d6e5
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 19:34:26 2016 +0100

    Merge branch 'master' of https://github.com/urho3d/Urho3D

commit 7bbb0f68bb1c8f0fa5ccf39475a5997e82c18b62
Author: joshua Nuttall <dragoncastjosh@live.com>
Date:   Sat Jul 16 18:57:49 2016 +0100

    PBR Gamma correctoin, and small prefernace changes to the demo scene
 2016-07-25 00:54:21 +03:00
Lasse Öörni
ccf1abec81 Cleanup cameraPos function parameter from GLSL directional billboard code. Fix directional billboard face camera rotation calculation when billboards are in model space (relative to node). Related to #1471. 2016-07-15 22:23:38 +03:00
Yusuf Umar
b24bcb8928 No longer need to passing camera position to direction billboard vertex buffer because Urho3D already has default uniform to do the job. 2016-07-13 18:54:18 +07:00
Yusuf Umar
f9e65027e3 Implementing RibbonTrail 2016-06-15 21:14:58 +03:00
Lasse Öörni
ed048b7293 Transmit shadow position to GetShadow() as highp to fix remaining shadow accuracy issue on Android. 2016-06-08 22:50:49 +03:00
Lasse Öörni
f36abeb57c Force highp for shadow related samplers, uniforms & varyings on GLES for better shadows on iOS. Note: may be incompatible for some mobile GPU's that don't support highp at all. 2016-06-08 21:30:31 +03:00
Lasse Öörni
f908fa4cfd Fix normal offset GLSL code for GLES. Set default mobile multiplier for normal offset to 2. 2016-05-07 20:20:44 +03:00
Lasse Öörni
a123794886 Normal offset support in GLSL. Fix deferred specular in GLSL. 2016-05-07 20:20:43 +03:00
Lasse Öörni
2151426adc Use proper world space in deferred light shaders. This allows the cLightPos uniform and shadow matrices to behave the same in all passes (simplifies code.) Closes #1335. 2016-04-23 01:35:41 +03:00
Lasse Öörni
ed8740428c Remove cCameraRot uniform. Instead derive from cViewInv as necessary. Closes #1163. 2016-04-19 23:18:07 +03:00
Lasse Öörni
c003af1114 Merge branch 'master' into vertexdeclaration 2016-04-18 22:34:00 +03:00
hdunderscore
310252fa25 Re-ordered the deferred g-buffer to allow GL3 to receive the material roughness. 2016-04-18 16:53:37 +10:00
hdunderscore
42cbca8b26 Fix an issue in the PBR shaders that was causing noise. 2016-04-17 12:26:43 +10:00
hdunderscore
ede6383c27 Reduced an artifact in the PBR IBL shader, simplified the code, renamed PBRFAST to IBLFAST and reduced unnecessary iterations when IBLFAST is defined. 2016-04-17 11:19:38 +10:00
Lasse Öörni
b5489bdf9b Fix second texcoord input attribute in the PBRLitSolid.glsl shader to conform with the new vertex semantic system. 2016-04-16 15:20:25 +03:00