diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /servers/register_server_types.cpp | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
| download | redot-engine-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.gz | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
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 21514a7f98..f3ff2223ed 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 ); } |