diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-10-07 11:31:18 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-10-07 11:31:18 -0300 |
| commit | 850eaf7ed796d2f2d9a35c6bc4ba9a4e69f5ca1d (patch) | |
| tree | 052ed86d4a0eafb2373e65b78b14b6eccba0f707 /servers/register_server_types.cpp | |
| parent | cf5778e51a883936ffc896231da8259e5ebabc0a (diff) | |
| download | redot-engine-850eaf7ed796d2f2d9a35c6bc4ba9a4e69f5ca1d.tar.gz | |
-the new shader language seems to work
-shader editor plugin can edit shaders
-code completion in shader editor plugin
Diffstat (limited to 'servers/register_server_types.cpp')
| -rw-r--r-- | servers/register_server_types.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index 06eaa4d122..19ee3a48c7 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -36,7 +36,7 @@ #include "spatial_sound_server.h" #include "spatial_sound_2d_server.h" #include "script_debugger_remote.h" - +#include "visual/shader_types.h" static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsage>* r_usage) { List<VS::TextureInfo> tinfo; @@ -55,6 +55,8 @@ static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsag } +ShaderTypes *shader_types=NULL; + void register_server_types() { Globals::get_singleton()->add_singleton( Globals::Singleton("VisualServer",VisualServer::get_singleton()) ); @@ -70,6 +72,8 @@ void register_server_types() { Globals::get_singleton()->add_singleton( Globals::Singleton("SpatialSound2DServer",SpatialSound2DServer::get_singleton()) ); Globals::get_singleton()->add_singleton( Globals::Singleton("SS2D",SpatialSound2DServer::get_singleton()) ); + shader_types = memnew( ShaderTypes ); + ObjectTypeDB::register_virtual_type<Physics2DDirectBodyState>(); ObjectTypeDB::register_virtual_type<Physics2DDirectSpaceState>(); @@ -87,5 +91,5 @@ void register_server_types() { void unregister_server_types(){ - + memdelete( shader_types ); } |