Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-15 21:06:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

The Merger lib now uses a vector to store props.

Browse Source
This commit is contained in:
Relintai 2020-06-23 01:15:11 +02:00
parent 19a255c4dd
commit 718823a1eb
2 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
library/voxelman_library_merger.cpp
View File

@ -145,24 +145,23 @@ void VoxelmanLibraryMerger::set_voxel_surfaces(const Vector<Variant> &surfaces)
} }
} }
Ref<PropData> VoxelmanLibraryMerger::get_prop(const int id) { Ref<PropData> VoxelmanLibraryMerger::get_prop(const int index) {
if (_props.has(id)) ERR_FAIL_INDEX_V(index, _props.size(), Ref<PropData>());
return _props[id];
return Ref<PropData>(); return _props[index];
} }
void VoxelmanLibraryMerger::add_prop(Ref<PropData> value) { void VoxelmanLibraryMerger::add_prop(Ref<PropData> value) {
if (!value.is_valid() || _props.has(value->get_id())) _props.push_back(value);
return; }
void VoxelmanLibraryMerger::set_prop(const int index, const Ref<PropData> &value) {
ERR_FAIL_INDEX(index, _props.size());
_props[value->get_id()] = value; _props.write[index] = value;
} }
void VoxelmanLibraryMerger::set_prop(const int id, const Ref<PropData> &value) { void VoxelmanLibraryMerger::remove_prop(const int index) {
_props[value->get_id()] = value; ERR_FAIL_INDEX(index, _props.size());
}
void VoxelmanLibraryMerger::remove_prop(const int id) { _props.remove(index);
if (_props.has(id))
_props.erase(id);
} }
int VoxelmanLibraryMerger::get_num_props() const { int VoxelmanLibraryMerger::get_num_props() const {
return _props.size(); return _props.size();
@ -170,31 +169,14 @@ int VoxelmanLibraryMerger::get_num_props() const {
void VoxelmanLibraryMerger::clear_props() { void VoxelmanLibraryMerger::clear_props() {
_props.clear(); _props.clear();
} }
/*
Vector<Variant> VoxelmanLibraryMerger::get_props() { Vector<Variant> VoxelmanLibraryMerger::get_props() {
Vector<Variant> r; VARIANT_ARRAY_GET(_props);
for (Map<int, Ref<PropData> >::Element *I = _props.front(); I; I = I->next()) {
r.push_back(I->value().get_ref_ptr());
}
return r;
} }
void VoxelmanLibraryMerger::set_props(const Vector<Variant> &props) { void VoxelmanLibraryMerger::set_props(const Vector<Variant> &props) {
_props.clear(); VARIANT_ARRAY_SET(props, _props, PropData);
}
for (int i = 0; i < props.size(); i++) {
Ref<VoxelSurfaceMerger> surface = Ref<VoxelSurfaceMerger>(props[i]);
if (surface.is_valid()) {
surface->set_library(this);
}
_props.push_back(surface);
}
//_props.clear();
}*/
void VoxelmanLibraryMerger::refresh_rects() { void VoxelmanLibraryMerger::refresh_rects() {
bool texture_added = false; bool texture_added = false;
@ -230,8 +212,8 @@ void VoxelmanLibraryMerger::refresh_rects() {
} }
texture_added = false; texture_added = false;
for (Map<int, Ref<PropData> >::Element *I = _props.front(); I; I = I->next()) { for (int i = 0; i < _props.size(); i++) {
Ref<PropData> prop = Ref<PropData>(I->value()); Ref<PropData> prop = _props.get(i);
if (prop.is_valid()) { if (prop.is_valid()) {
if (process_prop_textures(prop)) if (process_prop_textures(prop))
@ -417,10 +399,9 @@ void VoxelmanLibraryMerger::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_voxel_surfaces"), &VoxelmanLibraryMerger::set_voxel_surfaces); ClassDB::bind_method(D_METHOD("set_voxel_surfaces"), &VoxelmanLibraryMerger::set_voxel_surfaces);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_surfaces", PROPERTY_HINT_NONE, "17/17:VoxelSurfaceMerger", PROPERTY_USAGE_DEFAULT, "VoxelSurfaceMerger"), "set_voxel_surfaces", "get_voxel_surfaces"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_surfaces", PROPERTY_HINT_NONE, "17/17:VoxelSurfaceMerger", PROPERTY_USAGE_DEFAULT, "VoxelSurfaceMerger"), "set_voxel_surfaces", "get_voxel_surfaces");
//ClassDB::bind_method(D_METHOD("get_props"), &VoxelmanLibraryMerger::get_props); ClassDB::bind_method(D_METHOD("get_props"), &VoxelmanLibraryMerger::get_props);
//ClassDB::bind_method(D_METHOD("set_props"), &VoxelmanLibraryMerger::set_props); ClassDB::bind_method(D_METHOD("set_props"), &VoxelmanLibraryMerger::set_props);
//ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "props", PROPERTY_HINT_NONE, "17/17:PropData", PROPERTY_USAGE_DEFAULT, "PropData"), "set_props", "get_props"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "props", PROPERTY_HINT_NONE, "17/17:PropData", PROPERTY_USAGE_DEFAULT, "PropData"), "set_props", "get_props");
//ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "props", PROPERTY_HINT_NONE, "17/17:PackedScene", PROPERTY_USAGE_DEFAULT, "PackedScene"), "set_props", "get_props");
ClassDB::bind_method(D_METHOD("_setup_material_albedo", "material_index", "texture"), &VoxelmanLibraryMerger::_setup_material_albedo); ClassDB::bind_method(D_METHOD("_setup_material_albedo", "material_index", "texture"), &VoxelmanLibraryMerger::_setup_material_albedo);
} }

12
library/voxelman_library_merger.h
View File

@ -65,15 +65,15 @@ public:
Vector<Variant> get_voxel_surfaces(); Vector<Variant> get_voxel_surfaces();
void set_voxel_surfaces(const Vector<Variant> &surfaces); void set_voxel_surfaces(const Vector<Variant> &surfaces);
Ref<PropData> get_prop(const int id); Ref<PropData> get_prop(const int index);
void add_prop(Ref<PropData> value); void add_prop(Ref<PropData> value);
void set_prop(const int id, const Ref<PropData> &value); void set_prop(const int index, const Ref<PropData> &value);
void remove_prop(const int id); void remove_prop(const int index);
int get_num_props() const; int get_num_props() const;
void clear_props(); void clear_props();
//Vector<Variant> get_props(); Vector<Variant> get_props();
//void set_props(const Vector<Variant> &props); void set_props(const Vector<Variant> &props);
void refresh_rects(); void refresh_rects();
@ -89,7 +89,7 @@ protected:
private: private:
Vector<Ref<VoxelSurfaceMerger> > _voxel_surfaces; Vector<Ref<VoxelSurfaceMerger> > _voxel_surfaces;
Map<int, Ref<PropData> > _props; Vector<Ref<PropData> > _props;
Ref<TexturePacker> _packer; Ref<TexturePacker> _packer;
Ref<TexturePacker> _prop_packer; Ref<TexturePacker> _prop_packer;