Disabled picking in editor when an axis is selected and a tool is active to make the editor a lot less annoying to use

src/common/version.h

@@ -4,7 +4,7 @@
 /* Auto generated version file. DO NOT MODIFY */
 #define SYMMETRY_VERSION_MAJOR 0
 #define SYMMETRY_VERSION_MINOR 1
-#define SYMMETRY_VERSION_REVISION 300
+#define SYMMETRY_VERSION_REVISION 301
 #define SYMMETRY_VERSION_BRANCH "dev"
 
 #endif

src/game/editor.c

@@ -142,6 +142,7 @@ void editor_init(struct Editor* editor)
 	editor->picking_enabled                    = true;
 	editor->draw_cursor_entity                 = false;
 	editor->tool_scale_started                 = false;
+	editor->tool_translate_allowed             = false;
 	editor->entity_operation_save              = false;
 	editor->scene_operation_save               = false;
 
@@ -873,7 +874,6 @@ void editor_on_mousebutton_release(const struct Event* event)
 					editor_entity_select(editor, NULL);
 			}
 		}
-
 	}
 
 	if(editor->selected_entity && event->mousebutton.button == MSB_LEFT && nk_item_is_any_active(&gui->context) == 0)
@@ -881,13 +881,18 @@ void editor_on_mousebutton_release(const struct Event* event)
 		switch(editor->current_tool)
 		{
 		case EDITOR_TOOL_TRANSLATE:
-			if(editor->current_axis != EDITOR_AXIS_NONE)
+			if(editor->tool_translate_allowed)
+			{
+				//editor->picking_enabled = true;
+				//editor->tool_translate_allowed = false;
 				transform_copy(editor->selected_entity, editor->cursor_entity, false);
+				//editor->draw_cursor_entity = false;
+			}
 			break;
 		case EDITOR_TOOL_ROTATE:
 			if(editor->tool_rotate_rotation_started)
 			{
-				editor->picking_enabled = true;
+				//editor->picking_enabled = true;
 				editor->tool_rotate_rotation_started = false;
 				transform_copy(editor->selected_entity, editor->cursor_entity, false);
 				editor->tool_rotate_total_rotation = 0.f;
@@ -898,7 +903,7 @@ void editor_on_mousebutton_release(const struct Event* event)
 		case EDITOR_TOOL_SCALE:
 			if(editor->tool_scale_started)
 			{
-				editor->picking_enabled = true;
+				//editor->picking_enabled = true;
 				editor->tool_scale_started = false;
 				transform_copy(editor->selected_entity, editor->cursor_entity, false);
 				vec3_fill(&editor->tool_scale_amount, 1.f, 1.f, 1.f);
@@ -930,27 +935,6 @@ void editor_on_mousebutton_press(const struct Event* event)
 	if(event->mousebutton.button == MSB_LEFT && editor->selected_entity)
 	{
 		if(editor->current_tool == EDITOR_TOOL_ROTATE && editor->tool_rotate_allowed)
-		{
-			/* Check if there's an entity under cursor, if there is then select it,
-			   otherwise disable picking and start rotating */
-			struct Scene* scene = game_state_get()->scene;
-			struct Camera* editor_camera = &scene->cameras[CAM_EDITOR];
-			int mouse_x = 0, mouse_y = 0;
-			platform_mouse_position_get(&mouse_x, &mouse_y);
-			struct Ray ray = camera_screen_coord_to_ray(editor_camera, mouse_x, mouse_y);
-			struct Entity* intersected_entity = scene_ray_intersect_closest(scene, &ray, ERM_ALL);
-
-			bool start_rotation = true;
-			if(intersected_entity)
-			{
-				if(intersected_entity != editor->selected_entity)
-				{
-					editor_entity_select(editor, intersected_entity);
-					start_rotation = false;
-				}
-			}
-
-			if(start_rotation)
 		{
 			editor->picking_enabled = false;
 			editor->tool_rotate_rotation_started = true;
@@ -964,7 +948,6 @@ void editor_on_mousebutton_press(const struct Event* event)
 			}
 		}
 	}
-	}
 
 	/* Cancel rotation on right mouse press */
 	if(event->mousebutton.button == MSB_RIGHT && editor->selected_entity && editor->current_tool == EDITOR_TOOL_ROTATE)
@@ -988,7 +971,7 @@ void editor_on_mousemotion(const struct Event* event)
 	break;
 	case EDITOR_TOOL_TRANSLATE:
 	{
-		if(editor->selected_entity)
+		if(editor->selected_entity && editor->tool_translate_allowed)
 		{
 			struct Camera* editor_camera = &game_state->scene->cameras[CAM_EDITOR];
 			vec3 current_position = { 0.f, 0.f, 0.f };
@@ -1140,6 +1123,8 @@ void editor_on_mousemotion(const struct Event* event)
 	}
 
 	/* Check if we're hovering over an entity */
+	if(editor->picking_enabled)
+	{
 		struct Scene* scene = game_state->scene;
 		struct Camera* editor_camera = &scene->cameras[CAM_EDITOR];
 		struct Ray ray = camera_screen_coord_to_ray(editor_camera, event->mousemotion.x, event->mousemotion.y);
@@ -1155,6 +1140,11 @@ void editor_on_mousemotion(const struct Event* event)
 				editor->hovered_entity = NULL;
 		}
 	}
+	else if(editor->hovered_entity)
+	{
+		editor->hovered_entity = NULL;
+	}
+}
 
 void editor_on_key_release(const struct Event* event)
 {
@@ -1312,9 +1302,9 @@ void editor_tool_reset(struct Editor* editor)
 		editor->draw_cursor_entity = false;
 		break;
 	case EDITOR_TOOL_TRANSLATE:
-		if(editor->current_axis != EDITOR_AXIS_XZ)
+		editor->draw_cursor_entity = false;
-			editor_axis_set(editor, EDITOR_AXIS_XZ);
+		editor->tool_translate_allowed = false;
-		editor->draw_cursor_entity = true;
+		editor_axis_set(editor, EDITOR_AXIS_NONE);
 		break;
 	case EDITOR_TOOL_ROTATE:
 		editor->tool_rotate_amount = 0.f;
@@ -1370,6 +1360,13 @@ void editor_axis_set(struct Editor* editor, int axis)
 				editor->tool_rotate_allowed = false;
 				editor->tool_rotate_amount = 0.f;
 			}
+			else
+			{
+				if(axis != EDITOR_AXIS_NONE)
+					editor->picking_enabled = false;
+				else if(axis == EDITOR_AXIS_NONE && !editor->picking_enabled)
+					editor->picking_enabled = true;
+			}
 		}
 
 		if(editor->current_tool == EDITOR_TOOL_SCALE && axis != EDITOR_AXIS_NONE)
