Tweak settings in various 3D demos

- Enable 4× MSAA in all 3D demos.
- Enable filmic tonemapping with a whitepoint of 6 in GLES3 3D demos.
- Add subtle fog to the Truck Town demo.
- Use the `2d` stretch mode and `expand` stretch aspect to support
  multiple resolutions and aspect ratios.
This commit is contained in:
Hugo Locurcio
2020-08-16 20:12:40 +02:00
parent 4b9a809912
commit c6163b3d20
16 changed files with 105 additions and 49 deletions

View File

@@ -7,6 +7,8 @@ background_mode = 2
background_sky = SubResource( 1 )
ambient_light_color = Color( 1, 1, 1, 1 )
ambient_light_sky_contribution = 0.8
tonemap_mode = 2
tonemap_white = 6.0
glow_enabled = true
glow_levels/1 = true
glow_levels/2 = true

View File

@@ -49,7 +49,17 @@ __meta__ = {
}
skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton")
bone_name = "Head"
update_mode = 0
look_at_axis = 1
use_our_rotation_x = false
use_our_rotation_y = false
use_our_rotation_z = false
use_negative_our_rot = false
additional_rotation = Vector3( 90, 0, 0 )
position_using_additional_bone = false
additional_bone_name = ""
additional_bone_length = 1.0
debug_messages = false
[node name="IK_LookAt_LeftArm" type="Spatial" parent="Camera/Targets"]
script = ExtResource( 6 )
@@ -58,6 +68,17 @@ __meta__ = {
}
skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton")
bone_name = "Left_UpperArm"
update_mode = 0
look_at_axis = 1
use_our_rotation_x = false
use_our_rotation_y = false
use_our_rotation_z = false
use_negative_our_rot = false
additional_rotation = Vector3( 0, 0, 0 )
position_using_additional_bone = false
additional_bone_name = ""
additional_bone_length = 1.0
debug_messages = false
[node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/Targets"]
script = ExtResource( 6 )
@@ -66,7 +87,17 @@ __meta__ = {
}
skeleton_path = NodePath("../../../GodotBattleBot/Armature/Skeleton")
bone_name = "Right_UpperArm"
update_mode = 0
look_at_axis = 1
use_our_rotation_x = false
use_our_rotation_y = false
use_our_rotation_z = false
use_negative_our_rot = false
additional_rotation = Vector3( 0, 0, 180 )
position_using_additional_bone = false
additional_bone_name = ""
additional_bone_length = 1.0
debug_messages = false
[node name="Control" type="Control" parent="."]
anchor_right = 1.0

View File

@@ -22,10 +22,16 @@ different ways they can be used, including via SkeletonIK."
run/main_scene="res://look_at_ik.tscn"
config/icon="res://icon.png"
[display]
window/stretch/mode="2d"
window/stretch/aspect="expand"
[editor_plugins]
enabled=PoolStringArray( "sade" )
[rendering]
quality/filters/msaa=2
environment/default_environment="res://default_env.tres"

View File

@@ -14,17 +14,17 @@ func _physics_process(delta):
get_tree().quit()
if Input.is_action_just_pressed("reset_position"):
translation = Vector3(-3, 4, 8)
var dir = Vector3()
dir.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left")
dir.z = Input.get_action_strength("move_back") - Input.get_action_strength("move_forward")
# Get the camera's transform basis, but remove the X rotation such
# that the Y axis is up and Z is horizontal.
var cam_basis = $Target/Camera.global_transform.basis
var basis = cam_basis.rotated(cam_basis.x, -cam_basis.get_euler().x)
dir = basis.xform(dir)
# Limit the input to a length of 1. length_squared is faster to check.
if dir.length_squared() > 1:
dir /= dir.length()

View File

@@ -15,6 +15,8 @@ texture_size = 0
[resource]
background_mode = 2
background_sky = SubResource( 1 )
tonemap_mode = 2
tonemap_white = 6.0
ssao_blur = 1
glow_levels/7 = true
glow_strength = 0.79

View File

@@ -1,17 +1,16 @@
[gd_scene load_steps=16 format=2]
[gd_scene load_steps=15 format=2]
[ext_resource path="res://cubelib.tres" type="MeshLibrary" id=1]
[ext_resource path="res://cubio.tscn" type="PackedScene" id=2]
[ext_resource path="res://purple_wood.png" type="Texture" id=3]
[ext_resource path="res://default_env.tres" type="Environment" id=4]
[sub_resource type="SpatialMaterial" id=3]
[sub_resource type="SpatialMaterial" id=1]
albedo_color = Color( 0.7, 0.7, 0.7, 1 )
albedo_texture = ExtResource( 3 )
metallic = 0.1
roughness = 0.0
[sub_resource type="ArrayMesh" id=4]
[sub_resource type="ArrayMesh" id=2]
surfaces/0 = {
"aabb": AABB( -1, -1, -1, 2, 2, 2 ),
"array_data": PoolByteArray( 147, 59, 147, 59, 255, 187, 0, 60, 43, 43, 145, 0, 201, 59, 194, 38, 147, 59, 147, 187, 255, 187, 0, 60, 43, 213, 145, 0, 201, 59, 201, 59, 147, 187, 147, 187, 0, 188, 0, 60, 213, 213, 145, 0, 194, 38, 201, 59, 147, 187, 147, 59, 0, 188, 0, 60, 213, 43, 145, 0, 194, 38, 194, 38, 147, 59, 147, 187, 0, 60, 0, 60, 43, 213, 111, 0, 201, 59, 201, 59, 147, 59, 147, 59, 0, 60, 0, 60, 43, 43, 111, 0, 201, 59, 194, 38, 147, 187, 147, 59, 255, 59, 0, 60, 213, 43, 111, 0, 194, 38, 194, 38, 147, 187, 147, 187, 255, 59, 0, 60, 213, 213, 111, 0, 194, 38, 201, 59, 0, 188, 147, 187, 147, 59, 0, 60, 145, 213, 43, 0, 194, 38, 201, 59, 0, 188, 147, 59, 147, 59, 0, 60, 145, 43, 43, 0, 194, 38, 194, 38, 255, 187, 147, 59, 147, 187, 0, 60, 145, 43, 213, 0, 201, 59, 194, 38, 255, 187, 147, 187, 147, 187, 0, 60, 145, 213, 213, 0, 201, 59, 201, 59, 147, 59, 0, 60, 147, 187, 0, 60, 43, 111, 213, 0, 201, 59, 194, 38, 147, 187, 0, 60, 147, 187, 0, 60, 213, 111, 213, 0, 194, 38, 194, 38, 147, 187, 0, 60, 147, 59, 0, 60, 213, 111, 43, 0, 194, 38, 201, 59, 147, 59, 0, 60, 147, 59, 0, 60, 43, 111, 43, 0, 201, 59, 201, 59, 0, 60, 147, 187, 147, 187, 0, 60, 111, 213, 213, 0, 201, 59, 201, 59, 0, 60, 147, 59, 147, 187, 0, 60, 111, 43, 213, 0, 201, 59, 194, 38, 255, 59, 147, 59, 147, 59, 0, 60, 111, 43, 43, 0, 194, 38, 194, 38, 0, 60, 147, 187, 147, 59, 0, 60, 111, 213, 43, 0, 194, 38, 201, 59, 147, 59, 147, 187, 255, 187, 0, 60, 43, 213, 145, 0, 201, 59, 0, 60, 0, 60, 147, 187, 147, 187, 0, 60, 111, 213, 213, 0, 0, 60, 27, 60, 147, 59, 0, 188, 147, 187, 0, 60, 43, 145, 213, 0, 201, 59, 27, 60, 147, 59, 0, 188, 147, 59, 0, 60, 43, 145, 43, 0, 201, 59, 201, 59, 0, 60, 147, 187, 147, 59, 0, 60, 111, 213, 43, 0, 0, 60, 201, 59, 147, 59, 147, 187, 0, 60, 0, 60, 43, 213, 111, 0, 201, 59, 0, 60, 147, 187, 0, 188, 147, 59, 0, 60, 213, 145, 43, 0, 194, 38, 201, 59, 147, 187, 147, 187, 255, 59, 0, 60, 213, 213, 111, 0, 194, 38, 255, 59, 0, 188, 147, 187, 147, 59, 0, 60, 145, 213, 43, 0, 0, 0, 201, 59, 255, 187, 147, 187, 147, 187, 0, 60, 145, 213, 213, 0, 0, 0, 194, 38, 147, 187, 147, 187, 0, 188, 0, 60, 213, 213, 145, 0, 194, 38, 0, 0, 147, 187, 0, 188, 147, 187, 0, 60, 213, 145, 213, 0, 194, 38, 194, 38, 0, 60, 147, 59, 147, 187, 0, 60, 111, 43, 213, 0, 0, 0, 194, 38, 147, 59, 147, 59, 255, 187, 0, 60, 43, 43, 145, 0, 194, 166, 0, 0, 147, 59, 0, 60, 147, 187, 0, 60, 43, 111, 213, 0, 194, 166, 194, 38, 147, 59, 0, 60, 147, 59, 0, 60, 43, 111, 43, 0, 201, 59, 0, 60, 147, 59, 147, 59, 0, 60, 0, 60, 43, 43, 111, 0, 201, 59, 27, 60, 255, 59, 147, 59, 147, 59, 0, 60, 111, 43, 43, 0, 255, 59, 27, 60, 0, 188, 147, 59, 147, 59, 0, 60, 145, 43, 43, 0, 0, 0, 201, 59, 147, 187, 147, 59, 255, 59, 0, 60, 213, 43, 111, 0, 194, 38, 255, 59, 147, 187, 147, 59, 0, 188, 0, 60, 213, 43, 145, 0, 194, 38, 0, 60, 255, 187, 147, 59, 147, 187, 0, 60, 145, 43, 213, 0, 0, 0, 27, 60, 147, 187, 0, 60, 147, 187, 0, 60, 213, 111, 213, 0, 194, 38, 27, 60, 0, 60, 147, 187, 147, 187, 0, 60, 111, 213, 213, 0, 0, 0, 194, 38, 0, 60, 147, 187, 147, 59, 0, 60, 111, 213, 43, 0, 0, 0, 201, 59, 147, 59, 0, 188, 147, 59, 0, 60, 43, 145, 43, 0, 194, 166, 201, 59, 147, 59, 0, 188, 147, 187, 0, 60, 43, 145, 213, 0, 194, 166, 194, 38, 147, 59, 147, 187, 255, 187, 0, 60, 43, 213, 145, 0, 201, 59, 0, 0, 147, 59, 0, 188, 147, 187, 0, 60, 43, 145, 213, 0, 201, 59, 194, 38, 0, 60, 147, 59, 147, 187, 0, 60, 111, 43, 213, 0, 0, 60, 194, 38, 0, 60, 147, 187, 147, 187, 0, 60, 111, 213, 213, 0, 0, 60, 201, 59, 255, 59, 147, 59, 147, 59, 0, 60, 111, 43, 43, 0, 0, 0, 194, 38, 147, 59, 147, 59, 0, 60, 0, 60, 43, 43, 111, 0, 194, 166, 194, 38, 147, 59, 147, 187, 0, 60, 0, 60, 43, 213, 111, 0, 194, 166, 201, 59, 147, 187, 0, 188, 147, 187, 0, 60, 213, 145, 213, 0, 201, 59, 0, 60, 147, 187, 0, 188, 147, 59, 0, 60, 213, 145, 43, 0, 194, 38, 0, 60, 0, 188, 147, 59, 147, 59, 0, 60, 145, 43, 43, 0, 0, 0, 194, 38, 0, 188, 147, 187, 147, 59, 0, 60, 145, 213, 43, 0, 0, 0, 201, 59, 255, 187, 147, 187, 147, 187, 0, 60, 145, 213, 213, 0, 0, 0, 201, 59, 255, 187, 147, 59, 147, 187, 0, 60, 145, 43, 213, 0, 0, 0, 194, 38, 255, 59, 147, 59, 147, 59, 0, 60, 111, 43, 43, 0, 255, 59, 201, 59, 0, 60, 147, 59, 147, 187, 0, 60, 111, 43, 213, 0, 0, 60, 194, 38, 147, 59, 147, 59, 255, 187, 0, 60, 43, 43, 145, 0, 201, 59, 0, 0, 147, 187, 147, 59, 0, 188, 0, 60, 213, 43, 145, 0, 194, 38, 0, 0, 147, 59, 147, 59, 0, 60, 0, 60, 43, 43, 111, 0, 201, 59, 0, 60 ),
@@ -19,16 +18,16 @@ surfaces/0 = {
"blend_shape_data": [ ],
"format": 98067,
"index_count": 132,
"material": SubResource( 3 ),
"material": SubResource( 1 ),
"name": "Material",
"primitive": 4,
"skeleton_aabb": [ ],
"vertex_count": 65
}
[sub_resource type="BoxShape" id=5]
[sub_resource type="BoxShape" id=3]
[sub_resource type="Animation" id=6]
[sub_resource type="Animation" id=4]
length = 10.0
loop = true
tracks/0/type = "value"
@@ -44,7 +43,7 @@ tracks/0/keys = {
"values": [ Vector3( 1, 9, -5 ), Vector3( 1, 9, -5 ), Vector3( 1, 17, -5 ), Vector3( 1, 17, -5 ), Vector3( 1, 9, -5 ), Vector3( 1, 9, -5 ) ]
}
[sub_resource type="Animation" id=7]
[sub_resource type="Animation" id=5]
length = 10.0
loop = true
tracks/0/type = "value"
@@ -60,22 +59,22 @@ tracks/0/keys = {
"values": [ Vector3( -7, 17, 9 ), Vector3( -7, 17, 9 ), Vector3( 7, 17, 9 ), Vector3( 7, 17, 9 ), Vector3( -7, 17, 9 ) ]
}
[sub_resource type="SpatialMaterial" id=6]
albedo_color = Color( 0.7, 0.7, 0.7, 1 )
metallic = 0.1
roughness = 0.0
[sub_resource type="SpatialMaterial" id=7]
albedo_color = Color( 0.7, 0.7, 0.7, 1 )
metallic = 0.1
roughness = 0.0
[sub_resource type="SpatialMaterial" id=8]
albedo_color = Color( 0.7, 0.7, 0.7, 1 )
metallic = 0.1
roughness = 0.0
[sub_resource type="SpatialMaterial" id=9]
albedo_color = Color( 0.7, 0.7, 0.7, 1 )
metallic = 0.1
roughness = 0.0
[sub_resource type="SpatialMaterial" id=10]
albedo_color = Color( 0.7, 0.7, 0.7, 1 )
metallic = 0.1
roughness = 0.0
[sub_resource type="ArrayMesh" id=11]
[sub_resource type="ArrayMesh" id=9]
surfaces/0 = {
"aabb": AABB( -1.54775, 0.198285, -1.54775, 3.09549, 2.553, 3.09549 ),
"array_data": PoolByteArray( 143, 60, 128, 65, 143, 188, 0, 60, 43, 111, 213, 0, 49, 52, 24, 58, 143, 188, 128, 65, 143, 188, 0, 60, 213, 111, 213, 0, 19, 43, 24, 58, 143, 188, 128, 65, 143, 60, 0, 60, 213, 111, 43, 0, 19, 43, 192, 59, 143, 60, 128, 65, 143, 60, 0, 60, 43, 111, 43, 0, 49, 52, 192, 59, 0, 60, 88, 50, 228, 185, 0, 60, 98, 186, 219, 0, 227, 49, 179, 59, 228, 57, 88, 50, 255, 187, 0, 60, 37, 186, 158, 0, 184, 49, 172, 59, 143, 60, 159, 56, 48, 190, 0, 60, 44, 199, 153, 0, 124, 49, 192, 59, 48, 62, 159, 56, 143, 188, 0, 60, 103, 199, 212, 0, 181, 49, 204, 59, 228, 57, 88, 50, 0, 60, 0, 60, 37, 186, 98, 0, 141, 50, 125, 59, 255, 59, 88, 50, 228, 57, 0, 60, 98, 186, 37, 0, 169, 50, 114, 59, 48, 62, 159, 56, 143, 60, 0, 60, 103, 199, 44, 0, 91, 50, 100, 59, 143, 60, 159, 56, 48, 62, 0, 60, 44, 199, 103, 0, 44, 50, 114, 59, 0, 188, 88, 50, 228, 57, 0, 60, 158, 186, 37, 0, 190, 48, 125, 59, 228, 185, 88, 50, 255, 59, 0, 60, 219, 186, 98, 0, 218, 48, 114, 59, 143, 188, 159, 56, 48, 62, 0, 60, 212, 199, 103, 0, 140, 48, 100, 59, 48, 190, 159, 56, 143, 60, 0, 60, 153, 199, 44, 0, 92, 48, 114, 59, 228, 185, 88, 50, 255, 187, 0, 60, 219, 186, 158, 0, 108, 47, 200, 58, 255, 187, 88, 50, 228, 185, 0, 60, 158, 186, 219, 0, 22, 47, 193, 58, 48, 190, 159, 56, 143, 188, 0, 60, 153, 199, 212, 0, 159, 46, 213, 58, 143, 188, 159, 56, 48, 190, 0, 60, 212, 199, 153, 0, 16, 47, 225, 58, 0, 60, 88, 50, 228, 185, 0, 60, 98, 186, 219, 0, 102, 51, 89, 59, 48, 62, 159, 56, 143, 188, 0, 60, 103, 199, 212, 0, 102, 51, 58, 59, 228, 185, 88, 50, 255, 187, 0, 60, 219, 186, 158, 0, 81, 49, 125, 59, 143, 188, 159, 56, 48, 190, 0, 60, 212, 199, 153, 0, 214, 48, 125, 59, 228, 57, 88, 50, 0, 60, 0, 60, 37, 186, 98, 0, 150, 49, 89, 59, 143, 60, 159, 56, 48, 62, 0, 60, 44, 199, 103, 0, 150, 49, 58, 59, 0, 188, 88, 50, 228, 57, 0, 60, 158, 186, 37, 0, 72, 46, 146, 58, 48, 190, 159, 56, 143, 60, 0, 60, 153, 199, 44, 0, 83, 45, 146, 58, 48, 62, 159, 56, 143, 188, 0, 60, 103, 199, 212, 0, 248, 168, 55, 58, 143, 60, 159, 56, 48, 190, 0, 60, 44, 199, 153, 0, 5, 48, 55, 58, 143, 60, 176, 64, 48, 190, 0, 60, 43, 43, 145, 0, 5, 48, 99, 50, 48, 62, 176, 64, 143, 188, 0, 60, 111, 43, 213, 0, 248, 168, 99, 50, 143, 60, 159, 56, 48, 62, 0, 60, 44, 199, 103, 0, 248, 168, 55, 58, 48, 62, 159, 56, 143, 60, 0, 60, 103, 199, 44, 0, 5, 48, 55, 58, 48, 62, 176, 64, 143, 60, 0, 60, 111, 43, 43, 0, 5, 48, 99, 50, 143, 60, 176, 64, 48, 62, 0, 60, 43, 43, 111, 0, 248, 168, 99, 50, 48, 190, 159, 56, 143, 60, 0, 60, 153, 199, 44, 0, 248, 168, 55, 58, 143, 188, 159, 56, 48, 62, 0, 60, 212, 199, 103, 0, 5, 48, 55, 58, 143, 188, 176, 64, 48, 62, 0, 60, 213, 43, 111, 0, 5, 48, 99, 50, 48, 190, 176, 64, 143, 60, 0, 60, 145, 43, 43, 0, 248, 168, 99, 50, 143, 188, 159, 56, 48, 190, 0, 60, 212, 199, 153, 0, 248, 168, 55, 58, 48, 190, 159, 56, 143, 188, 0, 60, 153, 199, 212, 0, 5, 48, 55, 58, 48, 190, 176, 64, 143, 188, 0, 60, 145, 43, 213, 0, 5, 48, 99, 50, 143, 188, 176, 64, 48, 190, 0, 60, 213, 43, 145, 0, 248, 168, 99, 50, 48, 62, 159, 56, 143, 188, 0, 60, 103, 199, 212, 0, 10, 59, 55, 58, 48, 62, 176, 64, 143, 188, 0, 60, 111, 43, 213, 0, 10, 59, 99, 50, 143, 188, 159, 56, 48, 190, 0, 60, 212, 199, 153, 0, 10, 59, 55, 58, 143, 188, 176, 64, 48, 190, 0, 60, 213, 43, 145, 0, 10, 59, 99, 50, 143, 60, 159, 56, 48, 62, 0, 60, 44, 199, 103, 0, 10, 59, 55, 58, 143, 60, 176, 64, 48, 62, 0, 60, 43, 43, 111, 0, 10, 59, 99, 50, 48, 190, 159, 56, 143, 60, 0, 60, 153, 199, 44, 0, 10, 59, 55, 58, 48, 190, 176, 64, 143, 60, 0, 60, 145, 43, 43, 0, 10, 59, 99, 50, 143, 60, 128, 65, 143, 188, 0, 60, 43, 111, 213, 0, 5, 48, 98, 32, 143, 60, 128, 65, 143, 60, 0, 60, 43, 111, 43, 0, 5, 48, 98, 32, 143, 188, 128, 65, 143, 60, 0, 60, 213, 111, 43, 0, 5, 48, 98, 32, 143, 188, 128, 65, 143, 188, 0, 60, 213, 111, 213, 0, 5, 48, 98, 32, 143, 60, 128, 65, 143, 188, 0, 60, 43, 111, 213, 0, 10, 59, 98, 32, 143, 188, 128, 65, 143, 188, 0, 60, 213, 111, 213, 0, 10, 59, 98, 32, 143, 60, 128, 65, 143, 60, 0, 60, 43, 111, 43, 0, 10, 59, 98, 32, 143, 188, 128, 65, 143, 60, 0, 60, 213, 111, 43, 0, 10, 59, 98, 32 ),
@@ -83,7 +82,7 @@ surfaces/0 = {
"blend_shape_data": [ ],
"format": 98067,
"index_count": 138,
"material": SubResource( 8 ),
"material": SubResource( 6 ),
"name": "hat",
"primitive": 4,
"skeleton_aabb": [ ],
@@ -96,7 +95,7 @@ surfaces/1 = {
"blend_shape_data": [ ],
"format": 98067,
"index_count": 90,
"material": SubResource( 9 ),
"material": SubResource( 7 ),
"name": "Material",
"primitive": 4,
"skeleton_aabb": [ ],
@@ -109,17 +108,17 @@ surfaces/2 = {
"blend_shape_data": [ ],
"format": 98067,
"index_count": 12,
"material": SubResource( 10 ),
"material": SubResource( 8 ),
"name": "Material.001",
"primitive": 4,
"skeleton_aabb": [ ],
"vertex_count": 8
}
[sub_resource type="BoxShape" id=12]
[sub_resource type="BoxShape" id=10]
extents = Vector3( 4, 4, 4 )
[sub_resource type="GIProbeData" id=13]
[sub_resource type="GIProbeData" id=11]
bounds = AABB( -13.6076, -16.5391, -19.9349, 27.2151, 33.0781, 39.8698 )
cell_size = 0.311482
to_cell_xform = Transform( 3.21045, 0, 0, 0, 3.21045, 0, 0, 0, 3.21045, 43.6865, 53.0979, 64 )
@@ -136,7 +135,7 @@ __meta__ = {
mesh_library = ExtResource( 1 )
cell_octant_size = 4
data = {
"cells": PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 65530, 0, 0, 65531, 0, 0, 65532, 0, -536870912, 65533, 0, 0, 65534, 0, 0, 65535, 0, -536870912, 196603, 0, -536870912, 196604, 0, -536870912, 524292, 0, 0, 589820, 0, -536870912, 786432, 0, -536870912, 851967, 0, 0, 0, 1, 0, 1, 1, -536870912, 2, 1, 0, 3, 1, 0, 4, 1, -536870912, 65530, 1, 0, 65531, 1, 0, 65532, 1, -536870912, 65533, 1, -536870912, 65534, 1, 0, 65535, 1, -536870912, 131075, 1, 0, 196603, 1, 0, 196604, 1, 0, 524292, 1, -536870912, 589820, 1, -536870912, 786432, 1, 0, 851967, 1, 0, 0, 2, 0, 1, 2, 0, 2, 2, 0, 3, 2, -536870912, 4, 2, 0, 65530, 2, -536870912, 65531, 2, 0, 65532, 2, 0, 65533, 2, 0, 65534, 2, 536870912, 65535, 2, 0, 131075, 2, 0, 196603, 2, 0, 196604, 2, 0, 524292, 2, 0, 589820, 2, 0, 786432, 2, 0, 786433, 2, 1073741824, 851966, 2, 0, 851967, 2, 0, 0, 3, 0, 1, 3, 0, 2, 3, 0, 3, 3, 0, 4, 3, 0, 65530, 3, 0, 65531, 3, 0, 65532, 3, 0, 65533, 3, 0, 65534, 3, 0, 65535, 3, 0, 196603, 3, 0, 524291, 3, 0, 524292, 3, 0, 589820, 3, 0, 786432, 3, 0, 786433, 3, 0, 851966, 3, 0, 851967, 3, 0, 0, 4, 0, 1, 4, -536870912, 2, 4, 536870912, 3, 4, 0, 4, 4, 0, 65530, 4, 536870912, 65531, 4, 0, 65532, 4, 0, 65533, 4, -536870912, 65534, 4, 0, 65535, 4, 0, 196603, 4, 0, 786432, 4, 0, 851967, 4, 0, 0, 5, 0, 1, 5, 0, 2, 5, -536870912, 3, 5, 0, 4, 5, 0, 65530, 5, 0, 65531, 5, 0, 65532, 5, 536870912, 65533, 5, 0, 65534, 5, 536870912, 65535, 5, 0, 131075, 5, 0, 0, 6, 0, 1, 6, 0, 2, 6, 0, 3, 6, 0, 4, 6, 0, 65530, 6, 0, 65531, 6, 536870912, 65532, 6, 0, 65533, 6, 0, 65534, 6, 0, 65535, 6, 0, 131075, 6, 0, 196603, 6, 0, 0, 7, 0, 1, 7, 0, 2, 7, 0, 3, 7, 0, 4, 7, 0, 65530, 7, 0, 65531, 7, -536870912, 65532, 7, 0, 65533, 7, 0, 65534, 7, 0, 65535, 7, 0, 131075, 7, 0, 196603, 7, -536870912, 0, 8, 1073741824, 1, 8, 0, 2, 8, 0, 3, 8, 0, 4, 8, 0, 65530, 8, 0, 65531, 8, 0, 65532, 8, 0, 65533, 8, 0, 65534, 8, 0, 65535, 8, 536870912, 131075, 8, 0, 196603, 8, 0, 196604, 8, 0, 0, 9, 0, 1, 9, 0, 2, 9, 0, 3, 9, 0, 4, 9, 536870912, 65530, 9, 1073741824, 65531, 9, 0, 65532, 9, 0, 65533, 9, 0, 65534, 9, 0, 65535, 9, 0, 131073, 9, 0, 131074, 9, 0, 131075, 9, 0, 196603, 9, 0, 196604, 9, 0, 196605, 9, 0, 196608, 9, 0, 262142, 9, 0, 0, 10, 0, 1, 10, 0, 2, 10, 0, 3, 10, 0, 4, 10, 0, 65530, 10, 0, 65531, 10, 0, 65532, 10, 0, 65533, 10, 0, 65534, 10, 0, 65535, 10, 0, 0, 11, 0, 1, 11, 0, 2, 11, 0, 3, 11, 0, 4, 11, 0, 65530, 11, -536870912, 65531, 11, 0, 65532, 11, 0, 65533, 11, 0, 65534, 11, 0, 65535, 11, 0, 0, 65532, 0, 1, 65532, 0, 2, 65532, 0, 3, 65532, 0, 4, 65532, 0, 65530, 65532, 0, 65531, 65532, 0, 65532, 65532, -536870912, 65533, 65532, 0, 65534, 65532, 0, 65535, 65532, 536870912, 0, 65533, 536870912, 1, 65533, -536870912, 2, 65533, 0, 3, 65533, 0, 4, 65533, -536870912, 65530, 65533, 0, 65531, 65533, -536870912, 65532, 65533, 0, 65533, 65533, -536870912, 65534, 65533, -536870912, 65535, 65533, 0, 262145, 65533, -536870912, 262146, 65533, 0, 262147, 65533, 0, 589822, 65533, 0, 589823, 65533, 0, 655363, 65533, 0, 655364, 65533, 0, 720897, 65533, -536870912, 720898, 65533, 0, 786432, 65533, -536870912, 851967, 65533, 0, 0, 65534, -536870912, 1, 65534, 0, 2, 65534, -536870912, 3, 65534, -536870912, 4, 65534, -536870912, 65530, 65534, 0, 65531, 65534, 0, 65532, 65534, -536870912, 65533, 65534, 0, 65534, 65534, -536870912, 65535, 65534, -536870912, 65536, 65534, 0, 131071, 65534, -536870912, 196603, 65534, -536870912, 196604, 65534, 0, 196605, 65534, -536870912, 196606, 65534, -536870912, 196607, 65534, 0, 589822, 65534, -536870912, 589828, 65534, -536870912, 786432, 65534, 0, 851967, 65534, -536870912, 0, 65535, -536870912, 1, 65535, 0, 2, 65535, -536870912, 3, 65535, -536870912, 4, 65535, 0, 65530, 65535, -536870912, 65531, 65535, -536870912, 65532, 65535, 0, 65533, 65535, 0, 65534, 65535, -536870912, 65535, 65535, 0, 196603, 65535, -536870912, 196604, 65535, -536870912, 196611, 65535, 0, 589820, 65535, -536870912, 589821, 65535, -536870912, 589822, 65535, 0, 589828, 65535, -536870912, 786432, 65535, -536870912, 851967, 65535, 0 )
"cells": PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 65530, 0, 0, 65531, 0, 0, 65532, 0, -536870912, 65533, 0, 0, 65534, 0, 0, 65535, 0, -536870912, 196603, 0, -536870912, 196604, 0, -536870912, 524292, 0, 0, 589820, 0, 0, 786432, 0, -536870912, 851967, 0, -536870912, 0, 1, 0, 1, 1, -536870912, 2, 1, 0, 3, 1, -536870912, 4, 1, -536870912, 65530, 1, -536870912, 65531, 1, 0, 65532, 1, -536870912, 65533, 1, -536870912, 65534, 1, 0, 65535, 1, -536870912, 131075, 1, -536870912, 196603, 1, 0, 196604, 1, 0, 524292, 1, -536870912, 589820, 1, -536870912, 786432, 1, 0, 851967, 1, 0, 0, 2, -536870912, 1, 2, -536870912, 2, 2, -536870912, 3, 2, 0, 4, 2, 0, 65530, 2, -536870912, 65531, 2, 0, 65532, 2, -536870912, 65533, 2, 0, 65534, 2, 0, 65535, 2, -536870912, 131075, 2, 0, 196603, 2, -536870912, 196604, 2, -536870912, 524292, 2, 0, 589820, 2, 0, 786432, 2, 0, 786433, 2, -536870912, 851966, 2, 0, 851967, 2, -536870912, 0, 3, 0, 1, 3, 0, 2, 3, -536870912, 3, 3, 0, 4, 3, 0, 65530, 3, -536870912, 65531, 3, 536870912, 65532, 3, 0, 65533, 3, -536870912, 65534, 3, -536870912, 65535, 3, 0, 196603, 3, 0, 524291, 3, 0, 524292, 3, 0, 589820, 3, -536870912, 786432, 3, 0, 786433, 3, 0, 851966, 3, 0, 851967, 3, 0, 0, 4, 0, 1, 4, 0, 2, 4, 0, 3, 4, 0, 4, 4, 0, 65530, 4, 0, 65531, 4, 0, 65532, 4, 0, 65533, 4, 0, 65534, 4, 0, 65535, 4, 0, 196603, 4, 0, 786432, 4, 0, 851967, 4, 0, 0, 5, 0, 1, 5, 0, 2, 5, 0, 3, 5, 0, 4, 5, 0, 65530, 5, 0, 65531, 5, 0, 65532, 5, 0, 65533, 5, 0, 65534, 5, 0, 65535, 5, 0, 131075, 5, 0, 0, 6, 536870912, 1, 6, 0, 2, 6, 1073741824, 3, 6, 0, 4, 6, 0, 65530, 6, 0, 65531, 6, 0, 65532, 6, 0, 65533, 6, 536870912, 65534, 6, 0, 65535, 6, 0, 131075, 6, 0, 196603, 6, -536870912, 0, 7, 0, 1, 7, -536870912, 2, 7, 0, 3, 7, 536870912, 4, 7, 0, 65530, 7, 0, 65531, 7, 1073741824, 65532, 7, 0, 65533, 7, 0, 65534, 7, 0, 65535, 7, 0, 131075, 7, 0, 196603, 7, 0, 0, 8, 0, 1, 8, 0, 2, 8, 0, 3, 8, 0, 4, 8, 0, 65530, 8, 0, 65531, 8, 0, 65532, 8, 0, 65533, 8, 0, 65534, 8, 536870912, 65535, 8, 0, 131075, 8, 536870912, 196603, 8, 0, 196604, 8, 0, 0, 9, 0, 1, 9, 0, 2, 9, 536870912, 3, 9, 0, 4, 9, 0, 65530, 9, 0, 65531, 9, 0, 65532, 9, 0, 65533, 9, 0, 65534, 9, 0, 65535, 9, 0, 131073, 9, -536870912, 131074, 9, 0, 131075, 9, 0, 196603, 9, 536870912, 196604, 9, 0, 196605, 9, 0, 196608, 9, -536870912, 262142, 9, 0, 0, 10, 0, 1, 10, -536870912, 2, 10, 0, 3, 10, 0, 4, 10, 0, 65530, 10, 0, 65531, 10, 0, 65532, 10, 0, 65533, 10, 0, 65534, 10, 0, 65535, 10, 0, 0, 11, 0, 1, 11, 0, 2, 11, 0, 3, 11, 0, 4, 11, 0, 65530, 11, -536870912, 65531, 11, 0, 65532, 11, 0, 65533, 11, 1073741824, 65534, 11, 0, 65535, 11, 0, 0, 65532, 0, 1, 65532, 0, 2, 65532, 0, 3, 65532, 536870912, 4, 65532, 0, 65530, 65532, 0, 65531, 65532, 0, 65532, 65532, 0, 65533, 65532, 0, 65534, 65532, -536870912, 65535, 65532, 0, 0, 65533, 0, 1, 65533, -536870912, 2, 65533, 0, 3, 65533, 0, 4, 65533, 0, 65530, 65533, 0, 65531, 65533, 0, 65532, 65533, -536870912, 65533, 65533, 0, 65534, 65533, -536870912, 65535, 65533, -536870912, 262145, 65533, 0, 262146, 65533, 0, 262147, 65533, -536870912, 589822, 65533, 0, 589823, 65533, -536870912, 655363, 65533, 0, 655364, 65533, -536870912, 720897, 65533, 0, 720898, 65533, -536870912, 786432, 65533, -536870912, 851967, 65533, 0, 0, 65534, -536870912, 1, 65534, -536870912, 2, 65534, 0, 3, 65534, -536870912, 4, 65534, 0, 65530, 65534, 536870912, 65531, 65534, 1073741824, 65532, 65534, 0, 65533, 65534, 536870912, 65534, 65534, 536870912, 65535, 65534, 1073741824, 65536, 65534, 0, 131071, 65534, 536870912, 196603, 65534, 536870912, 196604, 65534, 1073741824, 196605, 65534, 0, 196606, 65534, 536870912, 196607, 65534, 536870912, 589822, 65534, 1073741824, 589828, 65534, 0, 786432, 65534, 536870912, 851967, 65534, 536870912, 0, 65535, 0, 1, 65535, 0, 2, 65535, 536870912, 3, 65535, 536870912, 4, 65535, 0, 65530, 65535, 0, 65531, 65535, 536870912, 65532, 65535, 536870912, 65533, 65535, 0, 65534, 65535, 0, 65535, 65535, 536870912, 196603, 65535, 536870912, 196604, 65535, 0, 196611, 65535, 536870912, 589820, 65535, 536870912, 589821, 65535, 536870912, 589822, 65535, 0, 589828, 65535, 536870912, 786432, 65535, 536870912, 851967, 65535, 536870912 )
}
__meta__ = {
"_editor_clip_": 0,
@@ -150,9 +149,6 @@ shadow_enabled = true
shadow_bias = 1.0
directional_shadow_normal_bias = 0.2
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = ExtResource( 4 )
[node name="Cubio" parent="." instance=ExtResource( 2 )]
[node name="Elevator1" type="KinematicBody" parent="."]
@@ -160,32 +156,32 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 9, -5 )
input_capture_on_drag = true
[node name="Mesh" type="MeshInstance" parent="Elevator1"]
mesh = SubResource( 4 )
mesh = SubResource( 2 )
material/0 = null
[node name="CollisionShape" type="CollisionShape" parent="Elevator1"]
shape = SubResource( 5 )
shape = SubResource( 3 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Elevator1"]
autoplay = "updown1"
playback_process_mode = 0
anims/updown1 = SubResource( 6 )
anims/updown1 = SubResource( 4 )
[node name="Elevator2" type="KinematicBody" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5.75394, 17, 9 )
[node name="Mesh" type="MeshInstance" parent="Elevator2"]
mesh = SubResource( 4 )
mesh = SubResource( 2 )
material/0 = null
[node name="CollisionShape" type="CollisionShape" parent="Elevator2"]
shape = SubResource( 5 )
shape = SubResource( 3 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Elevator2"]
autoplay = "side"
playback_process_mode = 0
anims/side = SubResource( 7 )
anims/updown1 = SubResource( 6 )
anims/side = SubResource( 5 )
anims/updown1 = SubResource( 4 )
[node name="Princess" type="Area" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 26.5054, 5.89978 )
@@ -194,18 +190,18 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 26.5054, 5.89978 )
_import_path = NodePath("Cube")
transform = Transform( -0.0250225, 0, 0.508718, 0, 0.509334, 0, -0.508718, 0, -0.0250225, 0, 0, 0 )
use_in_baked_light = true
mesh = SubResource( 11 )
mesh = SubResource( 9 )
material/0 = null
material/1 = null
material/2 = null
[node name="CollisionShape" type="CollisionShape" parent="Princess"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 )
shape = SubResource( 12 )
shape = SubResource( 10 )
[node name="GIProbe" type="GIProbe" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.4801, 6.6614 )
extents = Vector3( 13.6076, 16.5391, 19.9349 )
propagation = 1.0
data = SubResource( 13 )
data = SubResource( 11 )
[connection signal="body_entered" from="Princess" to="Cubio" method="_on_tcube_body_entered"]

View File

@@ -9,6 +9,8 @@ panorama = ExtResource( 1 )
background_mode = 2
background_sky = SubResource( 1 )
tonemap_mode = 2
tonemap_exposure = 1.2
tonemap_white = 6.0
ssao_enabled = true
ssao_light_affect = 0.78
ssao_quality = 2

View File

@@ -40,7 +40,7 @@ func _unhandled_input(ev):
zoom += ZOOM_SPEED
zoom = clamp(zoom, 2, 8)
camera.translation.z = zoom
if ev is InputEventMouseMotion and ev.button_mask & MAIN_BUTTONS:
# Compensate motion speed to be resolution-independent (based on the window height).
var relative_motion = ev.relative * get_viewport().size.y / base_height

View File

@@ -33,16 +33,16 @@ func _process(delta):
else:
path[path.size() - 1] = pfrom.linear_interpolate(pto, to_walk / d)
to_walk = 0
var atpos = path[path.size() - 1]
var atdir = to_watch
atdir.y = 0
var t = Transform()
t.origin = atpos
t = t.looking_at(atpos + atdir, Vector3.UP)
get_node("RobotBase").set_transform(t)
if path.size() < 2:
path = []
set_process(false)
@@ -55,11 +55,11 @@ func _unhandled_input(event):
var from = get_node("CameraBase/Camera").project_ray_origin(event.position)
var to = from + get_node("CameraBase/Camera").project_ray_normal(event.position) * 100
var p = get_closest_point_to_segment(from, to)
begin = get_closest_point(get_node("RobotBase").get_translation())
end = p
_update_path()
if event is InputEventMouseMotion:
if event.button_mask & (BUTTON_MASK_MIDDLE + BUTTON_MASK_RIGHT):
camrot += event.relative.x * 0.005
@@ -72,7 +72,7 @@ func _update_path():
path = Array(p) # Vector3 array too complex to use, convert to regular array.
path.invert()
set_process(true)
if draw_path:
var im = get_node("Draw")
im.set_material_override(m)

View File

@@ -30,3 +30,4 @@ singletons=[ ]
[rendering]
quality/driver/driver_name="GLES2"
quality/filters/msaa=2

View File

@@ -39,6 +39,11 @@ System="*res://utils/system.gd"
gdscript/warnings/return_value_discarded=false
[display]
window/stretch/mode="2d"
window/stretch/aspect="expand"
[input]
toggle_full_screen={
@@ -65,3 +70,5 @@ restart_test={
[rendering]
quality/driver/driver_name="GLES2"
environment/default_clear_color=Color( 0, 0, 0, 1 )
quality/filters/msaa=2

View File

@@ -10,3 +10,4 @@ panorama = ExtResource( 1 )
background_mode = 2
background_sky = SubResource( 1 )
tonemap_mode = 2
tonemap_white = 6.0

File diff suppressed because one or more lines are too long

View File

@@ -9,3 +9,7 @@ background_mode = 2
background_sky = SubResource( 1 )
ambient_light_color = Color( 0.347656, 0.347656, 0.347656, 1 )
ambient_light_sky_contribution = 0.2
fog_enabled = true
fog_color = Color( 0.686275, 0.772549, 0.815686, 1 )
fog_sun_amount = 1.0
fog_depth_end = 200.0

View File

@@ -76,4 +76,5 @@ shadow_filter=3
[rendering]
quality/driver/driver_name="GLES2"
quality/filters/msaa=2
environment/default_environment="res://default_env.tres"

View File

@@ -39,6 +39,8 @@ Settings="*res://settings.gd"
window/size/width=1600
window/size/height=900
window/stretch/mode="2d"
window/stretch/aspect="expand"
[input]
@@ -157,5 +159,6 @@ common/physics_fps=120
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true
vram_compression/import_etc2=false
quality/filters/msaa=2
environment/default_environment="res://default_env.tres"
gles2/debug/disable_half_float=true