1vanK
d6f5f5d45c
Fix gold coin animation
2016-05-11 11:27:29 +03:00
Lasse Öörni
a955725bd0
Add the interpolation mode IM_NONE to ValueAnimation. Add animating UI element to LightAnimation example. Add ResourceRef constructor that takes type & name as strings for easier script bindings.
2016-05-09 22:38:06 +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
7160a0ab7c
Normal offset shadow support for HLSL. Fix deferred specular calculation on HLSL.
2016-05-07 20:20:42 +03:00
Lasse Öörni
e048afa496
Cleanup drag-instantiate code. Use mouse raycast position if possible.
2016-05-06 14:01:12 +03:00
Lasse Öörni
bf860499bd
Remove unused function.
2016-05-06 14:01:11 +03:00
Golden Li
b463ed5a05
align to aabb bottom
2016-05-06 14:01:10 +03:00
Golden Li
3e35bb0afa
support resource drag to scene
2016-05-06 14:01:09 +03:00
Lasse Öörni
c197bf726a
Merge remote-tracking branch '1vanK/master'
2016-05-02 19:08:22 +03:00
1vanK
65b639af13
Editor: info about selected model (thanks MonkeyFirst for idea)
2016-05-01 20:43:07 +03:00
Lasse Öörni
6deb0780f8
Fix comments in 42_PBRMaterials.as. Add Lua version of the PBR sample.
2016-04-30 02:20:12 +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
88acae8c77
Fix instancing texcoord in the PBR HLSL shader.
2016-04-18 22:47:34 +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
076eaca13e
Update PBR techniques, fixed an issue with normal maps not showing with PBRDiffNormal.xml
2016-04-18 09:09:06 +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
Lasse Öörni
19f3b0f120
Merge branch 'master' into vertexdeclaration
2016-04-16 14:58:30 +03:00
Yao Wei Tjong 姚伟忠
43bea49674
Fix the PBRDemo shell script.
2016-04-15 18:56:31 +08:00
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
2016-04-15 18:56:19 +08:00
Lasse Öörni
ede04a46f1
Added equality operator to VertexElement. Add multiple color & UV channel (up to 4) support to AssetImporter. Make editor's resource browser recognize the UMD2 model format. Closes #707 .
2016-04-13 13:43:33 +03:00
Lasse Öörni
7b738c54ac
Merge branch 'master' into vertexdeclaration
2016-04-12 22:20:09 +03:00
Lasse Öörni
44133d00d9
Fix typo.
2016-04-11 00:35:41 +03:00
Lasse Öörni
a8ed3dd3a5
Updated VertexBuffer Lua bindings + demonstrate arbitrary vertex elements in DynamicGeometry Lua example.
2016-04-11 00:27:55 +03:00
Lasse Öörni
644eecfa7d
Demonstrate defining non-legacy vertex elements in the DynamicGeometry C++ & AngelScript examples.
2016-04-10 15:37:48 +03:00
1vanK
49a25f787c
OgreImporter: fix relative to absolute transform and Jack's walk animation
2016-04-07 18:45:24 +03:00
Lasse Öörni
8215c42e37
OpenGL arbitrary vertex attributes. Change GLSL attribute indexing to zero-based to match HLSL, so the second texcoord (lightmaps, billboard sizes) is now called texCoord1, and instancing texcoords are texCoord4,5,6.
2016-04-07 00:32:41 +03:00
Lasse Öörni
9fd22d3323
Fix instance texture coordinate in HLSL shaders.
2016-04-05 00:32:17 +03:00
hdunderscore
ace93bd98a
- Fix touch input bug ( https://github.com/urho3d/Urho3D/issues/1303 )
...
- Fix event name typo in script samples.
2016-04-04 19:36:53 +10:00
Lasse Öörni
8af9f4785e
Remove the special script attribute storage mechanism.
2016-03-30 20:54:43 +03:00
Lasse Öörni
d1096470d5
Execute DelayedStart() in ScriptInstance, LuaScriptInstance & LogicComponent before first FixedUpdate() if it comes sooner than Update(). Fix long-standing bug in NinjaSnowWar where the ninja orientation would be overwritten by yaw=0 from controls.
2016-03-29 21:45:18 +03:00
Lasse Öörni
5246f74984
Merge remote-tracking branch 'hdunderscore/input_mousemode_update'
2016-03-29 19:49:55 +03:00
hdunderscore
467c4bd4e8
- Updated sample mouse mode setup.
...
- (Web) Removed some of the exit engine logic.
2016-03-27 20:01:22 +11:00
cosmy
d11a1980ac
Add missing commas in EditorStrings
2016-03-24 16:39:04 +01:00
cosmy
f2c13b2fb0
Add missing Italian localization entries
2016-03-24 16:09:19 +01:00
hdunderscore
54565005e2
Updated HTML5 behavior of the samples, mouse modes and UI cursor.
...
Updates:
- Exposed a new method to determine whether the mouse pointer is confined to window.
- E_MOUSEMODECHANGED now has a new parameter, P_MOUSELOCK, indicating whether the mouse pointer is locked.
- MM_ABSOLUTE now behaves more closely to the desktop equivalent (web)
- Changed some samples to use different mouse movement methods as test cases.
- Input class: suppressNextMouseMove_ now suppresses all movements within the tick.
- Added script bindings for the Input class changes.
- On Web platform, removed event polling and instead use event callbacks, allowing pointer-lock requests to occur in browser events.
Bug fixes:
- Fixed mouse jumps on entering and exiting pointer-lock (web)
- Fixed a bug that caused the UI cursor and OS cursor to fall out of sync (web)
- Fixed a bug that could allow pointer-lock to be acquired after a different mouse mode was requested. (web)
- Prevent most samples from exiting on Web platform
- Reverted previous fix to web platform touch events, as upstream SDL has corrected the corresponding bug.
2016-03-23 01:52:12 +11:00
Ivan K
086cfa1687
Editor: fix all warnings; Complete UITemplate
2016-03-19 20:01:41 +04:00
Lasse Öörni
a973d8318d
Implement pause/resume by sound type in Audio. Closes #1250 . Demonstrate by pausing "Effect" type sounds in NinjaSnowWar when the game is paused. Cut quiet part from beginning of NutThrow sound to reduce perceived audio lag when attacking.
2016-03-17 23:01:55 +02:00
Ivan K
3d9ea8eece
Editor: fix some warnings
2016-03-16 15:47:39 +02:00
Ivan K
f27c48616d
Editor russification
2016-03-16 15:47:38 +02:00
Lasse Öörni
a9625eae8a
Add contributor credit, fix editor code comment.
2016-03-16 11:53:14 +02:00
Lasse Öörni
1877fb3b90
Minor space fix in code. Make editor stop itself when minimized and reduce defocused FPS to 10. Increase hierarchy window initial size to match inspector window initial size.
2016-03-16 11:51:17 +02:00
Yao Wei Tjong 姚伟忠
ccf6648eb3
Utilize new SDLActivity's get arguments feature.
2016-03-16 01:42:01 +08:00
Ivan K
8842604c80
Fix ToolTip border; EditorHierarchyWindow: tabs to spaces, fix ResetButton ImageRect
2016-03-15 03:36:04 +04:00
Lasse Öörni
a2b05dc0fd
Add "Tags" Russian localization from 1vanK.
2016-03-09 11:49:36 +02:00
cosmy1
9f59f28aad
Add missing translation in editor strings (FR, IT)
2016-03-09 03:40:58 +01:00
Lasse Öörni
27a290bf66
Add .hdr to image & texture picker filter lists.
2016-03-08 01:48:06 +02:00
dragonCASTjosh
103fe32dd1
Now working and Added initial .HDR support
2016-02-28 23:50:21 +00:00
Lasse Öörni
3e15c400ff
Fix uninitialized bool variable in editor script. Closes #1189 .
2016-02-11 17:24:11 +02:00
MonkeyFirst
17a8d6c450
fix-for-ui-typing-in-b.mode
2016-02-08 04:34:56 +06:00
MonkeyFirst
ff24dc3a12
fix double adding tag from scene
2016-01-29 00:11:16 +06:00
MonkeyFirst
f6ba2b1195
Add tags menu for editUIElement
2016-01-28 00:55:13 +06:00
MonkeyFirst
31e2f56808
tags menu
2016-01-27 23:40:02 +06:00
Lasse Öörni
a3411274f3
Node tag editing.
2016-01-22 17:51:32 +02:00
Lasse Öörni
474276fc17
Code convention & minor logic edits. Unify tag API between UIElement & Node. Use ; as the default tag separator to match the editor. Do not allow adding empty tags.
2016-01-22 17:51:31 +02:00
Lasse Öörni
2eca6bf91f
Use the OUTPOSITION convention in HLSL skydome shader.
2016-01-22 13:56:30 +02:00
Lasse Öörni
934de0f75d
Merge remote-tracking branch 'rasteron/master'
2016-01-22 13:55:12 +02:00
Ivan K
3774bef4f7
Add comments about tags to samples
2016-01-22 02:38:37 +04:00
Ivan K
68668266d2
Add tags to UIElement
2016-01-21 21:42:17 +02:00
Lasse Öörni
cd2c720352
Fix uniform type in D3D11 constant buffer.
2016-01-21 19:00:35 +02:00
Lasse Öörni
1e8335d5a4
Merge remote-tracking branch 'hjmediastudios/AddViewMatrix'
2016-01-21 18:38:36 +02:00
rasteron
6789580e18
Added Skydome Shaders and Technique
2016-01-21 16:52:25 +08:00
Nick Royer
150ddf86ca
Added uniforms to shader
2016-01-18 14:34:05 -06:00
Lasse Öörni
25ed4020a0
Match the enum order in EmitterType edit field.
2016-01-14 21:14:43 +02:00
Lasse Öörni
79f32fad0a
Shorter name for the directional mode in XML serialization. Eliminate duplicate code from ParticleEffect. Eliminate manual string compare in favor of GetStringListIndex().
2016-01-14 21:04:55 +02:00
Yusuf Umar
a8d9308abe
Moving billboard rotate computation from CPU to GPU. Particle with direction should run faster now.
2016-01-12 19:50:01 +07:00
Yusuf Umar
353c459e0d
Adding direction for particle/billboard. It can create pseudo 3d effect inspired by Unity stretched billboard. Can be used by using face camera option 'Rotate Along Direction'.
2016-01-12 10:46:23 +07:00
Yao Wei Tjong 姚伟忠
431559c2bd
For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning.
2016-01-06 16:38:58 +08:00
Ivan K
645f4b7685
Remove OldUI
2015-12-23 07:55:30 +04:00
Ivan K
368d880c2b
Editor: fix sharp edges, when UI opacity < 1.0
2015-12-23 07:50:30 +04:00
Lasse Öörni
6d2853d81d
Add 32-bit integer object index attribute for custom instancing schemes. May not work on GLES2 as it's using attribute index 13. Not supported on D3D9. Closes #1108 .
2015-12-22 18:55:40 +02:00
Lasse Öörni
b593380632
When attaching a UIElement as child, apply potentially changed style recursively. Remove default size from Button's style (generally style shouldn't change element size.) Closes #1103 .
2015-12-21 15:34:30 +02:00
Lasse Öörni
6a3bbb8aab
Fix D3D11 constant buffers for VSM. Fix editor shadow mode selection. Fix script API for new shadow modes. Fix debughud for new shadow modes. Edit documentation to refer to new shadow modes. Added contributor credit. Some code convention edits, e.g. VSM instead of Vsm. Dump new NinjaSnowWarShaders.xml file.
2015-12-18 14:22:24 +02:00
Lasse Öörni
41db8dbe69
Removed test model.
2015-12-18 12:35:09 +02:00
Xavier Maupeu
dbcfc9721e
merge VSM shadow
2015-12-17 23:04:48 +01:00
Xavier Maupeu
cf501d9585
add functions in Renderer to set shadow softness and VSM shadow parameters
2015-12-17 19:16:52 +01:00
Xavier Maupeu
b1beaf4ad1
VSM works with point light and spot light in openGL
2015-12-16 23:58:13 +01:00
Xavier Maupeu
33a278449b
VSM works with point light and spot light in direct3d9
2015-12-16 22:53:18 +01:00
Lasse Öörni
95f3cecc30
Add the NOUV mechanism for Depth & Shadow HLSL shaders. Document the significance of providing all vertex attributes expected by shader on D3D11. Tabs to spaces in Reference.dox.
2015-12-15 11:01:10 +02:00
Lasse Öörni
42ba4f9824
Fix material JSON save in editor. Fix AngelScript API bindings where XMLElement or JSONValue is passed as reference and should be modified (needs to be unsafe inout reference.)
2015-12-12 00:08:38 +02:00
Lasse Öörni
5165aa91fb
Remove GetJsonType() function from editor resource browser code since JSON files don't have a similar root element name, and it was causing the editor not to compile. Fix save of ResourceRef / ResourceRefList in JSON. Fix missing child nodes in JSON scenes. Fix editor to use the correct function to save / load JSON nodes. Fix number of attempts in finding the attribute matching JSON data.
2015-12-11 22:57:33 +02:00
Nick Royer
10bad1e36a
Added JSON animation triggers as well as a few quick file filter
...
settings for the editor and documentation changes.
2015-12-10 14:31:05 -06:00
Lasse Öörni
85697abb4b
Clear also stencil.
2015-12-07 11:02:38 +02:00
Lasse Öörni
66bc72a76f
In ForwardDepth renderpath, clear depth two times as on OpenGL it can't be guaranteed that the proper rendering pass depth buffer is same as in the linear depth pass. Closes #1073 .
2015-12-07 11:00:47 +02:00
Ivan K
21d8906e7c
Editor: set RenderPath for particle editor
2015-12-07 02:09:31 +04:00
Xavier Maupeu
9b48314d99
update glsl lighting
2015-12-05 17:12:28 +01:00
Xavier Maupeu
e636d44df9
vsm implementaion for hlsl shaders
2015-12-05 15:45:07 +01:00
Xavier Maupeu
45aa12c496
VSM shadow map can be blurred
2015-12-05 13:26:38 +01:00
Ivan K
044bb17208
editor: more space in status text
2015-12-02 19:57:55 +04:00
Ivan K
372c5b3481
editor: fix positioning of status text
2015-12-02 19:14:32 +04:00
Xavier Maupeu
2ac35e8a06
update lighting shader for vsm
2015-12-01 16:58:31 +01:00
Lasse Öörni
7901b9cae5
Cleanup unused node var names from the scene. Closes #1068 .
2015-12-01 12:05:31 +02:00
Xavier Maupeu
78a85ff2c6
simple VSM is working
2015-11-29 11:26:36 +01:00
Lasse Öörni
74e7d027b0
Code convention edits. Added contributor credit.
2015-11-26 18:16:33 +02:00
Yusuf Umar
8eac7a3d01
Updating particle editor with these changes:
...
- Adding grid with option to hide it
- Gizmo now always visible in the left corner
- Change particle preview viewport camera to behave more predictably
2015-11-26 18:06:27 +02:00
Xavier Maupeu
34c0d94208
update shader for vsm
2015-11-26 13:42:20 +01:00
Xavier Maupeu
4e41906157
first modifications in order to integrate VSM shadow
2015-11-26 10:13:27 +01:00
Lasse Öörni
29e62526eb
Added event for sound playback finished. Deprecate SoundSource::SetAutoRemove() and change samples + NinjaSnowWar to not use it. Fix network replication of SoundSource to work with repeated playback on the same source.
2015-11-25 22:50:19 +02:00
Lasse Öörni
d13addbbd7
Fix Vegetation shadow shader for D3D11. Ensure LitSolid changes are ported to Vegetation shader. Put wind related parameters to a custom constant buffer on D3D11. Closes #1052 .
2015-11-23 13:49:00 +02:00
Lasse Öörni
88c07f952d
If the original node is still selected in paste, behave as if duplicating. Closes #1034 .
2015-11-21 13:31:23 +02:00
Lasse Öörni
e1cae7077f
Ensure matching interpolator order with point lights, critical on D3D11. Closes #1048 .
2015-11-21 12:36:57 +02:00
Lasse Öörni
e6c75eb229
Added TRANSLUCENT option to lighting, which takes absolute value of NdotL (only works in forward lighting.) Add example translucent techniques. Closes #1016 .
2015-11-13 17:21:13 +02:00
Lasse Öörni
30a26fcfc5
Code formatting. Use node pointer in compare instead of node id.
2015-11-12 12:02:55 +02:00
Vladimir
bf34fc8afb
Urho3D Editor: Spawn on selected node in Spawn Editor
2015-11-11 19:51:35 +10:00
Lasse Öörni
2cd28f10a8
Merge remote-tracking branch 'cin/master'
2015-11-09 21:09:51 +02:00
Lasse Öörni
304c866dd0
Separate functions to toggle/show/hide editor sub-windows to prevent mistaken action e.g. when editing a material. Update changelog.
2015-11-09 21:03:01 +02:00
Vladimir
48e62be7ca
Urho3D Editor: Local offset for Spawn Editor
2015-11-09 21:01:46 +10:00
JSandusky
f0da08b140
Urho3D Editor: Correct misnaming of function call for hiding spawn editor
2015-11-08 20:18:09 -05:00
JSandusky
80ba2ed375
Urho3D Editor: Show "Window" commands now toggle visibility
...
example: CTRL + I, will show the inspector if not visible and hide it if
it is visible
2015-11-08 19:54:41 -05:00
JSandusky
ec7aebfa2d
Urho3D Editor: Enter/return executes first Quick Action in the quick action results
2015-11-08 19:53:38 -05:00
Lasse Öörni
cb0e6caa24
Apply material list in CreateModelWithStaticModel() & CreateModelWithAnimatedModel(). Closes #1018 .
2015-11-08 13:12:03 +02:00
Lasse Öörni
92a080d68b
Remove the GLES skybox fix as it was doing more harm than good. Closes #1011 .
2015-11-04 22:11:59 +02:00
Lasse Öörni
77603f30df
Exclude .atlas file type from resource browser XML parsing attempt.
2015-11-04 13:52:53 +02:00
Yao Wei Tjong 姚伟忠
22bd3de807
Refactor resource prefix path parameter to accept a list of paths.
...
Close #1000 .
2015-11-03 17:46:56 +08:00
Lasse Öörni
6e118d237f
Unify naming of rendertargets between the Bloom & Blur postprocesses.
2015-11-02 01:41:14 +02:00
Lasse Öörni
af985e0df1
Alternative O key to create obstacles in the navigation demos. Closes #995 .
2015-10-31 22:01:04 +02:00
Lasse Öörni
385493f39a
Explain that touch input is needed for multiple dragging. Closes #997 .
2015-10-31 16:48:25 +02:00
Yao Wei Tjong 姚伟忠
c0d8415ae8
Fix the spawn button label in CrowdNavigation demo.
...
[ci skip]
2015-10-31 14:41:26 +08:00
Lasse Öörni
94a7f4ef63
Make UI element layouting not modify the user assigned minSize. Instead keep record of the min.size required by layout separately. Fix HelloGUI sample to the new behavior. Closes #955 .
2015-10-29 17:22:53 +02:00
Lasse Öörni
13bc777ab6
Fix using old attribute name in the editor. Closes #979 .
2015-10-25 20:57:05 +02:00
Lasse Öörni
19027b4ae4
Merge remote-tracking branch 'JSandusky/MemoryReporting'
2015-10-23 11:55:20 +03:00
JSandusky
83d0f9a23c
Add Z-up and handedness options to OBJ export
2015-10-22 22:44:28 -04:00
JSandusky
8e39692ef3
Show "Memory usage" DebugHud in all samples (F3 key)
2015-10-22 19:49:49 -04:00
Jukka Jylänki
bf9111b862
Make Jacks not walk in synchronized lockstep timing in 06_SkeletalAnimation sample.
2015-10-11 19:05:51 +03:00
Lasse Öörni
4bdd80775b
Add accelerator keys for reset pos/rot/scale also in editor standard mode. Add reset transform function (Alt-Q).
2015-10-10 01:09:06 +03:00
Jukka Jylänki
fc0d427557
Add support for GPU hardware instancing on Emscripten. In WebGL 1 it is exposed by the ANGLE_instanced_arrays ( https://www.khronos.org/registry/webgl/extensions/ANGLE_instanced_arrays/ ) extension, and in WebGL 2, it is enabled in core.
2015-10-09 18:58:42 +03:00
Lasse Öörni
57310eed00
Fix editor to load the produced temporary scene correctly if AssetImporter -b option is specified.
2015-10-01 18:23:17 +03:00
Lasse Öörni
65d36e4db2
Fix crash / null exception in CharacterDemo which would result if the character node did not exist after loading the scene.
2015-09-30 16:34:24 +03:00
Lasse Öörni
b362c9a953
Remove unnecessary enum qualification.
2015-09-30 10:45:05 +03:00
Lasse Öörni
3859d6dd8c
Do not export editor debug geometry to OBJ.
2015-09-29 20:52:52 +03:00
Lasse Öörni
04d74d3f33
Fix Color::BLACK to just BLACK in Localization AngelScript sample. Thanks JSandusky.
2015-09-29 20:24:34 +03:00
JSandusky
4a16d34367
Implement OBJ export functionality in editor
...
- Global utility method for writing Drawables to an OBJ in Drawable
- AllContentOctreeQuery added
- Minor fixes to Octree query angelscript bindings
2015-09-29 20:24:33 +03:00
Lasse Öörni
1d6a980136
Prevent attempting to compile the ColorCorrection function (uses unsupported sampler3D) on GLES.
2015-09-23 10:55:10 +03:00
Lasse Öörni
69f4a405b7
Removed mention of missing functionality from CrowdNavigation help text. Fixed double -> float conversion warning.
2015-09-19 13:29:37 +03:00
aster2013
afa0b68f02
Remove imp.xml sprite sheet xml file.
2015-09-17 18:10:47 +08:00
Lasse Öörni
f59b6334ff
Fixed Blur.hlsl from MonkeyFirst. Closes #899 .
2015-09-17 12:21:52 +03:00
Lasse Öörni
dc7eb0d17a
Make the editor's cube map save path setting relative to the scene resource path, instead of being a relative filesystem path. Ensure that the generated cube map XML does not have double slashes and uses resource path relative filenames. Minor code cleanup.
2015-09-14 23:42:26 +03:00
JSandusky
ebd3e67776
Correction of cubemap XML face names.
...
- Minor refinements to the camera
- Prevention of rendering debug/editor visualization
2015-09-10 13:09:10 -04:00
JSandusky
da0463ec49
Add cubemap generation capability to the Urho3D editor
2015-09-10 00:13:38 -04:00
yushli
85bd13c172
Update 33_Urho2DSpriterAnimation.lua
...
animationIndex is changed to spriterAnimationIndex
2015-09-09 13:31:40 +08:00
aster2013
5d50ad4b71
Change SetAnimtion function in AnimatedSprite2D.
2015-09-06 20:37:15 +08:00
aster2013
0f6983b3fe
rename variable.
2015-09-05 22:57:48 +08:00
aster2013
03f61b0e2d
Remove generated sprite sheet for spriter animation.
2015-09-05 22:54:33 +08:00
aster2013
7ee85555a7
typo
2015-09-05 22:37:42 +08:00
aster2013
0cded698e4
Merge from spine-spriter branch.
...
Main changes:
Make spriter as a lib
Enable spine support in AnimatedSprite2D and Animation2D.
2015-09-05 22:23:35 +08:00
Lasse Öörni
5bd672f02a
Add missing Lua bindings to SplinePath. Make hierarchy & inspector windows the same width on editor startup. Remove unnecessary attributes from EditorHierarchyWindow.xml.
2015-09-02 18:07:42 +03:00
MonkeyFirst
eb8bdd67f2
fix HW width
2015-09-02 18:07:35 +03:00
MonkeyFirst
77c7460342
add one space after "if" and fight with other spaces
2015-09-02 18:07:35 +03:00
MonkeyFirst
150865c3ee
change icons default size
2015-09-02 18:07:35 +03:00
MonkeyFirst
f484bfe915
add for B.mode distance related camera move
2015-09-02 18:07:34 +03:00
MonkeyFirst
4ee86ced6f
revert group-types-clear-commits
2015-09-02 18:07:34 +03:00
MonkeyFirst
7c403d88d9
collapse hierarchy then loading new scene
2015-09-02 18:07:34 +03:00
MonkeyFirst
50502df4a4
add option for IDs show and oneclick button for collapse tree to scene-root scope
2015-09-02 18:07:33 +03:00
MonkeyFirst
3232b79cbe
clear old updateIcons placement
2015-09-02 18:07:33 +03:00
MonkeyFirst
14f35757cd
add SplinePath check for length
2015-09-02 18:07:33 +03:00
MonkeyFirst
06e186bd73
fix-ghost-icons
2015-09-02 18:07:33 +03:00
Yao Wei Tjong 姚伟忠
f9e27e33f2
Ensure Lua function references are released when refcounter reaches 0.
...
Add support for constructing Lua function from C function.
2015-08-28 16:27:30 +08:00
Lasse Öörni
56b218a236
Fix indent & if statement space.
2015-08-27 09:45:16 +03:00
MonkeyFirst
46aa0c52e1
fix-m-typing
2015-08-26 23:51:13 +06:00
Yao Wei Tjong 姚伟忠
934c640835
Fix Lua binding for Localization and Database subsystems.
...
Fix Lua version of the localization demo.
2015-08-24 18:14:06 +08:00
Lasse Öörni
47fe410d06
Suppress scene changes while toggling the debug icons visibility during preview camera render so that the attribute editor doesn't constantly refresh, making attributes uneditable. Closes #854 .
2015-08-24 11:48:21 +03:00
Yao Wei Tjong 姚伟忠
61647bb887
Optimize Lua Variant class bindings.
...
Take advantage of Lua being type-less by binding generic methods that can handle all the supported data type conversion.
At the same time reduce the amount of the overloads generated by tolua++ which could be potentially just dead code.
2015-08-24 13:26:25 +08:00
Yao Wei Tjong 姚伟忠
b1e1ab47c3
Fix Lua version of crowd simulation demo due to VariantMap API changes.
2015-08-21 23:32:37 +08:00
Lasse Öörni
0e3c778f34
Fix using null handle when updating temporary component state. Closes #848 .
2015-08-19 18:33:22 +03:00
Yao Wei Tjong 姚伟忠
ac0a712f0b
Refactor to rename 'filter type' to 'query filter type'.
...
Minor clean up on the NavBuildData class.
2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
27cc9c4277
Add filter and obstacle avoidance type attribute to CrowdManager class.
...
Enhance Editor to have functionality to edit the CrowdManager's filter and obstacle avoidance type attributes.
2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
c9bc4cbae3
Add new event for crowd agent formation.
...
Add convenient methods for querying point, path, raycast, etc using crowd's extent and filter type configuration.
2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
549b6fd8be
Add crowd update callback support. Remove redundant vectors.
2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
2c3033d62a
Limit interface to use only crowd agent's parameters and public APIs.
2015-08-16 15:43:12 +08:00
Lasse Öörni
7f4b115744
Make Drawable2D respect viewmask in rendering & raycast. Added viewmask attribute to Drawable2D's. Added proper category to 2D constraints to allow adding in editor. Closes #843 .
2015-08-15 13:23:37 +03:00
Lasse Öörni
4f2a35eeb7
Merge remote-tracking branch 'cosmy1/master'
2015-08-15 12:45:11 +03:00
Lasse Öörni
70b871ebfa
Code convention edits. Removed unused variable. Make debug icons use Basic shader for no fog. Do not render debug icons to camera preview viewport. Fixed Basic shader with VERTEXCOLOR define on D3D11.
2015-08-14 23:09:53 +03:00
Lasse Öörni
54649e7bb0
Merge remote-tracking branch 'monkeyfirst/debug-component-icons'
2015-08-14 22:25:04 +03:00
cosmy
22955e8ef5
Italian localization
...
Added Italian language to the editor.
2015-08-14 21:15:27 +02:00
MonkeyFirst
baedabf443
freeze icon's size in 2d
2015-08-14 02:30:19 +06:00
MonkeyFirst
72cf018c5f
resize zone icon
2015-08-14 01:53:27 +06:00
MonkeyFirst
37826c796b
change trigger icon
2015-08-14 01:50:36 +06:00
MonkeyFirst
bbe7b8f965
del empty lines
2015-08-13 23:51:03 +06:00
MonkeyFirst
cb6039a2b9
arrayed BS, blend & discard icons by distance
2015-08-13 23:34:13 +06:00
MonkeyFirst
43f2c2d618
fix icons min size
2015-08-13 01:12:04 +06:00
MonkeyFirst
aa673321dc
add footprint for splinepath
2015-08-12 23:17:50 +06:00
MonkeyFirst
9c6164e4fd
add trigger, custom geometry, particle emitter icons
2015-08-12 22:20:37 +06:00
Yao Wei Tjong 姚伟忠
55e68f4e0e
Code cleanup and bug fixes for DB subsystem and ToluaUtils refactoring.
2015-08-12 17:33:25 +08:00
Lasse Öörni
c254205bce
Recognize OTF files without going to XML parsing (which fails). Closes #830 .
2015-08-12 10:57:38 +03:00
MonkeyFirst
10c117c1bb
avoid update icons when debug icons not visible
2015-08-12 10:07:21 +06:00
MonkeyFirst
fc37f268fb
increase update time for splinepath
2015-08-12 09:38:55 +06:00
MonkeyFirst
9c0ab25999
add begin and end of splinepath coloring
2015-08-12 09:21:02 +06:00
MonkeyFirst
8670dd6f3c
add show spline path debug
2015-08-12 08:34:34 +06:00
MonkeyFirst
886668ab13
add debug temp container(node) and clear scene's scope
2015-08-12 01:35:00 +06:00
MonkeyFirst
4424b98715
add debug icons
2015-08-12 00:45:17 +06:00
Yao Wei Tjong 姚伟忠
4edba76ec2
Fix AngelScript and Lua bindings. Fix Lua samples to use new getters.
...
Tips: use this one liner to convert Lua scripts to use new getter signature.
find . -type f -exec grep -lP "eventData:Get.+?\(.+?\)" {} \; |xargs -n 1 perl -pi.bak -e 's/eventData:Get(.+?)\((?:([^,)]+),\s*(.*?)|(.+?))\)/eventData[\3\4]:Get\1(\2)/g'
2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
4807206bd7
Bind all variant types from C++ to Lua and vice versa. See #820 .
...
Other misc Lua binding enhancements:
- VariantMap in Lua can be indexed using both string literal and unsigned int literal. Internally they are both converted to StringHash. Lua table of strings/variants and any registered user types are now accepted as RHS value when assigning VariantMap's value, the variant type would be set accordingly based on the lua object type. Refcounted object would end up as VAR_PTR while others as VAR_VOIDPTR.
- Variant knows how to convert to string implicitly.
2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
8acb9e6441
Fix Variant and VariantMap bindings to Lua. Close #820 .
...
Add Lua bindings to return VariantVector as table of Variant.
Fix Lua database demo. It is in full working condition now.
[ci only: database, OSX]
2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
842de2fe48
Exposed the database subsystem API to scripting.
...
Add AngelScript version of the database demo.
Add Lua versio nof the database demo. WIP.
2015-08-10 01:51:26 +08:00
Lasse Öörni
5aaa3ea680
Fix the editor variable type popups not showing all text.
2015-08-08 14:32:48 +03:00
Lasse Öörni
a626021d95
Fixes for VS texture fetch on D3D11.
2015-08-06 22:28:05 +03:00
Lasse Öörni
b53b584123
8-bit render order support in materials. This adjusts the drawing order within a scene pass, and takes precedence over both state & distance sorting.
2015-08-06 16:42:52 +03:00
Lasse Öörni
d9d09909d4
Removed commented out code. Minor editor code formatting & typo fixes.
2015-08-05 21:28:47 +03:00
MonkeyFirst
99ad65844f
add more event to main editor handlers
2015-08-05 15:43:15 +06:00
MonkeyFirst
5da0bea816
global-editor-handlers
2015-08-05 04:21:39 +06:00
Lasse Öörni
fba5948ab0
Allow to disable rendering of the whole UI (except for the cursor and modal elements) by setting the UI root to not visible. Added new function UIElement::IsVisibleEffective() which checks for propagated visibility. Make sure to clear focus also if a child element (that has focus) becomes effectively invisible. Closes #811 .
2015-08-04 17:47:46 +03:00
Lasse Öörni
fe9eee4947
Merge remote-tracking branch 'monkeyfirst/fixed-event-handlers-4-b.mode'
2015-08-03 12:16:18 +03:00
Christian Clavet
13d2264abb
Updated french language
...
Updated the french language:
- Added new strings for the new terms
- Changed some whitespaces to tabs
- Improved translation
2015-08-01 17:42:45 -04:00
MonkeyFirst
038ec8c286
fixed missing event handler from color wheel after layer use
2015-08-02 03:08:23 +06:00
Lasse Öörni
c14d6ba4b7
Editor code convention edits. Use Alt+W for color wheel in both hotkey modes.
2015-07-31 22:00:48 +03:00
Lasse Öörni
baa40d62cb
Uppercase the HSV editor image to match existing files' convention.
2015-07-31 21:50:25 +03:00
Lasse Öörni
5344d386b0
Merge remote-tracking branch 'monkeyfirst/hsv-color-wheel'
2015-07-31 21:23:54 +03:00
MonkeyFirst
b42cb1ed2a
simplify menu localization
2015-07-31 02:46:23 +06:00
Lasse Öörni
9977ee909b
Fix line height in the included .sdf font files. Force reevaluation of material when font changed from ttf to sdf or vice versa. Added .sdf to attribute editor font picker. Closes #801 .
2015-07-30 23:27:31 +03:00
MonkeyFirst
c3b52a9e47
hsv-color-wheel
2015-07-30 01:57:16 +06:00
Lasse Öörni
d85cbd21db
Spaces back to tabs in EditorStrings.json.
2015-07-29 17:13:31 +03:00
Christian Clavet
6ee3237d47
Fixed some typos
...
Fixed some comma missing for the JSON file.
2015-07-28 17:10:16 -04:00
Christian Clavet
899a9bb7fa
Added missing strings (french)
...
For some reasons, some strings were missing at the beginning of the
file. Double checked and all the strings are completed.
English-Russian-French
2015-07-28 17:03:03 -04:00
Christian Clavet
7f4073be60
French strings addon
...
Added french strings
2015-07-28 16:33:01 -04:00
Lasse Öörni
61a7d65393
Explicitly set alpha blend mode for toolbar icons. See #799 .
2015-07-27 17:52:07 +03:00
Lasse Öörni
b74c2360f8
Restored original controls in standard hotkeys mode. The MMB pan option (standard hotkeys mode only) now changes the behavior of shift in relation to pan & orbit only. Editor code cleanup & code convention edits.
2015-07-27 17:35:10 +03:00
Lasse Öörni
50013c85d4
Merge remote-tracking branch 'monkeyfirst/hotkeys-smg-instances'
...
Conflicts:
bin/Data/EditorStrings.json
2015-07-27 16:26:42 +03:00
Ivan K
e91ddb3e58
Localization: fix string IDs conflict
2015-07-27 14:50:26 +04:00
Ivan K
15001acdb8
Russification: Particle Editor
2015-07-27 13:55:15 +04:00
Ivan K
6308da0c63
Russification: Material Editor
2015-07-27 13:28:10 +04:00
Ivan K
d0424bdf87
Russification: Attribute Inspector, resource picker buttons
2015-07-27 12:37:24 +04:00
Ivan K
77be3c88c4
Russification: FileSelector
2015-07-27 11:36:03 +04:00
MonkeyFirst
f1625c6fc7
WeakHandle for last... some polishing for B.mode delete
2015-07-26 22:04:27 +06:00
MonkeyFirst
7807e88e30
default pan for 2d, viewCloser for 2d , alt+scroll-zoom
2015-07-26 04:24:01 +06:00
Lasse Öörni
148bd67938
Do not attempt to localize MRU scene list in editor.
2015-07-25 22:27:17 +03:00
MonkeyFirst
7cf954d4fd
delete unused variables
2015-07-25 22:53:54 +06:00
MonkeyFirst
8fc2ae9436
some fixes for smart duplicate
2015-07-25 22:47:02 +06:00
MonkeyFirst
c35ddfedcf
fix ViewCloser camera placement
2015-07-25 01:31:09 +06:00
MonkeyFirst
ea02dcf9d1
delete unused action
2015-07-24 23:55:48 +06:00
MonkeyFirst
74f416b92c
fixed with StaticModels and renamed into smart duplicate
2015-07-24 23:35:39 +06:00
MonkeyFirst
892a353c2f
add B.mode view closer on kp_period
2015-07-24 16:54:55 +06:00
MonkeyFirst
df91bae159
add force to selecting node instead component in view port
2015-07-24 03:59:56 +06:00
MonkeyFirst
7de2a25206
auto instance
2015-07-24 02:45:05 +06:00
Lasse Öörni
d388ee7769
Lift the editor hotkeys dropdown higher in the settings window, grouped with rest of camera behavior controls.
2015-07-23 15:48:42 +03:00
Lasse Öörni
9e978e767c
Merge remote-tracking branch 'monkeyfirst/material-editor-few-model-preview'
...
Conflicts:
bin/Data/Scripts/Editor/EditorView.as
2015-07-23 15:40:41 +03:00
MonkeyFirst
85e34c5b20
add B. mode rotation when no selection & dox controls2 fix
2015-07-23 15:40:32 +06:00
Ivan K
345954d5aa
Editor: automatic creating language list
2015-07-22 16:09:40 +04:00
Ivan K
d00438c224
Editor: select language in preferences
2015-07-22 15:40:35 +04:00
MonkeyFirst
8a1c80796c
bledner mode mmb pan, flymode off by rmb or esc
2015-07-22 02:42:49 +06:00
MonkeyFirst
276937d054
blender mode add strafe in ortho w shift & ctrl
2015-07-22 01:44:46 +06:00
MonkeyFirst
3f8cb158d4
blender mode fixes: select w shift , strafe, pan
2015-07-22 01:30:18 +06:00
Ivan K
eb2457ce6a
editor russification, add warnings to Localization::LoadJSON
2015-07-21 23:12:20 +04:00
MonkeyFirst
c3f6f1c423
fixed camera move on shift-d
2015-07-21 23:26:00 +06:00
MonkeyFirst
5907f6c22b
Add mask selector, bits inversion, scroll types
2015-07-21 20:55:39 +06:00
Lasse Öörni
87c8a0874a
Merge remote-tracking branch '1vanK/improvements'
2015-07-21 13:46:06 +03:00
Lasse Öörni
14fe2ad334
Remove unused variable that was moved & renamed elsewhere.
2015-07-20 18:14:22 +03:00
MonkeyFirst
43df9f2e7c
fix include in editor.as
2015-07-20 04:00:17 +06:00
MonkeyFirst
f401a4992e
dialog settings fix
2015-07-20 03:13:01 +06:00
MonkeyFirst
9c8ba2e2b0
Add EditLayerWindow for fastest mask view change (with children nodes)
2015-07-20 02:59:22 +06:00
Ivan K
d540f79eec
Localization: fixes, adding comments, reworking samples, partial russification of editor
2015-07-19 16:07:24 +04:00
MonkeyFirst
64e7435eca
fix "standard" word
2015-07-19 17:07:14 +06:00
MonkeyFirst
1f519959aa
Add feature that allow to enable all hidden before nodes on one hotkey
2015-07-19 06:03:27 +06:00
MonkeyFirst
c9910c8c96
Add feature to parent selected nodes into last selected node
...
Add feature to parent selected nodes into last selected node
Standart key mode - U-key
Blender key mode - P + Ctrl
2015-07-19 04:44:11 +06:00
MonkeyFirst
b0c16c030a
Add to editor settings UI option
2015-07-19 01:45:35 +06:00
MonkeyFirst
f5e1e10b6a
Add hotkeys mode switching between standart & blender
2015-07-19 01:41:23 +06:00
Ivan K
1d845712c8
Internationalization: initial commit
...
Localization
2015-07-18 14:43:51 +04:00
MonkeyFirst
6b927e8533
add few models for preview
2015-07-18 03:05:20 +06:00
MonkeyFirst
721f121c91
init blender-keys-branch
2015-07-18 00:23:34 +06:00
Lasse Öörni
0fc4cdf12c
Tabs to spaces. Moved MMB pan setting from Preferences dialog to Settings dialog to match the rest of the camera options. Added contributor credit.
2015-07-17 18:08:57 +03:00
julyfortoday
e10aef79cf
Save/load mmbpan setting to/from xml, fixed naming
2015-07-17 09:07:25 -04:00
julyfortoday
6d8e057a7e
Added togglable setting for changing the behavior of the MMB, allows panning by default instead of rotation/orbit
2015-07-16 22:26:51 -04:00
julyfortoday
0981492802
Center camera on selected object using the HOME key
2015-07-16 18:25:00 -04:00
Mike3D
a25f596e08
Added missing file formats to Editor's resource browser
2015-07-16 07:52:47 +02:00
Lasse Öörni
37f13c91d9
Remove double semicolon.
2015-07-15 00:59:12 +03:00
Lasse Öörni
9b629b2a36
Editor functionality to assign child nodes as a spline path. Contributed by MonkeyFirst. Closes #781 .
2015-07-15 00:57:55 +03:00
Lasse Öörni
86d9f6e4cb
Restore @echo off to Editor.bat.
2015-07-14 19:35:14 +03:00
Lasse Öörni
989346f3a5
Merge remote-tracking branch '1vanK/EditorImprovements'
2015-07-14 19:33:13 +03:00
Lasse Öörni
6f8ed55c0a
Fix the Depth shader on D3D11. Simplify View code to determine whether a substitute RT for the backbuffer is needed. Fix having to render the hardware depth stencil twice in the ForwardDepth renderpath.
2015-07-14 19:32:58 +03:00
Ivan K
f317df2961
Adding a button 'Reset Viewport' and checkbox 'Show Axes' for particle editor
2015-07-14 11:56:53 +04:00
Ivan K
8d37ae8e3d
Fix scaling particle preview
2015-07-13 16:14:53 +04:00
Ivan K
0532ea5c6f
Big particle preview and scaling preview with LMB + LShift
2015-07-13 15:50:58 +04:00
Ivan K
e4304645a2
Starting the Editor without an empty console window
2015-07-13 11:55:01 +04:00
Lasse Öörni
ffa0b96e85
Fix typo. Ensure new node positioning uses world position in case the new node is parented.
2015-07-12 16:19:39 +03:00
Ivan K
8adcd0a965
Editor new node position
2015-07-12 13:48:24 +04:00
Lasse Öörni
986c4ca6fc
If CollisionShape trimesh or convex shape assigned without a collision model, try to get it from the StaticModel in the same node. Closes #769 .
2015-07-11 21:18:50 +03:00
Mike3D
84cb5abf0b
Increased precision qualifiers to medium for better compatibility across mobile devices. Closes #763 .
2015-07-04 12:39:30 +02:00
Lasse Öörni
4219b7b157
Revert mistaken change to 20_HugeObjectCount.as.
2015-07-24 17:11:10 +03:00
Lasse Öörni
e8af02f453
Add double serialization support to Variant, Deserializer/Serializer, XMLElement & JSONValue. Use double to store a Lua object's number attributes. Add editing of double attributes to the editor. Closes #758 .
2015-06-29 22:36:12 +03:00
Lasse Öörni
368cd56955
Fix FXAA3 shader on OpenGL 3. Add non-deprecated aliases for texture2DLod in Samplers.glsl. Thanks to Gunnar Kriik.
2015-06-14 01:55:55 +03:00
Lasse Öörni
6b6447eb8c
Detect presence of AssetImporter in either tool subdirectory or in the executable directory.
2015-06-09 21:23:04 +03:00
Yao Wei Tjong 姚伟忠
88d86548a4
Further minor clean up the CrowdAgent class.
...
Revise the sample so Jack walk and turn more naturally.
2015-05-28 17:52:12 +08:00
Yao Wei Tjong 姚伟忠
6b72c4412a
Minor code clean up and bug fixes for DetourCrowd implementation.
...
Avoid using multiple vectors to hold the same set of objects in the DetourCrowd sample.
2015-05-27 21:51:10 +08:00
Mike3D
e166e7a84d
Added moving obstacles and teleportation to sample 39. Also various behavior tweaks and ground texture modified to break monotony and discriminate with sample 15. If something doesn't appeal it can be reverted.
...
Also set default mask and areaID at OffMeshConnection initialization.
2015-05-23 09:27:39 +02:00
Mike3D
7f3a6ef86b
Added off-mesh connections to sample 39
2015-05-20 10:56:32 +02:00
Yao Wei Tjong 姚伟忠
e7e2c262e5
Make button slider not focusable so it is easier to tab around.
2015-05-19 15:33:59 +08:00
Mike3D
3fbb34f406
Use node instead of GetNode() in lua samples
...
Also simplified sample 15 for lua
2015-05-17 17:30:37 +02:00
Lasse Öörni
f9f920964f
Remove agents & obstacles on OnNodeSet(null), similar to Drawables. Do not allow adding an agent when node is already null. Added missing enum in AngelScript navigation API. Do not keep a persistent array of agent handles in the AngelScript crowd example, as that keeps the agents alive even past removal from scene. Closes #729 .
2015-05-17 16:54:57 +03:00
Mike3D
cca861f6d3
Simplified sample 39 using the crowd manager
2015-05-17 10:15:41 +02:00
JSandusky
ca7a6af1f3
CrowdAgent state handling
...
- CrowdAgentStateChanged event includes Node and Agent parameters
- CrowdAgentFailure event for target/agent-state failures
- GetAreaCost in NavigationMesh, script bindings updated
- Fixed error spawning Jack nodes on top of boxes in Angelscript sample
- DebugRendering for DynamicNavigationMesh layers
- Rename all references to AreaType as AreaID
- CrowdAgent angelscript enum bindings made consistent
- Include simple example handling of CrowdAgentFailure for faulty
initial state (sides of boxes) in all samples
- Consistent values in samples (box/mushroom counts)
- Completed "todo" for investigating rcFilterLedgeSpans in
DynamicNavigationMesh
2015-05-12 02:29:32 -04:00
Lasse Öörni
b6889b68df
In DeferredHWDepth renderpath, clear albedo rendertarget explicitly to prevent ghosting bugs from previous frames in case stencil is not available.
2015-05-10 15:09:42 +03:00
Lasse Öörni
2a34d35dec
Added missing vertex color variation to the LitSolid shaders.
2015-05-08 12:41:59 +03:00
Lasse Öörni
9c226e2c3c
Added pure diffuse vertexcolor & notexture vertexcolor techniques.
2015-05-08 11:03:44 +03:00
Mike3D
581d1b550b
Do not hardcode obstacle radius
2015-05-07 17:20:05 +02:00
Yao Wei Tjong 姚伟忠
252206a207
Decouple Physics subsystem from DetourCrowd implementation.
...
Also minor code clean up (dot the i's and cross the t's).
2015-05-07 16:52:18 +08:00
Lasse Öörni
f4b5ead164
On D3D11 & OpenGL3, convert luminance & luminance-alpha textures to RGBA on upload. Revert RampGenerator & Spot/SpotWide texture changes to use RGB format. Closes #718 .
2015-05-06 17:23:10 +03:00
Lasse Öörni
8f29e751b7
Fix memory leak in NavBuildData. Match capitalization of the CrowdNavigation help text in all versions.
2015-05-05 17:58:31 +03:00
Lasse Öörni
fe30619479
Merge remote-tracking branch 'JSandusky/DetourNavigation'
2015-05-05 14:53:10 +03:00
JSandusky
567a29d74e
Implementation of DetourCrowd and DetourTileCache
...
Added Components:
- DynamicNavigationMesh (uses DetourTileCache)
- Obstacle (interacts with DynamicNavigationMesh)
- DetourCrowdManager (uses DetourCrowd for crowd control)
- CrowdAgent (interacts with DetourCrowdManager)
- NavArea (marks area types)
Changes:
- Refactor NavigationMesh build process
- Addition of cylinder debug rendering
- Exposed Area Type Costs in navigation
CrowdNavigation sample for Lua, Angelscript, and C++ using
DynamicNavigationMesh, Obstacle, CrowdAgent, and DetourCrowdManager
components.
2015-05-04 22:14:00 -04:00
Lasse Öörni
c9bb360bf4
Fix AutoExposure shader on D3D11. Closes #714 .
2015-05-04 21:26:52 +03:00
Lasse Öörni
aa65cedefd
Add NOUV define to LitParticle, LitSolid & Unlit HLSL shaders when used as untextured, to prevent vertex layout creation problem on D3D11 when model has no UVs. Remove texcoords from the editor grid as they're no longer necessary. Closes #712 .
2015-04-29 20:09:18 +03:00
Lasse Öörni
ba777f0d17
Fix omissions in Lua VertexBuffer / IndexBuffer / Model bindings. Add 34_DynamicGeometry.lua example. Closes #704 .
2015-04-27 13:32:39 +03:00
Lasse Öörni
0235c02653
Expose Geometry, IndexBuffer & VertexBuffer to script, with VB & IB content access using VectorBuffer. AngelScript 34_DynamicGeometry example. Lua version to follow.
2015-04-27 10:29:38 +03:00
Lasse Öörni
97fb2638db
Add fill mode to materials.
2015-04-04 02:40:38 +03:00
Lasse Öörni
b26b2c470b
Fix Text shader non-SDF mode on OpenGL 3. Closes #685 .
2015-04-01 21:33:48 +03:00
Lasse Öörni
2961166acb
Graphics code cleanup. Remove the GraphicsFeatures event, as now the features can not change during runtime. Move all OpenGL extensions checks to CheckFeatureSupport(). Fix an AMD GLSL compilation bug, which caused buggy 4-sample shadows.
2015-03-31 23:06:09 +03:00
Lasse Öörni
73b0a8221a
Fix illegal use of texture3D on OpenGL 3. Closes #683 .
2015-03-25 14:18:33 +02:00
Lasse Öörni
d06ffe1445
Merge pull request #680 from urho3d/render-refactor
...
Render refactor
2015-03-24 23:34:39 +02:00
Lasse Öörni
b8c7c59eca
Configure amount of allowed bones for hardware skinning based on the rendering API. Allow 128 bones on Direct3D 11 & OpenGL 3. Add -mb (maxbones) parameter to AssetImporter & OgreImporter. When using OpenGL 3, allow deferred rendering to use different MRT formats without forcing an RGBA substitute rendertarget.
2015-03-21 23:22:08 +02:00
Lasse Öörni
81e6647b60
Clean up OpenGL Graphics class code. Use core functions for instancing on OpenGL 3. Do not enable/disable texture targets on OpenGL 3. Removed the framebuffer aging mechanism; instead framebuffers are cleaned up on context loss (resolution change.) Disable OpenGL constant buffer use by default (from Uniforms.glsl) as they were found to be slower in practice.
2015-03-21 01:56:38 +02:00
Lasse Öörni
040b6263f5
Fix crash with null constant buffer slots.
2015-03-18 20:54:21 +02:00
Lasse Öörni
2cefd437de
Check if shader uses uniforms outside buffer and invalidate all parameter groups in that case, when switching shaders. Add define in Uniforms.glsl which allows to disable constant buffers on OpenGL 3, as using them may actually be slower.
2015-03-18 10:27:46 +02:00
Lasse Öörni
0e5a05afc7
OpenGL 3 constant buffer support.
2015-03-18 02:40:28 +02:00
Lasse Öörni
992cbcc73f
Fix GLSL deprecation warnings. OpenGL 3 clip plane support. Use R32F format on OpenGL 3 for deferred linear depth instead of manual RGB encoding & decoding.
2015-03-17 01:01:11 +02:00
Lasse Öörni
07a75dc37b
Initial OpenGL 3.2 support.
2015-03-16 23:36:35 +02:00
Lasse Öörni
2858755334
Log missing vertex element(s) when vertex layout fails to create. Add texcoords to the editor grid to keep D3D11 happy.
2015-03-15 00:23:49 +02:00
Lasse Öörni
3759570319
Remove rrr swizzle from lighting shaders to allow the spotlight to be colored. Convert the default spot textures to RGB color to avoid sampling only the R channel on D3D11.
2015-03-12 21:25:42 +02:00
Lasse Öörni
dffab8cff1
Add item to Edit menu ("Add children to SM-group") to add all children of the StaticModelGroup node as instances. Closes #676 .
2015-03-09 21:14:04 +02:00
Lasse Öörni
4e308f21c3
3D textures on D3D11. Fixed the ColorCorrection shader.
2015-03-08 20:16:15 +02:00
Lasse Öörni
72a153f1a3
Fix Tonemap shader for D3D11.
2015-03-08 16:23:23 +02:00
Lasse Öörni
871fc3abea
Fix erroneous UI rendering after compiling the Text shader, by listing texcoord interpolator before color.
2015-03-08 16:15:17 +02:00
Lasse Öörni
e106f1b389
D3D11 clip plane support. Check that multisample level is supported. Various shader fixes.
2015-03-08 02:57:08 +02:00
Lasse Öörni
b9278e0a94
Implement partial rendertarget clear on D3D11. Implement Graphics::ResolveToTexture() on D3D11. Fix most post-process shaders on D3D11. Readded the custom constant buffer slot. Update documentation.
2015-03-07 23:02:31 +02:00
Lasse Öörni
988f1fdc33
Merge branch 'master' into render-refactor
2015-03-07 17:59:37 +02:00
Lasse Öörni
1c549bceee
Import also empty child nodes in AssetImporter scene mode, unless disabled with the -ne option. Refactor handling of the root scene node to prevent unnecessary creation of a duplicate root node. Do not attempt to parse .json files as XML in the editor resource browser. Closes #673 .
2015-03-07 13:36:27 +02:00
Lasse Öörni
6112220b16
Cube maps, point light shadows & deferred / light prepass rendering on D3D11.
2015-03-05 23:32:16 +02:00
Lasse Öörni
8b49a21587
Fix shadow alpha mask shader.
2015-03-05 00:42:19 +02:00
Lasse Öörni
4542e38b73
Fix terrain shader on D3D11.
2015-03-05 00:32:25 +02:00
Lasse Öörni
17cf79ab82
D3D11 rendertarget and initial shadow (directional & spot light) support. Fix creating too many rasterizer states for depth bias by quantizing. Fix crash on exit if states failed to create.
2015-03-05 00:21:21 +02:00
Lasse Öörni
6fd6efc4c3
Update PugiXml to 1.5. Do not attempt to parse .txt & .icns files as xml in the editor resource browser, to prevent log spam.
2015-03-04 16:10:21 +02:00
Lasse Öörni
e919935abd
Merge back D3D9 & D3D11 shaders using macros. Removed the "custom" constant buffer slot; rather allow to prevent the default material CB from being defined.
2015-03-02 03:39:21 +02:00
Lasse Öörni
73c847fbeb
Separate D3D11 shaders as the compatibility mode did not sample eg. the light ramp texture correctly.
2015-03-01 19:14:56 +02:00
Lasse Öörni
d7a16d6713
Fix potential negative specular lighting. Fix recreating the sampler state when a texture has been reloaded.
2015-03-01 14:08:01 +02:00
Lasse Öörni
a1d1f08190
Split uniforms into constant buffers on D3D11.
2015-02-28 21:09:41 +02:00
Lasse Öörni
0c48c9df87
Fix Assimp to not give negative light direction. Fix FOV handling for spot lights in AssetImporter. Added error prints to Editor if fails to execute AssetImporter. Closes #669 .
2015-02-24 12:19:25 +02:00
Lasse Öörni
9f129ecd51
Merge branch 'master' into render-refactor
2015-02-23 01:43:02 +02:00
Lasse Öörni
4fd2fe20b8
Fix Editor to not use the sm3Support variable any more.
2015-02-22 02:19:23 +02:00
Lasse Öörni
88080dad31
Remove Shader Model 2 mode & instancing without stream offset (D3D9) as they are hard to test. Added Graphics::GetApiName() function.
2015-02-21 20:53:12 +02:00
Chris Friesen
28b511df32
Added copy cam transform to editor for easy cam alignment
2015-02-17 00:06:01 -06:00
Lasse Öörni
56f64c60b9
Texture unit refactoring. On desktop ensure continuous range of 8 material texture units, while mobile has 5. Material can define a volume (3D) texture in the volume unit (desktop only.)
2015-02-15 15:33:16 +02:00
Lasse Öörni
6be3b14855
Merge branch 'master' into render-refactor
2015-02-15 12:59:09 +02:00
Lasse Öörni
3f2f88441d
Enable cascaded shadows on Emscripten.
2015-02-14 23:30:22 +02:00
Chris Friesen
57eeeb84b1
Fix terrain shader in chrome by explicitly setting precision
2015-02-13 21:31:59 +08:00
Lasse Öörni
b96f47db61
Change order of matrix multiplies in GLSL to eliminate need to transpose matrix uniforms and make the order consistent with skinned & instanced rendering.
2015-02-12 00:05:32 +02:00
aster2013
392efab9d7
Change GetIntensity, make it same to Color::Luma().[ci skip]
2015-02-04 13:26:41 +08:00
aster2013
c8ed3759d8
Fix bug.[ci skip]
2015-02-03 19:36:28 +08:00
Lasse Öörni
5198313a93
Fix null exception in multiple nodes duplication. Closes #632 .
2015-01-26 01:12:05 +02:00