godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18928 from BastiaanOlij/fix_viewport_flags 

Store flags so it isn't lost when viewport isn't setup yet
This commit is contained in:
Rémi Verschelde 2018-05-16 15:11:20 +02:00 committed by GitHub
parent dfd1331690 0fc4f22522
commit 93c4274941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/main/viewport.cpp
View File

@ -72,6 +72,9 @@ void ViewportTexture::setup_local_to_scene() {
vp->viewport_textures.insert(this);
VS::get_singleton()->texture_set_proxy(proxy, vp->texture_rid);
vp->texture_flags = flags;
VS::get_singleton()->texture_set_flags(vp->texture_rid, flags);
}
void ViewportTexture::set_viewport_path_in_scene(const NodePath &p_path) {
@ -122,20 +125,18 @@ Ref<Image> ViewportTexture::get_data() const {
return VS::get_singleton()->texture_get_data(vp->texture_rid);
}
void ViewportTexture::set_flags(uint32_t p_flags) {
flags = p_flags;
if (!vp)
return;
vp->texture_flags = p_flags;
VS::get_singleton()->texture_set_flags(vp->texture_rid, p_flags);
vp->texture_flags = flags;
VS::get_singleton()->texture_set_flags(vp->texture_rid, flags);
}
uint32_t ViewportTexture::get_flags() const {
if (!vp)
return 0;
return vp->texture_flags;
return flags;
}
void ViewportTexture::_bind_methods() {
@ -149,6 +150,7 @@ void ViewportTexture::_bind_methods() {
ViewportTexture::ViewportTexture() {
vp = NULL;
flags = 0;
set_local_to_scene(true);
proxy = VS::get_singleton()->texture_create();
}

1
scene/main/viewport.h
View File

@ -58,6 +58,7 @@ class ViewportTexture : public Texture {
friend class Viewport;
Viewport *vp;
uint32_t flags;
RID proxy;