Environment sky more or less working.

5 files changed, 128 insertions, 115 deletions

diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 37a185ecac..5e18e73b5b 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -61,25 +61,6 @@ void Environment::set_sky_custom_fov(float p_scale) {
 	bg_sky_custom_fov = p_scale;
 	VS::get_singleton()->environment_set_sky_custom_fov(environment, p_scale);
 }
-void Environment::set_sky_orientation(const Basis &p_orientation) {
-
-	bg_sky_orientation = p_orientation;
-	_change_notify("background_sky_rotation");
-	_change_notify("background_sky_rotation_degrees");
-	VS::get_singleton()->environment_set_sky_orientation(environment, bg_sky_orientation);
-}
-void Environment::set_sky_rotation(const Vector3 &p_euler_rad) {
-
-	bg_sky_orientation.set_euler(p_euler_rad);
-	_change_notify("background_sky_orientation");
-	_change_notify("background_sky_rotation_degrees");
-	VS::get_singleton()->environment_set_sky_orientation(environment, bg_sky_orientation);
-}
-void Environment::set_sky_rotation_degrees(const Vector3 &p_euler_deg) {
-
-	set_sky_rotation(p_euler_deg * Math_PI / 180.0);
-	_change_notify("background_sky_rotation");
-}
 void Environment::set_bg_color(const Color &p_color) {
 
 	bg_color = p_color;
@@ -98,17 +79,17 @@ void Environment::set_canvas_max_layer(int p_max_layer) {
 void Environment::set_ambient_light_color(const Color &p_color) {
 
 	ambient_color = p_color;
-	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, ambient_energy, ambient_sky_contribution);
+	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, VS::EnvironmentAmbientSource(ambient_source), ambient_energy, ambient_sky_contribution, VS::EnvironmentReflectionSource(reflection_source));
 }
 void Environment::set_ambient_light_energy(float p_energy) {
 
 	ambient_energy = p_energy;
-	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, ambient_energy, ambient_sky_contribution);
+	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, VS::EnvironmentAmbientSource(ambient_source), ambient_energy, ambient_sky_contribution, VS::EnvironmentReflectionSource(reflection_source));
 }
 void Environment::set_ambient_light_sky_contribution(float p_energy) {
 
 	ambient_sky_contribution = p_energy;
-	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, ambient_energy, ambient_sky_contribution);
+	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, VS::EnvironmentAmbientSource(ambient_source), ambient_energy, ambient_sky_contribution, VS::EnvironmentReflectionSource(reflection_source));
 }
 
 void Environment::set_camera_feed_id(int p_camera_feed_id) {
@@ -119,6 +100,22 @@ void Environment::set_camera_feed_id(int p_camera_feed_id) {
 #endif
 };
 
+void Environment::set_ambient_source(AmbientSource p_source) {
+	ambient_source = p_source;
+	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, VS::EnvironmentAmbientSource(ambient_source), ambient_energy, ambient_sky_contribution, VS::EnvironmentReflectionSource(reflection_source));
+}
+
+Environment::AmbientSource Environment::get_ambient_source() const {
+	return ambient_source;
+}
+void Environment::set_reflection_source(ReflectionSource p_source) {
+	reflection_source = p_source;
+	VS::get_singleton()->environment_set_ambient_light(environment, ambient_color, VS::EnvironmentAmbientSource(ambient_source), ambient_energy, ambient_sky_contribution, VS::EnvironmentReflectionSource(reflection_source));
+}
+Environment::ReflectionSource Environment::get_reflection_source() const {
+	return reflection_source;
+}
+
 Environment::BGMode Environment::get_background() const {
 
 	return bg_mode;
@@ -133,20 +130,14 @@ float Environment::get_sky_custom_fov() const {
 	return bg_sky_custom_fov;
 }
 
-Basis Environment::get_sky_orientation() const {
-
-	return bg_sky_orientation;
+void Environment::set_sky_rotation(const Vector3 &p_rotation) {
+	sky_rotation = p_rotation;
+	VS::get_singleton()->environment_set_sky_orientation(environment, Basis(p_rotation));
 }
 
 Vector3 Environment::get_sky_rotation() const {
 
-	// should we cache this? maybe overkill
-	return bg_sky_orientation.get_euler();
-}
-
-Vector3 Environment::get_sky_rotation_degrees() const {
-
-	return get_sky_rotation() * 180.0 / Math_PI;
+	return sky_rotation;
 }
 
 Color Environment::get_bg_color() const {
@@ -315,14 +306,14 @@ Ref<Texture2D> Environment::get_adjustment_color_correction() const {
 
 void Environment::_validate_property(PropertyInfo &property) const {
 
-	if (property.name == "background_sky" || property.name == "background_sky_custom_fov" || property.name == "background_sky_orientation" || property.name == "background_sky_rotation" || property.name == "background_sky_rotation_degrees" || property.name == "ambient_light/sky_contribution") {
-		if (bg_mode != BG_SKY && bg_mode != BG_COLOR_SKY) {
+	if (property.name == "sky" || property.name == "sky_custom_fov" || property.name == "sky_rotation" || property.name == "ambient_light/sky_contribution") {
+		if (bg_mode != BG_SKY && ambient_source != AMBIENT_SOURCE_SKY && reflection_source != REFLECTION_SOURCE_SKY) {
 			property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL;
 		}
 	}
 
 	if (property.name == "background_color") {
-		if (bg_mode != BG_COLOR && bg_mode != BG_COLOR_SKY) {
+		if (bg_mode != BG_COLOR && ambient_source != AMBIENT_SOURCE_COLOR) {
 			property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL;
 		}
 	}
@@ -951,9 +942,7 @@ void Environment::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_background", "mode"), &Environment::set_background);
 	ClassDB::bind_method(D_METHOD("set_sky", "sky"), &Environment::set_sky);
 	ClassDB::bind_method(D_METHOD("set_sky_custom_fov", "scale"), &Environment::set_sky_custom_fov);
-	ClassDB::bind_method(D_METHOD("set_sky_orientation", "orientation"), &Environment::set_sky_orientation);
 	ClassDB::bind_method(D_METHOD("set_sky_rotation", "euler_radians"), &Environment::set_sky_rotation);
-	ClassDB::bind_method(D_METHOD("set_sky_rotation_degrees", "euler_degrees"), &Environment::set_sky_rotation_degrees);
 	ClassDB::bind_method(D_METHOD("set_bg_color", "color"), &Environment::set_bg_color);
 	ClassDB::bind_method(D_METHOD("set_bg_energy", "energy"), &Environment::set_bg_energy);
 	ClassDB::bind_method(D_METHOD("set_canvas_max_layer", "layer"), &Environment::set_canvas_max_layer);
@@ -961,13 +950,13 @@ void Environment::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_ambient_light_energy", "energy"), &Environment::set_ambient_light_energy);
 	ClassDB::bind_method(D_METHOD("set_ambient_light_sky_contribution", "energy"), &Environment::set_ambient_light_sky_contribution);
 	ClassDB::bind_method(D_METHOD("set_camera_feed_id", "camera_feed_id"), &Environment::set_camera_feed_id);
+	ClassDB::bind_method(D_METHOD("set_ambient_source", "source"), &Environment::set_ambient_source);
+	ClassDB::bind_method(D_METHOD("set_reflection_source", "source"), &Environment::set_reflection_source);
 
 	ClassDB::bind_method(D_METHOD("get_background"), &Environment::get_background);
 	ClassDB::bind_method(D_METHOD("get_sky"), &Environment::get_sky);
 	ClassDB::bind_method(D_METHOD("get_sky_custom_fov"), &Environment::get_sky_custom_fov);
-	ClassDB::bind_method(D_METHOD("get_sky_orientation"), &Environment::get_sky_orientation);
 	ClassDB::bind_method(D_METHOD("get_sky_rotation"), &Environment::get_sky_rotation);
-	ClassDB::bind_method(D_METHOD("get_sky_rotation_degrees"), &Environment::get_sky_rotation_degrees);
 	ClassDB::bind_method(D_METHOD("get_bg_color"), &Environment::get_bg_color);
 	ClassDB::bind_method(D_METHOD("get_bg_energy"), &Environment::get_bg_energy);
 	ClassDB::bind_method(D_METHOD("get_canvas_max_layer"), &Environment::get_canvas_max_layer);
@@ -975,24 +964,26 @@ void Environment::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_ambient_light_energy"), &Environment::get_ambient_light_energy);
 	ClassDB::bind_method(D_METHOD("get_ambient_light_sky_contribution"), &Environment::get_ambient_light_sky_contribution);
 	ClassDB::bind_method(D_METHOD("get_camera_feed_id"), &Environment::get_camera_feed_id);
+	ClassDB::bind_method(D_METHOD("get_ambient_source"), &Environment::get_ambient_source);
+	ClassDB::bind_method(D_METHOD("get_reflection_source"), &Environment::get_reflection_source);
 
 	ADD_GROUP("Background", "background_");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "background_mode", PROPERTY_HINT_ENUM, "Clear Color,Custom Color,Sky,Color+Sky,Canvas,Keep,Camera Feed"), "set_background", "get_background");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "background_sky", PROPERTY_HINT_RESOURCE_TYPE, "Sky"), "set_sky", "get_sky");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "background_sky_custom_fov", PROPERTY_HINT_RANGE, "0,180,0.1"), "set_sky_custom_fov", "get_sky_custom_fov");
-	ADD_PROPERTY(PropertyInfo(Variant::BASIS, "background_sky_orientation"), "set_sky_orientation", "get_sky_orientation");
-	// Only display rotation in degrees in the inspector (like in Spatial).
-	// This avoids displaying the same information twice.
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "background_sky_rotation", PROPERTY_HINT_NONE, "", 0), "set_sky_rotation", "get_sky_rotation");
-	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "background_sky_rotation_degrees", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_sky_rotation_degrees", "get_sky_rotation_degrees");
-	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "background_color"), "set_bg_color", "get_bg_color");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "background_energy", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_bg_energy", "get_bg_energy");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "background_mode", PROPERTY_HINT_ENUM, "Clear Color,Custom Color,Sky,Canvas,Keep,Camera Feed"), "set_background", "get_background");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "background_canvas_max_layer", PROPERTY_HINT_RANGE, "-1000,1000,1"), "set_canvas_max_layer", "get_canvas_max_layer");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "background_camera_feed_id", PROPERTY_HINT_RANGE, "1,10,1"), "set_camera_feed_id", "get_camera_feed_id");
+	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "background_color"), "set_bg_color", "get_bg_color");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "background_energy", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_bg_energy", "get_bg_energy");
+	ADD_GROUP("Sky", "sky_");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sky", PROPERTY_HINT_RESOURCE_TYPE, "Sky"), "set_sky", "get_sky");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "sky_custom_fov", PROPERTY_HINT_RANGE, "0,180,0.1"), "set_sky_custom_fov", "get_sky_custom_fov");
+	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "sky_rotation"), "set_sky_rotation", "get_sky_rotation");
 	ADD_GROUP("Ambient Light", "ambient_light_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "ambient_light_source", PROPERTY_HINT_ENUM, "Background,Disabled,Color,Sky"), "set_ambient_source", "get_ambient_source");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "ambient_light_color"), "set_ambient_light_color", "get_ambient_light_color");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "ambient_light_energy", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_ambient_light_energy", "get_ambient_light_energy");
 	ADD_PROPERTY(PropertyInfo(Variant::REAL, "ambient_light_sky_contribution", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_ambient_light_sky_contribution", "get_ambient_light_sky_contribution");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "ambient_light_energy", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_ambient_light_energy", "get_ambient_light_energy");
+	ADD_GROUP("Reflected Light", "reflected_light_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "reflected_light_source", PROPERTY_HINT_ENUM, "Background,Disabled,Sky"), "set_reflection_source", "get_reflection_source");
 
 	ClassDB::bind_method(D_METHOD("set_fog_enabled", "enabled"), &Environment::set_fog_enabled);
 	ClassDB::bind_method(D_METHOD("is_fog_enabled"), &Environment::is_fog_enabled);
@@ -1282,11 +1273,19 @@ void Environment::_bind_methods() {
 	BIND_ENUM_CONSTANT(BG_CLEAR_COLOR);
 	BIND_ENUM_CONSTANT(BG_COLOR);
 	BIND_ENUM_CONSTANT(BG_SKY);
-	BIND_ENUM_CONSTANT(BG_COLOR_SKY);
 	BIND_ENUM_CONSTANT(BG_CANVAS);
 	BIND_ENUM_CONSTANT(BG_CAMERA_FEED);
 	BIND_ENUM_CONSTANT(BG_MAX);
 
+	BIND_ENUM_CONSTANT(AMBIENT_SOURCE_BG);
+	BIND_ENUM_CONSTANT(AMBIENT_SOURCE_DISABLED);
+	BIND_ENUM_CONSTANT(AMBIENT_SOURCE_COLOR);
+	BIND_ENUM_CONSTANT(AMBIENT_SOURCE_SKY);
+
+	BIND_ENUM_CONSTANT(REFLECTION_SOURCE_BG);
+	BIND_ENUM_CONSTANT(REFLECTION_SOURCE_DISABLED);
+	BIND_ENUM_CONSTANT(REFLECTION_SOURCE_SKY);
+
 	BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_ADDITIVE);
 	BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_SCREEN);
 	BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_SOFTLIGHT);
