diff --git a/models/menu/example.png b/models/menu/example.png index 172792c..73b53d6 100644 Binary files a/models/menu/example.png and b/models/menu/example.png differ diff --git a/models/menu/example.png.import b/models/menu/example.png.import new file mode 100644 index 0000000..a832586 --- /dev/null +++ b/models/menu/example.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b11pq5s135ga" +path="res://.godot/imported/example.png-77e947c353096f814470ef0964a03731.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://models/menu/example.png" +dest_files=["res://.godot/imported/example.png-77e947c353096f814470ef0964a03731.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/models/menu/welcome.png b/models/menu/welcome.png index 686fba5..2e37813 100644 Binary files a/models/menu/welcome.png and b/models/menu/welcome.png differ diff --git a/models/menu/welcome.png.import b/models/menu/welcome.png.import new file mode 100644 index 0000000..d9876f9 --- /dev/null +++ b/models/menu/welcome.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dokls1btlk3hc" +path="res://.godot/imported/welcome.png-d8714ef9202b6a1292017f423028cccc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://models/menu/welcome.png" +dest_files=["res://.godot/imported/welcome.png-d8714ef9202b6a1292017f423028cccc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/Player.tscn b/scenes/Player.tscn index b76a820..35cd307 100644 --- a/scenes/Player.tscn +++ b/scenes/Player.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://b78y8nhrad6ag"] [ext_resource type="Script" path="res://scripts/Player.gd" id="1_ady3x"] -[ext_resource type="Shader" path="res://scenes/view.gdshader" id="2_7jxaq"] +[ext_resource type="Shader" path="res://shaders/view.gdshader" id="2_7jxaq"] [ext_resource type="ArrayMesh" uid="uid://dejducbp84efs" path="res://models/man/bonecoDeNeve.obj" id="2_8u743"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kcbxg"] diff --git a/scenes/World.tscn b/scenes/World.tscn index 64ec209..837c08b 100644 --- a/scenes/World.tscn +++ b/scenes/World.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://b78y8nhrad6ag" path="res://scenes/Player.tscn" id="1_r5ocp"] [ext_resource type="ArrayMesh" uid="uid://dxfoqqm2nloti" path="res://models/desktop/bureau3.obj" id="2_b86p5"] [ext_resource type="ArrayMesh" uid="uid://ryvqneyivql2" path="res://models/bed/lettoAzzurro.obj" id="3_yfdxs"] -[ext_resource type="ArrayMesh" uid="uid://ctrw34ahl0147" path="res://models/ceilinglight/hangingLight.obj" id="4_1tc5e"] +[ext_resource type="ArrayMesh" uid="uid://ctrw34ahl0147" path="res://models/plafonnier/hangingLight.obj" id="4_1tc5e"] [ext_resource type="ArrayMesh" uid="uid://locruss302l4" path="res://models/computer/tourPC.obj" id="5_focw6"] [ext_resource type="ArrayMesh" uid="uid://bdf0r6v8c0i3u" path="res://models/computer/monitorLCD.obj" id="5_mfc80"] [ext_resource type="ArrayMesh" uid="uid://dtxl74y7beunj" path="res://models/computer/clavier.obj" id="5_ue750"] diff --git a/scenes/game/screen.tscn b/scenes/game/screen.tscn index 1e3543b..f045a55 100644 --- a/scenes/game/screen.tscn +++ b/scenes/game/screen.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=12 format=3 uid="uid://ur6erv76d2of"] [ext_resource type="FontFile" uid="uid://dwgslonlru0ck" path="res://ressources/Battlenet.ttf" id="1_7ecbr"] +[ext_resource type="Script" path="res://scripts/game.gd" id="1_orxmr"] [ext_resource type="Texture2D" uid="uid://c012k8qiyjn4a" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Windows_Button.png" id="2_j8eab"] [ext_resource type="Texture2D" uid="uid://ca0n6csxw7yd7" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Windows_Button_Pressed.png" id="3_eb8po"] [ext_resource type="Texture2D" uid="uid://c1s8gaui8k13h" path="res://models/RetroWindowsGUI/Flag.png" id="4_medxy"] -[ext_resource type="PackedScene" uid="uid://bk0s4luxcotjd" path="res://scenes/game/windows/windows.tscn" id="5_hgcmp"] -[ext_resource type="Shader" path="res://scenes/game/oldscreen.gdshader" id="6_7ta02"] +[ext_resource type="Shader" path="res://shaders/oldscreen.gdshader" id="6_7ta02"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_se4f0"] bg_color = Color(0.764706, 0.764706, 0.764706, 1) @@ -45,6 +45,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +script = ExtResource("1_orxmr") [node name="ColorRect" type="ColorRect" parent="."] layout_mode = 1 @@ -93,8 +94,6 @@ text = "Start" icon = ExtResource("4_medxy") expand_icon = true -[node name="Windows" parent="." instance=ExtResource("5_hgcmp")] - [node name="ColorRect2" type="ColorRect" parent="."] material = SubResource("ShaderMaterial_lp2yn") layout_mode = 1 diff --git a/scenes/game/windows/Windows.tscn b/scenes/game/windows/Windows.tscn new file mode 100644 index 0000000..065468d --- /dev/null +++ b/scenes/game/windows/Windows.tscn @@ -0,0 +1,125 @@ +[gd_scene load_steps=15 format=3 uid="uid://n06gkookqeml"] + +[ext_resource type="FontFile" uid="uid://dwgslonlru0ck" path="res://ressources/Battlenet.ttf" id="1_3xpen"] +[ext_resource type="Shader" path="res://shaders/oldscreen.gdshader" id="1_dy2m7"] +[ext_resource type="Texture2D" uid="uid://c012k8qiyjn4a" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Windows_Button.png" id="2_cdjsi"] +[ext_resource type="Texture2D" uid="uid://rryuulwvlsqi" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Windows_Button_Inactive.png" id="3_2cafe"] +[ext_resource type="Texture2D" uid="uid://ca0n6csxw7yd7" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Windows_Button_Pressed.png" id="4_aprk7"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_16my3"] +bg_color = Color(0.831373, 0.815686, 0.784314, 1) +border_width_left = 5 +border_width_top = 5 +border_width_right = 5 +border_width_bottom = 5 +border_color = Color(0.686275, 0.662745, 0.619608, 1) + +[sub_resource type="Gradient" id="Gradient_qyjym"] +offsets = PackedFloat32Array(0, 0.396624) +colors = PackedColorArray(0, 0, 0.501961, 1, 1, 1, 1, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_n5gkc"] +gradient = SubResource("Gradient_qyjym") + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_54rle"] +texture = SubResource("GradientTexture1D_n5gkc") +texture_margin_left = 3.27016 +texture_margin_top = 4.41471 +texture_margin_right = 0.654032 +region_rect = Rect2(0, -1.264, 45.529, 24.719) + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_y28d3"] +shader = ExtResource("1_dy2m7") +shader_parameter/SCREEN_HEIGHT = 240.0 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_8aptj"] +texture = ExtResource("2_cdjsi") +texture_margin_left = 2.0 +texture_margin_top = 2.0 +texture_margin_right = 2.0 +texture_margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_dlla7"] +texture = ExtResource("3_2cafe") +texture_margin_left = 2.0 +texture_margin_top = 2.0 +texture_margin_right = 2.0 +texture_margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jwtvu"] +texture = ExtResource("4_aprk7") +texture_margin_left = 2.0 +texture_margin_top = 2.0 +texture_margin_right = 2.0 +texture_margin_bottom = 2.0 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mmcpo"] +texture = ExtResource("2_cdjsi") +texture_margin_left = 2.0 +texture_margin_top = 2.0 +texture_margin_right = 2.0 +texture_margin_bottom = 2.0 + +[node name="Windows" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_right = -1100.0 +offset_bottom = -500.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Panel" type="Panel" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_16my3") + +[node name="Panel2" type="Panel" parent="."] +layout_mode = 1 +anchors_preset = 10 +anchor_right = 1.0 +offset_left = 10.0 +offset_top = 8.0 +offset_right = -9.0 +offset_bottom = 54.0 +grow_horizontal = 2 +theme_override_styles/panel = SubResource("StyleBoxTexture_54rle") + +[node name="ColorRect2" type="ColorRect" parent="Panel2"] +material = SubResource("ShaderMaterial_y28d3") +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -10.0 +offset_top = -8.0 +offset_right = -10.0 +offset_bottom = 346.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Button" type="Button" parent="Panel2"] +layout_mode = 1 +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -38.0 +offset_top = 6.0 +offset_right = -4.0 +offset_bottom = 42.0 +grow_horizontal = 0 +theme_override_colors/font_color = Color(0, 0, 0.0392157, 1) +theme_override_fonts/font = ExtResource("1_3xpen") +theme_override_font_sizes/font_size = 20 +theme_override_styles/normal = SubResource("StyleBoxTexture_8aptj") +theme_override_styles/hover = SubResource("StyleBoxTexture_dlla7") +theme_override_styles/pressed = SubResource("StyleBoxTexture_jwtvu") +theme_override_styles/focus = SubResource("StyleBoxTexture_mmcpo") +text = "X" +icon_alignment = 1 +expand_icon = true diff --git a/scenes/game/windows/a.tscn b/scenes/game/windows/a.tscn new file mode 100644 index 0000000..364c67a --- /dev/null +++ b/scenes/game/windows/a.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://l50emg1kqw4a"] + +[node name="Windows" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 diff --git a/scenes/game/windows/windows.tres b/scenes/game/windows/windows.tres deleted file mode 100644 index b00a672..0000000 --- a/scenes/game/windows/windows.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="Theme" load_steps=4 format=3 uid="uid://c4f16i11bfk0u"] - -[ext_resource type="Texture2D" uid="uid://cywgd6e1ef0ro" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Window_Header.png" id="1_0a8ho"] -[ext_resource type="FontFile" uid="uid://dwgslonlru0ck" path="res://ressources/Battlenet.ttf" id="1_olu6k"] - -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_h2pce"] -texture = ExtResource("1_0a8ho") - -[resource] -default_font = ExtResource("1_olu6k") -default_font_size = 30 -Panel/styles/panel = SubResource("StyleBoxTexture_h2pce") -Window/styles/embedded_border = null diff --git a/scenes/game/windows/windows.tscn b/scenes/game/windows/windows.tscn deleted file mode 100644 index c5fad16..0000000 --- a/scenes/game/windows/windows.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene format=3 uid="uid://bk0s4luxcotjd"] - -[node name="Window" type="Window"] -title = "lllllll" -position = Vector2i(0, 36) -size = Vector2i(500, 400) diff --git a/scripts/game.gd b/scripts/game.gd new file mode 100644 index 0000000..32d8b35 --- /dev/null +++ b/scripts/game.gd @@ -0,0 +1,20 @@ +extends Control + +var window = preload("res://scenes/game/windows/Windows.tscn") +var instance = window.instantiate() + +func new_ads(): + instance.position = Vector2(10.0, 5.0) + var _size = instance.get_rect() + print(_size) + add_child(instance) # Replace with function body. + +# Called when the node enters the scene tree for the first time. +func _ready(): + new_ads() + + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass diff --git a/scenes/game/oldscreen.gdshader b/shaders/oldscreen.gdshader similarity index 100% rename from scenes/game/oldscreen.gdshader rename to shaders/oldscreen.gdshader diff --git a/scenes/view.gdshader b/shaders/view.gdshader similarity index 100% rename from scenes/view.gdshader rename to shaders/view.gdshader