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

16 Commits

Author SHA1 Message Date
urho3d-travis-ci
1151b8a2d6 Travis CI: bump copyright to 2020. 2020-01-05 06:21:40 +00:00
urho3d-travis-ci
a476f0c401 Travis CI: bump copyright to 2019. 2019-01-12 01:00:16 +00:00
urho3d-travis-ci
70049ba582 Travis CI: bump copyright to 2018. 
[cache clear]
 2018-01-01 05:35:37 +00:00
Yao Wei Tjong 姚伟忠
d6eb307e34 Clang-Tidy - google-explicit-constructor. 2017-12-31 13:48:28 +08:00
Yao Wei Tjong 姚伟忠
ca97fd9b9b Clang-Tidy - modernize-use-auto. 2017-12-31 12:46:26 +08:00
Yao Wei Tjong 姚伟忠
5e89e566e6 Clang-Tidy - modernize-use-override. 2017-12-31 12:11:09 +08:00
Eugene Kozlov
59391f9523 Source/Tools and Source/Samples automatic upgrade: override, typedef to using, 0 to nullptr. 2017-08-29 11:40:46 +03:00
Lasse Öörni
9ef8ac9ba9 Tabs to spaces. 2017-06-17 00:09:05 +03:00
dragonCASTjosh
eebc9f04c3 Fixed sphere light issue 2017-06-13 06:01:59 +01:00
Yao Wei Tjong 姚伟忠
2efbcd570c Rename "define_resource_files" macro to "define_resource_dirs". 
Enhance it to take extra arguments for specifiying target-specific resource directories and other extra for Web platform support.
Close #809.
 2017-04-05 18:16:36 +08:00
urho3d-travis-ci
ee054a1507 Travis CI: bump copyright to 2017. 
[ccache clear]
 2017-01-01 13:01:31 +00:00
Lasse Öörni
812afaeb8f Fix PBR material demo to operate similarly on AS, Lua, C++. Remove forcing of alpha to 1 from Zone::SetAmbientColor() & Zone::SetFogColor(). Change "Enable HDR" to "HDR rendering" in editor settings dialog for consistency. 2016-07-29 16:44:57 +03:00
Lasse Öörni
77cabf9bff Remove "PS" from Roughness & Metallic uniform names. 2016-07-25 01:39:15 +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
a794f9e59b Prefer key constants instead of ascii codes in keydown/keypress checks. (AngelScript & C++) 2016-05-30 20:45:13 +03:00
Lasse Öörni
31e57e01fb Add PBR sample C++ version. 2016-05-01 13:41:18 +03:00