Relintai/tile_map_backport
1
0
Fork 0
mirror of https://github.com/Relintai/tile_map_backport.git synced 2024-11-05 10:11:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the remaining errors in the tiles editor plugin.

Browse Source
This commit is contained in:
Relintai 2021-12-12 17:45:40 +01:00
parent 86910e5679
commit 9e51f9e807
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tile_editor/tiles_editor_plugin.cpp
View File

@ -35,6 +35,7 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/canvas_item_editor_plugin.h"
#include "scene/main/viewport.h"
#include "../rtile_map.h" #include "../rtile_map.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
@ -48,10 +49,10 @@
RTilesEditorPlugin *RTilesEditorPlugin::singleton = nullptr; RTilesEditorPlugin *RTilesEditorPlugin::singleton = nullptr;
void RTilesEditorPlugin::_preview_frame_started() { void RTilesEditorPlugin::_preview_frame_started() {
VS::get_singleton()->request_frame_drawn_callback(callable_mp(const_cast<RTilesEditorPlugin *>(this), &RTilesEditorPlugin::_pattern_preview_done)); VS::get_singleton()->request_frame_drawn_callback(this, "_pattern_preview_done", Variant());
} }
void RTilesEditorPlugin::_pattern_preview_done() { void RTilesEditorPlugin::_pattern_preview_done(const Variant &p_userdata) {
pattern_preview_done.post(); pattern_preview_done.post();
} }
@ -77,18 +78,18 @@ void RTilesEditorPlugin::_thread() {
if (item.pattern.is_valid() && !item.pattern->is_empty()) { if (item.pattern.is_valid() && !item.pattern->is_empty()) {
// Generate the pattern preview // Generate the pattern preview
SubViewport *viewport = memnew(SubViewport); Viewport *viewport = memnew(Viewport);
viewport->set_size(thumbnail_size2); viewport->set_size(thumbnail_size2);
viewport->set_disable_input(true); viewport->set_disable_input(true);
viewport->set_transparent_background(true); viewport->set_transparent_background(true);
viewport->set_update_mode(SubViewport::UPDATE_ONCE); viewport->set_update_mode(Viewport::UPDATE_ONCE);
RTileMap *tile_map = memnew(RTileMap); RTileMap *tile_map = memnew(RTileMap);
tile_map->set_tileset(item.tile_set); tile_map->set_tileset(item.tile_set);
tile_map->set_pattern(0, Vector2(), item.pattern); tile_map->set_pattern(0, Vector2(), item.pattern);
viewport->add_child(tile_map); viewport->add_child(tile_map);
TypedArray<Vector2i> used_cells = tile_map->get_used_cells(0); Vector<Vector2> used_cells = tile_map->get_used_cells(0);
Rect2 encompassing_rect = Rect2(); Rect2 encompassing_rect = Rect2();
encompassing_rect.set_position(tile_map->map_to_world(used_cells[0])); encompassing_rect.set_position(tile_map->map_to_world(used_cells[0]));
@ -116,11 +117,11 @@ void RTilesEditorPlugin::_thread() {
// Add the viewport at the lasst moment to avoid rendering too early. // Add the viewport at the lasst moment to avoid rendering too early.
EditorNode::get_singleton()->add_child(viewport); EditorNode::get_singleton()->add_child(viewport);
RS::get_singleton()->connect(("frame_pre_draw"), callable_mp(const_cast<RTilesEditorPlugin *>(this), &RTilesEditorPlugin::_preview_frame_started), Vector<Variant>(), Object::CONNECT_ONESHOT); VS::get_singleton()->connect(("frame_pre_draw"), this, "_preview_frame_started", Vector<Variant>(), Object::CONNECT_ONESHOT);
pattern_preview_done.wait(); pattern_preview_done.wait();
Ref<Image> image = viewport->get_texture()->get_image(); Ref<Image> image = viewport->get_texture()->get_data();
Ref<ImageTexture> image_texture; Ref<ImageTexture> image_texture;
image_texture.instance(); image_texture.instance();
image_texture->create_from_image(image); image_texture->create_from_image(image);
@ -129,8 +130,8 @@ void RTilesEditorPlugin::_thread() {
Variant args[] = { item.pattern, image_texture }; Variant args[] = { item.pattern, image_texture };
const Variant *args_ptr[] = { &args[0], &args[1] }; const Variant *args_ptr[] = { &args[0], &args[1] };
Variant r; Variant r;
Callable::CallError error; Variant::CallError error;
item.callback.call(args_ptr, 2, r, error); r = item.obj->call(item.callback, args_ptr, 2, error);
viewport->queue_delete(); viewport->queue_delete();
} else { } else {
@ -180,6 +181,9 @@ void RTilesEditorPlugin::_bind_methods() {
ClassDB::bind_method(D_METHOD("synchronize_sources_list"), &RTilesEditorPlugin::synchronize_sources_list); ClassDB::bind_method(D_METHOD("synchronize_sources_list"), &RTilesEditorPlugin::synchronize_sources_list);
ClassDB::bind_method(D_METHOD("_tile_map_changed"), &RTilesEditorPlugin::_tile_map_changed); ClassDB::bind_method(D_METHOD("_tile_map_changed"), &RTilesEditorPlugin::_tile_map_changed);
ClassDB::bind_method(D_METHOD("_pattern_preview_done"), &RTilesEditorPlugin::_pattern_preview_done);
ClassDB::bind_method(D_METHOD("_preview_frame_started"), &RTilesEditorPlugin::_preview_frame_started);
} }
void RTilesEditorPlugin::make_visible(bool p_visible) { void RTilesEditorPlugin::make_visible(bool p_visible) {
@ -221,7 +225,7 @@ void RTilesEditorPlugin::synchronize_sources_list(Object *p_current) {
if (item_list->is_visible_in_tree()) { if (item_list->is_visible_in_tree()) {
if (atlas_sources_lists_current < 0 || atlas_sources_lists_current >= item_list->get_item_count()) { if (atlas_sources_lists_current < 0 || atlas_sources_lists_current >= item_list->get_item_count()) {
item_list->deselect_all(); item_list->unselect_all();
} else { } else {
item_list->set_current(atlas_sources_lists_current); item_list->set_current(atlas_sources_lists_current);
item_list->emit_signal(("item_selected"), atlas_sources_lists_current); item_list->emit_signal(("item_selected"), atlas_sources_lists_current);
@ -275,7 +279,7 @@ void RTilesEditorPlugin::edit(Object *p_object) {
// Add change listener. // Add change listener.
if (tile_map) { if (tile_map) {
tile_map->connect("changed", callable_mp(this, &RTilesEditorPlugin::_tile_map_changed)); tile_map->connect("changed", this, "_tile_map_changed");
} }
} }
@ -324,7 +328,7 @@ RTilesEditorPlugin::~RTilesEditorPlugin() {
pattern_preview_sem.post(); pattern_preview_sem.post();
while (!pattern_thread_exited.is_set()) { while (!pattern_thread_exited.is_set()) {
OS::get_singleton()->delay_usec(10000); OS::get_singleton()->delay_usec(10000);
RenderingServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on visual server VisualServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on visual server
} }
pattern_preview_thread.wait_to_finish(); pattern_preview_thread.wait_to_finish();
} }

3
tile_editor/tiles_editor_plugin.h
View File

@ -37,6 +37,7 @@
#include "tile_atlas_view.h" #include "tile_atlas_view.h"
#include "tile_map_editor.h" #include "tile_map_editor.h"
#include "tile_set_editor.h" #include "tile_set_editor.h"
#include "core/os/semaphore.h"
class RTilesEditorPlugin : public EditorPlugin { class RTilesEditorPlugin : public EditorPlugin {
GDCLASS(RTilesEditorPlugin, EditorPlugin); GDCLASS(RTilesEditorPlugin, EditorPlugin);
@ -80,7 +81,7 @@ private:
SafeFlag pattern_thread_exited; SafeFlag pattern_thread_exited;
Semaphore pattern_preview_done; Semaphore pattern_preview_done;
void _preview_frame_started(); void _preview_frame_started();
void _pattern_preview_done(); void _pattern_preview_done(const Variant &p_userdata);
static void _thread_func(void *ud); static void _thread_func(void *ud);
void _thread(); void _thread();