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

435 Commits

Author SHA1 Message Date
Arnis Lielturks
d4cf8a9f05
localization JSON file now supports simple key-value structure (#2359) 
* localization JSON file now supports simple key-value structure

* docs updated, code refactoring

* minor fix

* AngelScript integration fixed
 2019-02-16 14:42:01 +02:00
urho3d-travis-ci
a476f0c401 Travis CI: bump copyright to 2019. 2019-01-12 01:00:16 +00:00
Arnis Lielturks
e363036036
kNet replaced with SLikeNet (RakNet fork). 2018-08-11 20:35:09 +08:00
Yao Wei Tjong 姚伟忠
d827f5ebfb
Proper segregation between Gradle modules. 2018-08-06 21:46:00 +08:00
Eugene Kozlov
4d8a0fd31c
Merge pull request #2336 from rokups/feature/flagset 
Replace integer constants with enums and use FlagSet<Enum> for flags
 2018-07-14 18:16:59 +03:00
LordGolias
45793b8ae2 Fixed wrong number of rows in chat history of Sample 16_Chat. 2018-06-23 22:51:53 +02:00
LordGolias
dd9532de51 Commented out unused parameters. 2018-06-23 22:50:21 +02:00
Eugene Kozlov
82c5529295 Rename Quality to MaterialQuality. Revert AnimationTrack default ctor. Rename UseEvent to UpdateEvent. Make FlagSet casts more strict. Minor changes. 2018-06-20 01:24:37 +03:00
Rokas Kupstys
966590d8e7 Use FlagSet<> for storing masks. 
Author of FlagSet.h is Eugene Kozlov (https://github.com/eugeneko/).
 2018-06-18 18:26:46 +03:00
Eugene Kozlov
bf91b675ea Revert "Revert me: Test Vector with non-copyable type." 
This reverts commit 82cc60d974.
 2018-06-03 12:51:08 +03:00
Eugene Kozlov
82cc60d974 Revert me: Test Vector with non-copyable type. 2018-04-30 15:12:13 +03:00
Yao Wei Tjong 姚伟忠
db2f6c9c33
Clang-Tidy - bugprone-integer-division. 2018-04-01 10:48:47 +08:00
Yao Wei Tjong 姚伟忠
d43bf1b3d6
Clang-Tidy - hicpp-signed-bitwise. 
However, this check is disabled because we could not cleanly modify the code everywhere to make them pass.
 2018-04-01 10:48:47 +08:00
Uchechukwu Nwokoma
03d8c40252 Added URHO3D_URHO2D guard that seems omitted 2018-03-29 23:47:38 +08:00
Yao Wei Tjong 姚伟忠
6d08bcd8c0
Clang-Tidy - hicpp-member-init. 2018-02-25 23:32:38 +08:00
Yao Wei Tjong 姚伟忠
3a76654c44
Demonstrate how to bring to front an UI-element. 
Close #2251.
 2018-02-04 16:11:50 +08:00
Yao Wei Tjong 姚伟忠
d368227648 Minor formatting and modernizing the code. 
Close #2214.
 2018-01-26 07:56:25 +08:00
Ricardo Abreu
c6a6598764 Add stretchable sprite component and corresponding sample. 2018-01-26 06:57:23 +08:00
Yao Wei Tjong 姚伟忠
f1c1f5aa42 For CI - setup the lint stage on the primary CI. 2018-01-24 02:06:23 +08:00
Yao Wei Tjong 姚伟忠
29fed24492 Rinse and repeat by invoking clang-tidy (v3.9) from CLI directly. 
It appears that Clion's modified version of the clang-tidy does not detect and fix all the issues.
 2018-01-22 23:34:16 +08:00
Yao Wei Tjong 姚伟忠
2435a523d7 Clang-Tidy - readability-misleading-indentation, actually it's a bug. 2018-01-20 23:52:03 +08:00
Yao Wei Tjong 姚伟忠
f7ad9b138e Clang-Tidy - performance-unnecessary-copy-initialization. 2018-01-20 23:52:03 +08:00
Yao Wei Tjong 姚伟忠
1156ebfcec Clang-Tidy - cert-flp30-c. 2018-01-20 23:52:03 +08:00
urho3d-travis-ci
70049ba582 Travis CI: bump copyright to 2018. 
[cache clear]
 2018-01-01 05:35:37 +00:00
Yao Wei Tjong 姚伟忠
e2ecc52adc Clang-Tidy - cert-err58-cpp (WIP). 2017-12-31 15:38:09 +08:00
Yao Wei Tjong 姚伟忠
d6eb307e34 Clang-Tidy - google-explicit-constructor. 2017-12-31 13:48:28 +08:00
Yao Wei Tjong 姚伟忠
c99c5fbf64 Clang-Tidy - modernize-use-equals-default. 2017-12-31 13:48:26 +08:00
Yao Wei Tjong 姚伟忠
c8bc642020 Clang-Tidy - modernize-use-nullptr. 2017-12-31 13:48:25 +08:00
Yao Wei Tjong 姚伟忠
446247fa8c Clang-Tidy - modernize-loop-convert. 2017-12-31 13:48:08 +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
thesquib
7acefc3d88 Setup tests correctly in CMakeLists 2017-11-23 23:04:08 +13:00
thesquib
b46db86f24 Updated for current Urho3D, modified isometric demo to include interactions similar to the 2d platformer. 2017-11-23 23:01:51 +13:00
Mike3D
e7ff66e6d7 Added 2 Urho2D samples (isometric demo and platformer) 2017-11-23 23:01:50 +13:00
Yao Wei Tjong 姚伟忠
de58ce17a3 Merge branch 'master' of https://github.com/att-kin9/Urho3D into master. 
Close #2164.
 2017-11-12 17:13:06 +08:00
att-kin9
7ab0d69d0b
Deleted default parameter passed. 2017-11-08 22:49:02 +08:00
att-kin9
29e92fd246
Fixed failing for picking rigidbody. 
Fixed failing for picking rigidbody on touch devices.
 2017-11-07 11:42:03 +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
50fbdbd12e UIComponent AngelScript API fix, AS example and shutdown crash fix. 2017-08-23 22:02:51 +03:00
Lasse Öörni
df669fbe1b Restore earlier HelloGUI sample, instead create separate Hello3DUI which demonstrates 3D UI render to texture. Move getting viewport related to scene from Scene to Renderer, so that Scene doesn't have to know about Renderer unnecessarily. Refactor the internal UI render calls related to rendertarget use. 2017-08-23 21:15:56 +03:00
Lasse Öörni
d95aae9477 Merge remote-tracking branch 'rokups/feature/3D-UI' 2017-08-23 19:30:27 +03:00
Lasse Öörni
fece9d6cc4 Fix uninitialized variables in InverseKinematics sample. Closes #2081. 2017-08-20 12:24:05 +03:00
Rokas Kupstys
6fc2c19baa More code cleanups. 
* Moved `UIComponent::GetViewport()` to `Scene` class.
* Simplified resource initialization of `UIComponent` and removed need of overriding `IsEnabled()`.
* Renamed `UIComponent::GetElement()` to `GetRoot()` to be more consistent with UI subsystem.
* Removed ability to set root UI element to `UIComponent`, instead to add UI elements should be added as children to element renturned by `UIComponent::GetRoot()`.
* Cleaned up debug rendering in HelloGUI sample. Debug data is now rendered after pressing F2.
 2017-08-20 10:55:58 +03:00
Rokas Kupstys
16ee7e1121 * Changed UIComponent::IsValid() to overriden UIComponent::IsEnabled() 
* Separated batches and vertex buffers of normal UI and UI rendered to texture.
* Cleaned up `Render()` method adding additional `surface` parameter to render into. Passing null renders on to screen.
Support for rendering UI to texture.

This change adds support for rendering GUI into a texture. This is achieved by adding `UIComponent` component to `Node`. `UIComponent` overrides material of `Node`'s `StaticModel`. UI subsystem is changed so that batches belonging to UI elements owned by `UIComponent` are rendered into a texture that is also contained in `UIComponent`. Input is handled by UI subsystem, so anything that worked on normal UI will work on UI rendered on to 3D object. This required a minor change for input handling. Previously "screen" was considered surface of entire window. Now screen is considered area of root_element_position + root_element_size. This is fully backwards-compatible.

There is one issue i am unable to solve: since on OpenGL texture coordinates start from bottom-left corner a workaround is needed. Texture is flipped by projection matrix, however it breaks scissor test. I do not know how to properly fix it therefore scissor test is disabled when rendering into texture on OpenGL. Issue is clearly visible when scrolling a `ListView` in `HelloGUI` sample when UI is rendered on to a cube.

Other changes: lua and angelscript bindings, HelloGUI sample can toggle between rendering on screen or rendering on cube, added a ListView to HelloGUI sample window. `UI::DebugDraw()` support.
 2017-08-19 20:33:00 +03:00
Eugene Kozlov
ef3b6efd96 Add streaming mode to Lua samples 15_Navigation and 39_CrowdNavigation. Minor changes. 2017-08-08 01:34:57 +03:00
Eugene Kozlov
4403b99cbd Remove separate navigation streaming samples. 2017-08-08 01:34:57 +03:00
Eugene Kozlov
f84e9d1392 Add streaming mode to C++ samples 15_Navigation and 39_CrowdNavigation . Fix using outdated navigation mesh data for streaming. 2017-08-08 01:34:57 +03:00
Eugene Kozlov
db7d92e419 Fix stuck CrowdAgent-s after NavigationMesh::AddTile. 2017-08-08 01:34:56 +03:00
Eugene Kozlov
6f57b5b4e5 Add events for navigation mesh tile operations. Fix obstacles rendering into newly added tiles. 2017-08-08 01:34:56 +03:00
Eugene Kozlov
214dcc6638 Fix C++98 compilation. 2017-08-08 01:34:56 +03:00