Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)

1 files changed, 76 insertions, 85 deletions

diff --git a/scene/3d/light.h b/scene/3d/light.h
index 43ac7be350..6818e4f014 100644
--- a/scene/3d/light.h
+++ b/scene/3d/light.h
@@ -37,6 +37,10 @@
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
+
+
+class BakedLight;
+
 class Light : public VisualInstance {
 
 	OBJ_TYPE( Light, VisualInstance );
@@ -44,58 +48,36 @@ class Light : public VisualInstance {
 
 public:
 
-	enum Parameter {
-		PARAM_RADIUS=VisualServer::LIGHT_PARAM_RADIUS,
-		PARAM_ENERGY=VisualServer::LIGHT_PARAM_ENERGY,
-		PARAM_ATTENUATION=VisualServer::LIGHT_PARAM_ATTENUATION,
-		PARAM_SPOT_ANGLE=VisualServer::LIGHT_PARAM_SPOT_ANGLE,
-		PARAM_SPOT_ATTENUATION=VisualServer::LIGHT_PARAM_SPOT_ATTENUATION,
-		PARAM_SHADOW_DARKENING=VisualServer::LIGHT_PARAM_SHADOW_DARKENING,
-		PARAM_SHADOW_Z_OFFSET=VisualServer::LIGHT_PARAM_SHADOW_Z_OFFSET,
-		PARAM_SHADOW_Z_SLOPE_SCALE=VisualServer::LIGHT_PARAM_SHADOW_Z_SLOPE_SCALE,
-		PARAM_SHADOW_ESM_MULTIPLIER=VisualServer::LIGHT_PARAM_SHADOW_ESM_MULTIPLIER,
-		PARAM_SHADOW_BLUR_PASSES=VisualServer::LIGHT_PARAM_SHADOW_BLUR_PASSES,
-		PARAM_MAX=VisualServer::LIGHT_PARAM_MAX
-	};
-
-
-	enum LightColor {
-
-		COLOR_DIFFUSE=VisualServer::LIGHT_COLOR_DIFFUSE,
-		COLOR_SPECULAR=VisualServer::LIGHT_COLOR_SPECULAR
-	};
-
-	enum BakeMode {
-
-		BAKE_MODE_DISABLED,
-		BAKE_MODE_INDIRECT,
-		BAKE_MODE_INDIRECT_AND_SHADOWS,
-		BAKE_MODE_FULL
-
+	enum Param {
+		PARAM_ENERGY = VS::LIGHT_PARAM_ENERGY,
+		PARAM_SPECULAR = VS::LIGHT_PARAM_SPECULAR,
+		PARAM_RANGE = VS::LIGHT_PARAM_RANGE,
+		PARAM_ATTENUATION = VS::LIGHT_PARAM_ATTENUATION,
+		PARAM_SPOT_ANGLE = VS::LIGHT_PARAM_SPOT_ANGLE,
+		PARAM_SPOT_ATTENUATION = VS::LIGHT_PARAM_SPOT_ATTENUATION,
+		PARAM_SHADOW_MAX_DISTANCE = VS::LIGHT_PARAM_SHADOW_MAX_DISTANCE,
+		PARAM_SHADOW_SPLIT_1_OFFSET = VS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET,
+		PARAM_SHADOW_SPLIT_2_OFFSET = VS::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET,
+		PARAM_SHADOW_SPLIT_3_OFFSET = VS::LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET,
+		PARAM_SHADOW_NORMAL_BIAS = VS::LIGHT_PARAM_SHADOW_NORMAL_BIAS,
+		PARAM_SHADOW_BIAS = VS::LIGHT_PARAM_SHADOW_BIAS,
+		PARAM_SHADOW_BIAS_SPLIT_SCALE = VS::LIGHT_PARAM_SHADOW_BIAS_SPLIT_SCALE,
+		PARAM_MAX = VS::LIGHT_PARAM_MAX
 	};
 
-
-	enum Operator {
-
-		OPERATOR_ADD,
-		OPERATOR_SUB
-	};
 private:
 
-
-	Ref<Texture> projector;
-	float vars[PARAM_MAX];
-	Color colors[3];
-
-
-	BakeMode bake_mode;
-	VisualServer::LightType type;
-	bool shadows;
-	bool enabled;
+	Color color;
+	float param[PARAM_MAX];
+	Color shadow_color;
+	bool shadow;
+	bool negative;
+	uint32_t cull_mask;
+	VS::LightType type;
 	bool editor_only;
-	Operator op;
-
 	void _update_visibility();
+
+	BakedLight *baked_light;
 // bind helpers
 
 protected:
@@ -103,8 +85,7 @@ protected:
 	RID light;
 
 	virtual bool _can_gizmo_scale() const;
-	virtual RES _get_gizmo_geometry() const;
-
+	
 	static void _bind_methods();
 	void _notification(int p_what);
 
@@ -114,44 +95,37 @@ public:
 
 	VS::LightType get_light_type() const { return type; }
 
-	void set_parameter(Parameter p_var, float p_value);
-	float get_parameter(Parameter p_var) const;
+	void set_editor_only(bool p_editor_only);
+	bool is_editor_only() const;
 
-	void set_color(LightColor p_color,const Color& p_value);
-	Color get_color(LightColor p_color) const;
+	void set_param(Param p_param, float p_value);
+	float get_param(Param p_param) const;
 
-	void set_project_shadows(bool p_enabled);
-	bool has_project_shadows() const;
+	void set_shadow(bool p_enable);
+	bool has_shadow() const;
 
-	void set_projector(const Ref<Texture>& p_projector);
-	Ref<Texture> get_projector() const;
+	void set_negative(bool p_enable);
+	bool is_negative() const;
 
-	void set_operator(Operator p_op);
-	Operator get_operator() const;
+	void set_cull_mask(uint32_t p_cull_mask);
+	uint32_t get_cull_mask() const;
 
-	void set_bake_mode(BakeMode p_bake_mode);
-	BakeMode get_bake_mode() const;
+	void set_color(const Color& p_color);
+	Color get_color() const;
 
-	void set_enabled(bool p_enabled);
-	bool is_enabled() const;
+	void set_shadow_color(const Color& p_shadow_color);
+	Color get_shadow_color() const;
 
-	void set_editor_only(bool p_editor_only);
-	bool is_editor_only() const;
 
 	virtual AABB get_aabb() const;
 	virtual DVector<Face3> get_faces(uint32_t p_usage_flags) const;
 
-	void approximate_opengl_attenuation(float p_constant, float p_linear, float p_quadratic, float p_radius_treshold=0.5);
-
 	Light();
 	~Light();
 
 };
 
-VARIANT_ENUM_CAST( Light::Parameter );
-VARIANT_ENUM_CAST( Light::LightColor );
-VARIANT_ENUM_CAST( Light::Operator );
-VARIANT_ENUM_CAST( Light::BakeMode);
+VARIANT_ENUM_CAST(Light::Param);
 
 
 class DirectionalLight : public Light {
@@ -162,19 +136,15 @@ public:
 
 	enum ShadowMode {
 		SHADOW_ORTHOGONAL,
-		SHADOW_PERSPECTIVE,
 		SHADOW_PARALLEL_2_SPLITS,
 		SHADOW_PARALLEL_4_SPLITS
 	};
-	enum ShadowParam {
-		SHADOW_PARAM_MAX_DISTANCE,
-		SHADOW_PARAM_PSSM_SPLIT_WEIGHT,
-		SHADOW_PARAM_PSSM_ZOFFSET_SCALE
-	};
 
 private:
+
+	bool blend_splits;
 	ShadowMode shadow_mode;
-	float shadow_param[3];
+
 protected:
 	static void _bind_methods();
 public:
@@ -182,30 +152,51 @@ public:
 	void set_shadow_mode(ShadowMode p_mode);
 	ShadowMode get_shadow_mode() const;
 
-	void set_shadow_max_distance(float p_distance);
-	float get_shadow_max_distance() const;
-	void set_shadow_param(ShadowParam p_param, float p_value);
-	float get_shadow_param(ShadowParam p_param) const;
+	void set_blend_splits(bool p_enable);
+	bool is_blend_splits_enabled() const;
 
 	DirectionalLight();
 };
 
-VARIANT_ENUM_CAST( DirectionalLight::ShadowMode );
-VARIANT_ENUM_CAST( DirectionalLight::ShadowParam );
-
+VARIANT_ENUM_CAST(DirectionalLight::ShadowMode)
 
 class OmniLight : public Light {
 
 	OBJ_TYPE( OmniLight, Light );
+public:
+	// omni light
+	enum ShadowMode {
+		SHADOW_DUAL_PARABOLOID,
+		SHADOW_CUBE,
+	};
+
+	// omni light
+	enum ShadowDetail {
+		SHADOW_DETAIL_VERTICAL,
+		SHADOW_DETAIL_HORIZONTAL
+	};
+
+private:
+
+	ShadowMode shadow_mode;
+	ShadowDetail shadow_detail;
 protected:
 	static void _bind_methods();
 
 public:
 
+	void set_shadow_mode(ShadowMode p_mode);
+	ShadowMode get_shadow_mode() const;
 
-	OmniLight() : Light( VisualServer::LIGHT_OMNI ) { set_parameter(PARAM_SHADOW_Z_OFFSET,0.001);}
+	void set_shadow_detail(ShadowDetail p_detail);
+	ShadowDetail get_shadow_detail() const;
+
+	OmniLight();
 };
 
+VARIANT_ENUM_CAST(OmniLight::ShadowMode)
+VARIANT_ENUM_CAST(OmniLight::ShadowDetail)
+
 class SpotLight : public Light {
 
 	OBJ_TYPE( SpotLight, Light );