1 files changed, 111 insertions, 26 deletions

diff --git a/scene/resources/sky_box.h b/scene/resources/sky_box.h
index f748ac1e2d..7b707af3a6 100644
--- a/scene/resources/sky_box.h
+++ b/scene/resources/sky_box.h
@@ -27,13 +27,13 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef SKYBOX_H
-#define SKYBOX_H
+#ifndef Sky_H
+#define Sky_H
 
 #include "scene/resources/texture.h"
 
-class SkyBox : public Resource {
-	GDCLASS(SkyBox, Resource);
+class Sky : public Resource {
+	GDCLASS(Sky, Resource);
 
 public:
 	enum RadianceSize {
@@ -54,46 +54,131 @@ protected:
 public:
 	void set_radiance_size(RadianceSize p_size);
 	RadianceSize get_radiance_size() const;
-	SkyBox();
+	Sky();
 };
 
-VARIANT_ENUM_CAST(SkyBox::RadianceSize)
+VARIANT_ENUM_CAST(Sky::RadianceSize)
 
-class ImageSkyBox : public SkyBox {
-	GDCLASS(ImageSkyBox, SkyBox);
+class PanoramaSky : public Sky {
+	GDCLASS(PanoramaSky, Sky);
+
+private:
+	RID sky;
+	Ref<Texture> panorama;
+
+protected:
+	static void _bind_methods();
+	virtual void _radiance_changed();
 
 public:
-	enum ImagePath {
-		IMAGE_PATH_NEGATIVE_X,
-		IMAGE_PATH_POSITIVE_X,
-		IMAGE_PATH_NEGATIVE_Y,
-		IMAGE_PATH_POSITIVE_Y,
-		IMAGE_PATH_NEGATIVE_Z,
-		IMAGE_PATH_POSITIVE_Z,
-		IMAGE_PATH_MAX
+	void set_panorama(const Ref<Texture> &p_panorama);
+	Ref<Texture> get_panorama() const;
+
+	virtual RID get_rid() const;
+
+	PanoramaSky();
+	~PanoramaSky();
+};
+
+class ProceduralSky : public Sky {
+	GDCLASS(ProceduralSky, Sky);
+
+public:
+	enum TextureSize {
+		TEXTURE_SIZE_1024,
+		TEXTURE_SIZE_2048,
+		TEXTURE_SIZE_4096,
+		TEXTURE_SIZE_MAX
 	};
 
 private:
-	RID cube_map;
-	RID sky_box;
-	bool cube_map_valid;
+	Color sky_top_color;
+	Color sky_horizon_color;
+	float sky_curve;
+	float sky_energy;
+
+	Color ground_bottom_color;
+	Color ground_horizon_color;
+	float ground_curve;
+	float ground_energy;
+
+	Color sun_color;
+	float sun_latitude;
+	float sun_longitude;
+	float sun_angle_min;
+	float sun_angle_max;
+	float sun_curve;
+	float sun_energy;
+
+	TextureSize texture_size;
+
+	RID sky;
+	RID texture;
 
-	String image_path[IMAGE_PATH_MAX];
+	bool update_queued;
 
 protected:
 	static void _bind_methods();
 	virtual void _radiance_changed();
 
+	void _update_sky();
+	void _queue_update();
+
 public:
-	void set_image_path(ImagePath p_image, const String &p_path);
-	String get_image_path(ImagePath p_image) const;
+	void set_sky_top_color(const Color &p_sky_top);
+	Color get_sky_top_color() const;
+
+	void set_sky_horizon_color(const Color &p_sky_horizon);
+	Color get_sky_horizon_color() const;
+
+	void set_sky_curve(float p_curve);
+	float get_sky_curve() const;
+
+	void set_sky_energy(float p_energy);
+	float get_sky_energy() const;
+
+	void set_ground_bottom_color(const Color &p_ground_bottom);
+	Color get_ground_bottom_color() const;
+
+	void set_ground_horizon_color(const Color &p_ground_horizon);
+	Color get_ground_horizon_color() const;
+
+	void set_ground_curve(float p_curve);
+	float get_ground_curve() const;
+
+	void set_ground_energy(float p_energy);
+	float get_ground_energy() const;
+
+	void set_sun_color(const Color &p_sun);
+	Color get_sun_color() const;
+
+	void set_sun_latitude(float p_angle);
+	float get_sun_latitude() const;
+
+	void set_sun_longitude(float p_angle);
+	float get_sun_longitude() const;
+
+	void set_sun_angle_min(float p_angle);
+	float get_sun_angle_min() const;
+
+	void set_sun_angle_max(float p_angle);
+	float get_sun_angle_max() const;
+
+	void set_sun_curve(float p_curve);
+	float get_sun_curve() const;
+
+	void set_sun_energy(float p_energy);
+	float get_sun_energy() const;
+
+	void set_texture_size(TextureSize p_size);
+	TextureSize get_texture_size() const;
 
 	virtual RID get_rid() const;
 
-	ImageSkyBox();
-	~ImageSkyBox();
+	ProceduralSky();
+	~ProceduralSky();
 };
 
-VARIANT_ENUM_CAST(ImageSkyBox::ImagePath)
+VARIANT_ENUM_CAST(ProceduralSky::TextureSize)
 
-#endif // SKYBOX_H
+#endif // Sky_H