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

9836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gleblebedev
c4a8e9b098
Vegetation shader and technique bugfixes (#2659) 
* Vegetation shader and technique bugfixes

* GLSL bug fix for vegetation shader

* pivot fixed

* Shaders fixed

* Text formatting
 2020-07-14 04:08:32 +03:00
1vanK
c5b9b4131d Fix vegetation VSM shadows for DirectX 2020-07-09 01:04:39 +03:00
1vanK
7ec6290d68 Add sRGB option to editor 2020-07-07 23:28:53 +03:00
1vanK
2922d7914a Update authors 2020-07-07 14:42:57 +03:00
SirNate0
3a12936c47
Added PODVector::Resize overload that fills new element with a default value. (#2653) 2020-07-07 14:39:42 +03:00
1vanK
b16935c834 Update authors 2020-07-07 14:13:08 +03:00
Katekov Anton
d103e6ffa7
Fix vegetation shader for vsm shadows (#2658) 2020-07-07 14:02:06 +03:00
gleblebedev
f98d2cfd49
PBR sample terrain fixed (#2657) 2020-07-02 23:48:28 +03:00
1vanK
7af4f86244 Update authors 2020-07-02 11:26:24 +03:00
ChrisDenham
c2f5c24ebd
Update PBRLitSolid.hlsl (#2656) 
Removes a line that does not match the GLSL version of the code, and can make environment mapping to dark when specular color is not full white in the HLSL version.
It may be that it is the GLSL version that needs correcting to make it consistent with the HLSL version, but I'm not really sure why the HLSL version of this code would need to effectively multiply a specular color by itself.  Of course, if material specular colour happens to be pure white then there is no difference between them.
 2020-07-02 11:20:41 +03:00
gleblebedev
609f7de618
New PBR techniques. New PBR terrain shader. Skybox shader fixed. (#2655) 
* New PBR techniques. New PBR terrain shader. Skybox shader fixed.

* Bug fix in original terrain and missing techniques.

* PR cleanup

* Skybox.glsl cleanup

* Terrain added to PBR sample
 2020-07-02 11:19:43 +03:00
urho3d-travis-ci
bc55636f94 Travis CI: API documentation update at 2020-06-25 06:06:02 UTC. 
[ci package]

Commit: 0349aafbb5

Message: Localization::LoadJSONFile() : Pass String as reference
 2020-06-25 06:06:02 +00:00
1vanK
0349aafbb5 Localization::LoadJSONFile() : Pass String as reference 2020-06-25 08:55:33 +03:00
ChrisDenham
6fb55fa498
Allow Camera::SetFlipVertical to be used externally for OpenGL (#2643) 
* Allow Camera::FlipVertical to be used externally for OpenGL by toggling it either side of render to texture, i.e. instead of "set and clear" either side of render to texture.

(cherry picked from commit 434739d62c99e9328b66c338b7dc57c963b586c6)

* #1 Add explanation comment to previous commit.

(cherry picked from commit 4f1ca6cf8595b230e7ab2473fc37d1c0325a481a)

Co-authored-by: Chris Denham <chris.denham@logicom.com>
 2020-06-14 22:53:00 +03:00
1vanK
3075cba84e Recommit 16eea39499 with correct tangents 
https://discourse.urho3d.io/t/parallax-occlusion/6187/22
 2020-06-10 05:08:06 +03:00
sa
e0eb04b9b3 Change UIElement::dragButtonCombo_ to be a MouseButtonFlags type 
Also use the actual MOUSEB_ and QUAL_ constants instead of 0.
 2020-06-06 16:19:20 +03:00
sa
0a3379f53e Use MouseButtonFlags and QualifierFlags instead of int's 
Fixes #2631
 2020-06-06 16:19:20 +03:00
Eugene Kozlov
3c4a0a5489 Make FlagSet to bool conversion operator explicit. Fixes #2631. 2020-05-24 14:43:03 +03:00
Yao Wei Tjong 姚伟忠
7a2b5cd819
Fix the STATIC build caused by missing argument. 2020-05-11 07:08:23 +08:00
Yao Wei Tjong 姚伟忠
3ba62f036e
Fix the STATIC and SHARED build for VS and Xcode. 
Cleanup comments.
 2020-05-10 23:30:59 +08:00
Yao Wei Tjong 姚伟忠
3917983512
For CI - temporary workaround for Clang STATIC build. 2020-05-10 23:29:31 +08:00
Yao Wei Tjong 姚伟忠
0e4d095cfa
Shed off old construct since our CMake minimum required is 3.10.2 now. 2020-05-10 15:53:52 +08:00
Yao Wei Tjong 姚伟忠
5f3d7be206
Fix compilation on GCC 10.0.1 2020-05-09 15:20:14 +08:00
Eugene Kozlov
056c3d1022 Fix typo in OGLRenderSurface.cpp 2020-05-09 02:17:20 +03:00
Eugene Kozlov
e5b53e2f2c Delete GPU objects when OpenGL context is about to be lost. 2020-05-09 02:17:20 +03:00
Arnis Lielturks
89041d7031 prevent from viewport resize too often 2020-05-09 02:17:20 +03:00
Yao Wei Tjong
bcf29b8ee4
Fix for getting iOS CPU core count. 
Credit to Yuki001. Closed #2630.
 2020-05-07 23:47:01 +08:00
Arnis Lielturks
8c98f4ec88 contributor list updated 2020-05-06 21:44:25 +03:00
stievie
67389ec2bd
Initialize SSL when making a HTTP Request and URHO3D_SSL is defined (#2629) 
* Initialize SSL when making a HTTP Request and URHO3D_SSL is defined

* Simplify SSL initialization.
 2020-05-06 21:41:15 +03:00
urho3d-travis-ci
b7db6cecdb Travis CI: source tree update at 2020-05-03 09:46:38 UTC. 2020-05-03 09:46:38 +00:00
Arnis Lielturks
889367738b
HTTPS support - civetweb update (#2415) 
* initial update

* CMake updated for civetweb, https working

* unused file cleanup

* CMake updates to civetweb

* minor update, mingw not yet working

* CMakeLists updated

* fixed for unix builds

* cmake updates, console output updated

* docs updates

* HTTP sample now uses http and https links

* civetweb version 1.11

* additional changes

* mingw fix

* openssl fix

* additional ssl configuration

* osx workaround

* openssl is no longer optional

* openssl is optional

* civetweb cmakelists updates, URHO3D_SSL=1 set for travis

* debug messages removed from SSL/TLS initialization

* link libraries with civetweb

* code style fixes

* cmake updates

* DBE_TAG=latest removed
 2020-05-03 12:22:31 +03:00
Yao Wei Tjong 姚伟忠
3ec1bbbee6
Ignore VS '.vs' and 'out' directories. [ci skip] 2020-04-26 21:13:22 +08:00
Eugene Kozlov
14520d95af Add check for AnimationTrack::GetKeyFrameIndex. 
Closes #2625.
 2020-04-25 12:02:35 +03:00
Yao Wei Tjong
05c469884c
Update README.md 
Discourage chat. Promote only our official forum.
 2020-04-12 00:15:53 +08:00
Yao Wei Tjong 姚伟忠
fca8684a6a
Remove old build logic that is no longer works with new Emscripten. 
[ci skip]
 2020-04-10 20:05:17 +08:00
Yao Wei Tjong 姚伟忠
fde206b486
Minor cleaup. [ci skip] 2020-04-10 19:58:01 +08:00
Arnis Lielturks
72e2342343
Emscripten shell (#2608) 
* emscripten shell added, wip

* include dirs

* namespace

* more namespace fixes

* cmake tweak

* tweak

* emscripten shell added in different cmake file

* shell setup fixed

* application.html renamed to shell.html, engine tweaks

* shell.html location updated

* reworked canvas size detection and applying, highdpi disabled for web builds

* typo

* background tab loading fix

* web handlers moved to graphics subsystem

* removed a bit too much

* fix

* ready event resize

* svg fullscreen icon

* id used for fullscreen icon

* emscripten request pointer used instead

* pointer lock tweaks

* yet another tweak

* ui cursor fixed to take into account ui scale, emscripten mouse state reset when changing resolution

* code style updates

* ui scale calculated differently

* fix

* pointer position calculation properly fixed

* cursor position retrieval updated

* Fix code style. Simplify UI scale handling.

* cmake updates

Co-authored-by: Eugene Kozlov <nekoeuge@gmail.com>
 2020-04-07 19:38:21 +03:00
1vanK
ab22ec76c9 Update pugixml 2020-04-05 11:19:34 +08:00
sssooonnnggg
ce70a66f5a
Fix Technique clone bug. (#2615) 2020-04-02 17:25:18 +03:00
Eugene Kozlov
2345377c76 Change required TMX version from 1.0 to 1.* 2020-03-28 14:50:04 +03:00
talarcon
b9eb567781 Add base pass to pbr emissive technique 2020-03-21 15:14:52 +03:00
Eugene Kozlov
3af4d23623 Fix build of Sample 54 for ARM and RPI. 2020-03-20 09:48:27 +03:00
Eugene Kozlov
4ceb2fbdc9 Fix build of Sample 54. 2020-03-20 00:40:56 +03:00
Eugene Kozlov
1fe5548ecc Add sample for window settings change. Cleanup. 2020-03-20 00:37:24 +03:00
Eugene Kozlov
d1ad98d067 Fix inconsistent window mode transitions. 
- Fix unwanted window reposition to (0, 0) during
windowed-to-fullscreen-to-windowed mode transition.

- Fix unwanted display resolution change during
fullscreen-to-windowed mode transition on DX9 and DX11.
 2020-03-20 00:34:39 +03:00
Eugene Kozlov
e61850459d Enable Graphics::ToggleFullscreen customization. 
It's possible now to rotate between arbitrary window modes
via ToggleFullscreen. Graphics::SetMode implements default
behavior. Differences comparing to legacy behavior:

- Secondary mode uses automatic window size.
Window will be toggled to desktop-resolution fullscreen.
Fullscreen will be toggled to default-size window.

- Desktop-size borderless window is preferred
to hardware fullscreen by default.
 2020-03-20 00:34:39 +03:00
Eugene Kozlov
27216959ee Extract copy-paste from Graphics into common place. 
This commit shall not have any functional changes except the following:

- Semantics of multi sample level on DX9 backend has changed.
It represents actual hardware more instead of caller's desire.
Behavior of DX9, DX11 and OpenGL backend is synchronized now.
 2020-03-20 00:34:38 +03:00
魔大农
96cb0d5d1e Fixed event data names in sample 25 
Liberates emitter from screen corner.
 2020-03-16 09:51:10 +08:00
1vanK
8b43f3e6ea Fix doc 2020-03-14 22:49:20 +08:00
1vanK
97b09f848b Fix https://github.com/urho3d/Urho3D/issues/1877 2020-03-13 09:45:20 +08:00