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

Prop cache now also can store the materials themselves.

Browse Source
This commit is contained in:
Relintai 2021-08-09 20:55:40 +02:00
parent f9d5a4c29a
commit 4bde4a4638
2 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
singleton/prop_cache.cpp
View File

@ -45,6 +45,26 @@ SOFTWARE.
#include "core/hashfuncs.h"
#if VERSION_MAJOR > 3
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \
for (int i = 0; i < arr.size(); i++) { \
r.push_back(arr[i]); \
} \
return r;
#else
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \
for (int i = 0; i < arr.size(); i++) { \
r.push_back(arr[i].get_ref_ptr()); \
} \
return r;
#endif
PropCache *PropCache::_instance;
PropCache *PropCache::get_singleton() {
@ -102,6 +122,48 @@ void PropCache::material_paths_set(const PoolStringArray &value) {
_material_paths = value;
}
void PropCache::material_add(const Ref<Material> &value) {
ERR_FAIL_COND(!value.is_valid());
_materials.push_back(value);
}
void PropCache::material_set(const int index, const Ref<Material> &value) {
ERR_FAIL_INDEX(index, _materials.size());
_materials.set(index, value);
}
void PropCache::material_remove(const int index) {
_materials.remove(index);
}
int PropCache::material_get_num() const {
return _materials.size();
}
void PropCache::materials_clear() {
_materials.clear();
}
void PropCache::materials_load() {
}
Vector<Variant> PropCache::materials_get() {
VARIANT_ARRAY_GET(_materials);
}
void PropCache::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);
}
}
Ref<PropMaterialCache> PropCache::material_cache_get(const Ref<PropData> &prop) {
ERR_FAIL_COND_V(!prop.is_valid(), Ref<PropMaterialCache>());
@ -232,4 +294,15 @@ void PropCache::_bind_methods() {
ClassDB::bind_method(D_METHOD("material_paths_get"), &PropCache::material_paths_get);
ClassDB::bind_method(D_METHOD("material_paths_set", "value"), &PropCache::material_paths_set);
ADD_PROPERTY(PropertyInfo(Variant::POOL_STRING_ARRAY, "material_paths"), "material_paths_set", "material_paths_get");
ClassDB::bind_method(D_METHOD("material_add", "value"), &PropCache::material_add);
ClassDB::bind_method(D_METHOD("material_set", "index", "value"), &PropCache::material_set);
ClassDB::bind_method(D_METHOD("material_remove", "index"), &PropCache::material_remove);
ClassDB::bind_method(D_METHOD("material_get_num"), &PropCache::material_get_num);
ClassDB::bind_method(D_METHOD("materials_clear"), &PropCache::materials_clear);
ClassDB::bind_method(D_METHOD("materials_load"), &PropCache::materials_load);
ClassDB::bind_method(D_METHOD("materials_get"), &PropCache::materials_get);
ClassDB::bind_method(D_METHOD("materials_set"), &PropCache::materials_set);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "materials", PROPERTY_HINT_NONE, "17/17:Material", PROPERTY_USAGE_DEFAULT, "Material"), "materials_set", "materials_get");
}

13
singleton/prop_cache.h
View File

@ -39,6 +39,8 @@ SOFTWARE.
#include "core/vector.h"
#endif
#include "scene/resources/material.h"
#include "core/os/mutex.h"
#include "../props/prop_data.h"
@ -74,6 +76,16 @@ public:
PoolStringArray material_paths_get() const;
void material_paths_set(const PoolStringArray &array);
void material_add(const Ref<Material> &value);
void material_set(const int index, const Ref<Material> &value);
void material_remove(const int index);
int material_get_num() const;
void materials_clear();
void materials_load();
Vector<Variant> materials_get();
void materials_set(const Vector<Variant> &materials);
Ref<PropMaterialCache> material_cache_get(const Ref<PropData> &prop);
void material_cache_unref(const Ref<PropData> &prop);
@ -107,6 +119,7 @@ protected:
#endif
PoolStringArray _material_paths;
Vector<Ref<Material>> _materials;
};
#endif