1 files changed, 149 insertions, 35 deletions

diff --git a/scene/resources/baked_light.cpp b/scene/resources/baked_light.cpp
index 725ac1c946..647c8df5d4 100644
--- a/scene/resources/baked_light.cpp
+++ b/scene/resources/baked_light.cpp
@@ -5,6 +5,7 @@ void BakedLight::set_mode(Mode p_mode) {
 
 	mode=p_mode;
 	VS::get_singleton()->baked_light_set_mode(baked_light,(VS::BakedLightMode(p_mode)));
+
 }
 
 BakedLight::Mode BakedLight::get_mode() const{
@@ -23,56 +24,79 @@ DVector<uint8_t> BakedLight::get_octree() const {
 }
 
 
-void BakedLight::_update_lightmaps() {
-
-	VS::get_singleton()->baked_light_clear_lightmaps(baked_light);
-	for(Map<int,Ref<Texture> >::Element *E=lightmaps.front();E;E=E->next()) {
 
-		VS::get_singleton()->baked_light_add_lightmap(baked_light,E->get()->get_rid(),E->key());
-	}
 
-}
 
-void BakedLight::add_lightmap(const Ref<Texture> p_texture,int p_id) {
+void BakedLight::add_lightmap(const Ref<Texture> &p_texture,Size2 p_gen_size) {
 
-	ERR_FAIL_COND(!p_texture.is_valid());
-	ERR_FAIL_COND(p_id<0);
-	lightmaps[p_id]=p_texture;
-	VS::get_singleton()->baked_light_add_lightmap(baked_light,p_texture->get_rid(),p_id);
+	LightMap lm;
+	lm.texture=p_texture;
+	lm.gen_size=p_gen_size;
+	lightmaps.push_back(lm);
+	_update_lightmaps();
+	_change_notify();
 }
 
-void BakedLight::erase_lightmap(int p_id) {
+void BakedLight::set_lightmap_gen_size(int p_idx,const Size2& p_size){
 
-	ERR_FAIL_COND(!lightmaps.has(p_id));
-	lightmaps.erase(p_id);
+	ERR_FAIL_INDEX(p_idx,lightmaps.size());
+	lightmaps[p_idx].gen_size=p_size;
 	_update_lightmaps();
 }
+Size2 BakedLight::get_lightmap_gen_size(int p_idx) const{
 
-void BakedLight::get_lightmaps(List<int> *r_lightmaps) {
+	ERR_FAIL_INDEX_V(p_idx,lightmaps.size(),Size2());
+	return lightmaps[p_idx].gen_size;
 
-	for(Map<int,Ref<Texture> >::Element *E=lightmaps.front();E;E=E->next()) {
+}
+void BakedLight::set_lightmap_texture(int p_idx,const Ref<Texture> &p_texture){
 
-		r_lightmaps->push_back(E->key());
-	}
+	ERR_FAIL_INDEX(p_idx,lightmaps.size());
+	lightmaps[p_idx].texture=p_texture;
+	_update_lightmaps();
 
 }
+Ref<Texture> BakedLight::get_lightmap_texture(int p_idx) const{
 
-Ref<Texture> BakedLight::get_lightmap_texture(int p_id) {
+	ERR_FAIL_INDEX_V(p_idx,lightmaps.size(),Ref<Texture>());
+	return lightmaps[p_idx].texture;
 
-	if (!lightmaps.has(p_id))
-		return Ref<Texture>();
-
-	return lightmaps[p_id];
+}
+void BakedLight::erase_lightmap(int p_idx){
 
+	ERR_FAIL_INDEX(p_idx,lightmaps.size());
+	lightmaps.remove(p_idx);
+	_update_lightmaps();
+	_change_notify();
 
 }
+int  BakedLight::get_lightmaps_count() const{
 
-void BakedLight::clear_lightmaps() {
+	return lightmaps.size();
+}
+void BakedLight::clear_lightmaps(){
 
 	lightmaps.clear();
 	_update_lightmaps();
+	_change_notify();
+}
+
+
+
+void BakedLight::_update_lightmaps() {
+
+	VS::get_singleton()->baked_light_clear_lightmaps(baked_light);
+	for(int i=0;i<lightmaps.size();i++) {
+
+		RID tid;
+		if (lightmaps[i].texture.is_valid())
+			tid=lightmaps[i].texture->get_rid();
+		VS::get_singleton()->baked_light_add_lightmap(baked_light,tid,i);
+	}
 }
 
+
+
 RID BakedLight::get_rid() const {
 
 	return baked_light;
@@ -84,12 +108,11 @@ Array BakedLight::_get_lightmap_data() const {
 	ret.resize(lightmaps.size()*2);
 
 	int idx=0;
-	for(Map<int,Ref<Texture> >::Element *E=lightmaps.front();E;E=E->next()) {
+	for(int i=0;i<lightmaps.size();i++) {
 
-		ret[idx++]=E->key();
-		ret[idx++]=E->get();
+		ret[idx++]=Size2(lightmaps[i].gen_size);
+		ret[idx++]=lightmaps[i].texture;
 	}
-
 	return ret;
 
 }
@@ -99,11 +122,13 @@ void BakedLight::_set_lightmap_data(Array p_array){
 	lightmaps.clear();
 	for(int i=0;i<p_array.size();i+=2) {
 
-		int id = p_array[i];
+		Size2 size = p_array[i];
 		Ref<Texture> tex = p_array[i+1];
-		ERR_CONTINUE(id<0);
-		ERR_CONTINUE(tex.is_null());
-		lightmaps[id]=tex;
+//		ERR_CONTINUE(tex.is_null());
+		LightMap lm;
+		lm.gen_size=size;
+		lm.texture=tex;
+		lightmaps.push_back(lm);
 	}
 	_update_lightmaps();
 }
@@ -204,7 +229,7 @@ bool BakedLight::get_bake_flag(BakeFlags p_flags) const{
 void BakedLight::set_format(Format p_format) {
 
 	format=p_format;
-
+	VS::get_singleton()->baked_light_set_lightmap_multiplier(baked_light,format==FORMAT_HDR8?8.0:1.0);
 }
 
 BakedLight::Format BakedLight::get_format() const{
@@ -212,6 +237,88 @@ BakedLight::Format BakedLight::get_format() const{
 	return format;
 }
 
+void BakedLight::set_transfer_lightmaps_only_to_uv2(bool p_enable) {
+
+	transfer_only_uv2=p_enable;
+}
+
+bool BakedLight::get_transfer_lightmaps_only_to_uv2() const{
+
+	return transfer_only_uv2;
+}
+
+
+bool BakedLight::_set(const StringName& p_name, const Variant& p_value) {
+
+	String n = p_name;
+	if (!n.begins_with("lightmap"))
+		return false;
+	int idx = n.get_slice("/",1).to_int();
+	ERR_FAIL_COND_V(idx<0,false);
+	ERR_FAIL_COND_V(idx>lightmaps.size(),false);
+
+	String what = n.get_slice("/",2);
+	Ref<Texture> tex;
+	Size2 gens;
+
+	if (what=="texture")
+		tex=p_value;
+	else if (what=="gen_size")
+		gens=p_value;
+
+	if (idx==lightmaps.size()) {
+		if (tex.is_valid() || gens!=Size2())
+			add_lightmap(tex,gens);
+	} else {
+		if (tex.is_valid())
+			set_lightmap_texture(idx,tex);
+		else if (gens!=Size2())
+			set_lightmap_gen_size(idx,gens);
+	}
+
+
+	return true;
+}
+
+bool BakedLight::_get(const StringName& p_name,Variant &r_ret) const{
+
+	String n = p_name;
+	if (!n.begins_with("lightmap"))
+		return false;
+	int idx = n.get_slice("/",1).to_int();
+	ERR_FAIL_COND_V(idx<0,false);
+	ERR_FAIL_COND_V(idx>lightmaps.size(),false);
+
+	String what = n.get_slice("/",2);
+
+	if (what=="texture") {
+		if (idx==lightmaps.size())
+			r_ret=Ref<Texture>();
+		else
+			r_ret=lightmaps[idx].texture;
+
+	} else if (what=="gen_size") {
+
+		if (idx==lightmaps.size())
+			r_ret=Size2();
+		else
+			r_ret=Size2(lightmaps[idx].gen_size);
+	} else
+		return false;
+
+	return true;
+
+
+}
+void BakedLight::_get_property_list( List<PropertyInfo> *p_list) const{
+
+	for(int i=0;i<=lightmaps.size();i++) {
+
+		p_list->push_back(PropertyInfo(Variant::VECTOR2,"lightmaps/"+itos(i)+"/gen_size",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_EDITOR));
+		p_list->push_back(PropertyInfo(Variant::OBJECT,"lightmaps/"+itos(i)+"/texture",PROPERTY_HINT_RESOURCE_TYPE,"Texture",PROPERTY_USAGE_EDITOR));
+	}
+}
+
 
 void BakedLight::_bind_methods(){
 
@@ -222,7 +329,7 @@ void BakedLight::_bind_methods(){
 	ObjectTypeDB::bind_method(_MD("set_octree","octree"),&BakedLight::set_octree);
 	ObjectTypeDB::bind_method(_MD("get_octree"),&BakedLight::get_octree);
 
-	ObjectTypeDB::bind_method(_MD("add_lightmap","texture:Texture","id"),&BakedLight::add_lightmap);
+	ObjectTypeDB::bind_method(_MD("add_lightmap","texture:Texture","gen_size"),&BakedLight::add_lightmap);
 	ObjectTypeDB::bind_method(_MD("erase_lightmap","id"),&BakedLight::erase_lightmap);
 	ObjectTypeDB::bind_method(_MD("clear_lightmaps"),&BakedLight::clear_lightmaps);
 
@@ -253,6 +360,11 @@ void BakedLight::_bind_methods(){
 	ObjectTypeDB::bind_method(_MD("set_format","format"),&BakedLight::set_format);
 	ObjectTypeDB::bind_method(_MD("get_format"),&BakedLight::get_format);
 
+	ObjectTypeDB::bind_method(_MD("set_transfer_lightmaps_only_to_uv2","enable"),&BakedLight::set_transfer_lightmaps_only_to_uv2);
+	ObjectTypeDB::bind_method(_MD("get_transfer_lightmaps_only_to_uv2"),&BakedLight::get_transfer_lightmaps_only_to_uv2);
+
+
+
 
 	ObjectTypeDB::bind_method(_MD("set_energy_multiplier","energy_multiplier"),&BakedLight::set_energy_multiplier);
 	ObjectTypeDB::bind_method(_MD("get_energy_multiplier"),&BakedLight::get_energy_multiplier);
@@ -276,6 +388,7 @@ void BakedLight::_bind_methods(){
 	ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"baking_flags/specular"),_SCS("set_bake_flag"),_SCS("get_bake_flag"),BAKE_SPECULAR);
 	ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"baking_flags/translucent"),_SCS("set_bake_flag"),_SCS("get_bake_flag"),BAKE_TRANSLUCENT);
 	ADD_PROPERTYI( PropertyInfo(Variant::BOOL,"baking_flags/conserve_energy"),_SCS("set_bake_flag"),_SCS("get_bake_flag"),BAKE_CONSERVE_ENERGY);
+	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"lightmap/use_only_uv2"),_SCS("set_transfer_lightmaps_only_to_uv2"),_SCS("get_transfer_lightmaps_only_to_uv2"));
 
 	ADD_PROPERTY( PropertyInfo(Variant::RAW_ARRAY,"octree",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),_SCS("set_octree"),_SCS("get_octree"));
 	ADD_PROPERTY( PropertyInfo(Variant::ARRAY,"lightmaps",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),_SCS("_set_lightmap_data"),_SCS("_get_lightmap_data"));
@@ -308,6 +421,7 @@ BakedLight::BakedLight() {
 	edge_damp=0.0;
 	normal_damp=0.0;
 	format=FORMAT_RGB;
+	transfer_only_uv2=false;
 
 	flags[BAKE_DIFFUSE]=true;
 	flags[BAKE_SPECULAR]=false;