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

Merge pull request #34886 from JFonS/fix_32699 

Make NoiseTexture threading more robust
This commit is contained in:
Rémi Verschelde 2020-01-07 12:46:43 +01:00 committed by GitHub
parent 96fdb48edd 4e10c62024
commit cd408c5256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/opensimplex/noise_texture.cpp
View File

@ -53,6 +53,10 @@ NoiseTexture::NoiseTexture() {
NoiseTexture::~NoiseTexture() { NoiseTexture::~NoiseTexture() {
VS::get_singleton()->free(texture); VS::get_singleton()->free(texture);
if (noise_thread) {
Thread::wait_to_finish(noise_thread);
memdelete(noise_thread);
}
} }
void NoiseTexture::_bind_methods() { void NoiseTexture::_bind_methods() {
@ -73,6 +77,7 @@ void NoiseTexture::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_bump_strength"), &NoiseTexture::get_bump_strength); ClassDB::bind_method(D_METHOD("get_bump_strength"), &NoiseTexture::get_bump_strength);
ClassDB::bind_method(D_METHOD("_update_texture"), &NoiseTexture::_update_texture); ClassDB::bind_method(D_METHOD("_update_texture"), &NoiseTexture::_update_texture);
ClassDB::bind_method(D_METHOD("_queue_update"), &NoiseTexture::_queue_update);
ClassDB::bind_method(D_METHOD("_generate_texture"), &NoiseTexture::_generate_texture); ClassDB::bind_method(D_METHOD("_generate_texture"), &NoiseTexture::_generate_texture);
ClassDB::bind_method(D_METHOD("_thread_done", "image"), &NoiseTexture::_thread_done); ClassDB::bind_method(D_METHOD("_thread_done", "image"), &NoiseTexture::_thread_done);
@ -130,8 +135,6 @@ void NoiseTexture::_queue_update() {
Ref<Image> NoiseTexture::_generate_texture() { Ref<Image> NoiseTexture::_generate_texture() {
update_queued = false;
if (noise.is_null()) return Ref<Image>(); if (noise.is_null()) return Ref<Image>();
Ref<Image> image; Ref<Image> image;
@ -171,17 +174,18 @@ void NoiseTexture::_update_texture() {
Ref<Image> image = _generate_texture(); Ref<Image> image = _generate_texture();
_set_texture_data(image); _set_texture_data(image);
} }
update_queued = false;
} }
void NoiseTexture::set_noise(Ref<OpenSimplexNoise> p_noise) { void NoiseTexture::set_noise(Ref<OpenSimplexNoise> p_noise) {
if (p_noise == noise) if (p_noise == noise)
return; return;
if (noise.is_valid()) { if (noise.is_valid()) {
noise->disconnect(CoreStringNames::get_singleton()->changed, this, "_update_texture"); noise->disconnect(CoreStringNames::get_singleton()->changed, this, "_queue_update");
} }
noise = p_noise; noise = p_noise;
if (noise.is_valid()) { if (noise.is_valid()) {
noise->connect(CoreStringNames::get_singleton()->changed, this, "_update_texture"); noise->connect(CoreStringNames::get_singleton()->changed, this, "_queue_update");
} }
_queue_update(); _queue_update();
} }