Environment sky more or less working.

1 files changed, 36 insertions, 46 deletions

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);
 	}