diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-18 12:07:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-18 12:07:40 +0100 |
| commit | 7a68ee51340329877e4545415b415fa4facde6b6 (patch) | |
| tree | 3e54429b90d27d9568804ec61c6284d782ba53b9 | |
| parent | 6be59ae994aa9ea0a08f23342b8af3228f661890 (diff) | |
| parent | 63cb91e05cd51fe484c3fc6367658d1ac26972fe (diff) | |
Merge pull request #58266 from clayjohn/revert-sky-change
| -rw-r--r-- | doc/classes/Sky.xml | 2 | ||||
| -rw-r--r-- | scene/resources/sky.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/sky.h | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_scene_sky_rd.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/classes/Sky.xml b/doc/classes/Sky.xml index 20e3896b17..e14e57a1c4 100644 --- a/doc/classes/Sky.xml +++ b/doc/classes/Sky.xml @@ -9,7 +9,7 @@ <tutorials> </tutorials> <members> - <member name="process_mode" type="int" setter="set_process_mode" getter="get_process_mode" enum="Sky.ProcessMode" default="3"> + <member name="process_mode" type="int" setter="set_process_mode" getter="get_process_mode" enum="Sky.ProcessMode" default="0"> Sets the method for generating the radiance map from the sky. The radiance map is a cubemap with increasingly blurry versions of the sky corresponding to different levels of roughness. Radiance maps can be expensive to calculate. See [enum ProcessMode] for options. </member> <member name="radiance_size" type="int" setter="set_radiance_size" getter="get_radiance_size" enum="Sky.RadianceSize" default="3"> diff --git a/scene/resources/sky.cpp b/scene/resources/sky.cpp index 917aa40934..9cb6a16f5c 100644 --- a/scene/resources/sky.cpp +++ b/scene/resources/sky.cpp @@ -83,7 +83,7 @@ void Sky::_bind_methods() { ClassDB::bind_method(D_METHOD("get_material"), &Sky::get_material); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sky_material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,PanoramaSkyMaterial,ProceduralSkyMaterial,PhysicalSkyMaterial"), "set_material", "get_material"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Automatic,High Quality (Slow),High Quality Incremental (Average),Real-Time (Fast)"), "set_process_mode", "get_process_mode"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Automatic,HighQuality,HighQualityIncremental,RealTime"), "set_process_mode", "get_process_mode"); ADD_PROPERTY(PropertyInfo(Variant::INT, "radiance_size", PROPERTY_HINT_ENUM, "32,64,128,256,512,1024,2048"), "set_radiance_size", "get_radiance_size"); BIND_ENUM_CONSTANT(RADIANCE_SIZE_32); diff --git a/scene/resources/sky.h b/scene/resources/sky.h index 3653568ac6..5e52239032 100644 --- a/scene/resources/sky.h +++ b/scene/resources/sky.h @@ -59,7 +59,7 @@ public: private: RID sky; - ProcessMode mode = PROCESS_MODE_REALTIME; + ProcessMode mode = PROCESS_MODE_AUTOMATIC; RadianceSize radiance_size = RADIANCE_SIZE_256; Ref<Material> sky_material; diff --git a/servers/rendering/renderer_rd/renderer_scene_sky_rd.h b/servers/rendering/renderer_rd/renderer_scene_sky_rd.h index 7b6c813d90..13d24e2508 100644 --- a/servers/rendering/renderer_rd/renderer_scene_sky_rd.h +++ b/servers/rendering/renderer_rd/renderer_scene_sky_rd.h @@ -254,7 +254,7 @@ public: int radiance_size = 256; - RS::SkyMode mode = RS::SKY_MODE_REALTIME; + RS::SkyMode mode = RS::SKY_MODE_AUTOMATIC; ReflectionData reflection; bool dirty = false; |