diff --git a/Levels/Level01.tscn b/Levels/Level01.tscn index e76c819..371b631 100644 --- a/Levels/Level01.tscn +++ b/Levels/Level01.tscn @@ -32,4 +32,7 @@ transform = Transform( 0.707107, -0.353553, 0.612372, 0, 0.866025, 0.5, -0.70710 transform = Transform( 0.258819, 0, 0.965926, 0, 1, 0, -0.965926, 0, 0.258819, -3, 4.17456, 4 ) [node name="InfoScreen" parent="." instance=ExtResource( 2 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.67344, 0 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -8.96416, 4.67344, 0 ) +text = "Slap the ball into +the other one +[hold and release left_click to slap]" diff --git a/Materials/Glasse_Mat.tres b/Materials/Glasse_Mat.tres new file mode 100644 index 0000000..b6587f5 --- /dev/null +++ b/Materials/Glasse_Mat.tres @@ -0,0 +1,14 @@ +[gd_resource type="SpatialMaterial" load_steps=2 format=2] + +[ext_resource path="res://Textures/WeirdGlass_normalMap.jpeg" type="Texture" id=1] + +[resource] +flags_transparent = true +params_diffuse_mode = 4 +params_specular_mode = 3 +albedo_color = Color( 0.392157, 0.980392, 0.996078, 0.0980392 ) +metallic = 0.31 +roughness = 0.0 +normal_enabled = true +normal_scale = 0.05 +normal_texture = ExtResource( 1 ) diff --git a/Materials/Scanlines.tres b/Materials/Scanlines.tres new file mode 100644 index 0000000..342d91a --- /dev/null +++ b/Materials/Scanlines.tres @@ -0,0 +1,21 @@ +[gd_resource type="SpatialMaterial" load_steps=3 format=2] + +[ext_resource path="res://Materials/Black_Contour.tres" type="Material" id=1] +[ext_resource path="res://Textures/istockphoto-1397842925-612x612.jpg" type="Texture" id=2] + +[resource] +next_pass = ExtResource( 1 ) +params_diffuse_mode = 4 +params_specular_mode = 3 +albedo_texture = ExtResource( 2 ) +roughness = 0.61 +emission_enabled = true +emission = Color( 0.0313726, 0.521569, 0.341176, 1 ) +emission_energy = 3.75 +emission_operator = 0 +emission_on_uv2 = false +emission_texture = ExtResource( 2 ) +clearcoat_enabled = true +clearcoat = 1.0 +clearcoat_gloss = 0.5 +clearcoat_texture = ExtResource( 2 ) diff --git a/Player.gd b/Player.gd index 5a7ca61..d2f88bb 100644 --- a/Player.gd +++ b/Player.gd @@ -36,7 +36,6 @@ onready var hitbox = $Head/Camera/HitBox onready var slap_cooldown = $SlapCooldown onready var AudioCharge = $AudioCharge onready var Whoosh = $AudioWhoosh -onready var Music = $Music onready var Steps = [ $Step1, $Step2, $Step3, $Step4 ] var rng = RandomNumberGenerator.new() diff --git a/Scenes/InfoScreen.gd b/Scenes/InfoScreen.gd index ef30ddb..7249ba3 100644 --- a/Scenes/InfoScreen.gd +++ b/Scenes/InfoScreen.gd @@ -22,3 +22,9 @@ func set_text_to_screen(new_text): var number_of_line = text.split('\n',false).size() $ScreenBackGround.scale = Vector3(string_size.x * pixel_size + offset.x, string_size.y * pixel_size * number_of_line + offset.y,1); + + $Glass.scale = Vector3(string_size.x * pixel_size + offset.x, + string_size.y * pixel_size * number_of_line + offset.y,0.025); + + $ScreenContour.scale = Vector3(string_size.x * pixel_size + offset.x + 0.25, + string_size.y * pixel_size * number_of_line + offset.y + 0.25,0.025); diff --git a/Scenes/InfoScreen.tscn b/Scenes/InfoScreen.tscn index 6331891..2c12d77 100644 --- a/Scenes/InfoScreen.tscn +++ b/Scenes/InfoScreen.tscn @@ -1,15 +1,26 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Scenes/InfoScreen.gd" type="Script" id=1] [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://Materials/Scanlines.tres" type="Material" id=3] +[ext_resource path="res://Materials/Glasse_Mat.tres" type="Material" id=4] [sub_resource type="DynamicFont" id=3] -size = 100 +size = 50 outline_color = Color( 0, 0, 0, 1 ) font_data = ExtResource( 2 ) [sub_resource type="QuadMesh" id=2] +[sub_resource type="CubeMesh" id=5] +material = ExtResource( 4 ) +size = Vector3( 1, 1, 2 ) + +[sub_resource type="QuadMesh" id=6] + +[sub_resource type="SpatialMaterial" id=7] +albedo_color = Color( 0, 0, 0, 1 ) + [node name="InfoScreen" type="Spatial"] script = ExtResource( 1 ) @@ -22,5 +33,15 @@ text = " " font = SubResource( 3 ) [node name="ScreenBackGround" type="MeshInstance" parent="."] -transform = Transform( 1.3, 0, 0, 0, 1.66, 0, 0, 0, 1, 0, 0, 0 ) +transform = Transform( 1.15, 0, 0, 0, 1.09, 0, 0, 0, 1, 0, 0, 0 ) mesh = SubResource( 2 ) +material/0 = ExtResource( 3 ) + +[node name="Glass" type="MeshInstance" parent="."] +transform = Transform( 1.15, 0, 0, 0, 1.09, 0, 0, 0, 0.025, 0, 0, 0.0823192 ) +mesh = SubResource( 5 ) + +[node name="ScreenContour" type="MeshInstance" parent="."] +transform = Transform( 1.4, 0, 0, 0, 1.34, 0, 0, 0, 0.025, 0, 0, -0.0241812 ) +mesh = SubResource( 6 ) +material/0 = SubResource( 7 ) diff --git a/Textures/WeirdGlass_normalMap.jpeg b/Textures/WeirdGlass_normalMap.jpeg new file mode 100644 index 0000000..d45d325 Binary files /dev/null and b/Textures/WeirdGlass_normalMap.jpeg differ diff --git a/Textures/WeirdGlass_normalMap.jpeg.import b/Textures/WeirdGlass_normalMap.jpeg.import new file mode 100644 index 0000000..5584e39 --- /dev/null +++ b/Textures/WeirdGlass_normalMap.jpeg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/WeirdGlass_normalMap.jpeg-939657ccd81cd3316f82f288d8e2c2b1.s3tc.stex" +path.etc2="res://.import/WeirdGlass_normalMap.jpeg-939657ccd81cd3316f82f288d8e2c2b1.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/WeirdGlass_normalMap.jpeg" +dest_files=[ "res://.import/WeirdGlass_normalMap.jpeg-939657ccd81cd3316f82f288d8e2c2b1.s3tc.stex", "res://.import/WeirdGlass_normalMap.jpeg-939657ccd81cd3316f82f288d8e2c2b1.etc2.stex" ] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=1 +flags/repeat=true +flags/filter=true +flags/mipmaps=true +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Textures/istockphoto-1397842925-612x612.jpg b/Textures/istockphoto-1397842925-612x612.jpg new file mode 100644 index 0000000..ad3a845 Binary files /dev/null and b/Textures/istockphoto-1397842925-612x612.jpg differ diff --git a/Textures/istockphoto-1397842925-612x612.jpg.import b/Textures/istockphoto-1397842925-612x612.jpg.import new file mode 100644 index 0000000..875efdf --- /dev/null +++ b/Textures/istockphoto-1397842925-612x612.jpg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/istockphoto-1397842925-612x612.jpg-7684b4c34baf177371fb198561e83495.s3tc.stex" +path.etc2="res://.import/istockphoto-1397842925-612x612.jpg-7684b4c34baf177371fb198561e83495.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} + +[deps] + +source_file="res://Textures/istockphoto-1397842925-612x612.jpg" +dest_files=[ "res://.import/istockphoto-1397842925-612x612.jpg-7684b4c34baf177371fb198561e83495.s3tc.stex", "res://.import/istockphoto-1397842925-612x612.jpg-7684b4c34baf177371fb198561e83495.etc2.stex" ] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=true +flags/filter=true +flags/mipmaps=true +flags/anisotropic=false +flags/srgb=1 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0