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

Renamed MergeTexture to TexturePacker.

Browse Source
This commit is contained in:
Relintai 2019-10-21 21:11:11 +02:00
parent 171016d075
commit a0fe53dc24
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SCsub
View File

@ -2,5 +2,5 @@ Import('env')
env.add_source_files(env.modules_sources,"register_types.cpp") env.add_source_files(env.modules_sources,"register_types.cpp")
env.add_source_files(env.modules_sources,"merge_texture.cpp") env.add_source_files(env.modules_sources,"texture_packer.cpp")
env.add_source_files(env.modules_sources,"rectpack2D/pack.cpp") env.add_source_files(env.modules_sources,"rectpack2D/pack.cpp")

4
register_types.cpp
View File

@ -1,9 +1,9 @@
#include "register_types.h" #include "register_types.h"
#include "merge_texture.h" #include "texture_packer.h"
void register_texture_packer_types() { void register_texture_packer_types() {
ClassDB::register_class<MergeTexture>(); ClassDB::register_class<TexturePacker>();
} }
void unregister_texture_packer_types() { void unregister_texture_packer_types() {

48
merge_texture.cpp → texture_packer.cpp
View File

@ -1,6 +1,6 @@
#include "merge_texture.h" #include "texture_packer.h"
Ref<AtlasTexture> MergeTexture::add_texture(Ref<Texture> texture) { Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
for (int i = 0; i < _rects.size(); ++i) { for (int i = 0; i < _rects.size(); ++i) {
rect_xywhf *r = _rects.get(i); rect_xywhf *r = _rects.get(i);
@ -28,19 +28,19 @@ Ref<AtlasTexture> MergeTexture::add_texture(Ref<Texture> texture) {
return tex; return tex;
} }
Ref<Texture> MergeTexture::get_original_texture(int index) { Ref<Texture> TexturePacker::get_original_texture(int index) {
ERR_FAIL_INDEX_V(index, _rects.size(), Ref<Texture>()); ERR_FAIL_INDEX_V(index, _rects.size(), Ref<Texture>());
return _rects.get(index)->original_texture; return _rects.get(index)->original_texture;
} }
Ref<AtlasTexture> MergeTexture::get_texture(int index) { Ref<AtlasTexture> TexturePacker::get_texture(int index) {
ERR_FAIL_INDEX_V(index, _rects.size(), Ref<AtlasTexture>()); ERR_FAIL_INDEX_V(index, _rects.size(), Ref<AtlasTexture>());
return _rects.get(index)->atlas_texture; return _rects.get(index)->atlas_texture;
} }
void MergeTexture::remove_texture_index(int index) { void TexturePacker::remove_texture_index(int index) {
ERR_FAIL_INDEX(index, _rects.size()); ERR_FAIL_INDEX(index, _rects.size());
rect_xywhf *r = _rects.get(index); rect_xywhf *r = _rects.get(index);
@ -52,7 +52,7 @@ void MergeTexture::remove_texture_index(int index) {
memdelete(r); memdelete(r);
} }
void MergeTexture::remove_texture(Ref<Texture> texture) { void TexturePacker::remove_texture(Ref<Texture> texture) {
for (int i = 0; i < _rects.size(); ++i) { for (int i = 0; i < _rects.size(); ++i) {
rect_xywhf *r = _rects.get(i); rect_xywhf *r = _rects.get(i);
@ -64,20 +64,20 @@ void MergeTexture::remove_texture(Ref<Texture> texture) {
} }
} }
int MergeTexture::get_texture_count() { int TexturePacker::get_texture_count() {
return _rects.size(); return _rects.size();
} }
Ref<ImageTexture> MergeTexture::get_generated_texture(int index) { Ref<ImageTexture> TexturePacker::get_generated_texture(int index) {
ERR_FAIL_INDEX_V(index, _generated_textures.size(), Ref<ImageTexture>()); ERR_FAIL_INDEX_V(index, _generated_textures.size(), Ref<ImageTexture>());
return _generated_textures.get(index); return _generated_textures.get(index);
} }
int MergeTexture::get_generated_texture_count() { int TexturePacker::get_generated_texture_count() {
return _generated_textures.size(); return _generated_textures.size();
} }
void MergeTexture::merge() { void TexturePacker::merge() {
_bins.clear(); _bins.clear();
if (pack(_rects.ptr(), _rects.size(), 1024, false, _bins)) { if (pack(_rects.ptr(), _rects.size(), 1024, false, _bins)) {
@ -143,7 +143,7 @@ void MergeTexture::merge() {
} }
} }
String MergeTexture::test() { String TexturePacker::test() {
String res = ""; String res = "";
const int RECTS = 200; const int RECTS = 200;
@ -177,10 +177,10 @@ String MergeTexture::test() {
return res; return res;
} }
MergeTexture::MergeTexture() { TexturePacker::TexturePacker() {
} }
MergeTexture::~MergeTexture() { TexturePacker::~TexturePacker() {
_bins.clear(); _bins.clear();
@ -196,18 +196,18 @@ MergeTexture::~MergeTexture() {
_rects.clear(); _rects.clear();
} }
void MergeTexture::_bind_methods() { void TexturePacker::_bind_methods() {
ClassDB::bind_method(D_METHOD("test"), &MergeTexture::test); ClassDB::bind_method(D_METHOD("test"), &TexturePacker::test);
ClassDB::bind_method(D_METHOD("add_texture", "texture"), &MergeTexture::add_texture); ClassDB::bind_method(D_METHOD("add_texture", "texture"), &TexturePacker::add_texture);
ClassDB::bind_method(D_METHOD("get_texture", "index"), &MergeTexture::get_texture); ClassDB::bind_method(D_METHOD("get_texture", "index"), &TexturePacker::get_texture);
ClassDB::bind_method(D_METHOD("get_original_texture", "index"), &MergeTexture::get_original_texture); ClassDB::bind_method(D_METHOD("get_original_texture", "index"), &TexturePacker::get_original_texture);
ClassDB::bind_method(D_METHOD("remove_texture_index", "index"), &MergeTexture::remove_texture_index); ClassDB::bind_method(D_METHOD("remove_texture_index", "index"), &TexturePacker::remove_texture_index);
ClassDB::bind_method(D_METHOD("remove_texture", "texture"), &MergeTexture::remove_texture); ClassDB::bind_method(D_METHOD("remove_texture", "texture"), &TexturePacker::remove_texture);
ClassDB::bind_method(D_METHOD("get_texture_count"), &MergeTexture::get_texture_count); ClassDB::bind_method(D_METHOD("get_texture_count"), &TexturePacker::get_texture_count);
ClassDB::bind_method(D_METHOD("get_generated_texture", "index"), &MergeTexture::get_generated_texture); ClassDB::bind_method(D_METHOD("get_generated_texture", "index"), &TexturePacker::get_generated_texture);
ClassDB::bind_method(D_METHOD("get_generated_texture_count"), &MergeTexture::get_generated_texture_count); ClassDB::bind_method(D_METHOD("get_generated_texture_count"), &TexturePacker::get_generated_texture_count);
ClassDB::bind_method(D_METHOD("merge"), &MergeTexture::merge); ClassDB::bind_method(D_METHOD("merge"), &TexturePacker::merge);
} }

12
merge_texture.h → texture_packer.h
View File

@ -1,5 +1,5 @@
#ifndef MERGE_TEXTURE_H #ifndef TEXTURE_PACKER_H
#define MERGE_TEXTURE_H #define TEXTURE_PACKER_H
#include "core/image.h" #include "core/image.h"
#include "core/reference.h" #include "core/reference.h"
@ -11,8 +11,8 @@
#include "rectpack2D/pack.h" #include "rectpack2D/pack.h"
//Rename to TexturePacker //Rename to TexturePacker
class MergeTexture : public Reference { class TexturePacker : public Reference {
GDCLASS(MergeTexture, Reference); GDCLASS(TexturePacker, Reference);
public: public:
Ref<AtlasTexture> add_texture(Ref<Texture> texture); Ref<AtlasTexture> add_texture(Ref<Texture> texture);
@ -29,8 +29,8 @@ public:
String test(); String test();
MergeTexture(); TexturePacker();
~MergeTexture(); ~TexturePacker();
protected: protected:
static void _bind_methods(); static void _bind_methods();