@@ -1379,6 +1376,13 @@ void editor_axis_set(struct Editor* editor, int axis)
 			editor->draw_cursor_entity = true;
 			vec3_assign(&editor->tool_scale_amount, &editor->cursor_entity->base.transform.scale);
 		}
+
+		if(editor->current_tool == EDITOR_TOOL_TRANSLATE && axis != EDITOR_AXIS_NONE)
+		{
+			editor->tool_translate_allowed = true;
+			editor->picking_enabled = false;
+			editor->draw_cursor_entity = true;
+		}
 	}
 	else
 	{
@@ -1398,6 +1402,23 @@ void editor_axis_set(struct Editor* editor, int axis)
 			vec3_fill(&editor->tool_scale_amount, 1.f, 1.f, 1.f);
 			editor->draw_cursor_entity = false;
 		}
+
+		if(editor->current_tool == EDITOR_TOOL_ROTATE)
+		{
+			editor->tool_rotate_amount = 0.f;
+			editor->tool_rotate_total_rotation = 0.f;
+			editor->tool_rotate_allowed = false;
+			editor->tool_rotate_rotation_started = false;
+			editor->draw_cursor_entity = false;
+			editor->picking_enabled = true;
+		}
+
+		if(editor->current_tool == EDITOR_TOOL_TRANSLATE)
+		{
+			editor->picking_enabled = true;
+			editor->tool_translate_allowed = false;
+			editor->draw_cursor_entity = false;
+		}
 	}
 }
 

src/game/editor.h

@@ -49,6 +49,7 @@ struct Editor
 	float               tool_rotate_starting_rotation;
 	vec3                tool_scale_amount;
 	bool                tool_scale_started;
+	bool                tool_translate_allowed;
 	float               axis_line_length;
 	vec4                axis_color_x;
 	vec4                axis_color_y;

todo.txt

@@ -1,5 +1,5 @@
 Todo:
-	- Determine whether we should enable or disble picking when a tool is active within an editor
+	- Shift-A to add entity to scene
 	? Only show bounding box for hovered entity instead of wireframe mesh
 	- Fix crash where if an entity is hoverd in editor and deleted, the game crashes because the hovered variable in editor doesn't know that the entity was deleted
 	? Write entity flags to scene file or when saving entity to file?
@@ -7,7 +7,6 @@ Todo:
 	- Command to create a placeholder entity of a particular type in a file
 	- Reduce the opacity of wireframe around selected entity in editor
 	- Release mouse when window loses focus and limit fps
-	- Allow picking and selecting other entity types in editor i.e. the ones that don't have meshes
 	? Maybe reuse that same framebuffer/textures for active viewers
 	? When saving a scene entity entry, save the changed properties as well, that way when the scene is loaded, we load the base properties from archetype and the ones we changed per entry are saved when we saved the entity
 	  this will prevent us from having needless amount of entities with only minor changes from one another 
@@ -403,3 +402,4 @@ Done:
 	* Add links to Itch.io builds of the game in readme and on the blog. Add link to blog in the readme as well 
 	* Show version number in editor and console
 	* Save/Load base bounding boxes for entity types other than static mesh
+	* Disabled picking when a tool is active in editor