Fix window scaling not being applied on viewport
This commit is contained in:
parent
00ec79dd53
commit
a51eec71b1
@ -1,16 +1,17 @@
|
||||
[gd_scene load_steps=22 format=2]
|
||||
[gd_scene load_steps=23 format=2]
|
||||
|
||||
[ext_resource path="res://Characters/Player/Player.gd" type="Script" id=1]
|
||||
[ext_resource path="res://Characters/Player/PillCameras.gd" type="Script" id=2]
|
||||
[ext_resource path="res://Shaders/PillScreenRenderer.shader" type="Shader" id=3]
|
||||
[ext_resource path="res://Shaders/FadeOut.shader" type="Shader" id=4]
|
||||
[ext_resource path="res://Shaders/Masks/from_center.png" type="Texture" id=5]
|
||||
[ext_resource path="res://Resources/Audio/dino-eat.wav" type="AudioStream" id=6]
|
||||
[ext_resource path="res://Characters/Player/Footsteps.gd" type="Script" id=7]
|
||||
[ext_resource path="res://Resources/Audio/Step.wav" type="AudioStream" id=8]
|
||||
[ext_resource path="res://Characters/Player/UI/UI.tscn" type="PackedScene" id=9]
|
||||
[ext_resource path="res://Characters/Player/PillTaker.gd" type="Script" id=10]
|
||||
[ext_resource path="res://Level/Interactables/Pills/Pills.tscn" type="PackedScene" id=11]
|
||||
[ext_resource path="res://Characters/Player/WindowSizeViewport.gd" type="Script" id=3]
|
||||
[ext_resource path="res://Shaders/PillScreenRenderer.shader" type="Shader" id=4]
|
||||
[ext_resource path="res://Shaders/FadeOut.shader" type="Shader" id=5]
|
||||
[ext_resource path="res://Shaders/Masks/from_center.png" type="Texture" id=6]
|
||||
[ext_resource path="res://Resources/Audio/dino-eat.wav" type="AudioStream" id=7]
|
||||
[ext_resource path="res://Characters/Player/Footsteps.gd" type="Script" id=8]
|
||||
[ext_resource path="res://Resources/Audio/Step.wav" type="AudioStream" id=9]
|
||||
[ext_resource path="res://Characters/Player/UI/UI.tscn" type="PackedScene" id=10]
|
||||
[ext_resource path="res://Characters/Player/PillTaker.gd" type="Script" id=11]
|
||||
[ext_resource path="res://Level/Interactables/Pills/Pills.tscn" type="PackedScene" id=12]
|
||||
|
||||
[sub_resource type="ViewportTexture" id=1]
|
||||
viewport_path = NodePath("Body/PillCameras/MaskedView")
|
||||
@ -20,17 +21,17 @@ viewport_path = NodePath("Body/PillCameras/TrueView")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=3]
|
||||
resource_local_to_scene = true
|
||||
shader = ExtResource( 3 )
|
||||
shader = ExtResource( 4 )
|
||||
shader_param/mask_factor = 0.5
|
||||
shader_param/true_view = SubResource( 2 )
|
||||
shader_param/masked_view = SubResource( 1 )
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=4]
|
||||
shader = ExtResource( 4 )
|
||||
shader = ExtResource( 5 )
|
||||
shader_param/cutoff = 1.0
|
||||
shader_param/smooth_size = 0.135
|
||||
shader_param/color = null
|
||||
shader_param/mask = ExtResource( 5 )
|
||||
shader_param/mask = ExtResource( 6 )
|
||||
|
||||
[sub_resource type="CylinderShape" id=5]
|
||||
|
||||
@ -116,7 +117,7 @@ tracks/3/keys = {
|
||||
"clips": [ {
|
||||
"end_offset": 0.0,
|
||||
"start_offset": 0.0,
|
||||
"stream": ExtResource( 6 )
|
||||
"stream": ExtResource( 7 )
|
||||
} ],
|
||||
"times": PoolRealArray( 0 )
|
||||
}
|
||||
@ -151,7 +152,7 @@ tracks/0/keys = {
|
||||
}
|
||||
|
||||
[sub_resource type="AudioStreamRandomPitch" id=10]
|
||||
audio_stream = ExtResource( 8 )
|
||||
audio_stream = ExtResource( 9 )
|
||||
random_pitch = 1.3
|
||||
|
||||
[node name="Player" type="KinematicBody" groups=[
|
||||
@ -170,12 +171,11 @@ camera_nodepath = NodePath("Body/PillCameras")
|
||||
[node name="Body" type="Spatial" parent="."]
|
||||
|
||||
[node name="PillCameras" type="Spatial" parent="Body"]
|
||||
editor/display_folded = true
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0461721, 1.84617, 0 )
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="LookingAt" type="RayCast" parent="Body/PillCameras"]
|
||||
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 0 )
|
||||
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 )
|
||||
enabled = true
|
||||
cast_to = Vector3( 0, 0, 2 )
|
||||
|
||||
@ -183,10 +183,10 @@ cast_to = Vector3( 0, 0, 2 )
|
||||
current = true
|
||||
|
||||
[node name="TrueView" type="Viewport" parent="Body/PillCameras"]
|
||||
size = Vector2( 1024, 600 )
|
||||
render_target_update_mode = 3
|
||||
audio_listener_enable_3d = true
|
||||
shadow_atlas_size = 4
|
||||
script = ExtResource( 3 )
|
||||
|
||||
[node name="TrueCamera" type="Camera" parent="Body/PillCameras/TrueView"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0461721, 1.84617, 0 )
|
||||
@ -194,10 +194,10 @@ cull_mask = 2
|
||||
current = true
|
||||
|
||||
[node name="MaskedView" type="Viewport" parent="Body/PillCameras"]
|
||||
size = Vector2( 1024, 600 )
|
||||
render_target_update_mode = 3
|
||||
audio_listener_enable_3d = true
|
||||
shadow_atlas_size = 4
|
||||
script = ExtResource( 3 )
|
||||
|
||||
[node name="MaskedCamera" type="Camera" parent="Body/PillCameras/MaskedView"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0461721, 1.84617, 0 )
|
||||
@ -255,10 +255,10 @@ anims/FadeOut = SubResource( 9 )
|
||||
editor/display_folded = true
|
||||
|
||||
[node name="Chrum" type="AudioStreamPlayer3D" parent="Eating"]
|
||||
stream = ExtResource( 6 )
|
||||
stream = ExtResource( 7 )
|
||||
|
||||
[node name="Footsteps" type="Spatial" parent="."]
|
||||
script = ExtResource( 7 )
|
||||
script = ExtResource( 8 )
|
||||
|
||||
[node name="Footstep1" type="AudioStreamPlayer3D" parent="Footsteps"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1 )
|
||||
@ -266,22 +266,14 @@ stream = SubResource( 10 )
|
||||
unit_db = -25.0
|
||||
pitch_scale = 1.5
|
||||
|
||||
[node name="HUD" parent="." instance=ExtResource( 9 )]
|
||||
|
||||
[node name="DayTimeVisual" parent="HUD" index="6"]
|
||||
anchor_left = 0.5
|
||||
anchor_right = 0.5
|
||||
margin_left = -90.0
|
||||
margin_top = -90.0
|
||||
margin_right = 90.0
|
||||
margin_bottom = 90.0
|
||||
[node name="HUD" parent="." instance=ExtResource( 10 )]
|
||||
|
||||
[node name="PillTaker" type="Spatial" parent="."]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 )
|
||||
script = ExtResource( 10 )
|
||||
script = ExtResource( 11 )
|
||||
|
||||
[node name="Pills" parent="PillTaker" instance=ExtResource( 11 )]
|
||||
transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, 0.1, 0, -0.1, -4.37114e-009, 0, 0.7, 0 )
|
||||
[node name="Pills" parent="PillTaker" instance=ExtResource( 12 )]
|
||||
transform = Transform( 0.1, 0, 0, 0, -4.37114e-09, 0.1, 0, -0.1, -4.37114e-09, 0, 0.7, 0 )
|
||||
visible = false
|
||||
|
||||
[editable path="HUD"]
|
||||
|
||||
11
Characters/Player/WindowSizeViewport.gd
Normal file
11
Characters/Player/WindowSizeViewport.gd
Normal file
@ -0,0 +1,11 @@
|
||||
extends Viewport
|
||||
|
||||
|
||||
func _ready():
|
||||
get_tree().get_root().connect("size_changed", self, "adapt_resolution")
|
||||
|
||||
adapt_resolution()
|
||||
|
||||
|
||||
func adapt_resolution():
|
||||
size = OS.window_size
|
||||
@ -74,6 +74,9 @@ Daytime="*res://Global/Daytime.gd"
|
||||
|
||||
[display]
|
||||
|
||||
window/size/width=1600
|
||||
window/size/height=900
|
||||
window/size/borderless=true
|
||||
window/size/fullscreen=true
|
||||
|
||||
[input]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user