Marcel Admiraal
356a2b7235
Fix cast_motion sometimes failing
...
- Fixes Godot physics failing when the cast Shape is inside of, or
already colliding with another Shape.
- Fixes Bullet physics failing when there is no motion.
- Ensures Godot and Bullet physics behave the same.
- Updates the documentation to exclude the caveats for the failures and
differences.
2020-11-27 15:33:00 +00:00
reduz
1bcf3c305b
Implement signed distance fields for 2D shaders
2020-11-26 10:49:50 -03:00
bruvzg
493da99269
[Complex Text Layouts] Implement TextServer interface. Implement Fallback TextServer.
2020-11-26 13:55:26 +02:00
Jordan Schidlowsky
8150f07a0b
fix for two incorrectly bound texture formats
2020-11-19 14:20:29 -06:00
Nick Swoboda
bce3e2c3f6
Check uniform set validity before freeing
2020-11-18 16:53:11 -08:00
Aaron Franke
02161aad5a
Remove empty lines around braces with the formatting script
2020-11-16 23:38:11 -05:00
Rémi Verschelde
d7176e9040
Merge pull request #42167 from madmiraal/fix-42108
...
Remove the unnecessary sync() and the restrictions it imposes on 3D Physics.
2020-11-16 09:32:48 +01:00
Rémi Verschelde
a78d96086f
Fix new transform to pixel snapping logic
...
Co-authored-by: lawnjelly <lawnjelly@gmail.com>
2020-11-15 10:52:15 +01:00
Rafał Mikrut
925ae37d8d
Remove Attempted to free invalid ID error
2020-11-10 14:22:41 +01:00
Rémi Verschelde
dd851d8f91
Merge pull request #43333 from YeldhamDev/global_rate_scale_min
...
Disallow setting the AudioServer's 'global_rate_scale' to a value equal or inferior to 0
2020-11-10 09:32:56 +01:00
Rémi Verschelde
9d2e8f2f27
Variant: Rename Type::_RID to Type::RID
...
The underscore prefix was used to avoid the conflict between the `RID` class
name and the matching enum value in `Variant::Type`.
This can be fixed differently by prefixing uses of the `RID` class in `Variant`
with the scope resolution operator, as done already for `AABB`.
2020-11-09 16:29:04 +01:00
reduz
127458ed17
Reorganized core/ directory, it was too fatty already
...
-Removed FuncRef, since Callable makes it obsolete
-Removed int_types.h as its obsolete in c++11+
-Changed color names code
2020-11-07 20:17:12 -03:00
Hugo Locurcio
7b8fd6ba9e
Fix "unifom" typo in RasterizerStorageRD method
2020-11-06 18:12:00 +01:00
Michael Alexsander
d7f2c31a05
Disallow setting the AudioServer's 'global_rate_scale' to a value equal or inferior to 0
2020-11-05 08:44:53 -03:00
Rémi Verschelde
424cd00f8b
doc: Sync classref with current source + fixup some bindings
...
Includes various changes triggered by the refactoring of method bindings.
2020-11-04 15:38:26 +01:00
reduz
f123981a96
Implement DirectionalLight2D
...
Also separated Light2D in PointLight2D and DirectionalLight2D.
Used PointLight2D because its more of a point, and it does not work
the same as OmniLight (as shape depends on texture).
Added a few utility methods to Rect2D I needed.
2020-11-04 10:03:01 -03:00
Marios Staikopoulos
e5d7c7d5fc
Alpha Hash and Alpha2Coverage Implementation
2020-11-02 20:11:20 -08:00
reduz
0e6664539d
Refactor pixel snapping.
...
-Rename pixel_snap to snap_2d_to_vertices
-Added snap_2d_to_transforms which is more useful
Fixes #41814
Solves proposal https://github.com/godotengine/godot-proposals/issues/1666
Supersedes #35606 , supersedes #41535 , supersedes #41534
2020-10-30 08:57:32 -03:00
reduz
8ab9b39707
Implement CanvasGroup and CanvasItem clipping
...
-Allows merging several 2D objects into a single draw operation
-Use current node to clip children nodes
-Further fixes to Vulkan barriers
-Changed font texture generation to white, fixes dark eges when blurred
-Other small misc fixes to backbuffer code.
2020-10-28 18:53:32 -03:00
Rémi Verschelde
6c173e2f7f
Merge pull request #43058 from clayjohn/VULKAN-FXAA-bug
...
[4.0]Remove extra exposure multiply in FXAA
2020-10-25 00:35:12 +02:00
clayjohn
8e3e9e3755
Remove extra exposure multiply in FXAA
2020-10-24 13:00:39 -07:00
reduz
84d734da0e
Refactored 2D shader and lighting system
...
-Removed normal/specular properties from nodes
-Create CanvasTexture, which can contain normal/specular channels
-Refactored, optimized and simplified 2D shaders
-Use atlas for light textures.
-Use a shadow atlas for shadow textures.
-Use both items aboves to make light rendering stateless (faster).
-Reorganized uniform sets for more efficiency.
2020-10-24 15:57:25 -03:00
Rémi Verschelde
d05c7da1aa
Merge pull request #42949 from DavidSichma/shaderglobals
...
Shader globals bugfixes
2020-10-22 09:53:49 +02:00
clayjohn
6299575250
Add sky_only setting to DirectionalLight3Ds
2020-10-21 23:28:08 -07:00
Yuri Roubinsky
433183147e
Fix textureSize & texelFetch shader compilation errors
2020-10-21 17:45:40 +03:00
David Sichma
5d33cd94c8
Shader globals bugfixes
...
- shader globals editor displays properties correctly
- fixed some errors how globals were transferred
2020-10-21 01:34:25 +02:00
Hugo Locurcio
195540ab90
Remove unused `#define` from the tonemap shader
...
It was a leftover from an earlier version of the debanding PR
which used a simpler (but less effective) algorithm.
2020-10-20 19:59:50 +02:00
Rémi Verschelde
7d4921db1a
Merge pull request #42915 from Yetizone/negative_lights_behavior
...
tonemap.glsl: Ensure color parameter of tonemap_reinhard() is positive
2020-10-19 23:50:49 +02:00
Rémi Verschelde
cf3a4cb091
Merge pull request #42913 from Calinou/debanding-fix-brightness
...
Fix debanding slightly brightening the whole viewport
2020-10-19 23:18:24 +02:00
Yetizone
ffc4151f29
tonemap.glsl: Ensure color parameter of tonemap_reinhard() is positive
...
Color values can become negative in the case of negative lights which
leads to undesired behaviour.
2020-10-20 00:08:44 +03:00
Hugo Locurcio
15d033e25f
Fix debanding slightly brightening the whole viewport
...
Thanks to Mikkel Gjoel on Twitter for the tip :)
2020-10-19 22:53:28 +02:00
reduz
dd0b097e44
Fix invalid buffer updates in SDFGI
2020-10-19 17:39:09 -03:00
Rémi Verschelde
7480a7d178
Fixup method binding from #42910
2020-10-19 22:23:36 +02:00
Juan Linietsky
5d120f9ffb
Merge pull request #42046 from Chaosus/fix_default_texture
...
Fix setting the default texture to shader
2020-10-19 15:50:21 -03:00
Juan Linietsky
85ebf40b6c
Merge pull request #38097 from Calinou/add-viewport-debanding
...
Add a debanding property to Viewport
2020-10-19 14:15:44 -03:00
Juan Linietsky
53d5a252bb
Revert "Replace SAO implementation with MSSAO"
2020-10-18 19:27:51 -03:00
Juan Linietsky
d98261ab8f
Merge pull request #42077 from clayjohn/MSSAO
...
Replace SAO implementation with MSSAO
2020-10-18 18:34:43 -03:00
Juan Linietsky
6e5f137c01
Merge pull request #41415 from clayjohn/VULKAN-shader-overrides
...
Add FOG, RADIANCE, and IRRADIANCE shader overrides
2020-10-18 18:33:41 -03:00
Juan Linietsky
e799a2ba45
Merge pull request #42201 from clayjohn/Vulkan-new-glow
...
Optimize Glow with local memory
2020-10-18 18:32:36 -03:00
clayjohn
366ee46774
Replace SAO implementation with MSSAO
2020-10-18 13:15:51 -07:00
clayjohn
f46932feab
Add FOG, RADIANCE, and IRRADIANCE shader overrides
2020-10-18 12:06:51 -07:00
Yuri Roubinsky
d0f85b9321
Fix setting the default texture to shader
2020-10-18 21:59:37 +03:00
clayjohn
63a34b93aa
Optimize Glow with local memory
2020-10-18 11:37:12 -07:00
Juan Linietsky
4467412c9f
Merge pull request #38949 from puchik/ssr-fix-cutoff
...
Continue tracing screen space reflection after encountering sky
2020-10-18 14:45:33 -03:00
Rémi Verschelde
d9e5c355e5
Merge pull request #41418 from clayjohn/Vulkan-aerial
...
Add aerial perspective to fixed fog
2020-10-18 17:32:19 +02:00
reduz
ee06a70ea6
Refactor MethodBind to use variadic templates
...
Removed make_binders and the old style generated binders.
2020-10-18 12:28:44 +02:00
clayjohn
8c21c26fb5
Add aerial perspective to fixed fog
2020-10-17 10:53:07 -07:00
Hugo Locurcio
4357506e64
Fix "fixed" fog drawing in front of volumetric fog with a sky background
...
This closes #42820 .
Co-authored-by: Clay John <claynjohn@gmail.com>
2020-10-15 21:59:08 +02:00
Rémi Verschelde
e927f54170
Merge pull request #42804 from RandomShaper/fix_fft_window
...
Fix application of window in FFT
2020-10-15 13:21:33 +02:00
Hugo Locurcio
b44de3c6b1
Fix typo in soft shadow quality project settings hints
2020-10-15 10:31:35 +02:00
Pedro J. Estébanez
257ba4a7fb
Fix application of window in FFT
2020-10-15 01:57:17 +02:00
Yuri Roubinsky
1dbfd4c3e8
Merge pull request #42763 from Chaosus/shader_emit_autocompletion
...
Fix autocompletion for emit_particle in shader editor
2020-10-13 16:01:37 +03:00
Yuri Roubinsky
6914597026
FIx autocompletion for emit_particle in shader editor
2020-10-13 14:12:51 +03:00
Rafał Mikrut
84a1817a75
Fixes leaks with shader and material
2020-10-12 18:06:47 +02:00
Rémi Verschelde
d22791c271
doc: Sync classref with current source
2020-10-12 10:58:02 +02:00
unknown
1d3aec4230
Free a SortShader and a ParticlesCopyShader
2020-10-12 13:25:24 +05:30
reduz
26f5bd245c
Implement GPU Particle Collisions
...
-Sphere Attractor
-Box Attractor
-Vector Field
-Sphere Collider
-Box Collider
-Baked SDF Collider
-Heightmap Collider
2020-10-09 13:25:47 -03:00
Rémi Verschelde
e9ff08692c
Merge pull request #42548 from pezcode/lights-metallic
...
Add METALLIC to light() built-ins
2020-10-09 14:41:53 +02:00
clayjohn
bde2f9b46b
Return proper texture view format for decals
2020-10-03 22:56:00 -07:00
Pablo Escobar
1300fc7307
Add METALLIC to light() built-ins
2020-10-04 04:16:16 +02:00
Marcel Admiraal
7e44682c03
Fix how Line2D obtains the other object's supports
...
Measure the distance from the line against the rotated object, not the
rotated line, when obtaining the object's supports against a line.
2020-10-03 12:59:34 +01:00
John Pennycook
8d3afa985b
Make YSort stable
...
Keeps track of the order in which items are collected by
_collect_ysort_children, and uses that order to break
ties between items with similar Y positions.
2020-09-27 10:58:54 -07:00
Rémi Verschelde
9a463cb1d6
Merge pull request #42263 from Faless/js/servers_no_threads
...
Ignore thread models when compiling with NO_THREAD
2020-09-23 11:50:23 +02:00
Fabio Alessandrelli
f3c6ac1d71
Ignore thread models when compiling with NO_THREAD
...
The thread model option for physics (2D) and rendering (single-unsafe,
single-safe, multithread), was causing crashes/locks when set as
multithreaded and exported for a platform that does not support threads
(namely HTML5).
This commit ensures that when threads support is not available, that
option is ignored, and the equivalent of "single-unsafe" is always used
instead.
2020-09-23 11:24:01 +02:00
Rémi Verschelde
7b3759a94e
Merge pull request #42130 from clayjohn/RenderingDeviceHack
...
Expose local RenderingDevice creation to RenderingServer
2020-09-23 10:41:58 +02:00
Yuri Roubinsky
53740c69df
Forbids varying declaration in particles and sky shaders
2020-09-22 10:35:52 +03:00
Rémi Verschelde
3e78963bb9
Fix typos with codespell
...
Using codespell 1.17.1.
Method:
```
$ cat > ../godot-word-whitelist.txt << EOF
ang
curvelinear
dof
doubleclick
fave
findn
leapyear
lod
merchantibility
nd
numer
ois
ony
que
seeked
synching
te
uint
unselect
webp
EOF
$ codespell -w -q 3 -I ../godot-word-whitelist.txt --skip="./thirdparty,*.po"
$ git diff // undo unwanted changes
```
2020-09-18 13:44:25 +02:00
Marcel Admiraal
41209efa7f
Remove the unnecessary sync() and the restrictions it imposes on 3D Physics.
2020-09-18 10:43:31 +01:00
Rémi Verschelde
2d9b409103
Merge pull request #41528 from keegano/physics-fix-wrap-angle
...
Wrap angles to (-pi, pi) in momentum calculation.
2020-09-17 16:32:53 +02:00
bruvzg
6a14c72b12
Add window click-through support.
2020-09-17 12:36:18 +03:00
clayjohn
40159244cd
expose local RenderingDevice creation to RenderingServer
2020-09-16 21:11:39 -07:00
Haoyu Qiu
38147da819
Fixes crash when saving scene
2020-09-13 16:15:46 +08:00
Lyuma
2f888d2987
Fix ATTENUATION and implement SHADOW_ATTENUATION.
2020-09-10 15:45:56 -07:00
clayjohn
fbff7d424b
Set repeat in all 3 dimensions in 3d textures
2020-09-09 17:59:51 -07:00
reduz
a674da4eec
Implement 3D textures as import and resource format.
2020-09-09 13:50:21 -03:00
Marcel Admiraal
08bedf68ff
Clarify comparison precedence when enabling or disabling back buffer.
2020-09-07 11:00:00 +01:00
Rémi Verschelde
53d83c4575
Merge pull request #41781 from AnilBK/fix-typo
...
Fixed Some typos.
2020-09-07 08:31:51 +02:00
reduz
d0bddf53c5
Implement manual particle emission and particle sub emitters.
2020-09-06 10:29:27 -03:00
Yuri Roubinsky
b1351fe781
Fix crash regression in the shader function validation
...
introduced in #41780
2020-09-05 13:49:50 +03:00
Yuri Roubinsky
ab9978697e
Improve messages in shader function validation
2020-09-05 13:19:38 +03:00
Anilforextra
5705e0d309
Fixed Some typos.
2020-09-05 14:31:56 +05:45
Rémi Verschelde
696849f73a
Merge pull request #41761 from madmiraal/fix-assignment-operators
...
Ensure assignment operators return by reference to avoid unnecessary copies.
2020-09-04 13:00:17 +02:00
Rémi Verschelde
6a03aed5a4
Merge pull request #40958 from clayjohn/VULKAN-shadow-noise
...
Improve the quick hash function for all GPUs
2020-09-04 10:53:01 +02:00
Marcel Admiraal
ce263c4ff6
Ensure assignment operators return by reference to avoid unnecessary copies.
2020-09-04 09:18:19 +01:00
bruvzg
80b8eff6aa
[Complex Test Layouts] Change `String` to use UTF-32 encoding on all platforms.
2020-09-03 19:56:24 +03:00
Rémi Verschelde
2a8531cc56
Merge pull request #41456 from nekomatata/x11-fix-popups
...
Popup fixes for X11 display server
2020-09-03 00:09:19 +02:00
Yuri Roubinsky
2a00c868de
Fix particles shader to use built-ins
2020-09-02 22:54:41 +03:00
Juan Linietsky
f5f27bacdb
Re-Implement GPU particles on master.
...
-No new features yet
-Unlike godot 3.x, sorting happens using GPU
2020-09-02 21:37:11 +02:00
Rémi Verschelde
23ce1dbfd5
Merge pull request #41668 from clayjohn/GLOW-HQ
...
Add high quality glow mode
2020-09-01 21:04:07 +02:00
JFonS
8ab510a130
Fix typo in SDF jumpflood shader
2020-09-01 14:40:59 +02:00
clayjohn
8da3c739bf
Add high quality glow mode
2020-08-31 23:16:41 -07:00
Rémi Verschelde
30d31101c2
Merge pull request #41605 from clayjohn/VULKAN-glow
...
Fix recent glow regressions
2020-08-31 12:58:15 +02:00
clayjohn
d069cc9cf2
Fix recent glow regressions
2020-08-29 11:27:43 -07:00
TwistedTwigleg
0205eef96b
Fixed 2D physics regression that causes RigidBody2D nodes to spin uncontrollably when colliding
2020-08-28 14:16:12 -04:00
Yetizone
118a7bc53f
rasterizer_rd.cpp: Correct small typo
2020-08-27 12:44:18 +03:00
Keegan Owsley
e148338d42
Wrap angles to (-pi, pi) in momentum calculation.
...
Fixes a bug that causes KinematicBody2Ds to produce too much angular
momentum when rotating beyond 180 degrees.
2020-08-26 08:25:28 -07:00
PouleyKetchoupp
2b49cb0b73
Re-apply "Fixes for windows in X11 tiling WMs"
...
From PR #38727 which was reverted in #41373 because of regressions in Ubuntu
with Gnome.
Co-authored-by: Lorenzo Cerqua <lorenzocerqua@tutanota.com>
2020-08-22 18:42:42 +02:00
Juan Linietsky
4e52c75a98
Merge pull request #41345 from clayjohn/VULKAN-sky-fog
...
Add fog to sky shaders
2020-08-20 09:50:52 -03:00
clayjohn
9d341acf2d
Add fog to sky shaders
2020-08-19 22:58:14 -07:00
Juan Linietsky
9c5c1635b2
Revert "Fixes for windows in X11 tiling WMs"
2020-08-19 12:37:59 -03:00
Hugo Locurcio
8891579068
Add a debanding property to Viewport
...
It can be enabled in the Project Settings
(`rendering/quality/screen_filters/use_debanding`). It's disabled
by default as it has a small performance impact and can make
PNG screenshots much larger (due to how dithering works).
It will also slightly brighten the scene's dark areas.
As a result, it should be enabled only when banding is noticeable enough.
This closes #17006 .
2020-08-14 23:12:33 +02:00
Juan Linietsky
6a5ecfdef1
Restored fog (non volumetric).
...
Uses a simpler and more intuitive implementation based on density.
Its less flexible than before, but its easier to get nice results.
2020-08-13 22:09:22 -03:00
Juan Linietsky
079ca220e1
Added volumetric fog effect.
2020-08-13 11:28:45 -03:00
clayjohn
cf07a58a5f
Improve the quick hash function for all GPUs
2020-08-01 17:48:40 -07:00
Markus Sauermann
8335f00949
Wake up RigidBody 2D after applying torque
2020-08-01 14:36:24 +02:00
Brian Semrau
63dfe79fbe
Fixed next_pass materials not being drawn
2020-07-28 10:51:41 -04:00
Aaron Franke
56e2c6c704
Make all String float conversion methods be 64-bit
2020-07-27 18:38:53 -04:00
Rémi Verschelde
c845e20add
Revert "Allow Area2D and 3D mouse events without a collision layer"
...
This reverts commit 7eebb06b55
.
2020-07-27 22:45:01 +02:00
Rémi Verschelde
b19b896e06
Merge pull request #40487 from nekomatata/virtual-keyboard-enter-fixes
...
Fix Return key events in LineEdit & TextEdit on Android
2020-07-26 20:25:53 +02:00
PouleyKetchoupp
8c05dadcff
Fix Return key events in LineEdit & TextEdit on Android
...
Depending on the device implementation, editor actions could be
received with different action ids or not at all for multi-line.
Added a parameter to virtual keyboards to properly handle single-line
and multi-line cases in all situations.
Single-line:
Input type set to text without multiline to make sure actions are sent.
IME options are set to DONE action to force action id consistency.
Multi-line:
Input type set to text and multiline to make sure enter triggers new lines.
Actions are disabled by the multiline flag, so '\n' characters are
handled in text changed callbacks.
2020-07-26 20:06:07 +02:00
Rémi Verschelde
3842e8c465
Merge pull request #38727 from Riteo/tiling-wm-issues-tests
...
Fixes for windows in X11 tiling WMs
2020-07-26 17:41:28 +02:00
Juan Linietsky
acf32e87d5
Fixes RenderingServer crashes reported by #39951
...
Supersedes #40026
2020-07-23 07:58:23 -03:00
Lorenzo Cerqua
d670a49612
DisplayServer: separate window showing into another function
...
When creating a window, Godot would first register it to the WM(show it) and then set its flags.
This works fine on a floating WM, but on tiling WMs as soon as a window gets registered
the WM immediately acts on the window by scaling it up and treating it as a generic window,
being registered without any special flags.
This commit separates the showing of the window into another function and calls it after the most important flags are set,
making windows with special flags(eg. all popups) work again on tiling WMs.
Fixes #37930
2020-07-23 07:58:10 +02:00
Juan Linietsky
ee7c98da7c
Refactor light clustering
...
Move from high end to shared, so all renderers use clustering.
2020-07-22 20:39:51 -03:00
Rémi Verschelde
a5fb445121
Merge pull request #40450 from asmaloney/spelling
...
Fix spelling & grammar in comments, docs, and messages
2020-07-21 22:14:04 +02:00
Andy Maloney
4dda62f591
Fix spelling & grammar in comments, docs, and messages
2020-07-21 15:17:23 -04:00
Andy Maloney
8b949918b1
Fix spelling of a var, a struct, and message output
2020-07-17 12:02:06 -04:00
Rémi Verschelde
c8523038cc
Merge pull request #40268 from DanielZTing/master
...
Fix cancel/OK button order on macOS
2020-07-15 09:21:04 +02:00
Yuri Roubinsky
1a5cafebc9
Merge pull request #40389 from Chaosus/fix_shader
...
Fix some incorrect conversions which lead to crash in shaders
2020-07-15 08:49:59 +03:00
Yuri Roubinsky
01950553f2
Fix some incorrect conversions which lead to crash in shaders
2020-07-14 21:04:12 +03:00
Juan Linietsky
13e0385702
Properly pass safe margin on initialization.
...
Fixes jitter.
2020-07-14 10:19:58 -03:00
Rémi Verschelde
9678a41b19
Merge pull request #40272 from clayjohn/VULKAN-time-slicing
...
Add incremental update mode to sky
2020-07-11 10:00:39 +02:00
clayjohn
a54f93c169
Add incremental update mode to sky
2020-07-11 00:10:15 -07:00
Rémi Verschelde
d0cea291d2
Merge pull request #40193 from KoBeWi/dem_pikks
...
Allow Area2D and 3D mouse events without collision layer
2020-07-11 00:26:56 +02:00
Rémi Verschelde
21e1ff4bb0
Merge pull request #40266 from Chaosus/fma_fix
...
Enables 'fma' for GLES2
2020-07-11 00:18:50 +02:00
Daniel Ting
9605fc54c7
Fix cancel/OK button order on macOS
...
The macOS platform convention regarding button order is cancel on left,
OK on right.
2020-07-10 15:10:11 -05:00
Yuri Roubinsky
3eeb272b2e
Enables 'fma' for GLES2
2020-07-10 22:21:22 +03:00
Rémi Verschelde
dcd11faad3
Merge pull request #40253 from madmiraal/add-override-keywords
...
Add override keywords.
2020-07-10 21:04:23 +02:00
Yuri Roubinsky
ecb5f7ea23
Added 'fma' function to shader language
2020-07-10 19:58:03 +03:00
Marcel Admiraal
26fcf2b04c
Add override keywords.
2020-07-10 13:56:54 +01:00
Tomasz Chabora
7eebb06b55
Allow Area2D and 3D mouse events without a collision layer
...
Co-authored-by: madmiraal <madmiraal@users.noreply.github.com>
2020-07-10 13:23:20 +02:00
Marcel Admiraal
7eb0fcdb1a
Remove elements from monitored_bodies and monitored_areas as they are
...
processed before calling the callback, instead of after they have all
been processed, because the callbacks may readd them.
2020-07-04 10:17:57 +01:00
bruvzg
df968d577a
[macOS] Implement seamless display scaling.
2020-07-04 10:36:33 +03:00
Cevantime
23f7d2c29d
fix laxist collision detection on one way shapes
2020-07-03 11:24:15 +02:00
Rémi Verschelde
67e4082b1e
Merge pull request #37350 from aaronfranke/force-impulse
...
Refactor physics force and impulse code to use (force, position) order
2020-07-02 18:39:16 +02:00
Rémi Verschelde
3fb5faaceb
Merge pull request #40018 from Faless/js/more_improvements_4.0
...
HTML5 fixes, refactor, audio fallback, fixed FPS.
2020-07-02 07:22:43 +02:00
Fabio Alessandrelli
a9b7dd25df
Add default 50ms output_latency web override.
...
Hopefully a good tradeoff between latency and performance on most
browsers.
2020-07-01 17:16:13 +02:00
Rémi Verschelde
9000e59650
Merge pull request #40016 from akien-mga/environment-code-cleanup
...
Environment: Refactor code for readability + more
2020-07-01 16:28:48 +02:00
Rémi Verschelde
a8a2769bb6
Merge pull request #38713 from aaronfranke/string-64bit
...
Make all String integer conversion methods be 64-bit
2020-07-01 16:01:05 +02:00
Rémi Verschelde
372136fe75
Environment: Refactor code for readability + more
...
- Makes all boolean setters/getters consistent.
- Fixes bug where `glow_hdr_bleed_scale` was not used.
- Split CameraEffects to their own source file.
- Reorder all Environment method and properties declarations,
definitions and bindings to be consistent with each other
and with the order of property bindings.
- Bind missing enum values added with SDFGI.
- Remove unused SDFGI enhance_ssr boolean.
- Sync doc changes after SDFGI merge and other misc changes.
2020-07-01 14:44:45 +02:00
Yuri Roubinsky
c554d9e556
Added const qualifier support for function arguments in shaders
2020-07-01 12:55:00 +03:00
Rémi Verschelde
27605769c4
Merge pull request #35633 from Xrayez/physics-shape-property
...
Expose shape property for shape query parameters classes
2020-06-30 13:57:23 +02:00
Rémi Verschelde
5a33c77f0a
Merge pull request #39953 from neikeq/fix-missing-defval-regr-from-39827
...
Fix missing DEFVAL in RenderingDevice.storage_buffer_create
2020-06-30 09:40:43 +02:00
Rémi Verschelde
8e8699e36b
Merge pull request #39894 from madmiraal/fix-39768
...
Trigger broadphase update when changing collision layer/mask.
2020-06-29 21:34:45 +02:00
Ignacio Etcheverry
7c3ff85c71
Fix missing DEFVAL in RenderingDevice.storage_buffer_create
2020-06-29 17:13:09 +02:00
Juan Linietsky
b1aa24ea3c
Slight occlusion improvements.
2020-06-28 09:11:21 -03:00
Marcel Admiraal
79d3d3d17b
Trigger broadphase update when changing collision layer/mask, and
...
check for collision layer/mask changes in 2D hash grid broadphase update.
2020-06-27 18:34:16 +01:00
Rémi Verschelde
ff0583770a
Merge pull request #39869 from Chaosus/shader_fix_return
...
Prevents usage of return in main shader functions
2020-06-27 17:03:42 +02:00
Yuri Roubinsky
2ce77e4b57
Prevents usage of return in main shader functions
2020-06-27 17:36:45 +03:00
qarmin
997d367b51
Fixes recently introduced shader leaks
2020-06-27 15:08:20 +02:00
Juan Linietsky
201d606b3d
Addition of SDFGI for open world global illumination
...
Move GI to a deferred pass
2020-06-26 11:06:48 -03:00
Andrii Doroshenko (Xrayez)
da3fbc0296
Expose shape property for shape query parameters classes
...
Co-authored-by: PouleyKetchoupp <pouleyketchoup@gmail.com>
2020-06-26 16:54:05 +03:00
Yuri Roubinsky
b6ca9536f2
Fix few places in shaders where const passing still incorrect
2020-06-25 10:40:19 +03:00
Marcel Admiraal
8ffe905c45
Check for motion in cast_motion() before doing Bullet convexSweepTest().
...
Also ensure that default closest_safe and closest_unsafe values are
defined in cast_motion() and before cast_motion() is called.
2020-06-21 16:20:26 +01:00
Yuri Roubinsky
636a9d9f50
Implemented global const array to shaders
2020-06-19 16:04:54 +03:00
Rémi Verschelde
93d79023ad
Merge pull request #39541 from Ev1lbl0w/feature/disable-rendering
...
Expose disable_render_loop property to GDScript
2020-06-16 20:48:41 +02:00
Ev1lbl0w
03879a564a
Expose disable_render_loop property to GDScript
2020-06-16 15:43:44 +01:00
Rémi Verschelde
d3c10e8dd6
Merge pull request #39457 from bruvzg/kbd_layouts
...
Add keyboard layout enumeration / set / get functions.
2020-06-15 11:10:34 +02:00
Marcel Admiraal
62142c5416
Ensure pair callback data is set to null when it's null.
2020-06-13 14:43:25 +01:00
bruvzg
92352b1c23
Add keyboard layout enumeration / set / get functions (macOS, Windows, Linux/X11), remove latin variant function.
2020-06-13 11:02:00 +03:00
Marcel Admiraal
a442526744
Test collision mask before creating constraint pair in Godot physics broadphase 2D and 3D.
2020-06-08 17:46:21 +01:00
jfons
af3f9a854e
Minor fix on GLSL shader parser
2020-06-06 19:53:16 +02:00
Marcel Admiraal
b5e31b70dc
Correct misspellings of damped spring.
2020-06-04 18:07:24 +01:00
Yuri Roubinsky
1a7e101324
Fix shader's length() function parsing in expressions
2020-06-03 19:39:48 +03:00
Aaron Franke
e5ae89775a
Remove 32-bit String hex_to_int method
2020-06-03 00:03:34 -04:00
Aaron Franke
ba27deef06
Refactor physics force and impulse code
2020-06-02 23:18:59 -04:00
lawnjelly
61b3eb3b28
Light2D shadow mask construction fix
...
When using the default setting (layer 1 set only) nothing is stored in the tscn file for a Light2D, hence it relies on the value in the constructor.
The problem is the constructed value is 1 in Light2D, and -1 in RasterizerCanvas::Light. -1 results in all bits being set so all occluders are shown, rather than just those in layer 1.
This PR changes Rasterizer::Canvas constructor to set to 1. An alternative is to have -1 as the value for layer 1 throughout.
(cherry picked from commit bf54fa5a62
)
2020-06-02 10:37:01 +02:00
Andrii Doroshenko (Xrayez)
69d5de632e
Split `Geometry` singleton into `Geometry2D` and `Geometry3D`
...
Extra `_2d` suffixes are removed from 2D methods accoringly.
2020-05-27 14:28:34 +03:00
Arman
48a59e6c4a
Continue tracing screen space reflection after encountering sky
...
Instead of breaking the whole trace when encountering the sky/camera far clip, continue tracing and check if "hits" are sky/far clip or not. Prevents some objects not being reflected due to gaps.
2020-05-22 00:12:42 -07:00
Rémi Verschelde
0b8cb945cf
doc: Sync classref with current source
2020-05-20 15:29:37 +02:00
Rémi Verschelde
aec07538f4
Merge pull request #38309 from SkyLucilfer/AndroidLineEdit
...
Fix Android LineEdit editing bugs
2020-05-20 11:45:59 +02:00
Rémi Verschelde
ca3192d18a
Style: Fix unnecessary semicolons that confused clang-format
2020-05-19 11:24:58 +02:00
Rémi Verschelde
37efaad8fb
Merge pull request #38816 from Faless/js/fix_audio_driver_4.0
...
AudioDriverJavaScript buffer size calculation.
2020-05-18 13:43:24 +02:00
Fabio Alessandrelli
90c7102b51
Move mix_rate, ouput_latency to AudioDriverManager
...
Each driver used to define the (same) project settings values
`audio/mix_rate` and `audio/output_latency`, but the setting names are
not driver specific.
Overriding is still possible via platform tags.
2020-05-18 13:02:06 +02:00
Rémi Verschelde
c74d65cec8
GLSL: Change shader type specifier from [vertex] to #[vertex]
...
The added `#` prevents clang-format from misinterpreting the meaning
of this statement and thus messing up the formatting of the next
lines up until the first `layout` statement.
Similarly, a semicolon is now enforced on `versions` defines to
prevent clang-format from messing up formatting and putting them
all on a single line. Note: In its current state the code will
ignore chained statements on a single line separated by a semicolon.
Also removed some extraneous lines missed in previous style changes
or added by mistake with said changes (e.g. after uniform definitions
that clang-format messes up somewhat too, but we live with it).
2020-05-18 10:58:14 +02:00
SkyJJ
cc473b948f
Fix Android LineEdit editing bugs
2020-05-16 17:55:27 +02:00
Rémi Verschelde
0ee0fa42e6
Style: Enforce braces around if blocks and loops
...
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 21:57:34 +02:00
Rémi Verschelde
07bc4e2f96
Style: Enforce separation line between function definitions
...
I couldn't find a tool that enforces it, so I went the manual route:
```
find -name "thirdparty" -prune \
-o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \
-o -name "*.glsl" > files
perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files)
misc/scripts/fix_style.sh -c
```
This adds a newline after all `}` on the first column, unless they
are followed by `#` (typically `#endif`). This leads to having lots
of places with two lines between function/class definitions, but
clang-format then fixes it as we enforce max one line of separation.
This doesn't fix potential occurrences of function definitions which
are indented (e.g. for a helper class defined in a .cpp), but it's
better than nothing. Also can't be made to run easily on CI/hooks so
we'll have to be careful with new code.
Part of #33027 .
2020-05-14 16:54:55 +02:00
Rémi Verschelde
0be6d925dc
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
...
Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.
This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.
There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).
Part of #33027 .
2020-05-14 16:54:55 +02:00
Rémi Verschelde
a1aaed5a84
Remove redundant void argument lists
...
Using clang-tidy's `modernize-redundant-void-arg`.
https://clang.llvm.org/extra/clang-tidy/checks/modernize-redundant-void-arg.html
2020-05-14 13:51:45 +02:00
Rémi Verschelde
dcd1151d77
Enforce use of bool literals instead of integers
...
Using clang-tidy's `modernize-use-bool-literals`.
https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-bool-literals.html
2020-05-14 13:45:01 +02:00
Rémi Verschelde
1a8167867b
Modernize remaining uses of 0/NULL instead of nullptr (C++11)
...
Using clang-tidy's `modernize-use-nullptr`.
https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-nullptr.html
2020-05-14 13:45:01 +02:00
Rémi Verschelde
1f6f364a56
Port member initialization from constructor to declaration (C++11)
...
Using `clang-tidy`'s `modernize-use-default-member-init` check and
manual review of the changes, and some extra manual changes that
`clang-tidy` failed to do.
Also went manually through all of `core` to find occurrences that
`clang-tidy` couldn't handle, especially all initializations done
in a constructor without using initializer lists.
2020-05-14 10:01:56 +02:00
Rémi Verschelde
092b2bd36f
Merge pull request #38691 from madmiraal/fix-eq-uninitialised-warning
...
Silence EQ::Band::c1, c2 and c3 may be used uninitialized warnings.
2020-05-12 11:50:50 +02:00
Marcel Admiraal
d02143905f
Silence EQ::Band::c1, c2 and c3 may be used uninitialized warnings.
2020-05-12 09:47:39 +01:00
qarmin
d27f640a32
Fixes memory leak with lightmap part 2
2020-05-12 10:11:17 +02:00
qarmin
84867275bb
Fix memory leak with light maps
2020-05-11 21:04:39 +02:00
Juan Linietsky
1bea8e1eac
New lightmapper
...
-Added LocalVector (needed it)
-Added stb_rect_pack (It's pretty cool, we could probably use it for other stuff too)
-Fixes and changes all around the place
-Added library for 128 bits fixed point (required for Delaunay3D)
2020-05-10 15:59:09 -03:00
Rémi Verschelde
94721f5ab8
Revert "Renamed plane's d to distance"
...
This reverts commit ec7b481170
.
This was wrong, `d` is not a distance but the `d` constant in the
parametric equation `ax + by + cz = d` describing the plane.
2020-05-10 16:47:11 +02:00
Rémi Verschelde
69de7ce38c
Style: clang-format: Disable AllowShortCaseLabelsOnASingleLine
...
Part of #33027 .
2020-05-10 13:13:54 +02:00
Rémi Verschelde
e956e80c1f
Style: clang-format: Disable AllowShortIfStatementsOnASingleLine
...
Part of #33027 , also discussed in #29848 .
Enforcing the use of brackets even on single line statements would be
preferred, but `clang-format` doesn't have this functionality yet.
2020-05-10 13:12:16 +02:00
Rémi Verschelde
03b13e0c69
Style: Add missing copyright headers
2020-05-10 13:12:16 +02:00
Marcus Elg
ec7b481170
Renamed plane's d to distance
2020-05-10 12:12:51 +02:00
Rémi Verschelde
ff5dfcdf68
Revert "register RenderingDevice as gdscript singleton"
...
This reverts commit 1058a57666
.
RenderingDevice is meant to be instantiated in scripts, not a singleton.
This actually doesn't work properly right now, but reduz will fix it.
2020-05-09 22:18:32 +02:00
Hugo Locurcio
3a11baaeac
Turn the anisotropic filtering setting into an enum
...
Since it only accepts power-of-two values, exposing it as an enum
makes more sense. This also allows for adding property hints to indicate
the performance cost of each value.
This also improves property hints for MSAA and FXAA.
2020-05-08 12:07:35 +02:00
Rémi Verschelde
bef52957d0
Merge pull request #38226 from Calinou/increase-camera3d-fov
...
Increase the default Camera3D field of view to 75
2020-05-07 21:16:21 +02:00
Rémi Verschelde
5940ca650e
Merge pull request #38406 from clayjohn/VULKAN-sun-diameter
...
Calculate sun diameter even when not using shadows
2020-05-03 18:14:36 +02:00
Philip Whitfield
1058a57666
register RenderingDevice as gdscript singleton
2020-05-03 12:01:38 +02:00
clayjohn
34ee273e20
Calculate sun diameter even when not using shadows
2020-05-01 22:22:35 -07:00
Hugo Locurcio
ccc4f3899c
Increase the default Camera3D field of view to 75
...
A vertical FOV of 75 degrees is roughly equivalent to a 91 degree
horizontal FOV on a 4:3 display (~107.51 degrees on 16:9),
which is close to the typical default FOV used in PC games.
Note that this doesn't apply to the in-editor camera which keeps its
FOV to 70. This is because it doesn't display in fullscreen;
its viewport only displays in the center of the editor (roughly).
This means the viewport won't cover the viewer's eyes as much. Therefore,
the editor camera FOV should be slightly lower to account for this.
Since this changes the default value, this may break existing projects
slightly.
For the record, this was already done in
https://github.com/godotengine/godot-demo-projects/pull/260
for the official demo projects.
2020-05-01 14:03:27 +02:00
Rémi Verschelde
b4a5bbaea2
Merge pull request #38337 from RandomShaper/time_rollback
...
Improve shader time roll over
2020-04-30 16:25:20 +02:00
Pedro J. Estébanez
f7706659b5
Improve shader time roll over
...
- Resurrect it for GL ES 2
- Add it to the Vulkan rasterizer
- Expose the setting from the `RenderingServer`, since it does not belong in any specific rasterizer
2020-04-30 11:42:11 +02:00
Kiri Jolly
459cab99f4
Fixed unbounded dual-paraboloid shadow map culling.
...
Dual paraboloid shadowmaps were ending up with infinitely large volumes of area behind the hemisphere un-culled.
This change just adds a back plane to the convex shape used for the culling volume.
2020-04-29 19:24:43 -07:00
Rémi Verschelde
58435b0c91
Merge pull request #20371 from aaronfranke/vector-lerp
...
[Core] [Mono] [GDNative] Rename "linear_interpolate" methods to "lerp"
2020-04-29 15:50:00 +02:00
Rémi Verschelde
1d45a269f8
Merge pull request #38302 from qarmin/format_set
...
RasterizerStorageRD: Don't override format value
2020-04-29 14:16:52 +02:00
Aaron Franke
540156b387
[Core] Rename linear_interpolate to lerp
2020-04-29 04:02:49 -04:00
Rémi Verschelde
0bf6a86db4
Merge pull request #37795 from Chaosus/shader_fix_const_order2
...
Fix shader constant sorting
2020-04-29 09:41:34 +02:00
qarmin
ad6bcea49d
Don't override format value
2020-04-28 18:51:17 +02:00
qarmin
0e9942a671
Fix copy paste array index bug
2020-04-28 18:26:57 +02:00
Rémi Verschelde
fdf58a5858
Rename InputFilter back to Input
...
It changed name as part of the DisplayServer and input refactoring
in #37317 , with the rationale that input no longer goes through the
main loop, so the previous Input singleton now only does filtering.
But the gains in consistency are quite limited in the renaming, and
it breaks compatibility for all scripts and tutorials that access
the Input singleton via the scripting language. A temporary option
was suggested to keep the scripting singleton named `Input` even if
its type is `InputFilter`, but that adds inconsistency and breaks C#.
Fixes godotengine/godot-proposals#639 .
Fixes #37319 .
Fixes #37690 .
2020-04-28 15:19:49 +02:00
bruvzg
2bb119c088
Fix "redefinition of 'ssr' with a different type" shader compile error.
2020-04-23 13:56:04 +03:00
Ignacio Roldán Etcheverry
5d29f42afa
Merge pull request #38116 from neikeq/index_buffer_create-defval
...
Fix missing DEFVAL for RenderingDevice.index_buffer_create
2020-04-22 17:30:23 +02:00
Ignacio Etcheverry
c5a721f58d
Fix missing DEFVAL for RenderingDevice.index_buffer_create
2020-04-22 16:52:04 +02:00
muiroc
66ab577eb8
Register the DisplayServer Singleton
2020-04-21 22:04:12 +02:00
Juan Linietsky
f8ef38efed
Add proper type to most public API uses of Array
2020-04-21 12:16:45 -03:00
Juan Linietsky
ae09b55a19
Exposed RenderingDevice to script API
...
Also added an easier way to load native GLSL shaders.
Extras:
Had to fix no-cache for subresources in resource loader, it was not properly working, making shaders not properly reload.
Note:
The precommit hooks are broken because they don't seem to support enums from one class being used in another.
Feel free to fix this after merging this PR.
2020-04-20 21:21:58 -03:00
Rémi Verschelde
2905367fed
Merge pull request #37970 from SkyLucilfer/ServerTypo
...
Correct typo mistake of profiler_add_frame_data argument in physics 3d server
2020-04-20 23:49:36 +02:00
Rémi Verschelde
9cf48b3e99
Merge pull request #38039 from akien-mga/docdata-skip-unexposed
...
DocData: Skip unexposed classes
2020-04-20 15:21:49 +02:00
Rémi Verschelde
0ef8bcac4d
DocData: Skip unexposed classes
...
Properly expose classes that we actually want accessible.
2020-04-20 12:51:10 +02:00
Rémi Verschelde
b7b46093d8
doc: Sync classref with current source
...
Add missing enum bindings.
2020-04-20 11:48:00 +02:00
Rémi Verschelde
088c2a0870
Merge pull request #37947 from clayjohn/DOCS-rendering-update
...
Update many docs with recent rendering changes
2020-04-20 11:16:12 +02:00
Juan Linietsky
49d0c6a5c9
Ability to create local RenderingDevice instances.
2020-04-18 21:47:17 -03:00
SkyJJ
0991cdc975
Correct typo mistake of profiler_add_frame_data argument in physics 3d server
2020-04-17 21:56:25 +02:00
clayjohn
b50d954cb0
Update many docs with recent rendering changes
2020-04-17 09:47:59 -07:00
Rémi Verschelde
17304f1aae
Merge pull request #37949 from reduz/implement-global-shader-uniforms
...
Implement global and per instance shader uniforms.
2020-04-17 18:36:06 +02:00
Rémi Verschelde
cfda0e3770
Merge pull request #37953 from clayjohn/VULKAN-sky-sun-size
...
Add light size to Sky Shaders
2020-04-17 18:35:45 +02:00
clayjohn
7cd2ff309c
Add light size to Sky Shaders
2020-04-17 09:32:24 -07:00
Juan Linietsky
0e1c66d9fc
Implement global and per instance shader uniforms.
...
Adds two keywords to shader language for uniforms:
-'global'
-'instance'
This allows them to reference values outside the material.
2020-04-17 12:35:41 -03:00
clayjohn
0ff929a926
Use sky properly for ambient and reflections
2020-04-16 23:45:30 -07:00
Rémi Verschelde
4f2c1feab5
Merge pull request #37869 from madmiraal/fix-36533
...
Assign zero to range when ConvexPolygonShape2D is empty.
2020-04-16 11:39:18 +02:00
clayjohn
61d86190e0
Fix texture check in decal setup
2020-04-15 12:06:02 -07:00
Juan Linietsky
6f293ed795
Add support for projectors in spot and omni lights.
2020-04-14 17:05:45 -03:00
Rémi Verschelde
5e5103f460
Merge pull request #37861 from reduz/implement-decals
...
Implement decals
2020-04-14 17:13:20 +02:00
Juan Linietsky
5944eb6e7f
Implement decals
...
Also implemented decal atlas, so projectors and other stuff can be added.
Sidenote: Had to make RID hashable, so some unrelated includes changed
in order to include it in hashfuncs.h
2020-04-14 11:13:34 -03:00
Marcel Admiraal
88d307df14
Assign zero to range when ConvexPolygonShape2D is empty.
2020-04-14 12:53:32 +01:00
Rémi Verschelde
e0eb9a8ae4
Merge pull request #37826 from nekomatata/direct-body-state-sleep
...
Fix set_sleep_state in Bullet body direct state
2020-04-14 12:53:20 +02:00
PouleyKetchoupp
30b184cb06
Fix set_sleep_state in Bullet body direct state
...
It was inverted, it should set the body to be active when sleep is disabled.
2020-04-14 11:39:34 +02:00
qarmin
88c0a9e3de
Fixes leak with CopyToFbShaderRD
2020-04-13 11:39:44 +02:00
Rémi Verschelde
06748a2b5f
Merge pull request #37749 from clayjohn/Vulkan-improved-ss
...
Add vogel filter and settings to soft shadows
2020-04-13 00:39:37 +02:00
Juan Linietsky
a57dc398db
Implement MSAA
2020-04-12 15:33:57 -03:00
Juan Linietsky
d160644c88
Merge pull request #37819 from reduz/implement-fxaa
...
Add screen space AA option, with FXAA implementation.
2020-04-12 11:46:14 -03:00
Juan Linietsky
16ae2cc1bf
Add screen space AA option, with FXAA implementation.
2020-04-12 10:57:18 -03:00
Rémi Verschelde
1846d33b5f
Merge pull request #37822 from nekomatata/rigid-body-force-pos
...
Fix add_force in Godot Physics RigidBody
2020-04-12 11:46:22 +02:00
PouleyKetchoupp
4a0d15f91c
Fix add_force in Godot Physics RigidBody
...
Now takes the center of mass into account for calculating the applied
torque, like apply_impulse does.
2020-04-12 11:20:32 +02:00
Juan Linietsky
9dc19f7619
Merge pull request #37808 from reduz/port-effects-to-compute
...
Moved most of the effect code to compute.
2020-04-11 23:38:05 -03:00
Juan Linietsky
d81911490b
Moved most of the effect code to compute.
...
Simplifies it and improves performance.
Improves image barrier handling per mipmap on RenderingDeviceVulkan
2020-04-11 19:44:07 -03:00
Rémi Verschelde
636d4bad99
Merge pull request #37794 from clayjohn/VULKAN-SSS-sky
...
Fix SSS affecting Sky
2020-04-11 16:30:51 +02:00
Yuri Roubinsky
bc30f541e6
Fix shader constant sorting
2020-04-11 12:40:17 +03:00
clayjohn
e3a9af2db1
Fix SSS affecting Sky
2020-04-11 01:20:24 -07:00
clayjohn
621f6f09a8
Add proper quality settings to soft shadows
2020-04-10 23:09:17 -07:00