1 files changed, 63 insertions, 18 deletions

diff --git a/combinator.tscn b/combinator.tscn
index dd100e9..92fbc1c 100644
--- a/combinator.tscn
+++ b/combinator.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://mesh/combinator.dae" type="PackedScene" id=1]
 [ext_resource path="res://scripts/combinator.gd" type="Script" id=2]
@@ -9,15 +9,19 @@
 
 points = PoolVector3Array( 1, -1, -0.999512, 1, -1, 1, -1, -1, 0.999512, -0.999512, -1, -1, 1, 1, -0.999512, -0.999512, 1, -1, -1, 1, 0.999512, 0.999512, 1, 1, 1, -1, -0.999512, 1, 1, -0.999512, 0.999512, 1, 1, 1, -1, 1, 1, -1, 1, 0.999512, 1, 1, -1, 1, 0.999512, -1, -1, 0.999512, -1, -1, 0.999512, -1, 1, 0.999512, -0.999512, 1, -1, -0.999512, -1, -1, 1, 1, -0.999512, 1, -1, -0.999512, -0.999512, -1, -1, -0.999512, 1, -1 )
 
-[sub_resource type="ConvexPolygonShape" id=2]
+[sub_resource type="ConvexPolygonShape" id=3]
 
 points = PoolVector3Array( -1, -1, 1.46973, -1, 1, 1.46973, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1, -1, 1, -1, -1, 1, 1, -1, 1, 1, 1.46973, 1, -1, 1.46973, 1, -1, 1.46973, 1, 1, 1.46973, -1, 1, 1.46973, -1, -1, 1.46973, -1, -1, -1, 1, -1, -1, 1, -1, 1.46973, -1, -1, 1.46973, 1, 1, -1, -1, 1, -1, -1, 1, 1.46973, 1, 1, 1.46973 )
 
-[sub_resource type="BoxShape" id=3]
+[sub_resource type="ConvexPolygonShape" id=5]
+
+points = PoolVector3Array( -1, -1, 1.46973, -1, 1, 1.46973, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1, -1, 1, -1, -1, 1, 1, -1, 1, 1, 1.46973, 1, -1, 1.46973, 1, -1, 1.46973, 1, 1, 1.46973, -1, 1, 1.46973, -1, -1, 1.46973, -1, -1, -1, 1, -1, -1, 1, -1, 1.46973, -1, -1, 1.46973, 1, 1, -1, -1, 1, -1, -1, 1, 1.46973, 1, 1, 1.46973 )
+
+[sub_resource type="BoxShape" id=6]
 
 extents = Vector3( 1, 1, 1 )
 
-[sub_resource type="SpatialMaterial" id=4]
+[sub_resource type="SpatialMaterial" id=7]
 
 flags_transparent = false
 flags_unshaded = true
@@ -53,9 +57,8 @@ uv1_offset = Vector2( 0, 0 )
 uv2_scale = Vector2( 1, 1 )
 uv2_offset = Vector2( 0, 0 )
 
-[sub_resource type="Animation" id=5]
+[sub_resource type="Animation" id=8]
 
-resource_name = "click"
 length = 0.5
 loop = false
 step = 0.1
@@ -71,13 +74,26 @@ tracks/0/keys = {
 "values": [ Vector3( 1.086, 1.15185, -1.42215 ), Vector3( 1.086, 1.01428, -1.42215 ), Vector3( 1.086, 1.15185, -1.42215 ) ]
 }
 
-[node name="Combinator" instance=ExtResource( 1 )]
+[sub_resource type="Animation" id=9]
 
-script = ExtResource( 2 )
+length = 0.5
+loop = false
+step = 0.1
+tracks/0/type = "value"
+tracks/0/path = NodePath("Cube.3:translation")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/keys = {
+"times": PoolFloatArray( 0, 0.2, 0.5 ),
+"transitions": PoolFloatArray( 1, 1, 1 ),
+"update": 0,
+"values": [ Vector3( 0.523316, 1.15185, -1.42215 ), Vector3( 0.523316, 1.05707, -1.42215 ), Vector3( 0.523316, 1.15185, -1.42215 ) ]
+}
 
-[node name="Cube" parent="."]
+[node name="Combinator" instance=ExtResource( 1 )]
 
-material_override = ExtResource( 3 )
+script = ExtResource( 2 )
 
 [node name="StaticBody" type="StaticBody" parent="Cube"]
 
