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

9612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loic Blot
694d637fd9 Add int64_t and uint64_t support for Serializer/Deserializer 2016-07-28 22:39:36 +02:00
Lasse Öörni
bd76c45f40 Merge pull request #1491 from eugeneko/master 
Make HashMap::TryGetValue constant.
 2016-07-27 13:41:41 +03:00
Eugene Kozlov
014ef043ef Make HashMap::TryGetValue constant. 2016-07-25 23:26:42 +03:00
urho3d-travis-ci
79c7ded061 Travis CI: API documentation update at 2016-07-25 19:39:39 UTC. 
[ci package]

Commit: 56ba0def78

Message: Add Graphics::SetDither(). Closes #1489.
 2016-07-25 19:39:39 +00:00
Lasse Öörni
56ba0def78 Add Graphics::SetDither(). Closes #1489. 2016-07-25 19:03:43 +03:00
Lasse Öörni
786598f08d Merge remote-tracking branch '1vanK/master' 2016-07-25 18:37:40 +03:00
Lasse Öörni
c647ae7dfa Put zone texture to environment texture unit on OpenGL ES. Fix web build including texture unit mappings which are not included in the shaders. 2016-07-25 17:18:08 +03:00
1vanK
fafd921f32 String + number operator 2016-07-25 16:23:43 +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
Lasse Öörni
3b6e59d466 Reduce directional light brightness in the PBR scene. 2016-07-25 14:03:01 +03:00
SuperWangKai
3b32322103 Merge pull request #4 from urho3d/master 
sync with urho3d
 2016-07-25 14:38:02 +08: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
Yao Wei Tjong 姚伟忠
9fee916c55 For documentation - use https protocol when it is available. 2016-07-24 13:39:14 +08:00
Lasse Öörni
63f71ab874 Remove assert from StringUtils ToVectorVariant() function and return empty variant in error case. Closes #1485. Convert assert in Log::SetLevel() to error logging, and remove assert from Log::Write(). 2016-07-23 19:00:31 +03:00
urho3d-travis-ci
896787c9dc Travis CI: API documentation update at 2016-07-23 14:52:19 UTC. 
[ci package]

Commit: d506ab4288

Message: Add SetFontSize() to Text & Text3D. Fix comments of SetFont() referring to nonexistent parameter. Closes #1484.
 2016-07-23 14:52:19 +00:00
