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

Rename flag to better name

This commit is contained in:
Juan Linietsky 2018-07-27 08:58:56 -03:00
parent bfb21be871
commit 6a5aec3644
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/3d/cpu_particles.cpp
View File

@ -25,7 +25,7 @@ void CPUParticles::set_emitting(bool p_emitting) {
update_mutex->lock(); update_mutex->lock();
#endif #endif
VS::get_singleton()->connect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->connect("frame_pre_draw", this, "_update_render_thread");
VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_REDRAW_FRAME_IF_VISIBLE, true); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
#ifndef NO_THREADS #ifndef NO_THREADS
update_mutex->unlock(); update_mutex->unlock();
@ -983,7 +983,7 @@ void CPUParticles::_notification(int p_what) {
update_mutex->lock(); update_mutex->lock();
#endif #endif
VS::get_singleton()->connect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->connect("frame_pre_draw", this, "_update_render_thread");
VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_REDRAW_FRAME_IF_VISIBLE, true); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
#ifndef NO_THREADS #ifndef NO_THREADS
update_mutex->unlock(); update_mutex->unlock();
#endif #endif
@ -997,7 +997,7 @@ void CPUParticles::_notification(int p_what) {
update_mutex->lock(); update_mutex->lock();
#endif #endif
VS::get_singleton()->disconnect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->disconnect("frame_pre_draw", this, "_update_render_thread");
VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_REDRAW_FRAME_IF_VISIBLE, false); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, false);
#ifndef NO_THREADS #ifndef NO_THREADS
update_mutex->unlock(); update_mutex->unlock();
#endif #endif
@ -1024,7 +1024,7 @@ void CPUParticles::_notification(int p_what) {
update_mutex->lock(); update_mutex->lock();
#endif #endif
VS::get_singleton()->disconnect("frame_pre_draw", this, "_update_render_thread"); VS::get_singleton()->disconnect("frame_pre_draw", this, "_update_render_thread");
VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_REDRAW_FRAME_IF_VISIBLE, false); VS::get_singleton()->instance_geometry_set_flag(get_instance(), VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, false);
#ifndef NO_THREADS #ifndef NO_THREADS
update_mutex->unlock(); update_mutex->unlock();

2
servers/visual/visual_server_scene.cpp
View File

@ -820,7 +820,7 @@ void VisualServerScene::instance_geometry_set_flag(RID p_instance, VS::InstanceF
instance->baked_light = p_enabled; instance->baked_light = p_enabled;
} break; } break;
case VS::INSTANCE_FLAG_REDRAW_FRAME_IF_VISIBLE: { case VS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE: {
instance->redraw_if_visible = p_enabled; instance->redraw_if_visible = p_enabled;

2
servers/visual_server.cpp
View File

@ -2201,7 +2201,7 @@ void VisualServer::_bind_methods() {
BIND_ENUM_CONSTANT(INSTANCE_GEOMETRY_MASK); BIND_ENUM_CONSTANT(INSTANCE_GEOMETRY_MASK);
BIND_ENUM_CONSTANT(INSTANCE_FLAG_USE_BAKED_LIGHT); BIND_ENUM_CONSTANT(INSTANCE_FLAG_USE_BAKED_LIGHT);
BIND_ENUM_CONSTANT(INSTANCE_FLAG_REDRAW_FRAME_IF_VISIBLE); BIND_ENUM_CONSTANT(INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE);
BIND_ENUM_CONSTANT(INSTANCE_FLAG_MAX); BIND_ENUM_CONSTANT(INSTANCE_FLAG_MAX);
BIND_ENUM_CONSTANT(SHADOW_CASTING_SETTING_OFF); BIND_ENUM_CONSTANT(SHADOW_CASTING_SETTING_OFF);

2
servers/visual_server.h
View File

@ -809,7 +809,7 @@ public:
enum InstanceFlags { enum InstanceFlags {
INSTANCE_FLAG_USE_BAKED_LIGHT, INSTANCE_FLAG_USE_BAKED_LIGHT,
INSTANCE_FLAG_REDRAW_FRAME_IF_VISIBLE, INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE,
INSTANCE_FLAG_MAX INSTANCE_FLAG_MAX
}; };