@@ -102,6 +118,7 @@ _update_shape_index = 0
 
 [node name="Cube.1" parent="."]
 
+transform = Transform( 0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.5, 1.086, 1.15185, -1.42215 )
 material_override = ExtResource( 3 )
 
 [node name="StaticBody" type="StaticBody" parent="Cube.1"]
@@ -109,7 +126,7 @@ material_override = ExtResource( 3 )
 input_ray_pickable = true
 input_capture_on_drag = false
 shape_count = 1
-shapes/0/shape = SubResource( 2 )
+shapes/0/shape = SubResource( 3 )
 shapes/0/transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
 shapes/0/trigger = true
 collision_layer = 1
@@ -121,7 +138,7 @@ constant_angular_velocity = Vector3( 0, 0, 0 )
 
 [node name="CollisionShape" type="CollisionShape" parent="Cube.1/StaticBody"]
 
-shape = SubResource( 2 )
+shape = SubResource( 3 )
 trigger = true
 _update_shape_index = 0
 
@@ -129,6 +146,31 @@ _update_shape_index = 0
 
 material_override = ExtResource( 3 )
 
+[node name="Cube.3" parent="."]
+
+material_override = ExtResource( 3 )
+
+[node name="StaticBody" type="StaticBody" parent="Cube.3"]
+
+input_ray_pickable = true
+input_capture_on_drag = false
+shape_count = 1
+shapes/0/shape = SubResource( 5 )
+shapes/0/transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
+shapes/0/trigger = true
+collision_layer = 1
+collision_mask = 1
+friction = 1.0
+bounce = 0.0
+constant_linear_velocity = Vector3( 0, 0, 0 )
+constant_angular_velocity = Vector3( 0, 0, 0 )
+
+[node name="CollisionShape" type="CollisionShape" parent="Cube.3/StaticBody"]
+
+shape = SubResource( 5 )
+trigger = true
+_update_shape_index = 0
+
 [node name="Cylinder.1" parent="."]
 
 material_override = ExtResource( 3 )
@@ -159,11 +201,11 @@ shadow_atlas_quad_3 = 4
 
 [node name="Area" type="Area" parent="."]
 
-transform = Transform( 1.05, 0, 0, 0, 1, 0, 0, 0, 1.05, 0.0714184, 0.355354, 0.670982 )
+transform = Transform( 1.05, 0, 0, 0, 1, 0, 0, 0, 1.05, 0.0714184, 0.38471, 0.670982 )
 input_ray_pickable = true
 input_capture_on_drag = false
 shape_count = 1
-shapes/0/shape = SubResource( 3 )
+shapes/0/shape = SubResource( 6 )
 shapes/0/transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
 shapes/0/trigger = true
 space_override = 0
@@ -183,7 +225,7 @@ collision_mask = 1
 
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.99, 0 )
 layers = 1
-material_override = SubResource( 4 )
+material_override = SubResource( 7 )
 cast_shadow = 1
 extra_cull_margin = 0.0
 visible_in_all_rooms = false
@@ -199,7 +241,7 @@ centered = true
 
 [node name="CollisionShape" type="CollisionShape" parent="Area"]
 
-shape = SubResource( 3 )
+shape = SubResource( 6 )
 trigger = true
 _update_shape_index = 0
 
@@ -226,7 +268,7 @@ v_offset = 0.0
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.818578, 2.10295, -1.66632 )
 layers = 1
 light_color = Color( 1, 1, 1, 1 )
-light_energy = 15.0
+light_energy = 5.0
 light_negative = false
 light_specular = 0.1
 light_cull_mask = -1
@@ -246,7 +288,8 @@ omni_shadow_detail = 1
 playback_process_mode = 1
 playback_default_blend_time = 0.0
 root_node = NodePath("..")
-anims/click = SubResource( 5 )
+anims/click = SubResource( 8 )
+anims/incubate = SubResource( 9 )
 playback/active = true
 playback/speed = 1.0
 blend_times = [  ]
@@ -256,6 +299,8 @@ autoplay = ""
 
 [connection signal="input_event" from="Cube.1/StaticBody" to="." method="_on_panel_input_event"]
 
+[connection signal="input_event" from="Cube.3/StaticBody" to="." method="_on_incubate_input_event"]
+
 [connection signal="input_event" from="Area" to="." method="_on_Area_input_event"]