Relintai/props_2d
1
0
Fork 0
mirror of https://github.com/Relintai/props_2d.git synced 2025-02-14 17:00:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also remove multiple material support from TiledWall2D.

Browse Source
This commit is contained in:
Relintai 2022-02-23 08:39:01 +01:00
parent 4b8edd9567
commit b9b151414a
2 changed files with 14 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
tiled_wall/tiled_wall_2d_data.cpp
View File

@ -175,46 +175,13 @@ void TiledWall2DData::set_flavour_chance(const float value) {
} }
//materials //materials
void TiledWall2DData::material_add(const Ref<Material> &value) {
ERR_FAIL_COND(!value.is_valid());
_materials.push_back(value); Ref<Material> TiledWall2DData::material_get() {
return _material;
} }
void TiledWall2DData::material_set(const int index, const Ref<Material> &value) { void TiledWall2DData::material_set(const Ref<Material> &value) {
ERR_FAIL_INDEX(index, _materials.size()); _material = value;
_materials.set(index, value);
emit_changed();
}
void TiledWall2DData::material_remove(const int index) {
_materials.remove(index);
emit_changed();
}
int TiledWall2DData::material_get_num() const {
return _materials.size();
}
void TiledWall2DData::materials_clear() {
_materials.clear();
}
Vector<Variant> TiledWall2DData::materials_get() {
VARIANT_ARRAY_GET(_materials);
}
void TiledWall2DData::materials_set(const Vector<Variant> &materials) {
_materials.clear();
for (int i = 0; i < materials.size(); i++) {
Ref<Material> material = Ref<Material>(materials[i]);
_materials.push_back(material);
}
emit_changed(); emit_changed();
} }
@ -247,16 +214,10 @@ void TiledWall2DData::setup_cache(Ref<Prop2DMaterialCache> cache) {
call("_setup_cache", cache); call("_setup_cache", cache);
} }
void TiledWall2DData::_setup_cache(Ref<Prop2DMaterialCache> cache) { void TiledWall2DData::_setup_cache(Ref<Prop2DMaterialCache> cache) {
if (!cache->material_get().is_valid()) { if (_material.is_valid() && !cache->material_get().is_valid()) {
for (int i = 0; i < _materials.size(); ++i) { Ref<Material> nm = _material->duplicate();
const Ref<Material> &m = _materials[i];
if (m.is_valid()) { cache->material_set(nm);
Ref<Material> nm = m->duplicate();
cache->material_set(nm);
}
}
} }
for (int i = 0; i < _textures.size(); ++i) { for (int i = 0; i < _textures.size(); ++i) {
@ -303,7 +264,7 @@ TiledWall2DData::TiledWall2DData() {
TiledWall2DData::~TiledWall2DData() { TiledWall2DData::~TiledWall2DData() {
_textures.clear(); _textures.clear();
_flavour_textures.clear(); _flavour_textures.clear();
_materials.clear(); _material.unref();
} }
void TiledWall2DData::_bind_methods() { void TiledWall2DData::_bind_methods() {
@ -340,15 +301,9 @@ void TiledWall2DData::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "flavour_chance"), "set_flavour_chance", "get_flavour_chance"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "flavour_chance"), "set_flavour_chance", "get_flavour_chance");
//materials //materials
ClassDB::bind_method(D_METHOD("material_add", "value"), &TiledWall2DData::material_add); ClassDB::bind_method(D_METHOD("material_get"), &TiledWall2DData::material_get);
ClassDB::bind_method(D_METHOD("material_set", "index", "value"), &TiledWall2DData::material_set); ClassDB::bind_method(D_METHOD("material_set", "value"), &TiledWall2DData::material_set);
ClassDB::bind_method(D_METHOD("material_remove", "index"), &TiledWall2DData::material_remove); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "Material"), "material_set", "material_get");
ClassDB::bind_method(D_METHOD("material_get_num"), &TiledWall2DData::material_get_num);
ClassDB::bind_method(D_METHOD("materials_clear"), &TiledWall2DData::materials_clear);
ClassDB::bind_method(D_METHOD("materials_get"), &TiledWall2DData::materials_get);
ClassDB::bind_method(D_METHOD("materials_set"), &TiledWall2DData::materials_set);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "materials", PROPERTY_HINT_NONE, "17/17:Material", PROPERTY_USAGE_DEFAULT, "Material"), "materials_set", "materials_get");
#if TEXTURE_PACKER_PRESENT #if TEXTURE_PACKER_PRESENT
ClassDB::bind_method(D_METHOD("add_textures_into", "texture_packer"), &TiledWall2DData::add_textures_into); ClassDB::bind_method(D_METHOD("add_textures_into", "texture_packer"), &TiledWall2DData::add_textures_into);

12
tiled_wall/tiled_wall_2d_data.h
View File

@ -93,14 +93,8 @@ public:
void set_flavour_chance(const float value); void set_flavour_chance(const float value);
//materials //materials
void material_add(const Ref<Material> &value); Ref<Material> material_get();
void material_set(const int index, const Ref<Material> &value); void material_set(const Ref<Material> &value);
void material_remove(const int index);
int material_get_num() const;
void materials_clear();
Vector<Variant> materials_get();
void materials_set(const Vector<Variant> &materials);
#if TEXTURE_PACKER_PRESENT #if TEXTURE_PACKER_PRESENT
void add_textures_into(Ref<TexturePacker> texture_packer); void add_textures_into(Ref<TexturePacker> texture_packer);
@ -126,7 +120,7 @@ private:
Vector<Ref<Texture>> _flavour_textures; Vector<Ref<Texture>> _flavour_textures;
float _flavour_chance; float _flavour_chance;
Vector<Ref<Material>> _materials; Ref<Material> _material;
}; };
VARIANT_ENUM_CAST(TiledWall2DData::TiledWall2DTilingType); VARIANT_ENUM_CAST(TiledWall2DData::TiledWall2DTilingType);