From 4decfe8b1c66194664c46cf896bf956ebed90870 Mon Sep 17 00:00:00 2001 From: betalars Date: Sat, 15 Apr 2023 15:57:14 +0200 Subject: [PATCH] Moved UI Elements, Intorduced new Cursors --- .../interface-elements/bottom.png} | 0 .../interface-elements/bottom.png.import} | 6 ++-- src/import/interface-elements/cursor.png | 3 ++ .../interface-elements/cursor.png.import | 34 +++++++++++++++++++ src/import/interface-elements/cursor_drag.png | 3 ++ .../interface-elements/cursor_drag.png.import | 34 +++++++++++++++++++ src/import/interface-elements/cursor_grab.png | 3 ++ .../interface-elements/cursor_grab.png.import | 34 +++++++++++++++++++ .../interface-elements/cursor_point.png | 3 ++ .../cursor_point.png.import | 34 +++++++++++++++++++ .../interface-elements/frame.png} | 0 .../interface-elements/frame.png.import} | 6 ++-- src/project.godot | 5 +++ 13 files changed, 159 insertions(+), 6 deletions(-) rename src/{logic-scenes/startup/start_bottom.png => import/interface-elements/bottom.png} (100%) rename src/{logic-scenes/startup/start_bottom.png.import => import/interface-elements/bottom.png.import} (70%) create mode 100644 src/import/interface-elements/cursor.png create mode 100644 src/import/interface-elements/cursor.png.import create mode 100644 src/import/interface-elements/cursor_drag.png create mode 100644 src/import/interface-elements/cursor_drag.png.import create mode 100644 src/import/interface-elements/cursor_grab.png create mode 100644 src/import/interface-elements/cursor_grab.png.import create mode 100644 src/import/interface-elements/cursor_point.png create mode 100644 src/import/interface-elements/cursor_point.png.import rename src/{logic-scenes/startup/start_frame.png => import/interface-elements/frame.png} (100%) rename src/{logic-scenes/startup/start_frame.png.import => import/interface-elements/frame.png.import} (70%) diff --git a/src/logic-scenes/startup/start_bottom.png b/src/import/interface-elements/bottom.png similarity index 100% rename from src/logic-scenes/startup/start_bottom.png rename to src/import/interface-elements/bottom.png diff --git a/src/logic-scenes/startup/start_bottom.png.import b/src/import/interface-elements/bottom.png.import similarity index 70% rename from src/logic-scenes/startup/start_bottom.png.import rename to src/import/interface-elements/bottom.png.import index 70efec83..59accd92 100644 --- a/src/logic-scenes/startup/start_bottom.png.import +++ b/src/import/interface-elements/bottom.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bwicl5q0lw06q" -path="res://.godot/imported/start_bottom.png-687c4ed67f36702eaa13bc180a11daac.ctex" +path="res://.godot/imported/bottom.png-3eb31957ef51fac0c94899c57d0847c3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://logic-scenes/startup/start_bottom.png" -dest_files=["res://.godot/imported/start_bottom.png-687c4ed67f36702eaa13bc180a11daac.ctex"] +source_file="res://import/interface-elements/bottom.png" +dest_files=["res://.godot/imported/bottom.png-3eb31957ef51fac0c94899c57d0847c3.ctex"] [params] diff --git a/src/import/interface-elements/cursor.png b/src/import/interface-elements/cursor.png new file mode 100644 index 00000000..43e89b29 --- /dev/null +++ b/src/import/interface-elements/cursor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc5726e6df2fa364b7e6eaf15c19240cef26f1d3259789d18f473ef25f8ed3c9 +size 1314 diff --git a/src/import/interface-elements/cursor.png.import b/src/import/interface-elements/cursor.png.import new file mode 100644 index 00000000..71feb80e --- /dev/null +++ b/src/import/interface-elements/cursor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5a36ownywoa8" +path="res://.godot/imported/cursor.png-10cec2772e1d2948212bee924d0eb111.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://import/interface-elements/cursor.png" +dest_files=["res://.godot/imported/cursor.png-10cec2772e1d2948212bee924d0eb111.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/src/import/interface-elements/cursor_drag.png b/src/import/interface-elements/cursor_drag.png new file mode 100644 index 00000000..bcc07bf9 --- /dev/null +++ b/src/import/interface-elements/cursor_drag.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5280db06c759973f26658506eee2ac127f82dae910b75077411bbfa438e9c4f +size 1430 diff --git a/src/import/interface-elements/cursor_drag.png.import b/src/import/interface-elements/cursor_drag.png.import new file mode 100644 index 00000000..12a4fae4 --- /dev/null +++ b/src/import/interface-elements/cursor_drag.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cr3xaxqvj8gla" +path="res://.godot/imported/cursor_drag.png-84fc75458df1f30de98b2e854ccd3631.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://import/interface-elements/cursor_drag.png" +dest_files=["res://.godot/imported/cursor_drag.png-84fc75458df1f30de98b2e854ccd3631.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/src/import/interface-elements/cursor_grab.png b/src/import/interface-elements/cursor_grab.png new file mode 100644 index 00000000..c4d1aaa5 --- /dev/null +++ b/src/import/interface-elements/cursor_grab.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:597ac5a0ab9b5e933bdc5e4dcb6e1dacfc0727f4599ceb143dd74c25fc6840fe +size 1586 diff --git a/src/import/interface-elements/cursor_grab.png.import b/src/import/interface-elements/cursor_grab.png.import new file mode 100644 index 00000000..9e50d418 --- /dev/null +++ b/src/import/interface-elements/cursor_grab.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d005qvnbnishb" +path="res://.godot/imported/cursor_grab.png-f38d4369c64694a26a6f4ea70068e889.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://import/interface-elements/cursor_grab.png" +dest_files=["res://.godot/imported/cursor_grab.png-f38d4369c64694a26a6f4ea70068e889.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/src/import/interface-elements/cursor_point.png b/src/import/interface-elements/cursor_point.png new file mode 100644 index 00000000..f3caddce --- /dev/null +++ b/src/import/interface-elements/cursor_point.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f570efe1683968c03d2ca504d2c83c95a445109825ed0fc23220594b187ff3a2 +size 1606 diff --git a/src/import/interface-elements/cursor_point.png.import b/src/import/interface-elements/cursor_point.png.import new file mode 100644 index 00000000..f8cf1e08 --- /dev/null +++ b/src/import/interface-elements/cursor_point.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://djocdj0psv4wq" +path="res://.godot/imported/cursor_point.png-0b3cad564cc0e3b9bb8ca527d95e8bfb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://import/interface-elements/cursor_point.png" +dest_files=["res://.godot/imported/cursor_point.png-0b3cad564cc0e3b9bb8ca527d95e8bfb.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/src/logic-scenes/startup/start_frame.png b/src/import/interface-elements/frame.png similarity index 100% rename from src/logic-scenes/startup/start_frame.png rename to src/import/interface-elements/frame.png diff --git a/src/logic-scenes/startup/start_frame.png.import b/src/import/interface-elements/frame.png.import similarity index 70% rename from src/logic-scenes/startup/start_frame.png.import rename to src/import/interface-elements/frame.png.import index 185c0c1c..d0e7aa16 100644 --- a/src/logic-scenes/startup/start_frame.png.import +++ b/src/import/interface-elements/frame.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d0ucjqi8tx6vt" -path="res://.godot/imported/start_frame.png-e3da868bb60eabb343abc46b5c0d68c9.ctex" +path="res://.godot/imported/frame.png-2a731741f972f4976de0b52bee013a7e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://logic-scenes/startup/start_frame.png" -dest_files=["res://.godot/imported/start_frame.png-e3da868bb60eabb343abc46b5c0d68c9.ctex"] +source_file="res://import/interface-elements/frame.png" +dest_files=["res://.godot/imported/frame.png-2a731741f972f4976de0b52bee013a7e.ctex"] [params] diff --git a/src/project.godot b/src/project.godot index cb886fe2..409d368f 100644 --- a/src/project.godot +++ b/src/project.godot @@ -20,11 +20,16 @@ config/icon="res://icon.png" State="*res://singletons/global_state.gd" +[debug] + +gdscript/warnings/native_method_override=0 + [display] window/size/viewport_width=1440 window/size/viewport_height=1080 window/size/mode=3 +mouse_cursor/custom_image="res://import/interface-elements/cursor.png" window/stretch/mode="canvas_items" window/stretch/aspect="expand"