Lasse Öörni
d506ab4288 Add SetFontSize() to Text & Text3D. Fix comments of SetFont() referring to nonexistent parameter. Closes #1484. 2016-07-23 17:16:33 +03:00
Lasse Öörni
515dfa760c Fix backbuffer not getting cleared in the situation where just the UI and rendertexture views are being rendered. (http://urho3d.prophpbb.com/topic2238.html) 2016-07-22 20:01:28 +03:00
Lasse Öörni
4ce51e3cc0 Add gamma correction postprocess toggle to the editor. 2016-07-22 17:51:39 +03:00
Lasse Öörni
287c520810 Fix wrong UV index in Drawable OBJ export. Closes #1483. 2016-07-22 16:58:31 +03:00
Lasse Öörni
995fbd4213 Add public accessors for View's view rectangle & view dimensions. Explain that Viewport may return a zero rect, which means to dynamically use the rendertarget's full size. Add todo's related to Viewport::WorldToScreenPoint() && Viewport::ScreenToWorldPoint() potentially operating incorrectly for texture rendertargets. Closes #1482. 2016-07-22 00:35:15 +03:00
Yao Wei Tjong 姚伟忠
b454440f51 For CI - adapt to NDK r12b which renamed '*-clang3.6' to '*-clang'. 2016-07-18 22:51:57 +08:00
Yao Wei Tjong 姚伟忠
20da34f21b Auto-generate Urho3DAll.h header file. Close #1472. 2016-07-18 22:40:45 +08:00
Yao Wei Tjong 姚伟忠
c675421464 Normal comment to doxygen comment using regex + manual correction. 
cd Source/Urho3D && git grep -lP '^\s+//[^/]+\.^M*$' -- '*.h' |xargs perl -pi -e 's|^(\s+)//([^/]+\.^M*)$|$1///$2|g'
Ctrl+M is one character.
 2016-07-18 22:01:10 +08:00
Yao Wei Tjong 姚伟忠
c4a92e97b0 Adapt the 'legacy' Android toolchain file to support Android NDK r12b. 
This will be the last time we modify this toolchain file for Urho3D project. We are forced to touch it one last time because we need to bump the NDK version in urho3d/android-ndk repository.
 2016-07-18 22:01:10 +08:00
Mike3D
238f09c53d Fixed TileMap2D::PositionToTileIndex() and use it in tile map sample 2016-07-18 13:18:57 +02:00
SuperWangKai
7a4f79015f Merge pull request #3 from urho3d/master 
Merge urho3d
 2016-07-18 10:43:14 +08:00
Lasse Öörni
ca6d6e54ae Merge pull request #1476 from tommy3/doxygen-comments 
Normal comment to doxygen comment.
 2016-07-16 16:51:48 +03:00
tommy3
808fd992c6 Normal comment to doxygen comment. 2016-07-16 15:30:09 +02:00
tommy3
6fbe9537f4 Normal comment to doxygen comment. 2016-07-16 14:57:28 +02: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
urho3d-travis-ci
d1802a9092 Travis CI: API documentation update at 2016-07-15 07:58:43 UTC. 
[ci package]

Commit: 761afff122

Message: Fix dir manipulation off by one error in Android DirExists() function. Closes #1470.
 2016-07-15 07:58:43 +00:00
Lasse Öörni
761afff122 Fix dir manipulation off by one error in Android DirExists() function. Closes #1470. 2016-07-15 09:26:19 +03:00
Lasse Öörni
af00713e12 Add Clone() to ParticleEffect & ParticleEffect2D. Closes #1469. 2016-07-15 01:32:33 +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
Yao Wei Tjong 姚伟忠
fd9db884b4 Add template version of UIElement::GetChild() methods. 2016-07-11 19:17:52 +08:00
Yao Wei Tjong 姚伟忠
307fac84f5 Minor documentation update about URHO3D_C++11 build option. 2016-07-11 15:30:17 +08:00
Yao Wei Tjong 姚伟忠
5e8ee79f2b Partial revert - use Object as base but keep lifetime management logic. 
Avoid duplicate reference of "window" UI-element.
 2016-07-11 15:25:54 +08:00
Lasse Öörni
9db4af58e5 Simplify returning a new MessageBox to AngelScript. Fix crash due to multiple handling of MessageBox acknowledge when modal status is manually reset. 2016-07-10 22:01:58 +03:00
urho3d-travis-ci
569314697b Travis CI: API documentation update at 2016-07-10 16:27:23 UTC. 
[ci package]

Commit: 4485cb8fa4

Message: Remove unnecessary include.
 2016-07-10 16:27:23 +00:00
Lasse Öörni
4485cb8fa4 Remove unnecessary include. 2016-07-10 19:10:22 +03:00
Lasse Öörni
c38d29a20c Make MessageBox a UIElement subclass for automatic lifetime management through the UI hierarchy. (Use MessageBox:new in Lua for safe operation.) Remove the "test all factories" feature in Engine class (Debug mode) since it would leave a MessageBox in the UI. Use UI root size for centering the MessageBox instead of Graphics resolution, since the UI might be scaled. Closes #1439. Closes #634. 2016-07-10 19:03:23 +03:00
Yao Wei Tjong 姚伟忠
9183bdfc4e Fix URHO3D_PACKAGING support for Android build. 
When the option is enabled, PackageTool host tool will be built and used to package the assets into pak files.
 2016-07-08 22:38:08 +08:00
Yao Wei Tjong 姚伟忠
3b1575fe0b Fix memory linker flags setup for Web build. 
This is a regression issue. We used to configure it globally before moving it to setup_target() macro. There is a pro and con on where to configure the memory linker flag. If we do it globally then we cannot alter the total memory size per target application (if a project has multiple targets). However, since there is a bug in its current implementation in the setup_target() macro, the logic is moved back again to global section a quick fix for this bug. This means we could not have alternative memory size in any of the sample targets, which we do not do anymore after the default memory size has been increased to 128 MB.
 2016-07-08 21:53:27 +08:00
fredakilla
10449971b9 get body properties when body exists 2016-07-08 21:18:11 +08:00
Lasse Öörni
02e1d6dd2c Add performance note of package files on Android. 2016-07-07 15:40:21 +03:00
Lasse Öörni
96d256ed16 Refactor File internal operations to support package files also on Android. Closes #1455. 2016-07-07 15:25:46 +03:00
Lasse Öörni
28ed7c1706 Remove ambiguous WeakPtr initialization from Graphics class. Closes #1459. 2016-07-06 17:36:41 +03:00