Cursor look state machine

core/Cursor.gd

@@ -67,16 +67,16 @@ func pointcast():
 			if (hoveredObjects.size() >= 2):
 				sortByPosY(hoveredObjects,false)
 			if (hoveredObjects[0] != hoveredObject):
+				if (hoveredObject and hoveredObject.has_method("on_unhover")):
+					hoveredObject.on_unhover()
 				hoveredObject = hoveredObjects[0]
+				if (hoveredObject and hoveredObject.has_method("on_hover")):
+					hoveredObject.on_hover()
 				print("Current hovered object :", hoveredObject)
 				if (isSticker(hoveredObject)):
 					hoveredSticker = hoveredObject
 					print("Current hovered sticker :", hoveredSticker)
-					if (hoveredSticker.has_method("on_hover")):
-						hoveredSticker.on_hover()
 				else:
-					if (hoveredSticker.has_method("on_unhover")):
-						hoveredSticker.on_unhover()
 					hoveredSticker = null
 		else:
 			resetCast(true)
@@ -136,6 +136,17 @@ func cursorClick():
 		hoveredObject.on_click()
 		
 func cursor_look():
+	if (grabbedSticker ):
+		currentCursorState = CURSOR_STATE.GRABBED
+	elif (hoveredSticker):
+		if (!($GrabTimer.is_stopped())):
+			currentCursorState = CURSOR_STATE.GRABBED
+		else:
+			currentCursorState = CURSOR_STATE.GRAB
+	elif (!($GrabTimer.is_stopped())):
+		currentCursorState = CURSOR_STATE.CLICK
+	else:
+		currentCursorState = CURSOR_STATE.DEFAULT
 
 	if (currentCursorState != oldCursorState):
 		oldCursorState = currentCursorState

export_presets.cfg

@@ -5,8 +5,8 @@ platform="Windows Desktop"
 runnable=true
 dedicated_server=false
 custom_features=""
-export_filter="scenes"
+export_filter="resources"
-export_files=PackedStringArray("res://maps/mainMenu.tscn", "res://maps/map1.tscn", "res://maps/mapManager.tscn")
+export_files=PackedStringArray("res://maps/mainMenu.tscn", "res://maps/map1.tscn", "res://maps/mapManager.tscn", "res://shaders/shaderMaterial_Outline.tres", "res://shaders/shader_outline3.gdshader", "res://shaders/shader_outline2.gdshader", "res://shaders/shader_outline.gdshader", "res://core/bridgeNode.tscn", "res://core/Cursor.gd", "res://core/Cursor.tscn", "res://core/debugDraw.tscn", "res://core/player.gd", "res://core/player.tscn", "res://core/sceneInstance.gd", "res://core/Sticker.gd", "res://core/Sticker.tscn")
 include_filter=""
 exclude_filter=""
 export_path="builds/stickerClone.exe"
@@ -32,7 +32,7 @@ codesign/timestamp_server_url=""
 codesign/digest_algorithm=1
 codesign/description=""
 codesign/custom_options=PackedStringArray()
-application/modify_resources=true
+application/modify_resources=false
 application/icon=""
 application/console_wrapper_icon=""
 application/icon_interpolation=4

prefab/free_sticker.tscn

@@ -10,6 +10,8 @@ region = Rect2(384, 64, 288, 224)
 script/source = "@tool
 extends Sprite2D
 
+var OutlineMat:ShaderMaterial = preload(\"res://shaders/shaderMaterial_Outline.tres\")
+
 @export_group(\"Sticker Detection Shape\")
 @export var Shape :Shape2D:
 	set(new_shape):
@@ -35,8 +37,6 @@ func on_click():
 	print(self,\" clicked\")
 
 func on_hover():
-	var OutlineMat:ShaderMaterial
-	OutlineMat = load(\"res://shaders/shaderMaterial_Outline.tres\")
 	material = OutlineMat 
 	queue_redraw()