diff --git a/default_env.tres b/default_env.tres index bed4799..20207a4 100644 --- a/default_env.tres +++ b/default_env.tres @@ -5,4 +5,3 @@ [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/materials/tilables/base_plastic_hard_shiny.material b/materials/tilables/base_plastic_hard_shiny.material index 9baeac5..f6389f3 100644 Binary files a/materials/tilables/base_plastic_hard_shiny.material and b/materials/tilables/base_plastic_hard_shiny.material differ diff --git a/materials/tilables/base_plastic_soft.material b/materials/tilables/base_plastic_soft.material index fca6c45..b3486b4 100644 Binary files a/materials/tilables/base_plastic_soft.material and b/materials/tilables/base_plastic_soft.material differ diff --git a/materials/tilables/base_steel_glossy.material b/materials/tilables/base_steel_glossy.material index c159c2d..6035a2c 100644 Binary files a/materials/tilables/base_steel_glossy.material and b/materials/tilables/base_steel_glossy.material differ diff --git a/meshes/props/pendo_teddy/pendo_teddy.glb b/meshes/props/pendo_teddy/pendo_teddy.glb index 0560a50..0243a48 100644 Binary files a/meshes/props/pendo_teddy/pendo_teddy.glb and b/meshes/props/pendo_teddy/pendo_teddy.glb differ diff --git a/meshes/props/pendo_teddy/pendo_teddy.material b/meshes/props/pendo_teddy/pendo_teddy.material index bb23da7..e9140a8 100644 Binary files a/meshes/props/pendo_teddy/pendo_teddy.material and b/meshes/props/pendo_teddy/pendo_teddy.material differ diff --git a/previewer/previewer.gd b/previewer/previewer.gd index 861b1f2..f0e9001 100644 --- a/previewer/previewer.gd +++ b/previewer/previewer.gd @@ -7,6 +7,19 @@ func _process( delta ): if Input.is_action_pressed("move_backward"): $dummy/camera_stand.translate( Vector3( 0.0, 0.0, 10.0*delta ) ) if Input.is_action_pressed("move_left"): - $dummy/camera_stand.rotate_y( 1.0*delta ) + $dummy/camera_stand.translate( Vector3(-10.0*delta, 0.0, 0.0 ) ) if Input.is_action_pressed("move_right"): - $dummy/camera_stand.rotate_y( -1.0*delta ) + $dummy/camera_stand.translate( Vector3( 10.0*delta, 0.0, 0.0 ) ) + +func _input(event): + + if event.is_action_pressed( "move_look" ): + Input.set_mouse_mode( Input.MOUSE_MODE_CAPTURED ) + elif event.is_action_released( "move_look" ): + Input.set_mouse_mode( Input.MOUSE_MODE_VISIBLE ) + + if event is InputEventMouseMotion: + if Input.is_action_pressed( "move_look" ): + $dummy/camera_stand/camera.rotate_x( -event.relative.y * 0.01 ) + $dummy/camera_stand.rotate_y( -event.relative.x * 0.01 ) + \ No newline at end of file diff --git a/previewer/previewer.tscn b/previewer/previewer.tscn index d67f3c4..348479e 100644 --- a/previewer/previewer.tscn +++ b/previewer/previewer.tscn @@ -2,8 +2,8 @@ [ext_resource path="res://previewer/previewer.gd" type="Script" id=1] [ext_resource path="res://previewer/dummy/dummy.tscn" type="PackedScene" id=2] -[ext_resource path="res://meshes/props/pendo_teddy/pendo_teddy.tscn" type="PackedScene" id=3] -[ext_resource path="res://meshes/props/travel_box/container.tscn" type="PackedScene" id=4] +[ext_resource path="res://meshes/props/travel_box/container.tscn" type="PackedScene" id=3] +[ext_resource path="res://meshes/props/pendo_teddy/pendo_teddy.tscn" type="PackedScene" id=4] [sub_resource type="ProceduralSky" id=1] @@ -54,10 +54,10 @@ mesh = SubResource( 6 ) [node name="props" type="Spatial" parent="."] -[node name="pendo_teddy" parent="props" instance=ExtResource( 3 )] +[node name="pendo_teddy" parent="props" instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3 ) -[node name="container" parent="props" instance=ExtResource( 4 )] +[node name="container" parent="props" instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5 ) [node name="light_system" type="Spatial" parent="."] @@ -70,4 +70,3 @@ shadow_enabled = true [node name="gi_probe" type="GIProbe" parent="light_system"] extents = Vector3( 63.192, 10, 76.3229 ) data = SubResource( 7 ) -