Merging
This commit is contained in:
commit
9adb87a843
3 changed files with 23 additions and 8 deletions
|
@ -23,3 +23,8 @@ func _input(event):
|
|||
$dummy/camera_stand/camera.rotate_x( -event.relative.y * 0.01 )
|
||||
$dummy/camera_stand.rotate_y( -event.relative.x * 0.01 )
|
||||
|
||||
if event.is_action_pressed( "move_zoom_in" ):
|
||||
$dummy/camera_stand/camera.set_fov( $dummy/camera_stand/camera.get_fov()-1.0 )
|
||||
elif event.is_action_pressed( "move_zoom_out" ):
|
||||
$dummy/camera_stand/camera.set_fov( $dummy/camera_stand/camera.get_fov()+1.0 )
|
||||
|
|
@ -15,15 +15,15 @@ background_sky = SubResource( 1 )
|
|||
background_energy = 0.1
|
||||
ambient_light_energy = 3.82
|
||||
|
||||
[sub_resource type="SpatialMaterial" id=5]
|
||||
[sub_resource type="SpatialMaterial" id=3]
|
||||
albedo_texture = ExtResource( 3 )
|
||||
uv1_scale = Vector3( 7.6, 7.6, 7.6 )
|
||||
uv1_offset = Vector3( 0.2, 0.2, 0 )
|
||||
|
||||
[sub_resource type="PlaneMesh" id=6]
|
||||
material = SubResource( 5 )
|
||||
[sub_resource type="PlaneMesh" id=4]
|
||||
material = SubResource( 3 )
|
||||
|
||||
[sub_resource type="GIProbeData" id=7]
|
||||
[sub_resource type="GIProbeData" id=5]
|
||||
bounds = AABB( -63.192, -10, -76.3229, 126.384, 20, 152.646 )
|
||||
cell_size = 1.19255
|
||||
to_cell_xform = Transform( 0.838543, 0, 0, 0, 0.838543, 0, 0, 0, 0.838543, 52.9891, 8.38543, 64 )
|
||||
|
@ -45,7 +45,7 @@ environment = SubResource( 2 )
|
|||
|
||||
[node name="test_csg_mesh" type="CSGMesh" parent="terrain"]
|
||||
transform = Transform( 60.964, 0, 0, 0, 1.21928, 0, 0, 0, 60.964, 0, 0, 0 )
|
||||
mesh = SubResource( 6 )
|
||||
mesh = SubResource( 4 )
|
||||
|
||||
[node name="props" type="Spatial" parent="."]
|
||||
|
||||
|
@ -61,10 +61,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5 )
|
|||
|
||||
[node name="directional_light" type="DirectionalLight" parent="light_system"]
|
||||
transform = Transform( 0.522088, 0.655715, -0.545401, 0, 0.639473, 0.768814, 0.852892, -0.401389, 0.333861, 0, 13.7088, 0 )
|
||||
light_energy = 1.29
|
||||
light_energy = 2.21
|
||||
shadow_enabled = true
|
||||
|
||||
[node name="gi_probe" type="GIProbe" parent="light_system"]
|
||||
extents = Vector3( 63.192, 10, 76.3229 )
|
||||
data = SubResource( 7 )
|
||||
data = SubResource( 5 )
|
||||
|
||||
|
|
|
@ -46,6 +46,16 @@ move_look={
|
|||
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"pressed":false,"doubleclick":false,"script":null)
|
||||
]
|
||||
}
|
||||
move_zoom_out={
|
||||
"deadzone": 0.5,
|
||||
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":5,"pressed":false,"doubleclick":false,"script":null)
|
||||
]
|
||||
}
|
||||
move_zoom_in={
|
||||
"deadzone": 0.5,
|
||||
"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":4,"pressed":false,"doubleclick":false,"script":null)
|
||||
]
|
||||
}
|
||||
|
||||
[node]
|
||||
|
||||
|
|
Loading…
Reference in a new issue