summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/material.cpp19
-rw-r--r--scene/resources/material.h7
-rw-r--r--scene/resources/particles_material.h2
-rw-r--r--scene/resources/sky_material.h6
4 files changed, 29 insertions, 5 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index a5ec9fcba5..445c0d9677 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -36,6 +36,7 @@
#include "editor/editor_settings.h"
#endif
+#include "scene/main/scene_tree.h"
#include "scene/scene_string_names.h"
void Material::set_next_pass(const Ref<Material> &p_pass) {
@@ -80,6 +81,14 @@ void Material::_validate_property(PropertyInfo &property) const {
}
}
+void Material::inspect_native_shader_code() {
+ SceneTree *st = Object::cast_to<SceneTree>(OS::get_singleton()->get_main_loop());
+ RID shader = get_shader_rid();
+ if (st && shader.is_valid()) {
+ st->call_group("_native_shader_source_visualizer", "_inspect_shader", shader);
+ }
+}
+
void Material::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_next_pass", "next_pass"), &Material::set_next_pass);
ClassDB::bind_method(D_METHOD("get_next_pass"), &Material::get_next_pass);
@@ -87,6 +96,9 @@ void Material::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_render_priority", "priority"), &Material::set_render_priority);
ClassDB::bind_method(D_METHOD("get_render_priority"), &Material::get_render_priority);
+ ClassDB::bind_method(D_METHOD("inspect_native_shader_code"), &Material::inspect_native_shader_code);
+ ClassDB::set_method_flags(get_class_static(), _scs_create("inspect_native_shader_code"), METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR);
+
ADD_PROPERTY(PropertyInfo(Variant::INT, "render_priority", PROPERTY_HINT_RANGE, itos(RENDER_PRIORITY_MIN) + "," + itos(RENDER_PRIORITY_MAX) + ",1"), "set_render_priority", "get_render_priority");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "next_pass", PROPERTY_HINT_RESOURCE_TYPE, "Material"), "set_next_pass", "get_next_pass");
@@ -260,6 +272,13 @@ Shader::Mode ShaderMaterial::get_shader_mode() const {
return Shader::MODE_SPATIAL;
}
}
+RID ShaderMaterial::get_shader_rid() const {
+ if (shader.is_valid()) {
+ return shader->get_rid();
+ } else {
+ return RID();
+ }
+}
ShaderMaterial::ShaderMaterial() {
}
diff --git a/scene/resources/material.h b/scene/resources/material.h
index a2183a65e4..0048b43c8b 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -47,6 +47,8 @@ class Material : public Resource {
Ref<Material> next_pass;
int render_priority;
+ void inspect_native_shader_code();
+
protected:
_FORCE_INLINE_ RID _get_material() const { return material; }
static void _bind_methods();
@@ -66,6 +68,7 @@ public:
int get_render_priority() const;
virtual RID get_rid() const override;
+ virtual RID get_shader_rid() const = 0;
virtual Shader::Mode get_shader_mode() const = 0;
Material();
@@ -100,6 +103,8 @@ public:
virtual Shader::Mode get_shader_mode() const override;
+ virtual RID get_shader_rid() const override;
+
ShaderMaterial();
~ShaderMaterial();
};
@@ -736,7 +741,7 @@ public:
static RID get_material_rid_for_2d(bool p_shaded, bool p_transparent, bool p_double_sided, bool p_cut_alpha, bool p_opaque_prepass, bool p_billboard = false, bool p_billboard_y = false);
- RID get_shader_rid() const;
+ virtual RID get_shader_rid() const override;
virtual Shader::Mode get_shader_mode() const override;
diff --git a/scene/resources/particles_material.h b/scene/resources/particles_material.h
index e699a8fb6d..49b48a01b7 100644
--- a/scene/resources/particles_material.h
+++ b/scene/resources/particles_material.h
@@ -340,7 +340,7 @@ public:
void set_sub_emitter_keep_velocity(bool p_enable);
bool get_sub_emitter_keep_velocity() const;
- RID get_shader_rid() const;
+ virtual RID get_shader_rid() const override;
virtual Shader::Mode get_shader_mode() const override;
diff --git a/scene/resources/sky_material.h b/scene/resources/sky_material.h
index 6f9dfbee4a..8fe015519d 100644
--- a/scene/resources/sky_material.h
+++ b/scene/resources/sky_material.h
@@ -89,7 +89,7 @@ public:
float get_sun_curve() const;
virtual Shader::Mode get_shader_mode() const override;
- RID get_shader_rid() const;
+ virtual RID get_shader_rid() const override;
ProceduralSkyMaterial();
~ProceduralSkyMaterial();
@@ -114,7 +114,7 @@ public:
Ref<Texture2D> get_panorama() const;
virtual Shader::Mode get_shader_mode() const override;
- RID get_shader_rid() const;
+ virtual RID get_shader_rid() const override;
PanoramaSkyMaterial();
~PanoramaSkyMaterial();
@@ -180,7 +180,7 @@ public:
Ref<Texture2D> get_night_sky() const;
virtual Shader::Mode get_shader_mode() const override;
- RID get_shader_rid() const;
+ virtual RID get_shader_rid() const override;
PhysicalSkyMaterial();
~PhysicalSkyMaterial();