diff options
| author | Juan Linietsky | 2017-02-06 00:38:39 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-02-06 00:38:39 -0300 |
| commit | 6f2e16306a6552d704fb2346c9abdd26e0e523b7 (patch) | |
| tree | e1fadf2a05d6f04675045b9e34128ed96628e07c /servers/visual | |
| parent | af3fabeb7745e6f7f4e7fe7a299bdd234fff26a6 (diff) | |
| download | godot-6f2e16306a6552d704fb2346c9abdd26e0e523b7.tar.gz godot-6f2e16306a6552d704fb2346c9abdd26e0e523b7.tar.zst godot-6f2e16306a6552d704fb2346c9abdd26e0e523b7.zip | |
Several bugfixes, improving the import workflow
Diffstat (limited to 'servers/visual')
| -rw-r--r-- | servers/visual/rasterizer.h | 3 | ||||
| -rw-r--r-- | servers/visual/visual_server_raster.cpp | 6 | ||||
| -rw-r--r-- | servers/visual/visual_server_raster.h | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 44bc9bfef..84043c1a8 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -196,6 +196,8 @@ public: virtual RID texture_create_radiance_cubemap(RID p_source,int p_resolution=-1) const=0; + virtual void texture_set_detect_3d_callback(RID p_texture,VisualServer::TextureDetectCallback p_callback,void* p_userdata)=0; + virtual void texture_set_detect_srgb_callback(RID p_texture,VisualServer::TextureDetectCallback p_callback,void* p_userdata)=0; virtual void textures_keep_original(bool p_enable)=0; @@ -512,6 +514,7 @@ public: virtual VS::InstanceType get_base_type(RID p_rid) const=0; virtual bool free(RID p_rid)=0; + virtual bool has_os_feature(const String& p_feature) const=0; static RasterizerStorage*base_signleton; RasterizerStorage(); diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index 279da9149..8f8742521 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -157,6 +157,12 @@ RID VisualServerRaster::get_test_cube() { return test_cube; } + +bool VisualServerRaster::has_os_feature(const String& p_feature) const { + + return VSG::storage->has_os_feature(p_feature); +} + VisualServerRaster::VisualServerRaster() { VSG::canvas = memnew( VisualServerCanvas); diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 5c8105681..9184c64c2 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -622,7 +622,8 @@ public: BIND3(texture_set_size_override,RID,int,int) BIND2RC(RID,texture_create_radiance_cubemap,RID,int) - + BIND3(texture_set_detect_3d_callback,RID,TextureDetectCallback,void*) + BIND3(texture_set_detect_srgb_callback,RID,TextureDetectCallback,void*) BIND2(texture_set_path,RID,const String&) BIND1RC(String,texture_get_path,RID) @@ -1135,6 +1136,8 @@ public: virtual bool has_feature(Features p_feature) const; + virtual bool has_os_feature(const String& p_feature) const; + VisualServerRaster(); ~VisualServerRaster(); |