@@ -1324,11 +1323,12 @@ Environment::Environment() :
 
 	bg_mode = BG_CLEAR_COLOR;
 	bg_sky_custom_fov = 0;
-	bg_sky_orientation = Basis();
 	bg_energy = 1.0;
 	bg_canvas_max_layer = 0;
 	ambient_energy = 1.0;
 	//ambient_sky_contribution = 1.0;
+	ambient_source = AMBIENT_SOURCE_BG;
+	reflection_source = REFLECTION_SOURCE_BG;
 	set_ambient_light_sky_contribution(1.0);
 	set_camera_feed_id(1);
 
diff --git a/scene/resources/environment.h b/scene/resources/environment.h
index e9088d4fbd..30f96e97fd 100644
--- a/scene/resources/environment.h
+++ b/scene/resources/environment.h
@@ -46,13 +46,25 @@ public:
 		BG_CLEAR_COLOR,
 		BG_COLOR,
 		BG_SKY,
-		BG_COLOR_SKY,
 		BG_CANVAS,
 		BG_KEEP,
 		BG_CAMERA_FEED,
 		BG_MAX
 	};
 
+	enum AmbientSource {
+		AMBIENT_SOURCE_BG,
+		AMBIENT_SOURCE_DISABLED,
+		AMBIENT_SOURCE_COLOR,
+		AMBIENT_SOURCE_SKY,
+	};
+
+	enum ReflectionSource {
+		REFLECTION_SOURCE_BG,
+		REFLECTION_SOURCE_DISABLED,
+		REFLECTION_SOURCE_SKY,
+	};
+
 	enum ToneMapper {
 		TONE_MAPPER_LINEAR,
 		TONE_MAPPER_REINHARDT,
@@ -92,7 +104,7 @@ private:
 	BGMode bg_mode;
 	Ref<Sky> bg_sky;
 	float bg_sky_custom_fov;
-	Basis bg_sky_orientation;
+	Vector3 sky_rotation;
 	Color bg_color;
 	float bg_energy;
 	int bg_canvas_max_layer;
@@ -100,6 +112,8 @@ private:
 	float ambient_energy;
 	float ambient_sky_contribution;
 	int camera_feed_id;
+	AmbientSource ambient_source;
+	ReflectionSource reflection_source;
 
 	ToneMapper tone_mapper;
 	float tonemap_exposure;
@@ -183,11 +197,10 @@ protected:
 
 public:
 	void set_background(BGMode p_bg);
+
 	void set_sky(const Ref<Sky> &p_sky);
 	void set_sky_custom_fov(float p_scale);
-	void set_sky_orientation(const Basis &p_orientation);
-	void set_sky_rotation(const Vector3 &p_euler_rad);
-	void set_sky_rotation_degrees(const Vector3 &p_euler_deg);
+	void set_sky_rotation(const Vector3 &p_rotation);
 	void set_bg_color(const Color &p_color);
 	void set_bg_energy(float p_energy);
 	void set_canvas_max_layer(int p_max_layer);
@@ -195,13 +208,15 @@ public:
 	void set_ambient_light_energy(float p_energy);
 	void set_ambient_light_sky_contribution(float p_energy);
 	void set_camera_feed_id(int p_camera_feed_id);
+	void set_ambient_source(AmbientSource p_source);
+	AmbientSource get_ambient_source() const;
+	void set_reflection_source(ReflectionSource p_source);
+	ReflectionSource get_reflection_source() const;
 
 	BGMode get_background() const;
 	Ref<Sky> get_sky() const;
 	float get_sky_custom_fov() const;
-	Basis get_sky_orientation() const;
 	Vector3 get_sky_rotation() const;
-	Vector3 get_sky_rotation_degrees() const;
 	Color get_bg_color() const;
 	float get_bg_energy() const;
 	int get_canvas_max_layer() const;
@@ -412,6 +427,8 @@ public:
 };
 
 VARIANT_ENUM_CAST(Environment::BGMode)
