diff options
| author | Juan Linietsky | 2015-01-03 16:52:37 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-01-03 16:52:37 -0300 |
| commit | fbdd925d9be1c4c96d05089d7d5a58cd938b002c (patch) | |
| tree | 9f4eb2ae7c61450dffb4a86bb5e82cf66e23d496 /scene/resources/shader.cpp | |
| parent | eb1f978b1c1693018e9a6d353ca914f8e6586b4e (diff) | |
| download | godot-fbdd925d9be1c4c96d05089d7d5a58cd938b002c.tar.gz godot-fbdd925d9be1c4c96d05089d7d5a58cd938b002c.tar.zst godot-fbdd925d9be1c4c96d05089d7d5a58cd938b002c.zip | |
Diffstat (limited to 'scene/resources/shader.cpp')
| -rw-r--r-- | scene/resources/shader.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index cc6bed314..e47b2432f 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -33,12 +33,6 @@ #include "scene/scene_string_names.h" -void Shader::set_mode(Mode p_mode) { - - ERR_FAIL_INDEX(p_mode,2); - VisualServer::get_singleton()->shader_set_mode(shader,VisualServer::ShaderMode(p_mode)); - emit_signal(SceneStringNames::get_singleton()->changed); -} Shader::Mode Shader::get_mode() const { @@ -176,7 +170,6 @@ void Shader::get_default_texture_param_list(List<StringName>* r_textures) const{ void Shader::_bind_methods() { - ObjectTypeDB::bind_method(_MD("set_mode","mode"),&Shader::set_mode); ObjectTypeDB::bind_method(_MD("get_mode"),&Shader::get_mode); ObjectTypeDB::bind_method(_MD("set_code","vcode","fcode","lcode","fofs","lofs"),&Shader::set_code,DEFVAL(0),DEFVAL(0)); @@ -203,9 +196,9 @@ void Shader::_bind_methods() { } -Shader::Shader() { +Shader::Shader(Mode p_mode) { - shader = VisualServer::get_singleton()->shader_create(); + shader = VisualServer::get_singleton()->shader_create(VS::ShaderMode(p_mode)); params_cache_dirty=true; } @@ -237,7 +230,7 @@ RES ResourceFormatLoaderShader::load(const String &p_path,const String& p_origin String base_path = p_path.get_base_dir(); - Ref<Shader> shader( memnew( Shader ) ); + Ref<Shader> shader;//( memnew( Shader ) ); int line=0; |
