diff --git a/app/android/.build_version b/app/android/.build_version index 0a6ad9b..c175e23 100644 --- a/app/android/.build_version +++ b/app/android/.build_version @@ -1 +1 @@ -4.3.dev +4.3.beta diff --git a/app/assets/fonts/Montserrat-Medium.ttf b/app/assets/fonts/Montserrat-Medium.ttf new file mode 100644 index 0000000..4012225 Binary files /dev/null and b/app/assets/fonts/Montserrat-Medium.ttf differ diff --git a/app/assets/fonts/Montserrat-Medium.ttf.import b/app/assets/fonts/Montserrat-Medium.ttf.import new file mode 100644 index 0000000..8236fa8 --- /dev/null +++ b/app/assets/fonts/Montserrat-Medium.ttf.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://drsixxc4tmvjf" +path="res://.godot/imported/Montserrat-Medium.ttf-9322cac81db17d2f033bd26b2a37967f.fontdata" + +[deps] + +source_file="res://assets/fonts/Montserrat-Medium.ttf" +dest_files=["res://.godot/imported/Montserrat-Medium.ttf-9322cac81db17d2f033bd26b2a37967f.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/app/assets/fonts/Montserrat-Regular.ttf b/app/assets/fonts/Montserrat-Regular.ttf new file mode 100644 index 0000000..f4a266d Binary files /dev/null and b/app/assets/fonts/Montserrat-Regular.ttf differ diff --git a/app/assets/fonts/Montserrat-Regular.ttf.import b/app/assets/fonts/Montserrat-Regular.ttf.import new file mode 100644 index 0000000..abd124e --- /dev/null +++ b/app/assets/fonts/Montserrat-Regular.ttf.import @@ -0,0 +1,40 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://cg50jsgpda2en" +path="res://.godot/imported/Montserrat-Regular.ttf-15e5248c373097bdb910cdf2cfc29eaa.fontdata" + +[deps] + +source_file="res://assets/fonts/Montserrat-Regular.ttf" +dest_files=["res://.godot/imported/Montserrat-Regular.ttf-15e5248c373097bdb910cdf2cfc29eaa.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=true +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=100 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=4.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[{ +"chars": [], +"glyphs": [], +"name": "New Configuration", +"size": Vector2i(16, 0), +"variation_embolden": 0.0 +}] +language_support={} +script_support={} +opentype_features={} diff --git a/app/assets/fonts/Montserrat-SemiBold.ttf b/app/assets/fonts/Montserrat-SemiBold.ttf new file mode 100644 index 0000000..189ce9d Binary files /dev/null and b/app/assets/fonts/Montserrat-SemiBold.ttf differ diff --git a/app/assets/fonts/Montserrat-SemiBold.ttf.import b/app/assets/fonts/Montserrat-SemiBold.ttf.import new file mode 100644 index 0000000..025df29 --- /dev/null +++ b/app/assets/fonts/Montserrat-SemiBold.ttf.import @@ -0,0 +1,34 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://rexpxwrqdt8f" +path="res://.godot/imported/Montserrat-SemiBold.ttf-6086a97dc2fcb684054d9f5bbbb469a2.fontdata" + +[deps] + +source_file="res://assets/fonts/Montserrat-SemiBold.ttf" +dest_files=["res://.godot/imported/Montserrat-SemiBold.ttf-6086a97dc2fcb684054d9f5bbbb469a2.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/app/assets/fonts/Montserrat-VariableFont_wght.ttf.import b/app/assets/fonts/Montserrat-VariableFont_wght.ttf.import index 994a105..d6c811b 100644 --- a/app/assets/fonts/Montserrat-VariableFont_wght.ttf.import +++ b/app/assets/fonts/Montserrat-VariableFont_wght.ttf.import @@ -13,10 +13,10 @@ dest_files=["res://.godot/imported/Montserrat-VariableFont_wght.ttf-e7d36c45e6f3 [params] Rendering=null -antialiasing=1 +antialiasing=0 generate_mipmaps=true disable_embedded_bitmaps=true -multichannel_signed_distance_field=false +multichannel_signed_distance_field=true msdf_pixel_range=8 msdf_size=100 allow_system_fallback=true diff --git a/app/assets/fonts/Raleway-Medium.ttf b/app/assets/fonts/Raleway-Medium.ttf new file mode 100644 index 0000000..c6fa533 Binary files /dev/null and b/app/assets/fonts/Raleway-Medium.ttf differ diff --git a/app/assets/fonts/Raleway-Medium.ttf.import b/app/assets/fonts/Raleway-Medium.ttf.import new file mode 100644 index 0000000..a9d3e07 --- /dev/null +++ b/app/assets/fonts/Raleway-Medium.ttf.import @@ -0,0 +1,40 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://cs508knjj1lnw" +path="res://.godot/imported/Raleway-Medium.ttf-e6b827b5e551ebf6c5a60ff4992e2aba.fontdata" + +[deps] + +source_file="res://assets/fonts/Raleway-Medium.ttf" +dest_files=["res://.godot/imported/Raleway-Medium.ttf-e6b827b5e551ebf6c5a60ff4992e2aba.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=true +disable_embedded_bitmaps=true +multichannel_signed_distance_field=true +msdf_pixel_range=8 +msdf_size=100 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[{ +"chars": [], +"glyphs": [], +"name": "New Configuration", +"size": Vector2i(16, 0), +"variation_embolden": 0.0 +}] +language_support={} +script_support={} +opentype_features={} diff --git a/app/assets/materials/grid.gdshader b/app/assets/materials/grid.gdshader index ce00b9f..a976fb4 100644 --- a/app/assets/materials/grid.gdshader +++ b/app/assets/materials/grid.gdshader @@ -23,7 +23,7 @@ vec2 sdf_repeat(vec2 position) { void fragment() { float total_dist = 0.0; - + for(int i = 0; i < supersampling; i++) { float center_dist = distance(UV, vec2(0.5, 0.5)); vec2 rand = random(vec2(float(i))) * 0.004 * (0.5 - center_dist); @@ -32,10 +32,10 @@ void fragment() { total_dist += 1.0 / float(supersampling); } } - + ALBEDO = vec3(1.0); ALPHA = total_dist; - + //if(dist <= 0.0) { //ALBEDO = vec3(1.0); //} else { diff --git a/app/content/main.tscn b/app/content/main.tscn index a109d50..489332d 100644 --- a/app/content/main.tscn +++ b/app/content/main.tscn @@ -36,15 +36,6 @@ unique_name_in_owner = true unique_name_in_owner = 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.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.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="XRControllerRight" parent="XROrigin3D" instance=ExtResource("7_0b3tc")] unique_name_in_owner = true transform = Transform3D(0.999999, -1.39635e-11, 0, 1.31553e-10, 1, 0, 0, 0, 1, 0.336726, 0.575093, -0.437942) @@ -66,6 +57,3 @@ transform = Transform3D(1, -1.39636e-11, 0, 4.42413e-11, 1, 0, 0, 0, 1, -0.57679 [node name="Screenshot" type="Node" parent="."] script = ExtResource("12_e13ym") - -[editable path="XROrigin3D/XRControllerLeft"] -[editable path="XROrigin3D/XRControllerLeft/hand_l"] diff --git a/app/content/ui/components/panel/glass.gdshader b/app/content/ui/components/panel/glass.gdshader index deaaf8e..a6f02f4 100644 --- a/app/content/ui/components/panel/glass.gdshader +++ b/app/content/ui/components/panel/glass.gdshader @@ -33,18 +33,18 @@ float SchlickFresnel(float u) { } void fragment() { - + float VdotN = dot(VIEW, NORMAL); float fresnel = clamp(SchlickFresnel(VdotN), 0.0, 1.0); - + ALBEDO = border_color.xyz; ALPHA = 0.0; float border_scale = 1.0 + 2.0 * corner_radius; float d = rectangle((UV - 0.5) * size * border_scale); float border_width = (border_size + border_fade_in + border_fade_out) * border_scale; - + bool inside = false; - + if (d >= corner_radius - border_width && d <= corner_radius) { // Border float rel_d = (d - corner_radius + border_width) / border_width; @@ -65,15 +65,15 @@ void fragment() { ALPHA = color.w; inside = true; } - + if (inside) { 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.rgb, a); - + ROUGHNESS = roughness; SPECULAR = 0.5 * inversesqrt(ALPHA); - + float noise = (fract(sin(dot(UV, vec2(12.9898, 78.233))) * 43758.5453) - 0.5) * 2.0; ALBEDO += noise * grain_amount;