+VARIANT_ENUM_CAST(Environment::AmbientSource)
+VARIANT_ENUM_CAST(Environment::ReflectionSource)
 VARIANT_ENUM_CAST(Environment::ToneMapper)
 VARIANT_ENUM_CAST(Environment::GlowBlendMode)
 VARIANT_ENUM_CAST(Environment::DOFBlurQuality)
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 368d65cb85..8569d998e4 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -461,7 +461,7 @@ void SpatialMaterial::_update_shader() {
 		code += ",unshaded";
 	}
 	if (flags[FLAG_DISABLE_DEPTH_TEST]) {
-		code += ",depth_test_disable";
+		code += ",depth_test_disabled";
 	}
 	if (flags[FLAG_USE_VERTEX_LIGHTING]) {
 		code += ",vertex_lighting";
diff --git a/scene/resources/sky.cpp b/scene/resources/sky.cpp
index 59af1f58e8..3e797a7bde 100644
--- a/scene/resources/sky.cpp
+++ b/scene/resources/sky.cpp
@@ -36,7 +36,10 @@ void Sky::set_radiance_size(RadianceSize p_size) {
 	ERR_FAIL_INDEX(p_size, RADIANCE_SIZE_MAX);
 
 	radiance_size = p_size;
-	_radiance_changed();
+	static const int size[RADIANCE_SIZE_MAX] = {
+		32, 64, 128, 256, 512, 1024, 2048
+	};
+	VS::get_singleton()->sky_set_radiance_size(sky, size[radiance_size]);
 }
 
 Sky::RadianceSize Sky::get_radiance_size() const {
@@ -44,12 +47,30 @@ Sky::RadianceSize Sky::get_radiance_size() const {
 	return radiance_size;
 }
 
+void Sky::set_process_mode(ProcessMode p_mode) {
+	mode = p_mode;
+	VS::get_singleton()->sky_set_mode(sky, VS::SkyMode(mode));
+}
+
+Sky::ProcessMode Sky::get_process_mode() const {
+	return mode;
+}
+
+RID Sky::get_rid() const {
+
+	return sky;
+}
+
 void Sky::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_radiance_size", "size"), &Sky::set_radiance_size);
 	ClassDB::bind_method(D_METHOD("get_radiance_size"), &Sky::get_radiance_size);
 
+	ClassDB::bind_method(D_METHOD("set_process_mode", "mode"), &Sky::set_process_mode);
+	ClassDB::bind_method(D_METHOD("get_process_mode"), &Sky::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");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "HighQuality,RealTime"), "set_process_mode", "get_process_mode");
 
 	BIND_ENUM_CONSTANT(RADIANCE_SIZE_32);
 	BIND_ENUM_CONSTANT(RADIANCE_SIZE_64);
@@ -59,35 +80,30 @@ void Sky::_bind_methods() {
 	BIND_ENUM_CONSTANT(RADIANCE_SIZE_1024);
 	BIND_ENUM_CONSTANT(RADIANCE_SIZE_2048);
 	BIND_ENUM_CONSTANT(RADIANCE_SIZE_MAX);
+
+	BIND_ENUM_CONSTANT(PROCESS_MODE_QUALITY);
+	BIND_ENUM_CONSTANT(PROCESS_MODE_REALTIME);
 }
 
 Sky::Sky() {
+	mode = PROCESS_MODE_QUALITY;
 	radiance_size = RADIANCE_SIZE_128;
+	sky = VS::get_singleton()->sky_create();
 }
 
-/////////////////////////////////////////
-
-void PanoramaSky::_radiance_changed() {
+Sky::~Sky() {
 
-	if (panorama.is_valid()) {
-		static const int size[RADIANCE_SIZE_MAX] = {
-			32, 64, 128, 256, 512, 1024, 2048
-		};
-		VS::get_singleton()->sky_set_texture(sky, panorama->get_rid(), size[get_radiance_size()]);
-	}
+	VS::get_singleton()->free(sky);
 }
 
+/////////////////////////////////////////
+
 void PanoramaSky::set_panorama(const Ref<Texture2D> &p_panorama) {
 
 	panorama = p_panorama;
 
-	if (panorama.is_valid()) {
-
-		_radiance_changed();
-
-	} else {
-		VS::get_singleton()->sky_set_texture(sky, RID(), 0);
-	}
+	RID rid = p_panorama.is_valid() ? p_panorama->get_rid() : RID();
+	VS::get_singleton()->sky_set_texture(get_rid(), rid);
 }
 
 Ref<Texture2D> PanoramaSky::get_panorama() const {
@@ -95,11 +111,6 @@ Ref<Texture2D> PanoramaSky::get_panorama() const {
 	return panorama;
 }
 
-RID PanoramaSky::get_rid() const {
-
-	return sky;
-}
-
 void PanoramaSky::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_panorama", "texture"), &PanoramaSky::set_panorama);
@@ -109,27 +120,12 @@ void PanoramaSky::_bind_methods() {
 }
 
 PanoramaSky::PanoramaSky() {
-
-	sky = VS::get_singleton()->sky_create();
 }
 
 PanoramaSky::~PanoramaSky() {
-
-	VS::get_singleton()->free(sky);
 }
 //////////////////////////////////
 
-void ProceduralSky::_radiance_changed() {
-
-	if (update_queued)
-		return; //do nothing yet
-
-	static const int size[RADIANCE_SIZE_MAX] = {
-		32, 64, 128, 256, 512, 1024, 2048
-	};
-	VS::get_singleton()->sky_set_texture(sky, texture, size[get_radiance_size()]);
-}
-
 Ref<Image> ProceduralSky::_generate_sky() {
 
 	update_queued = false;
@@ -390,10 +386,6 @@ ProceduralSky::TextureSize ProceduralSky::get_texture_size() const {
 	return texture_size;
 }
 
-RID ProceduralSky::get_rid() const {
-	return sky;
-}
-
 void ProceduralSky::_update_sky() {
 
 	bool use_thread = true;
@@ -421,7 +413,7 @@ void ProceduralSky::_update_sky() {
 		} else {
 			texture = VS::get_singleton()->texture_2d_create(image);
 		}
-		_radiance_changed();
+		VS::get_singleton()->sky_set_texture(get_rid(), texture);
 	}
 }
 
@@ -443,7 +435,8 @@ void ProceduralSky::_thread_done(const Ref<Image> &p_image) {
 		texture = VS::get_singleton()->texture_2d_create(p_image);
 	}
 
-	_radiance_changed();
+	VS::get_singleton()->sky_set_texture(get_rid(), texture);
+
 	Thread::wait_to_finish(sky_thread);
 	memdelete(sky_thread);
 	sky_thread = NULL;
@@ -547,8 +540,6 @@ void ProceduralSky::_bind_methods() {
 
 ProceduralSky::ProceduralSky(bool p_desaturate) {
 
-	sky = VS::get_singleton()->sky_create();
-
 	update_queued = false;
 	sky_top_color = Color::hex(0xa5d6f1ff);
 	sky_horizon_color = Color::hex(0xd6eafaff);
@@ -589,7 +580,6 @@ ProceduralSky::~ProceduralSky() {
 		memdelete(sky_thread);
 		sky_thread = NULL;
 	}
-	VS::get_singleton()->free(sky);
 	if (texture.is_valid()) {
 		VS::get_singleton()->free(texture);
 	}
diff --git a/scene/resources/sky.h b/scene/resources/sky.h
index cc5ec79a1f..09ebbd88a0 100644
--- a/scene/resources/sky.h
+++ b/scene/resources/sky.h
@@ -49,38 +49,48 @@ public:
 		RADIANCE_SIZE_MAX
 	};
 
+	enum ProcessMode {
+		PROCESS_MODE_QUALITY,
+		PROCESS_MODE_REALTIME
+	};
+
 private:
+	RID sky;
+	ProcessMode mode;
 	RadianceSize radiance_size;
 
 protected:
 	static void _bind_methods();
-	virtual void _radiance_changed() = 0;
 
 public:
 	void set_radiance_size(RadianceSize p_size);
 	RadianceSize get_radiance_size() const;
+
+	void set_process_mode(ProcessMode p_mode);
+	ProcessMode get_process_mode() const;
+
+	virtual RID get_rid() const;
+
 	Sky();
+	~Sky();
 };
 
 VARIANT_ENUM_CAST(Sky::RadianceSize)
+VARIANT_ENUM_CAST(Sky::ProcessMode)
 
 class PanoramaSky : public Sky {
 	GDCLASS(PanoramaSky, Sky);
 
 private:
-	RID sky;
 	Ref<Texture2D> panorama;
 
 protected:
 	static void _bind_methods();
-	virtual void _radiance_changed();
 
 public:
 	void set_panorama(const Ref<Texture2D> &p_panorama);
 	Ref<Texture2D> get_panorama() const;
 
-	virtual RID get_rid() const;
-
 	PanoramaSky();
 	~PanoramaSky();
 };
@@ -120,7 +130,6 @@ private:
 
 	TextureSize texture_size;
 
-	RID sky;
 	RID texture;
 
 	bool update_queued;
@@ -133,7 +142,6 @@ private:
 
 protected:
 	static void _bind_methods();
-	virtual void _radiance_changed();
 
 	Ref<Image> _generate_sky();
 	void _update_sky();
@@ -189,8 +197,6 @@ public:
 	void set_texture_size(TextureSize p_size);
 	TextureSize get_texture_size() const;
 
-	virtual RID get_rid() const;
-
 	ProceduralSky(bool p_desaturate = false);
 	~ProceduralSky();
 };