alexandru.stanciu/immersive-home
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

enable mipmaps for fonts and minor improvements

Browse Source
This commit is contained in:
Nitwel 2024-05-12 17:29:56 +02:00
parent 0bee8c5f9c
commit 8b285fdbe7
16 changed files with 88 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/environment.tres
View File

@ -7,9 +7,10 @@ sky_material = SubResource("ProceduralSkyMaterial_i4xao")
[resource]
background_mode = 1
background_color = Color(0.441, 0.962033, 0.98, 1)
background_color = Color(1, 1, 1, 1)
sky = SubResource("Sky_vhymk")
ambient_light_source = 2
ambient_light_color = Color(1, 1, 1, 1)
ssao_radius = 6.52
ssao_intensity = 5.68
adjustment_contrast = 2.23

2
app/assets/environment_passthrough.tres
View File

@ -6,7 +6,7 @@
sky_material = SubResource("ProceduralSkyMaterial_i4xao")
[resource]
background_color = Color(0, 0, 0, 0)
background_color = Color(1, 1, 1, 0)
background_energy_multiplier = 0.0
sky = SubResource("Sky_vhymk")
ambient_light_source = 2

15
app/assets/fonts/Montserrat-VariableFont_wght.ttf.import
View File

@ -14,20 +14,27 @@ dest_files=["res://.godot/imported/Montserrat-VariableFont_wght.ttf-e7d36c45e6f3
Rendering=null
antialiasing=1
generate_mipmaps=false
generate_mipmaps=true
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
msdf_size=100
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=3.0
oversampling=4.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
preload=[{
"chars": [],
"glyphs": [],
"name": "New Configuration",
"size": Vector2i(16, 0),
"variation_embolden": 0.0
}]
language_support={}
script_support={}
opentype_features={}

15
app/assets/icons/base_icons.woff2.import
View File

@ -14,20 +14,27 @@ dest_files=["res://.godot/imported/base_icons.woff2-e891c7009d71889de458845dfeb3
Rendering=null
antialiasing=1
generate_mipmaps=false
generate_mipmaps=true
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
msdf_size=100
allow_system_fallback=true
force_autohinter=false
hinting=1
subpixel_positioning=1
oversampling=4.0
oversampling=3.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[]
preload=[{
"chars": [],
"glyphs": [],
"name": "New Configuration",
"size": Vector2i(16, 0),
"variation_embolden": 0.0
}]
language_support={}
script_support={}
opentype_features={}

38
app/content/main.tscn
View File

@ -14,7 +14,6 @@
[ext_resource type="PackedScene" uid="uid://bhyddd1f0ry1x" path="res://content/ui/onboarding/onboarding.tscn" id="12_uq2nj"]
[node name="Main" type="Node3D"]
transform = Transform3D(1, -0.000296142, 0.000270963, 0.000296143, 1, -4.5899e-06, -0.000270962, 4.67014e-06, 1, 0, 0, 0)
script = ExtResource("1_uvrd4")
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
@ -22,6 +21,7 @@ environment = ExtResource("2_lsndp")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(1, -2.51787e-05, 0.000567105, -0.000567105, 4.3985e-08, 1, -2.51784e-05, -1, 2.97105e-08, -4.65661e-10, 7.21041, 2.06458)
visible = false
shadow_enabled = true
[node name="StartXR" parent="." instance=ExtResource("1_i4c04")]
@ -35,20 +35,25 @@ enable_passthrough = true
transform = Transform3D(0.999999, -1.39633e-11, 0, 9.48075e-12, 1, 0, 0, 0, 1, -0.355145, 0.550439, -0.477945)
[node name="IndexTip" parent="XROrigin3D/XRControllerLeft" index="4"]
transform = Transform3D(0.967526, 0.252326, -0.0150302, -0.0150302, 0.116784, 0.993043, 0.252326, -0.960569, 0.116784, -0.00665808, 0.0427912, -0.169868)
transform = Transform3D(0.967526, 0.252326, -0.0150302, -0.0150302, 0.116784, 0.993043, 0.252326, -0.960569, 0.116784, -0.00665802, 0.0427912, -0.169868)
[node name="ThumbTip" parent="XROrigin3D/XRControllerLeft" index="5"]
transform = Transform3D(0.967043, 0.24582, -0.0663439, -0.0663439, 0.494837, 0.86645, 0.24582, -0.833492, 0.494837, 0.0261569, 0.0891963, -0.0934418)
transform = Transform3D(0.967043, 0.24582, -0.0663439, -0.0663439, 0.494837, 0.866449, 0.24582, -0.833492, 0.494837, 0.0261569, 0.0891963, -0.0934418)
[node name="MiddleTip" parent="XROrigin3D/XRControllerLeft" index="6"]
transform = Transform3D(0.98042, 0.196912, 0.00149799, 0.001498, -0.015065, 0.999885, 0.196912, -0.980305, -0.0150651, -0.00327212, -0.00771427, -0.176318)
[node name="Palm" parent="XROrigin3D/XRControllerLeft" index="7"]
transform = Transform3D(1, 3.12361e-06, -3.13859e-06, -3.12371e-06, 1, -1.97886e-05, 3.13859e-06, 1.97889e-05, 1, 0.0307807, -0.0419722, -0.0399505)
transform = Transform3D(1, 3.12364e-06, -3.13861e-06, -3.12371e-06, 1, -1.97886e-05, 3.13854e-06, 1.97889e-05, 1, 0.0307807, -0.0419721, -0.0399505)
[node name="XRControllerRight" parent="XROrigin3D" instance=ExtResource("7_0b3tc")]
transform = Transform3D(0.999999, -1.39635e-11, 0, 1.31553e-10, 1, 0, 0, 0, 1, 0.336726, 0.575093, -0.437942)
[node name="OpenXRCompositionLayerEquirect" type="OpenXRCompositionLayerEquirect" parent="XROrigin3D" node_paths=PackedStringArray("layer_viewport")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.71, 0)
layer_viewport = NodePath("../../SubViewportContainer/SubViewport")
alpha_blend = true
[node name="XRSimulator" parent="." instance=ExtResource("5_3qc8g")]
min_camera_height = 0.01
xr_origin = NodePath("../XROrigin3D")
@ -69,5 +74,30 @@ transform = Transform3D(1, -1.39636e-11, 0, 4.42413e-11, 1, 0, 0, 0, 1, -0.57679
[node name="Node" type="Node" parent="."]
script = ExtResource("12_e13ym")
[node name="SubViewportContainer" type="SubViewportContainer" parent="."]
offset_right = 40.0
offset_bottom = 40.0
[node name="SubViewport" type="SubViewport" parent="SubViewportContainer"]
disable_3d = true
transparent_bg = true
handle_input_locally = false
render_target_update_mode = 4
[node name="Label" type="Label" parent="SubViewportContainer/SubViewport"]
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -298.0
offset_top = -61.5
offset_right = 298.0
offset_bottom = 61.5
grow_horizontal = 2
grow_vertical = 2
theme_override_font_sizes/font_size = 100
text = "Hello World"
[editable path="XROrigin3D/XRControllerLeft"]
[editable path="XROrigin3D/XRControllerLeft/hand_l"]

2
app/content/system/controller_left/controller_left.gd
View File

@ -74,7 +74,7 @@ func _physics_process(_delta):
func _setup_hand():
TouchManager.add_finger(Finger.Type.INDEX_LEFT, $IndexTip/TouchArea)
collide = Collide.new(hand, hand_mesh, index_tip)
collide = Collide.new(hand, hand_mesh, index_tip.get_node("Marker3D"))
add_child(collide)
auto_hand.hand_active_changed.connect(func(hand: int, active: bool):

1
app/content/system/controller_left/controller_left.tscn
View File

@ -55,6 +55,7 @@ use_external_skeleton = true
external_skeleton = NodePath("../hand_l/Armature/Skeleton3D")
[node name="Marker3D" type="Marker3D" parent="IndexTip"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.01, 0)
gizmo_extents = 0.02
[node name="TouchArea" type="Area3D" parent="IndexTip"]

2
app/content/system/controller_right/controller_right.gd
View File

@ -30,7 +30,7 @@ var grabbed = false
func _ready():
TouchManager.add_finger(Finger.Type.INDEX_RIGHT, $IndexTip/TouchArea)
collide = Collide.new(hand, hand_mesh, index_tip)
collide = Collide.new(hand, hand_mesh, index_tip.get_node("Marker3D"))
add_child(collide)
initiator.type = Initiator.Type.HAND_RIGHT

1
app/content/system/controller_right/controller_right.tscn
View File

@ -45,6 +45,7 @@ use_external_skeleton = true
external_skeleton = NodePath("../hand_r/Armature/Skeleton3D")
[node name="Marker3D" type="Marker3D" parent="IndexTip"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.01, 0)
gizmo_extents = 0.02
[node name="TouchArea" type="Area3D" parent="IndexTip"]

2
app/content/system/dot/dot.tscn
View File

@ -21,8 +21,6 @@ shape = SubResource("SphereShape3D_3wgjq")
[node name="Label3D" type="Label3D" parent="."]
pixel_size = 0.002
billboard = 1
render_priority = 15
outline_render_priority = 14
text = "lightbulb"
font = ExtResource("4_504vw")
font_size = 100

4
app/content/system/house/mini/mini_wall.tres
View File

@ -4,11 +4,11 @@
[ext_resource type="Texture2D" uid="uid://bbuq4wn7e5o2q" path="res://content/system/house/mini/temp_gradient.tres" id="2_3lwi8"]
[resource]
render_priority = 9
render_priority = 0
shader = ExtResource("1_sbr3e")
shader_parameter/data = PackedFloat32Array()
shader_parameter/data_size = 0
shader_parameter/alpha = 0.3
shader_parameter/alpha = 1.0
shader_parameter/roughness = 0.15
shader_parameter/edge_color = Color(0, 0, 0, 1)
shader_parameter/color_gradient = ExtResource("2_3lwi8")

14
app/content/system/house/mini/mini_wall_shader.gdshader
View File

@ -1,5 +1,5 @@
shader_type spatial;
render_mode blend_mix, depth_draw_opaque, cull_disabled, diffuse_burley, specular_schlick_ggx, shadows_disabled;
render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_burley, specular_schlick_ggx, shadows_disabled;
uniform vec4 data[100];
uniform int data_size: hint_range(0, 100, 1);
@ -27,7 +27,7 @@ float SchlickFresnel(float u) {
}
void vertex() {
color = vec3(1.0, 1.0, 1.0);
color = vec3(0.9, 0.9, 0.9);
if(data_size > 0) {
float distances[100];
@ -68,16 +68,16 @@ void vertex() {
void fragment() {
ALBEDO = vec3(color.xyz);
ALPHA = alpha;
//ALPHA = alpha;
float VdotN = dot(VIEW, NORMAL);
float fresnel = clamp(SchlickFresnel(VdotN), 0.0, 1.0);
// apply glass look
float a = mix(0.001, 1.0, ALPHA);
ALPHA = mix(fresnel * edge_color.a, 1.0, a);
ALBEDO = mix(edge_color.rgb * edge_color.a, ALBEDO, a);
//float a = mix(0.001, 1.0, ALPHA);
//ALPHA = mix(fresnel * edge_color.a, 1.0, a);
//ALBEDO = mix(edge_color.rgb * edge_color.a, ALBEDO, a);
ROUGHNESS = roughness;
SPECULAR = 0.5 * inversesqrt(ALPHA);
//SPECULAR = 0.5 * inversesqrt(ALPHA);
DEPTH = FRAGCOORD.z - 0.00001;
}

12
app/content/ui/menu/menu.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=23 format=3 uid="uid://c3kdssrmv84kv"]
[gd_scene load_steps=22 format=3 uid="uid://c3kdssrmv84kv"]
[ext_resource type="Script" path="res://content/ui/menu/menu.gd" id="1_ng4u3"]
[ext_resource type="Script" path="res://content/functions/movable.gd" id="2_8coxu"]
@ -7,7 +7,6 @@
[ext_resource type="PackedScene" uid="uid://crrb0l3ekuotj" path="res://content/ui/menu/edit/edit_menu.tscn" id="4_r2raj"]
[ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="5_w4i01"]
[ext_resource type="Script" path="res://content/ui/components/tabs/tabs_content.gd" id="6_7rntr"]
[ext_resource type="ArrayMesh" uid="uid://cbqhhnknyium2" path="res://assets/immersive_home_panels/immersive_home_panels.obj" id="7_f4u4o"]
[ext_resource type="PackedScene" uid="uid://ddpxthb414unp" path="res://content/ui/menu/view/view_menu.tscn" id="8_71pkg"]
[ext_resource type="PackedScene" uid="uid://c01gkeldvjwtr" path="res://content/ui/menu/room/room_menu.tscn" id="10_u4i1x"]
[ext_resource type="PackedScene" uid="uid://c6r4higceibif" path="res://content/ui/menu/settings/settings_menu.tscn" id="11_7wm6b"]
@ -26,7 +25,7 @@ shader_parameter/edge_color = Color(0, 0, 0, 1)
shader_parameter/size = Vector2(0.42, 0.32)
shader_parameter/border_size = 0.001
shader_parameter/border_fade_in = 0.005
shader_parameter/border_fade_out = 0.0
shader_parameter/border_fade_out = 0.001
shader_parameter/corner_radius = 0.02
shader_parameter/roughness = 0.3
shader_parameter/grain_amount = 0.02
@ -272,8 +271,10 @@ tabs = NodePath("../Tabs")
visible = false
[node name="EditMenu" parent="AnimationContainer/TabsContent" instance=ExtResource("4_r2raj")]
visible = false
[node name="RoomMenu" parent="AnimationContainer/TabsContent" instance=ExtResource("10_u4i1x")]
visible = false
[node name="AutomateMenu" type="Node3D" parent="AnimationContainer/TabsContent"]
visible = false
@ -289,11 +290,6 @@ gizmo_extents = 0.02
transform = Transform3D(0.5, 0, 0, 0, 0.433012, 0.25, 0, -0.25, 0.433012, 0.2, -0.38, 0.11)
gizmo_extents = 0.02
[node name="ImmersiveHomePanels" type="MeshInstance3D" parent="."]
transform = Transform3D(-4.37114e-10, 0, 0.01, 0, 0.01, 0, -0.01, 0, -4.37114e-10, 0.32, 0, -0.0500001)
visible = false
mesh = ExtResource("7_f4u4o")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_s30cd")

16
app/content/ui/menu/settings/menus/features_menu.tscn
View File

@ -8,7 +8,7 @@
[ext_resource type="Texture2D" uid="uid://bl33klueufwja" path="res://assets/cursors/pointer.png" id="6_ypel5"]
[ext_resource type="Texture2D" uid="uid://churthrr24yhw" path="res://assets/cursors/old.png" id="7_un12x"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_0hxn1"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_51ev7"]
resource_local_to_scene = true
render_priority = 10
shader = ExtResource("4_v4u0l")
@ -23,7 +23,7 @@ shader_parameter/corner_radius = 0.2
shader_parameter/roughness = 0.3
shader_parameter/grain_amount = 0.02
[sub_resource type="QuadMesh" id="QuadMesh_1x032"]
[sub_resource type="QuadMesh" id="QuadMesh_gh4gw"]
size = Vector2(0.04, 0.04)
[sub_resource type="BoxShape3D" id="BoxShape3D_01skh"]
@ -34,7 +34,7 @@ size = Vector3(0.04, 0.04, 0.01)
resource_local_to_scene = true
size = Vector3(0.04, 0.04, 0.03)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_pnxr8"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_mn1g0"]
resource_local_to_scene = true
render_priority = 10
shader = ExtResource("4_v4u0l")
@ -49,7 +49,7 @@ shader_parameter/corner_radius = 0.2
shader_parameter/roughness = 0.3
shader_parameter/grain_amount = 0.02
[sub_resource type="QuadMesh" id="QuadMesh_6ehqp"]
[sub_resource type="QuadMesh" id="QuadMesh_jbtbu"]
size = Vector2(0.04, 0.04)
[node name="FeaturesMenu" type="Node3D"]
@ -93,8 +93,8 @@ icon = true
toggleable = true
[node name="Panel3D" parent="CursorOptions/CircleCursor/Body" index="0"]
material_override = SubResource("ShaderMaterial_0hxn1")
mesh = SubResource("QuadMesh_1x032")
material_override = SubResource("ShaderMaterial_51ev7")
mesh = SubResource("QuadMesh_gh4gw")
[node name="CollisionShape3D" parent="CursorOptions/CircleCursor/Body" index="1"]
shape = SubResource("BoxShape3D_01skh")
@ -126,8 +126,8 @@ icon = true
toggleable = true
[node name="Panel3D" parent="CursorOptions/RetroCursor/Body" index="0"]
material_override = SubResource("ShaderMaterial_pnxr8")
mesh = SubResource("QuadMesh_6ehqp")
material_override = SubResource("ShaderMaterial_mn1g0")
mesh = SubResource("QuadMesh_jbtbu")
[node name="CollisionShape3D" parent="CursorOptions/RetroCursor/Body" index="1"]
shape = SubResource("BoxShape3D_01skh")

3
app/lib/utils/mesh/construct_room_mesh.gd
View File

@ -35,6 +35,9 @@ static func generate_wall_mesh_with_doors(corners, height, doors):
var mesh = ArrayMesh.new()
if Geometry2D.is_polygon_clockwise(PackedVector2Array(corners)) == false:
corners.reverse()
for i in range(0, corners.size()):
var corner = corners[i]
var next_corner = corners[(i + 1) % corners.size()]

1
app/project.godot
View File

@ -71,6 +71,7 @@ renderer/rendering_method="gl_compatibility"
renderer/rendering_method.mobile="gl_compatibility"
textures/vram_compression/import_etc2_astc=true
environment/ssao/quality=0
anti_aliasing/quality/msaa_3d=2
viewport/transparent_background=true
[xr]