Merge pull request #32915 from Nehluxhes/gridmap_scaling

Gridmap : Mesh preview now scales + grid update on cell size change

modules/gridmap/grid_map.cpp

@@ -227,10 +227,10 @@ Ref<MeshLibrary> GridMap::get_mesh_library() const {
 }
 
 void GridMap::set_cell_size(const Vector3 &p_size) {
-
 	ERR_FAIL_COND(p_size.x < 0.001 || p_size.y < 0.001 || p_size.z < 0.001);
 	cell_size = p_size;
 	_recreate_octant_data();
+	emit_signal("cell_size_changed", cell_size);
 }
 Vector3 GridMap::get_cell_size() const {
 
@@ -902,6 +902,8 @@ void GridMap::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
 
 	BIND_CONSTANT(INVALID_CELL_ITEM);
+
+	ADD_SIGNAL(MethodInfo("cell_size_changed", PropertyInfo(Variant::VECTOR3, "cell_size")));
 }
 
 void GridMap::set_clip(bool p_enabled, bool p_clip_above, int p_floor, Vector3::Axis p_axis) {

modules/gridmap/grid_map_editor_plugin.cpp

@@ -276,6 +276,7 @@ void GridMapEditor::_update_cursor_transform() {
 	cursor_transform = Transform();
 	cursor_transform.origin = cursor_origin;
 	cursor_transform.basis.set_orthogonal_index(cursor_rot);
+	cursor_transform.basis *= node->get_cell_scale();
 	cursor_transform = node->get_global_transform() * cursor_transform;
 
 	if (cursor_instance.is_valid()) {
@@ -298,7 +299,7 @@ void GridMapEditor::_update_selection_transform() {
 	}
 
 	Transform xf;
-	xf.scale(Vector3(1, 1, 1) * (Vector3(1, 1, 1) + (selection.end - selection.begin)) * node->get_cell_size());
+	xf.scale((Vector3(1, 1, 1) + (selection.end - selection.begin)) * node->get_cell_size());
 	xf.origin = selection.begin * node->get_cell_size();
 
 	VisualServer::get_singleton()->instance_set_transform(selection_instance, node->get_global_transform() * xf);
@@ -595,7 +596,7 @@ void GridMapEditor::_update_paste_indicator() {
 
 		Basis item_rot;
 		item_rot.set_orthogonal_index(item.orientation);
-		xf.basis = item_rot * xf.basis;
+		xf.basis = item_rot * xf.basis * node->get_cell_scale();
 
 		VisualServer::get_singleton()->instance_set_transform(item.instance, node->get_global_transform() * xf);
 	}
@@ -933,9 +934,10 @@ void GridMapEditor::update_palette() {
 }
 
 void GridMapEditor::edit(GridMap *p_gridmap) {
+	if (!p_gridmap && node)
+		node->disconnect("cell_size_changed", this, "_draw_grids");
 
 	node = p_gridmap;
-	VS *vs = VS::get_singleton();
 
 	input_action = INPUT_NONE;
 	selection.active = false;
@@ -961,30 +963,54 @@ void GridMapEditor::edit(GridMap *p_gridmap) {
 
 	set_process(true);
 
-	Vector3 edited_floor = p_gridmap->has_meta("_editor_floor_") ? p_gridmap->get_meta("_editor_floor_") : Variant();
 	clip_mode = p_gridmap->has_meta("_editor_clip_") ? ClipMode(p_gridmap->get_meta("_editor_clip_").operator int()) : CLIP_DISABLED;
 
+	_draw_grids(node->get_cell_size());
+	update_grid();
+	_update_clip();
+
+	node->connect("cell_size_changed", this, "_draw_grids");
+}
+
+void GridMapEditor::_update_clip() {
+
+	node->set_meta("_editor_clip_", clip_mode);
+	if (clip_mode == CLIP_DISABLED)
+		node->set_clip(false);
+	else
+		node->set_clip(true, clip_mode == CLIP_ABOVE, edit_floor[edit_axis], edit_axis);
+}
+
+void GridMapEditor::update_grid() {
+
+	grid_xform.origin.x -= 1; // Force update in hackish way.
+
+	grid_ofs[edit_axis] = edit_floor[edit_axis] * node->get_cell_size()[edit_axis];
+
+	edit_grid_xform.origin = grid_ofs;
+	edit_grid_xform.basis = Basis();
+
 	for (int i = 0; i < 3; i++) {
-		if (vs->mesh_get_surface_count(grid[i]) > 0)
+		VisualServer::get_singleton()->instance_set_visible(grid_instance[i], i == edit_axis);
-			vs->mesh_remove_surface(grid[i], 0);
+	}
+
+	updating = true;
+	floor->set_value(edit_floor[edit_axis]);
+	updating = false;
+}
+
+void GridMapEditor::_draw_grids(const Vector3 &cell_size) {
+	Vector3 edited_floor = node->has_meta("_editor_floor_") ? node->get_meta("_editor_floor_") : Variant();
+
+	for (int i = 0; i < 3; i++) {
+		if (VS::get_singleton()->mesh_get_surface_count(grid[i]) > 0)
+			VS::get_singleton()->mesh_remove_surface(grid[i], 0);
 		edit_floor[i] = edited_floor[i];
 	}
 
-	{
-
-		// Update grids.
-		indicator_mat.instance();
-		indicator_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
-		indicator_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
-		indicator_mat->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true);
-		indicator_mat->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
-		indicator_mat->set_albedo(Color(0.8, 0.5, 0.1));
-
 	Vector<Vector3> grid_points[3];
 	Vector<Color> grid_colors[3];
 
-		float cell_size[3] = { p_gridmap->get_cell_size().x, p_gridmap->get_cell_size().y, p_gridmap->get_cell_size().z };
-
 	for (int i = 0; i < 3; i++) {
 
 		Vector3 axis;
@@ -1026,37 +1052,6 @@ void GridMapEditor::edit(GridMap *p_gridmap) {
 		VisualServer::get_singleton()->mesh_add_surface_from_arrays(grid[i], VisualServer::PRIMITIVE_LINES, d);
 		VisualServer::get_singleton()->mesh_surface_set_material(grid[i], 0, indicator_mat->get_rid());
 	}
-	}
-
-	update_grid();
-	_update_clip();
-}
-
-void GridMapEditor::_update_clip() {
-
-	node->set_meta("_editor_clip_", clip_mode);
-	if (clip_mode == CLIP_DISABLED)
-		node->set_clip(false);
-	else
-		node->set_clip(true, clip_mode == CLIP_ABOVE, edit_floor[edit_axis], edit_axis);
-}
-
-void GridMapEditor::update_grid() {
-
-	grid_xform.origin.x -= 1; // Force update in hackish way.
-
-	grid_ofs[edit_axis] = edit_floor[edit_axis] * node->get_cell_size()[edit_axis];
-
-	edit_grid_xform.origin = grid_ofs;
-	edit_grid_xform.basis = Basis();
-
-	for (int i = 0; i < 3; i++) {
-		VisualServer::get_singleton()->instance_set_visible(grid_instance[i], i == edit_axis);
-	}
-
-	updating = true;
-	floor->set_value(edit_floor[edit_axis]);
-	updating = false;
 }
 
 void GridMapEditor::_notification(int p_what) {
@@ -1197,6 +1192,7 @@ void GridMapEditor::_bind_methods() {
 	ClassDB::bind_method("_node_removed", &GridMapEditor::_node_removed);
 
 	ClassDB::bind_method(D_METHOD("_set_display_mode", "mode"), &GridMapEditor::_set_display_mode);
+	ClassDB::bind_method("_draw_grids", &GridMapEditor::_draw_grids);
 }
 
 GridMapEditor::GridMapEditor(EditorNode *p_editor) {
@@ -1472,6 +1468,13 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	_set_selection(false);
 	updating = false;
 	accumulated_floor_delta = 0.0;
+
+	indicator_mat.instance();
+	indicator_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
+	indicator_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
+	indicator_mat->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true);
+	indicator_mat->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
+	indicator_mat->set_albedo(Color(0.8, 0.5, 0.1));
 }
 
 GridMapEditor::~GridMapEditor() {

modules/gridmap/grid_map_editor_plugin.h

@@ -201,7 +201,8 @@ class GridMapEditor : public VBoxContainer {
 
 	EditorNode *editor;
 
-	void update_grid();
+	void update_grid(); // Change which and where the grid is displayed
+	void _draw_grids(const Vector3 &cell_size);
 	void _configure();
 	void _menu_option(int);
 	void update_palette();