#15 #23 developpement de la classe SeedItem

entities/interactables/item_object/item_object_sprite.tscn

@@ -1,8 +1,36 @@
-[gd_scene load_steps=6 format=3 uid="uid://bcj812ox8xv2t"]
+[gd_scene load_steps=7 format=3 uid="uid://bcj812ox8xv2t"]
 
-[ext_resource type="Texture2D" uid="uid://bf6nw4onkhavr" path="res://common/inventory/assets/icons/shovel.svg" id="1_7u8ru"]
+[ext_resource type="Script" uid="uid://reliyx2pg7kf" path="res://entities/interactables/item_object/script/item_object_sprite.gd" id="1_wing4"]
+[ext_resource type="Texture2D" uid="uid://bo3o2qf3i20ke" path="res://common/inventory/assets/icons/scuba-diving-tank.svg" id="2_ng3e4"]
 [ext_resource type="Texture2D" uid="uid://c1eiu5ag7lcp8" path="res://entities/interactables/item_object/assets/sprites/shadow.svg" id="2_ng201"]
 
+[sub_resource type="Animation" id="Animation_wing4"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Shadow:scale")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(0.875, 0.875)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Icon:position")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(0, 0)]
+}
+
 [sub_resource type="Animation" id="Animation_ng201"]
 resource_name = "default"
 length = 2.0
@@ -10,77 +38,26 @@ loop_mode = 1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath(".:position")
+tracks/0/path = NodePath("Shadow:scale")
 tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/keys = {
 "times": PackedFloat32Array(0, 1, 2),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
-"values": [Vector2(0, 0), Vector2(0, -5), Vector2(0, 0)]
+"values": [Vector2(0.875, 0.875), Vector2(0.7, 0.7), Vector2(0.875, 0.875)]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
 tracks/1/enabled = true
-tracks/1/path = NodePath("Shadow:position")
+tracks/1/path = NodePath("Icon:position")
 tracks/1/interp = 2
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 1, 2),
+"times": PackedFloat32Array(0, 1, 2.06667),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
-"values": [Vector2(0, 23), Vector2(0, 28), Vector2(0, 23)]
-}
-tracks/2/type = "value"
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/path = NodePath("Shadow:scale")
-tracks/2/interp = 2
-tracks/2/loop_wrap = true
-tracks/2/keys = {
-"times": PackedFloat32Array(0, 1, 2),
-"transitions": PackedFloat32Array(1, 1, 1),
-"update": 0,
-"values": [Vector2(0.875, 0.875), Vector2(0.7, 0.7), Vector2(0.875, 0.875)]
-}
-
-[sub_resource type="Animation" id="Animation_wing4"]
-length = 0.001
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath(".:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 0,
-"values": [Vector2(0, 0)]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("Shadow:position")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 0,
-"values": [Vector2(0, 23)]
-}
-tracks/2/type = "value"
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/path = NodePath("Shadow:scale")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 0,
-"values": [Vector2(0.875, 0.875)]
+"values": [Vector2(0, 0), Vector2(0, -8), Vector2(0, 0)]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_ng3e4"]
@@ -89,8 +66,11 @@ _data = {
 &"default": SubResource("Animation_ng201")
 }
 
-[node name="ItemObjectSprite" type="Sprite2D"]
-texture = ExtResource("1_7u8ru")
+[node name="ItemObjectSprite" type="Node2D"]
+script = ExtResource("1_wing4")
+
+[node name="Icon" type="Sprite2D" parent="."]
+texture = ExtResource("2_ng3e4")
 
 [node name="Shadow" type="Sprite2D" parent="."]
 modulate = Color(1, 1, 1, 0.227451)

entities/interactables/item_object/script/item_object.gd

@@ -2,15 +2,16 @@ extends Interactable
 class_name ItemObject
 
 const ITEM_AREA_WIDTH = 10
+const ITEM_SPRITE_SIZE = 40.
 const SPRITE_SCENE : PackedScene = preload("res://entities/interactables/item_object/item_object_sprite.tscn")
 
 @export var item : Item : 
 	set(_item):
 		item = _item
-		if sprite:
-			sprite.texture = item.icon
+		if object_sprite:
+			object_sprite.apply_texture_to_sprite(item.icon, ITEM_SPRITE_SIZE)
 
-@onready var sprite : Sprite2D = generate_sprite()
+@onready var object_sprite : ItemObjectSprite = generate_sprite()
 
 func _init(_item = null):
 	if _item:
@@ -39,10 +40,13 @@ func pickup_animation(player : Player):
 			queue_free()
 	)
 
-func generate_sprite() -> Sprite2D:
-	var s = SPRITE_SCENE.instantiate() as Sprite2D
-	add_child(s)
+func generate_sprite() -> ItemObjectSprite:
+	var spriteNode = SPRITE_SCENE.instantiate() as ItemObjectSprite
+	add_child(spriteNode)
 
-	s.texture = item.icon
+	spriteNode.apply_texture_to_sprite(
+		item.icon,
+		ITEM_SPRITE_SIZE
+	)
 
-	return s
+	return spriteNode

entities/interactables/item_object/script/item_object_sprite.gd

@@ -0,0 +1,11 @@
+extends Node2D
+class_name ItemObjectSprite
+
+@onready var iconSprite = $Icon
+
+func apply_texture_to_sprite(texture, item_sprite_size = 50.):
+	iconSprite.texture = texture
+	iconSprite.scale = Vector2(
+		1./(texture.get_width()/item_sprite_size),
+		1./(texture.get_height()/item_sprite_size)
+	)

entities/interactables/item_object/script/item_object_sprite.gd.uid

@@ -0,0 +1 @@
+uid://reliyx2pg7kf