diff --git a/assets/props/dagger/dagger.material b/assets/props/dagger/dagger.material deleted file mode 100644 index 54b6c7c..0000000 Binary files a/assets/props/dagger/dagger.material and /dev/null differ diff --git a/assets/props/dagger/dagger.mesh b/assets/props/dagger/dagger.mesh index 8315087..88f695e 100644 Binary files a/assets/props/dagger/dagger.mesh and b/assets/props/dagger/dagger.mesh differ diff --git a/assets/props/dagger/materials/MA_dagger.material b/assets/props/dagger/materials/MA_dagger.material new file mode 100644 index 0000000..419d855 Binary files /dev/null and b/assets/props/dagger/materials/MA_dagger.material differ diff --git a/assets/props/dagger/textures/dagger_BC.tga b/assets/props/dagger/textures/dagger_BC.tga new file mode 100644 index 0000000..42747a4 Binary files /dev/null and b/assets/props/dagger/textures/dagger_BC.tga differ diff --git a/assets/props/dagger/textures/dagger_BC.tga.import b/assets/props/dagger/textures/dagger_BC.tga.import new file mode 100644 index 0000000..1b2a3d0 --- /dev/null +++ b/assets/props/dagger/textures/dagger_BC.tga.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.s3tc.stex" +path.etc2="res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc2.stex" +path.etc="res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2", "etc" ], +"vram_texture": true +} + +[deps] + +source_file="res://assets/props/dagger/textures/dagger_BC.tga" +dest_files=[ "res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.s3tc.stex", "res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc2.stex", "res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc.stex" ] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=true +flags/filter=true +flags/mipmaps=true +flags/anisotropic=false +flags/srgb=1 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/props/dagger/textures/dagger_NM.tga b/assets/props/dagger/textures/dagger_NM.tga new file mode 100644 index 0000000..5e8db00 Binary files /dev/null and b/assets/props/dagger/textures/dagger_NM.tga differ diff --git a/assets/props/dagger/textures/dagger_NM.tga.import b/assets/props/dagger/textures/dagger_NM.tga.import new file mode 100644 index 0000000..4f46e69 --- /dev/null +++ b/assets/props/dagger/textures/dagger_NM.tga.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dagger_NM.tga-02457e4299815720542e6c6827c3099f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/props/dagger/textures/dagger_NM.tga" +dest_files=[ "res://.import/dagger_NM.tga-02457e4299815720542e6c6827c3099f.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/props/dagger/textures/dagger_ORM.tga b/assets/props/dagger/textures/dagger_ORM.tga new file mode 100644 index 0000000..167dc9c Binary files /dev/null and b/assets/props/dagger/textures/dagger_ORM.tga differ diff --git a/assets/props/dagger/textures/dagger_ORM.tga.import b/assets/props/dagger/textures/dagger_ORM.tga.import new file mode 100644 index 0000000..d4dd3cf --- /dev/null +++ b/assets/props/dagger/textures/dagger_ORM.tga.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dagger_ORM.tga-e70732208e6213759f9b467913b86699.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/props/dagger/textures/dagger_ORM.tga" +dest_files=[ "res://.import/dagger_ORM.tga-e70732208e6213759f9b467913b86699.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/developers/jeremy/Dagger.gd b/developers/jeremy/Dagger.gd index bda80da..f090554 100644 --- a/developers/jeremy/Dagger.gd +++ b/developers/jeremy/Dagger.gd @@ -1,12 +1,34 @@ extends Spatial signal clicked(dagger) +var current_scene = null +var dissolve = null +var wait_frames = 1 +var time_max = 2000 # msec +var tick_reference = null +var value = 0.1 + func _ready(): - print("[Dagger#_ready]") connect("clicked", self, "handle_piece_click") -func _on_Area_input_event(camera, event, click_position, click_normal, shape_idx): - print("[Dagger#_ready] You have clicked in dagger ...") +func _on_Area_input_event(_camera, event, _click_position, _click_normal, _shape_idx): if event is InputEventMouseButton or event is InputEventScreenTouch: - print("[Dagger#_ready] Click !! Click !!") - $dagger.free() + dissolve = true + +func _process(_delta): + if dissolve == true: + if tick_reference == null: + tick_reference = OS.get_ticks_msec() + print("[Dagger#_process] Reference tick to " + String(tick_reference)) + + var tick = OS.get_ticks_msec() + + print("[Dagger#_process] Dissolve ... " + String(tick) + " < " + String(tick_reference + time_max)) + + if tick < tick_reference + time_max: + print("[Dagger#_process] Apply value to "+ String(value)) + value += 0.01 + $dagger.mesh.surface_get_material(0).set("shader_param/dissolve_amount", value) + else: + print("[Dagger#_process] animation ending !!") + dissolve = null diff --git a/developers/jeremy/Dagger.tscn b/developers/jeremy/Dagger.tscn index 07c8762..58acc8b 100644 --- a/developers/jeremy/Dagger.tscn +++ b/developers/jeremy/Dagger.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://assets/props/dagger/dagger.mesh" type="ArrayMesh" id=1] [ext_resource path="res://assets/props/misc/plane.mesh" type="ArrayMesh" id=2] [ext_resource path="res://developers/jeremy/Dagger.gd" type="Script" id=3] +[ext_resource path="res://assets/props/dagger/materials/MA_dagger.material" type="Material" id=4] [sub_resource type="CapsuleShape" id=1] -radius = 0.136165 -height = 0.0793334 +radius = 0.0928268 +height = 0.330033 [node name="Spatial" type="Spatial"] script = ExtResource( 3 ) @@ -20,13 +21,14 @@ mesh = ExtResource( 2 ) material/0 = null [node name="dagger" type="MeshInstance" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.542265, 0.160108, -0.620212 ) +transform = Transform( 0.40207, 0.904171, -0.144269, 0.267663, 0.034613, 0.962891, 0.875612, -0.425765, -0.228096, -0.471081, 0.0121503, -0.16144 ) mesh = ExtResource( 1 ) -material/0 = null +material/0 = ExtResource( 4 ) [node name="Area" type="Area" parent="dagger"] [node name="CollisionShape" type="CollisionShape" parent="dagger/Area"] +transform = Transform( 0.984898, 0.0129629, -0.172648, 0.172618, 0.0034483, 0.984983, 0.0133636, -0.99991, 0.00115858, 0, 0.0899074, 0 ) shape = SubResource( 1 ) [connection signal="input_event" from="dagger/Area" to="." method="_on_Area_input_event"]