Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Use Vector2i instead of Vector2 for Image get_pixelv and set_pixelv

Browse source 
Co-authored-by: Andrii Doroshenko <xrayez@gmail.com>
This commit is contained in:
Aaron Franke 2020-11-21 02:42:29 -05:00
parent 48049b8d9e
commit 2c53e8b0e9
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
4 changed files with 54 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/import/resource_importer_texture_atlas.cpp
View file

@ -97,7 +97,7 @@ Error ResourceImporterTextureAtlas::import(const String &p_source_file, const St
return OK;
}
static void _plot_triangle(Vector2 *vertices, const Vector2 &p_offset, bool p_transposed, Ref<Image> p_image, const Ref<Image> &p_src_image) {
static void _plot_triangle(Vector2i *vertices, const Vector2i &p_offset, bool p_transposed, Ref<Image> p_image, const Ref<Image> &p_src_image) {
int width = p_image->get_width();
int height = p_image->get_height();
int src_width = p_src_image->get_width();
@ -281,13 +281,13 @@ Error ResourceImporterTextureAtlas::import_group_file(const String &p_group_file
for (int j = 0; j < pack_data.chart_pieces.size(); j++) {
const EditorAtlasPacker::Chart &chart = charts[pack_data.chart_pieces[j]];
for (int k = 0; k < chart.faces.size(); k++) {
Vector2 positions[3];
Vector2i positions[3];
for (int l = 0; l < 3; l++) {
int vertex_idx = chart.faces[k].vertex[l];
positions[l] = chart.vertices[vertex_idx];
positions[l] = Vector2i(chart.vertices[vertex_idx]);
}
_plot_triangle(positions, chart.final_offset, chart.transposed, new_atlas, pack_data.image);
_plot_triangle(positions, Vector2i(chart.final_offset), chart.transposed, new_atlas, pack_data.image);
}
}
}