From e0c9ff44e99799a20b80afa0c9f6e7800239a784 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 17 Aug 2021 13:10:37 +0200 Subject: [PATCH] Added setup_cache and setup_rects methods to the TiledWallData. --- tiled_wall/tiled_wall_data.cpp | 49 ++++++++++++++++++++++++++++++++++ tiled_wall/tiled_wall_data.h | 10 ++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/tiled_wall/tiled_wall_data.cpp b/tiled_wall/tiled_wall_data.cpp index c1efce5..883932d 100644 --- a/tiled_wall/tiled_wall_data.cpp +++ b/tiled_wall/tiled_wall_data.cpp @@ -57,6 +57,8 @@ SOFTWARE. arr_into.push_back(e); \ } +#include "../material_cache/prop_material_cache.h" + const String TiledWallData::BINDING_STRING_TILED_WALL_TILING_TYPE = "None,Horizontal,Vertical,Both"; TiledWallData::TiledWallTilingType TiledWallData::get_tiling_type() const { @@ -214,6 +216,43 @@ void TiledWallData::add_textures_into(Ref texture_packer) { } #endif +void TiledWallData::setup_cache(Ref cache) { + call("_setup_cache", cache); +} +void TiledWallData::_setup_cache(Ref cache) { + if (cache->material_get_num() == 0) { + for (int i = 0; i < _materials.size(); ++i) { + const Ref &m = _materials[i]; + + if (m.is_valid()) { + cache->material_add(m); + } + } + } + + for (int i = 0; i < _textures.size(); ++i) { + const Ref &t = _textures[i]; + + if (t.is_valid()) { + cache->texture_add(t); + } + } + + for (int i = 0; i < _flavour_textures.size(); ++i) { + const Ref &t = _flavour_textures[i]; + + if (t.is_valid()) { + cache->texture_add(t); + } + } +} + +void TiledWallData::setup_rects(Ref cache) { + call("_setup_rects", cache); +} +void TiledWallData::_setup_rects(Ref cache) { +} + void TiledWallData::copy_from(const Ref &tiled_wall_data) { ERR_FAIL_COND(!tiled_wall_data.is_valid()); @@ -287,6 +326,16 @@ void TiledWallData::_bind_methods() { ClassDB::bind_method(D_METHOD("add_textures_into", "texture_packer"), &TiledWallData::add_textures_into); #endif + BIND_VMETHOD(MethodInfo("_setup_cache", PropertyInfo(Variant::OBJECT, "cache", PROPERTY_HINT_RESOURCE_TYPE, "PropMaterialCache"))); + + ClassDB::bind_method(D_METHOD("setup_cache", "cache"), &TiledWallData::setup_cache); + ClassDB::bind_method(D_METHOD("_setup_cache", "cache"), &TiledWallData::_setup_cache); + + BIND_VMETHOD(MethodInfo("_setup_rects", PropertyInfo(Variant::OBJECT, "cache", PROPERTY_HINT_RESOURCE_TYPE, "PropMaterialCache"))); + + ClassDB::bind_method(D_METHOD("setup_rects", "cache"), &TiledWallData::setup_rects); + ClassDB::bind_method(D_METHOD("_setup_rects", "cache"), &TiledWallData::_setup_rects); + ClassDB::bind_method(D_METHOD("copy_from", "prop_data"), &TiledWallData::copy_from); BIND_ENUM_CONSTANT(TILED_WALL_TILING_TYPE_NONE); diff --git a/tiled_wall/tiled_wall_data.h b/tiled_wall/tiled_wall_data.h index 2eb143c..03d2758 100644 --- a/tiled_wall/tiled_wall_data.h +++ b/tiled_wall/tiled_wall_data.h @@ -40,13 +40,15 @@ SOFTWARE. #include "core/version.h" -#include "scene/resources/texture.h" #include "scene/resources/material.h" +#include "scene/resources/texture.h" #if TEXTURE_PACKER_PRESENT #include "../../texture_packer/texture_packer.h" #endif +class PropMaterialCache; + class TiledWallData : public Resource { GDCLASS(TiledWallData, Resource); @@ -100,6 +102,12 @@ public: void add_textures_into(Ref texture_packer); #endif + void setup_cache(Ref cache); + void _setup_cache(Ref cache); + + void setup_rects(Ref cache); + void _setup_rects(Ref cache); + void copy_from(const Ref &tiled_wall_data); TiledWallData();