Relintai/props
1
0
Fork 0
mirror of https://github.com/Relintai/props.git synced 2025-02-04 16:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added default_prop_material_cache_class property to the PropCache singleton.

Browse Source
This commit is contained in:
Relintai 2021-08-09 16:18:34 +02:00
parent e34649c44f
commit e0db2189be
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
singleton/prop_cache.cpp
View File

@ -29,8 +29,10 @@ SOFTWARE.
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
#include "core/config/engine.h" #include "core/config/engine.h"
#include "core/config/project_settings.h"
#else #else
#include "core/engine.h" #include "core/engine.h"
#include "core/project_settings.h"
#endif #endif
#include "../jobs/prop_texture_job.h" #include "../jobs/prop_texture_job.h"
@ -49,6 +51,13 @@ PropCache *PropCache::get_singleton() {
return _instance; return _instance;
} }
String PropCache::get_default_prop_material_cache_class() {
return _default_prop_material_cache_class;
}
void PropCache::set_default_prop_material_cache_class(const String &cls_name) {
_default_prop_material_cache_class = cls_name;
}
#if TEXTURE_PACKER_PRESENT #if TEXTURE_PACKER_PRESENT
bool PropCache::has_texture(const Ref<PropData> &prop) { bool PropCache::has_texture(const Ref<PropData> &prop) {
for (int i = 0; i < _entries.size(); ++i) { for (int i = 0; i < _entries.size(); ++i) {
@ -136,7 +145,6 @@ Ref<TexturePacker> PropCache::create_texture(const Ref<PropData> &prop) {
Ref<TexturePacker> PropCache::get_or_create_texture_immediate(const Ref<PropData> &prop) { Ref<TexturePacker> PropCache::get_or_create_texture_immediate(const Ref<PropData> &prop) {
if (!has_texture(prop)) { if (!has_texture(prop)) {
Ref<TexturePacker> merger = create_texture(prop); Ref<TexturePacker> merger = create_texture(prop);
merger->merge(); merger->merge();
@ -151,7 +159,6 @@ Ref<TexturePacker> PropCache::get_or_create_texture_threaded(const Ref<PropData>
#if THREAD_POOL_PRESENT #if THREAD_POOL_PRESENT
if (!has_texture(prop)) { if (!has_texture(prop)) {
Ref<TexturePacker> merger = create_texture(prop); Ref<TexturePacker> merger = create_texture(prop);
Ref<PropTextureJob> job; Ref<PropTextureJob> job;
@ -173,6 +180,12 @@ Ref<TexturePacker> PropCache::get_or_create_texture_threaded(const Ref<PropData>
PropCache::PropCache() { PropCache::PropCache() {
_instance = this; _instance = this;
#if TEXTURE_PACKER_PRESENT
_default_prop_material_cache_class = GLOBAL_DEF("props/default_prop_material_cache_class", "PropMaterialCachePCM");
#else
_default_prop_material_cache_class = GLOBAL_DEF("props/default_prop_material_cache_class", "PropMaterialCache");
#endif
} }
PropCache::~PropCache() { PropCache::~PropCache() {
@ -183,6 +196,10 @@ PropCache::~PropCache() {
} }
void PropCache::_bind_methods() { void PropCache::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_default_prop_material_cache_class"), &PropCache::get_default_prop_material_cache_class);
ClassDB::bind_method(D_METHOD("set_default_prop_material_cache_class", "cls_name"), &PropCache::set_default_prop_material_cache_class);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "default_prop_material_cache_class"), "set_default_prop_material_cache_class", "get_default_prop_material_cache_class");
#if TEXTURE_PACKER_PRESENT #if TEXTURE_PACKER_PRESENT
ClassDB::bind_method(D_METHOD("has_texture", "prop"), &PropCache::has_texture); ClassDB::bind_method(D_METHOD("has_texture", "prop"), &PropCache::has_texture);
ClassDB::bind_method(D_METHOD("set_texture", "prop", "merger"), &PropCache::set_texture); ClassDB::bind_method(D_METHOD("set_texture", "prop", "merger"), &PropCache::set_texture);

5
singleton/prop_cache.h
View File

@ -57,6 +57,9 @@ public:
public: public:
static PropCache *get_singleton(); static PropCache *get_singleton();
String get_default_prop_material_cache_class();
void set_default_prop_material_cache_class(const String& cls_name);
bool has_texture(const Ref<PropData> &prop); bool has_texture(const Ref<PropData> &prop);
void set_texture(const Ref<PropData> &prop, const Ref<TexturePacker> &merger); void set_texture(const Ref<PropData> &prop, const Ref<TexturePacker> &merger);
@ -82,6 +85,8 @@ public:
protected: protected:
static void _bind_methods(); static void _bind_methods();
String _default_prop_material_cache_class;
}; };
#endif #endif