1 files changed, 34 insertions, 23 deletions

diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp
index 77c6199794..84fa07e4f4 100644
--- a/scene/resources/shader.cpp
+++ b/scene/resources/shader.cpp
@@ -30,7 +30,7 @@
 
 #include "shader.h"
 
-#include "core/os/file_access.h"
+#include "core/io/file_access.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering_server.h"
@@ -49,6 +49,8 @@ void Shader::set_code(const String &p_code) {
 		mode = MODE_PARTICLES;
 	} else if (type == "sky") {
 		mode = MODE_SKY;
+	} else if (type == "fog") {
+		mode = MODE_FOG;
 	} else {
 		mode = MODE_SPATIAL;
 	}
@@ -72,13 +74,13 @@ void Shader::get_param_list(List<PropertyInfo> *p_params) const {
 	params_cache.clear();
 	params_cache_dirty = false;
 
-	for (List<PropertyInfo>::Element *E = local.front(); E; E = E->next()) {
-		PropertyInfo pi = E->get();
+	for (PropertyInfo &pi : local) {
 		if (default_textures.has(pi.name)) { //do not show default textures
 			continue;
 		}
+		String original_name = pi.name;
 		pi.name = "shader_param/" + pi.name;
-		params_cache[pi.name] = E->get().name;
+		params_cache[pi.name] = original_name;
 		if (p_params) {
 			//small little hack
 			if (pi.type == Variant::RID) {
@@ -95,29 +97,37 @@ RID Shader::get_rid() const {
 	return shader;
 }
 
-void Shader::set_default_texture_param(const StringName &p_param, const Ref<Texture2D> &p_texture) {
+void Shader::set_default_texture_param(const StringName &p_param, const Ref<Texture2D> &p_texture, int p_index) {
 	if (p_texture.is_valid()) {
-		default_textures[p_param] = p_texture;
-		RS::get_singleton()->shader_set_default_texture_param(shader, p_param, p_texture->get_rid());
+		if (!default_textures.has(p_param)) {
+			default_textures[p_param] = Map<int, Ref<Texture2D>>();
+		}
+		default_textures[p_param][p_index] = p_texture;
+		RS::get_singleton()->shader_set_default_texture_param(shader, p_param, p_texture->get_rid(), p_index);
 	} else {
-		default_textures.erase(p_param);
-		RS::get_singleton()->shader_set_default_texture_param(shader, p_param, RID());
+		if (default_textures.has(p_param) && default_textures[p_param].has(p_index)) {
+			default_textures[p_param].erase(p_index);
+
+			if (default_textures[p_param].is_empty()) {
+				default_textures.erase(p_param);
+			}
+		}
+		RS::get_singleton()->shader_set_default_texture_param(shader, p_param, RID(), p_index);
 	}
 
 	emit_changed();
 }
 
-Ref<Texture2D> Shader::get_default_texture_param(const StringName &p_param) const {
-	if (default_textures.has(p_param)) {
-		return default_textures[p_param];
-	} else {
-		return Ref<Texture2D>();
+Ref<Texture2D> Shader::get_default_texture_param(const StringName &p_param, int p_index) const {
+	if (default_textures.has(p_param) && default_textures[p_param].has(p_index)) {
+		return default_textures[p_param][p_index];
 	}
+	return Ref<Texture2D>();
 }
 
 void Shader::get_default_texture_param_list(List<StringName> *r_textures) const {
-	for (const Map<StringName, Ref<Texture2D>>::Element *E = default_textures.front(); E; E = E->next()) {
-		r_textures->push_back(E->key());
+	for (const KeyValue<StringName, Map<int, Ref<Texture2D>>> &E : default_textures) {
+		r_textures->push_back(E.key);
 	}
 }
 
@@ -138,17 +148,18 @@ void Shader::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_code", "code"), &Shader::set_code);
 	ClassDB::bind_method(D_METHOD("get_code"), &Shader::get_code);
 
-	ClassDB::bind_method(D_METHOD("set_default_texture_param", "param", "texture"), &Shader::set_default_texture_param);
-	ClassDB::bind_method(D_METHOD("get_default_texture_param", "param"), &Shader::get_default_texture_param);
+	ClassDB::bind_method(D_METHOD("set_default_texture_param", "param", "texture", "index"), &Shader::set_default_texture_param, DEFVAL(0));
+	ClassDB::bind_method(D_METHOD("get_default_texture_param", "param", "index"), &Shader::get_default_texture_param, DEFVAL(0));
 
 	ClassDB::bind_method(D_METHOD("has_param", "name"), &Shader::has_param);
 
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_code", "get_code");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_code", "get_code");
 
 	BIND_ENUM_CONSTANT(MODE_SPATIAL);
 	BIND_ENUM_CONSTANT(MODE_CANVAS_ITEM);
 	BIND_ENUM_CONSTANT(MODE_PARTICLES);
 	BIND_ENUM_CONSTANT(MODE_SKY);
+	BIND_ENUM_CONSTANT(MODE_FOG);
 }
 
 Shader::Shader() {
@@ -167,7 +178,7 @@ RES ResourceFormatLoaderShader::load(const String &p_path, const String &p_origi
 	}
 
 	Ref<Shader> shader;
-	shader.instance();
+	shader.instantiate();
 
 	Vector<uint8_t> buffer = FileAccess::get_file_as_array(p_path);
 
@@ -184,7 +195,7 @@ RES ResourceFormatLoaderShader::load(const String &p_path, const String &p_origi
 }
 
 void ResourceFormatLoaderShader::get_recognized_extensions(List<String> *p_extensions) const {
-	p_extensions->push_back("shader");
+	p_extensions->push_back("gdshader");
 }
 
 bool ResourceFormatLoaderShader::handles_type(const String &p_type) const {
@@ -193,7 +204,7 @@ bool ResourceFormatLoaderShader::handles_type(const String &p_type) const {
 
 String ResourceFormatLoaderShader::get_resource_type(const String &p_path) const {
 	String el = p_path.get_extension().to_lower();
-	if (el == "shader") {
+	if (el == "gdshader") {
 		return "Shader";
 	}
 	return "";
@@ -224,7 +235,7 @@ Error ResourceFormatSaverShader::save(const String &p_path, const RES &p_resourc
 void ResourceFormatSaverShader::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
 	if (const Shader *shader = Object::cast_to<Shader>(*p_resource)) {
 		if (shader->is_text_shader()) {
-			p_extensions->push_back("shader");
+			p_extensions->push_back("gdshader");
 		}
 	}
 }