Browse Source

Some Vector2i usage cleanup

Replace casting Vector2 -> Vector2i -> Vector2 with a simple call to .floor(), and some minor fixes.
Aaron Franke 6 years ago
parent
commit
1a06496f45

+ 1 - 1
drivers/gles2/rasterizer_canvas_gles2.h

@@ -84,7 +84,7 @@ public:
 
 
 		Transform2D skeleton_transform;
 		Transform2D skeleton_transform;
 		Transform2D skeleton_transform_inverse;
 		Transform2D skeleton_transform_inverse;
-		Vector2i skeleton_texture_size;
+		Size2i skeleton_texture_size;
 
 
 		RID current_tex;
 		RID current_tex;
 		RID current_normal;
 		RID current_normal;

+ 9 - 10
editor/plugins/tile_set_editor_plugin.cpp

@@ -924,8 +924,7 @@ void TileSetEditor::_on_workspace_draw() {
 			case EDITMODE_OCCLUSION:
 			case EDITMODE_OCCLUSION:
 			case EDITMODE_NAVIGATION: {
 			case EDITMODE_NAVIGATION: {
 				if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::AUTO_TILE || tileset->tile_get_tile_mode(get_current_tile()) == TileSet::ATLAS_TILE) {
 				if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::AUTO_TILE || tileset->tile_get_tile_mode(get_current_tile()) == TileSet::ATLAS_TILE) {
-					Vector2 coord = edited_shape_coord;
-					draw_highlight_subtile(coord);
+					draw_highlight_subtile(edited_shape_coord);
 				}
 				}
 				draw_polygon_shapes();
 				draw_polygon_shapes();
 				draw_grid_snap();
 				draw_grid_snap();
@@ -1872,7 +1871,7 @@ void TileSetEditor::_update_tile_data() {
 	} else {
 	} else {
 		int spacing = tileset->autotile_get_spacing(get_current_tile());
 		int spacing = tileset->autotile_get_spacing(get_current_tile());
 		Vector2 size = tileset->tile_get_region(get_current_tile()).size;
 		Vector2 size = tileset->tile_get_region(get_current_tile()).size;
-		Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing));
+		Vector2 cell_count = (size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing))).floor();
 		for (int y = 0; y < cell_count.y; y++) {
 		for (int y = 0; y < cell_count.y; y++) {
 			for (int x = 0; x < cell_count.x; x++) {
 			for (int x = 0; x < cell_count.x; x++) {
 				SubtileData data;
 				SubtileData data;
@@ -1974,7 +1973,7 @@ void TileSetEditor::_select_previous_tile() {
 			case EDITMODE_Z_INDEX: {
 			case EDITMODE_Z_INDEX: {
 				int spacing = tileset->autotile_get_spacing(get_current_tile());
 				int spacing = tileset->autotile_get_spacing(get_current_tile());
 				Vector2 size = tileset->tile_get_region(get_current_tile()).size;
 				Vector2 size = tileset->tile_get_region(get_current_tile()).size;
-				Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing));
+				Vector2 cell_count = (size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing))).floor();
 				cell_count -= Vector2(1, 1);
 				cell_count -= Vector2(1, 1);
 				edited_shape_coord = cell_count;
 				edited_shape_coord = cell_count;
 				_select_edited_shape_coord();
 				_select_edited_shape_coord();
@@ -2031,7 +2030,7 @@ void TileSetEditor::_select_next_subtile() {
 	} else {
 	} else {
 		int spacing = tileset->autotile_get_spacing(get_current_tile());
 		int spacing = tileset->autotile_get_spacing(get_current_tile());
 		Vector2 size = tileset->tile_get_region(get_current_tile()).size;
 		Vector2 size = tileset->tile_get_region(get_current_tile()).size;
-		Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing));
+		Vector2 cell_count = (size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing))).floor();
 		if (edited_shape_coord.x >= cell_count.x - 1 && edited_shape_coord.y >= cell_count.y - 1) {
 		if (edited_shape_coord.x >= cell_count.x - 1 && edited_shape_coord.y >= cell_count.y - 1) {
 			_select_next_tile();
 			_select_next_tile();
 		} else {
 		} else {
@@ -2057,7 +2056,7 @@ void TileSetEditor::_select_previous_subtile() {
 	} else {
 	} else {
 		int spacing = tileset->autotile_get_spacing(get_current_tile());
 		int spacing = tileset->autotile_get_spacing(get_current_tile());
 		Vector2 size = tileset->tile_get_region(get_current_tile()).size;
 		Vector2 size = tileset->tile_get_region(get_current_tile()).size;
-		Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing));
+		Vector2 cell_count = (size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing))).floor();
 		if (edited_shape_coord.x <= 0 && edited_shape_coord.y <= 0) {
 		if (edited_shape_coord.x <= 0 && edited_shape_coord.y <= 0) {
 			_select_previous_tile();
 			_select_previous_tile();
 		} else {
 		} else {
@@ -2077,9 +2076,9 @@ void TileSetEditor::_select_next_shape() {
 	} else if (edit_mode != EDITMODE_COLLISION) {
 	} else if (edit_mode != EDITMODE_COLLISION) {
 		_select_next_subtile();
 		_select_next_subtile();
 	} else {
 	} else {
-		Vector2i edited_coord = Vector2();
+		Vector2i edited_coord = Vector2i();
 		if (tileset->tile_get_tile_mode(get_current_tile()) != TileSet::SINGLE_TILE) {
 		if (tileset->tile_get_tile_mode(get_current_tile()) != TileSet::SINGLE_TILE) {
-			edited_coord = edited_shape_coord;
+			edited_coord = Vector2i(edited_shape_coord);
 		}
 		}
 		SubtileData data = current_tile_data[edited_coord];
 		SubtileData data = current_tile_data[edited_coord];
 		if (data.collisions.size() == 0) {
 		if (data.collisions.size() == 0) {
@@ -2130,9 +2129,9 @@ void TileSetEditor::_select_previous_shape() {
 	} else if (edit_mode != EDITMODE_COLLISION) {
 	} else if (edit_mode != EDITMODE_COLLISION) {
 		_select_previous_subtile();
 		_select_previous_subtile();
 	} else {
 	} else {
-		Vector2i edited_coord = Vector2();
+		Vector2i edited_coord = Vector2i();
 		if (tileset->tile_get_tile_mode(get_current_tile()) != TileSet::SINGLE_TILE) {
 		if (tileset->tile_get_tile_mode(get_current_tile()) != TileSet::SINGLE_TILE) {
-			edited_coord = edited_shape_coord;
+			edited_coord = Vector2i(edited_shape_coord);
 		}
 		}
 		SubtileData data = current_tile_data[edited_coord];
 		SubtileData data = current_tile_data[edited_coord];
 		if (data.collisions.size() == 0) {
 		if (data.collisions.size() == 0) {