Relintai/texture_packer
1
0
Fork 0
mirror of https://github.com/Relintai/texture_packer.git synced 2024-11-14 10:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clang format.

Browse Source
This commit is contained in:
Relintai 2020-01-09 04:29:45 +01:00
parent 189810d164
commit 8d3b160f02
9 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layers/texture_layer_merger.h
View File

@ -3,9 +3,9 @@
#include "core/reference.h" #include "core/reference.h"
#include "core/image.h"
#include "core/math/rect2.h" #include "core/math/rect2.h"
#include "core/vector.h" #include "core/vector.h"
#include "core/image.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class TextureLayerMerger : public Reference { class TextureLayerMerger : public Reference {

4
register_types.cpp
View File

@ -1,7 +1,7 @@
#include "register_types.h" #include "register_types.h"
#include "texture_packer.h"
#include "texture_merger.h" #include "texture_merger.h"
#include "texture_packer.h"
#include "texture_resource/packer_image_resource.h" #include "texture_resource/packer_image_resource.h"
@ -27,6 +27,4 @@ void register_texture_packer_types() {
} }
void unregister_texture_packer_types() { void unregister_texture_packer_types() {
} }

2
texture_merger.h
View File

@ -3,8 +3,8 @@
#include "scene/main/node.h" #include "scene/main/node.h"
#include "core/vector.h"
#include "core/engine.h" #include "core/engine.h"
#include "core/vector.h"
#include "texture_packer.h" #include "texture_packer.h"

2
texture_packer.cpp
View File

@ -362,8 +362,6 @@ void TexturePacker::merge() {
int row_width = (r->w - 2 * _margin); int row_width = (r->w - 2 * _margin);
for (int x = 0; x < row_width; ++x) { for (int x = 0; x < row_width; ++x) {
for (int sx = 0; sx < input_format_offset; ++sx) { for (int sx = 0; sx < input_format_offset; ++sx) {
data.set(start_indx + (x * 4) + sx, image_data[orig_img_indx + sx + (x * input_format_offset)]); data.set(start_indx + (x * 4) + sx, image_data[orig_img_indx + sx + (x * input_format_offset)]);
} }

4
texture_packer.h
View File

@ -1,9 +1,9 @@
#ifndef TEXTURE_PACKER_H #ifndef TEXTURE_PACKER_H
#define TEXTURE_PACKER_H #define TEXTURE_PACKER_H
#include "core/reference.h"
#include "core/image.h"
#include "core/color.h" #include "core/color.h"
#include "core/image.h"
#include "core/reference.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "core/vector.h" #include "core/vector.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"

2
texture_resource/editor_plugin_packer_image_resource.h
View File

@ -2,8 +2,8 @@
#ifndef EDITOR_PLUGIN_PACKER_IMAGE_RESOURCE_H #ifndef EDITOR_PLUGIN_PACKER_IMAGE_RESOURCE_H
#define EDITOR_PLUGIN_PACKER_IMAGE_RESOURCE_H #define EDITOR_PLUGIN_PACKER_IMAGE_RESOURCE_H
#include "editor/editor_plugin.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "editor/editor_plugin.h"
#include "packer_image_resource_importer.h" #include "packer_image_resource_importer.h"

5
texture_resource/packer_image_resource_importer.h
View File

@ -2,9 +2,9 @@
#ifndef EDITOR_IMPORT_COLLADA_MDR #ifndef EDITOR_IMPORT_COLLADA_MDR
#define EDITOR_IMPORT_COLLADA_MDR #define EDITOR_IMPORT_COLLADA_MDR
#include "editor/import/editor_import_plugin.h"
#include "core/ustring.h"
#include "core/io/resource_saver.h" #include "core/io/resource_saver.h"
#include "core/ustring.h"
#include "editor/import/editor_import_plugin.h"
#include "core/image.h" #include "core/image.h"
#include "core/io/image_loader.h" #include "core/io/image_loader.h"
@ -35,7 +35,6 @@ public:
~PackerImageResourceImporter(); ~PackerImageResourceImporter();
private: private:
}; };
#endif #endif