From cee39035e3127a705e8d3401d5fce4407606a9b2 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 3 Jul 2020 19:45:04 -0400 Subject: [PATCH 1/3] Move mobile demos to their own folder --- mobile/README.md | 9 +++++++++ {misc => mobile}/android_iap/iap_demo.gd | 0 {misc => mobile}/android_iap/icon.png | Bin {misc => mobile}/android_iap/icon.png.import | 0 {misc => mobile}/android_iap/main.tscn | 0 {misc => mobile}/android_iap/project.godot | 0 {misc => mobile}/multitouch_cubes/CubeScene.tscn | 0 {misc => mobile}/multitouch_cubes/GestureArea.gd | 0 {misc => mobile}/multitouch_cubes/Main.tscn | 0 {misc => mobile}/multitouch_cubes/default_env.tres | 0 {misc => mobile}/multitouch_cubes/icon.png | Bin {misc => mobile}/multitouch_cubes/icon.png.import | 0 {misc => mobile}/multitouch_cubes/project.godot | 0 {misc => mobile}/multitouch_view/Main.gd | 0 {misc => mobile}/multitouch_view/Main.tscn | 0 {misc => mobile}/multitouch_view/README.md | 0 {misc => mobile}/multitouch_view/TouchHelper.gd | 0 {misc => mobile}/multitouch_view/icon.png | Bin {misc => mobile}/multitouch_view/icon.png.import | 0 {misc => mobile}/multitouch_view/project.godot | 0 .../multitouch_view/screenshots/.gdignore | 0 .../multitouch_view/screenshots/multitouch.png | Bin {misc => mobile}/sensors/cube_6.png | Bin {misc => mobile}/sensors/cube_6.png.import | 0 {misc => mobile}/sensors/default_env.tres | 0 {misc => mobile}/sensors/icon.png | Bin {misc => mobile}/sensors/icon.png.import | 0 {misc => mobile}/sensors/main.gd | 0 {misc => mobile}/sensors/main.tscn | 0 {misc => mobile}/sensors/project.godot | 0 30 files changed, 9 insertions(+) create mode 100644 mobile/README.md rename {misc => mobile}/android_iap/iap_demo.gd (100%) rename {misc => mobile}/android_iap/icon.png (100%) rename {misc => mobile}/android_iap/icon.png.import (100%) rename {misc => mobile}/android_iap/main.tscn (100%) rename {misc => mobile}/android_iap/project.godot (100%) rename {misc => mobile}/multitouch_cubes/CubeScene.tscn (100%) rename {misc => mobile}/multitouch_cubes/GestureArea.gd (100%) rename {misc => mobile}/multitouch_cubes/Main.tscn (100%) rename {misc => mobile}/multitouch_cubes/default_env.tres (100%) rename {misc => mobile}/multitouch_cubes/icon.png (100%) rename {misc => mobile}/multitouch_cubes/icon.png.import (100%) rename {misc => mobile}/multitouch_cubes/project.godot (100%) rename {misc => mobile}/multitouch_view/Main.gd (100%) rename {misc => mobile}/multitouch_view/Main.tscn (100%) rename {misc => mobile}/multitouch_view/README.md (100%) rename {misc => mobile}/multitouch_view/TouchHelper.gd (100%) rename {misc => mobile}/multitouch_view/icon.png (100%) rename {misc => mobile}/multitouch_view/icon.png.import (100%) rename {misc => mobile}/multitouch_view/project.godot (100%) rename {misc => mobile}/multitouch_view/screenshots/.gdignore (100%) rename {misc => mobile}/multitouch_view/screenshots/multitouch.png (100%) rename {misc => mobile}/sensors/cube_6.png (100%) rename {misc => mobile}/sensors/cube_6.png.import (100%) rename {misc => mobile}/sensors/default_env.tres (100%) rename {misc => mobile}/sensors/icon.png (100%) rename {misc => mobile}/sensors/icon.png.import (100%) rename {misc => mobile}/sensors/main.gd (100%) rename {misc => mobile}/sensors/main.tscn (100%) rename {misc => mobile}/sensors/project.godot (100%) diff --git a/mobile/README.md b/mobile/README.md new file mode 100644 index 0000000000..e7d05b8ea2 --- /dev/null +++ b/mobile/README.md @@ -0,0 +1,9 @@ +# Mobile Demos + +These demos depend on features only available in mobile phones or tablets. + +The Android IAP demo only runs on Android. + +Language: All are GDScript + +Renderer: All are GLES 2 diff --git a/misc/android_iap/iap_demo.gd b/mobile/android_iap/iap_demo.gd similarity index 100% rename from misc/android_iap/iap_demo.gd rename to mobile/android_iap/iap_demo.gd diff --git a/misc/android_iap/icon.png b/mobile/android_iap/icon.png similarity index 100% rename from misc/android_iap/icon.png rename to mobile/android_iap/icon.png diff --git a/misc/android_iap/icon.png.import b/mobile/android_iap/icon.png.import similarity index 100% rename from misc/android_iap/icon.png.import rename to mobile/android_iap/icon.png.import diff --git a/misc/android_iap/main.tscn b/mobile/android_iap/main.tscn similarity index 100% rename from misc/android_iap/main.tscn rename to mobile/android_iap/main.tscn diff --git a/misc/android_iap/project.godot b/mobile/android_iap/project.godot similarity index 100% rename from misc/android_iap/project.godot rename to mobile/android_iap/project.godot diff --git a/misc/multitouch_cubes/CubeScene.tscn b/mobile/multitouch_cubes/CubeScene.tscn similarity index 100% rename from misc/multitouch_cubes/CubeScene.tscn rename to mobile/multitouch_cubes/CubeScene.tscn diff --git a/misc/multitouch_cubes/GestureArea.gd b/mobile/multitouch_cubes/GestureArea.gd similarity index 100% rename from misc/multitouch_cubes/GestureArea.gd rename to mobile/multitouch_cubes/GestureArea.gd diff --git a/misc/multitouch_cubes/Main.tscn b/mobile/multitouch_cubes/Main.tscn similarity index 100% rename from misc/multitouch_cubes/Main.tscn rename to mobile/multitouch_cubes/Main.tscn diff --git a/misc/multitouch_cubes/default_env.tres b/mobile/multitouch_cubes/default_env.tres similarity index 100% rename from misc/multitouch_cubes/default_env.tres rename to mobile/multitouch_cubes/default_env.tres diff --git a/misc/multitouch_cubes/icon.png b/mobile/multitouch_cubes/icon.png similarity index 100% rename from misc/multitouch_cubes/icon.png rename to mobile/multitouch_cubes/icon.png diff --git a/misc/multitouch_cubes/icon.png.import b/mobile/multitouch_cubes/icon.png.import similarity index 100% rename from misc/multitouch_cubes/icon.png.import rename to mobile/multitouch_cubes/icon.png.import diff --git a/misc/multitouch_cubes/project.godot b/mobile/multitouch_cubes/project.godot similarity index 100% rename from misc/multitouch_cubes/project.godot rename to mobile/multitouch_cubes/project.godot diff --git a/misc/multitouch_view/Main.gd b/mobile/multitouch_view/Main.gd similarity index 100% rename from misc/multitouch_view/Main.gd rename to mobile/multitouch_view/Main.gd diff --git a/misc/multitouch_view/Main.tscn b/mobile/multitouch_view/Main.tscn similarity index 100% rename from misc/multitouch_view/Main.tscn rename to mobile/multitouch_view/Main.tscn diff --git a/misc/multitouch_view/README.md b/mobile/multitouch_view/README.md similarity index 100% rename from misc/multitouch_view/README.md rename to mobile/multitouch_view/README.md diff --git a/misc/multitouch_view/TouchHelper.gd b/mobile/multitouch_view/TouchHelper.gd similarity index 100% rename from misc/multitouch_view/TouchHelper.gd rename to mobile/multitouch_view/TouchHelper.gd diff --git a/misc/multitouch_view/icon.png b/mobile/multitouch_view/icon.png similarity index 100% rename from misc/multitouch_view/icon.png rename to mobile/multitouch_view/icon.png diff --git a/misc/multitouch_view/icon.png.import b/mobile/multitouch_view/icon.png.import similarity index 100% rename from misc/multitouch_view/icon.png.import rename to mobile/multitouch_view/icon.png.import diff --git a/misc/multitouch_view/project.godot b/mobile/multitouch_view/project.godot similarity index 100% rename from misc/multitouch_view/project.godot rename to mobile/multitouch_view/project.godot diff --git a/misc/multitouch_view/screenshots/.gdignore b/mobile/multitouch_view/screenshots/.gdignore similarity index 100% rename from misc/multitouch_view/screenshots/.gdignore rename to mobile/multitouch_view/screenshots/.gdignore diff --git a/misc/multitouch_view/screenshots/multitouch.png b/mobile/multitouch_view/screenshots/multitouch.png similarity index 100% rename from misc/multitouch_view/screenshots/multitouch.png rename to mobile/multitouch_view/screenshots/multitouch.png diff --git a/misc/sensors/cube_6.png b/mobile/sensors/cube_6.png similarity index 100% rename from misc/sensors/cube_6.png rename to mobile/sensors/cube_6.png diff --git a/misc/sensors/cube_6.png.import b/mobile/sensors/cube_6.png.import similarity index 100% rename from misc/sensors/cube_6.png.import rename to mobile/sensors/cube_6.png.import diff --git a/misc/sensors/default_env.tres b/mobile/sensors/default_env.tres similarity index 100% rename from misc/sensors/default_env.tres rename to mobile/sensors/default_env.tres diff --git a/misc/sensors/icon.png b/mobile/sensors/icon.png similarity index 100% rename from misc/sensors/icon.png rename to mobile/sensors/icon.png diff --git a/misc/sensors/icon.png.import b/mobile/sensors/icon.png.import similarity index 100% rename from misc/sensors/icon.png.import rename to mobile/sensors/icon.png.import diff --git a/misc/sensors/main.gd b/mobile/sensors/main.gd similarity index 100% rename from misc/sensors/main.gd rename to mobile/sensors/main.gd diff --git a/misc/sensors/main.tscn b/mobile/sensors/main.tscn similarity index 100% rename from misc/sensors/main.tscn rename to mobile/sensors/main.tscn diff --git a/misc/sensors/project.godot b/mobile/sensors/project.godot similarity index 100% rename from misc/sensors/project.godot rename to mobile/sensors/project.godot From 6b11ca7302415c81acbe297a0e4147daec3b9087 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 3 Jul 2020 20:04:59 -0400 Subject: [PATCH 2/3] Move around 2D and GUI demos --- {misc => 2d}/instancing/README.md | 0 {misc => 2d}/instancing/ball.tscn | 0 {misc => 2d}/instancing/ball_factory.gd | 0 {misc => 2d}/instancing/bowling_ball.png | Bin .../instancing/bowling_ball.png.import | 0 {misc => 2d}/instancing/icon.png | Bin 2d/{sdf_font => instancing}/icon.png.import | 0 {misc => 2d}/instancing/project.godot | 0 {misc => 2d}/instancing/scene_instancing.tscn | 0 .../screenshots/.gdignore | 0 .../instancing/screenshots/instancing.png | Bin 2d/sdf_font/default_environment.tres | 3 -- {misc => 2d}/tween/README.md | 0 {misc => 2d}/tween/godot.png | Bin {misc => 2d}/tween/godot.png.import | 0 {misc => 2d}/tween/icon.png | Bin {misc/instancing => 2d/tween}/icon.png.import | 0 {misc => 2d}/tween/main.gd | 0 {misc => 2d}/tween/main.tscn | 0 {misc => 2d}/tween/project.godot | 0 .../tween}/screenshots/.gdignore | 0 {misc => 2d}/tween/screenshots/tween.png | Bin {misc => gui}/regex/README.md | 0 {misc => gui}/regex/icon.png | Bin {misc => gui}/regex/icon.png.import | 0 {misc => gui}/regex/project.godot | 0 {misc => gui}/regex/regex.gd | 0 {misc => gui}/regex/regex.tscn | 0 {misc => gui}/regex/screenshots/.gdignore | 0 {misc => gui}/regex/screenshots/regex.png | Bin {2d => gui}/sdf_font/README.md | 0 {2d => gui}/sdf_font/font.font | Bin {2d => gui}/sdf_font/icon.png | Bin {misc/tween => gui/sdf_font}/icon.png.import | 0 {2d => gui}/sdf_font/project.godot | 1 - .../sdf_font}/screenshots/.gdignore | 0 {2d => gui}/sdf_font/screenshots/sdf.png | Bin {2d => gui}/sdf_font/sdf_font_demo.tscn | 32 ++++++++++-------- 38 files changed, 18 insertions(+), 18 deletions(-) rename {misc => 2d}/instancing/README.md (100%) rename {misc => 2d}/instancing/ball.tscn (100%) rename {misc => 2d}/instancing/ball_factory.gd (100%) rename {misc => 2d}/instancing/bowling_ball.png (100%) rename {misc => 2d}/instancing/bowling_ball.png.import (100%) rename {misc => 2d}/instancing/icon.png (100%) rename 2d/{sdf_font => instancing}/icon.png.import (100%) rename {misc => 2d}/instancing/project.godot (100%) rename {misc => 2d}/instancing/scene_instancing.tscn (100%) rename 2d/{sdf_font => instancing}/screenshots/.gdignore (100%) rename {misc => 2d}/instancing/screenshots/instancing.png (100%) delete mode 100644 2d/sdf_font/default_environment.tres rename {misc => 2d}/tween/README.md (100%) rename {misc => 2d}/tween/godot.png (100%) rename {misc => 2d}/tween/godot.png.import (100%) rename {misc => 2d}/tween/icon.png (100%) rename {misc/instancing => 2d/tween}/icon.png.import (100%) rename {misc => 2d}/tween/main.gd (100%) rename {misc => 2d}/tween/main.tscn (100%) rename {misc => 2d}/tween/project.godot (100%) rename {misc/instancing => 2d/tween}/screenshots/.gdignore (100%) rename {misc => 2d}/tween/screenshots/tween.png (100%) rename {misc => gui}/regex/README.md (100%) rename {misc => gui}/regex/icon.png (100%) rename {misc => gui}/regex/icon.png.import (100%) rename {misc => gui}/regex/project.godot (100%) rename {misc => gui}/regex/regex.gd (100%) rename {misc => gui}/regex/regex.tscn (100%) rename {misc => gui}/regex/screenshots/.gdignore (100%) rename {misc => gui}/regex/screenshots/regex.png (100%) rename {2d => gui}/sdf_font/README.md (100%) rename {2d => gui}/sdf_font/font.font (100%) rename {2d => gui}/sdf_font/icon.png (100%) rename {misc/tween => gui/sdf_font}/icon.png.import (100%) rename {2d => gui}/sdf_font/project.godot (92%) rename {misc/tween => gui/sdf_font}/screenshots/.gdignore (100%) rename {2d => gui}/sdf_font/screenshots/sdf.png (100%) rename {2d => gui}/sdf_font/sdf_font_demo.tscn (73%) diff --git a/misc/instancing/README.md b/2d/instancing/README.md similarity index 100% rename from misc/instancing/README.md rename to 2d/instancing/README.md diff --git a/misc/instancing/ball.tscn b/2d/instancing/ball.tscn similarity index 100% rename from misc/instancing/ball.tscn rename to 2d/instancing/ball.tscn diff --git a/misc/instancing/ball_factory.gd b/2d/instancing/ball_factory.gd similarity index 100% rename from misc/instancing/ball_factory.gd rename to 2d/instancing/ball_factory.gd diff --git a/misc/instancing/bowling_ball.png b/2d/instancing/bowling_ball.png similarity index 100% rename from misc/instancing/bowling_ball.png rename to 2d/instancing/bowling_ball.png diff --git a/misc/instancing/bowling_ball.png.import b/2d/instancing/bowling_ball.png.import similarity index 100% rename from misc/instancing/bowling_ball.png.import rename to 2d/instancing/bowling_ball.png.import diff --git a/misc/instancing/icon.png b/2d/instancing/icon.png similarity index 100% rename from misc/instancing/icon.png rename to 2d/instancing/icon.png diff --git a/2d/sdf_font/icon.png.import b/2d/instancing/icon.png.import similarity index 100% rename from 2d/sdf_font/icon.png.import rename to 2d/instancing/icon.png.import diff --git a/misc/instancing/project.godot b/2d/instancing/project.godot similarity index 100% rename from misc/instancing/project.godot rename to 2d/instancing/project.godot diff --git a/misc/instancing/scene_instancing.tscn b/2d/instancing/scene_instancing.tscn similarity index 100% rename from misc/instancing/scene_instancing.tscn rename to 2d/instancing/scene_instancing.tscn diff --git a/2d/sdf_font/screenshots/.gdignore b/2d/instancing/screenshots/.gdignore similarity index 100% rename from 2d/sdf_font/screenshots/.gdignore rename to 2d/instancing/screenshots/.gdignore diff --git a/misc/instancing/screenshots/instancing.png b/2d/instancing/screenshots/instancing.png similarity index 100% rename from misc/instancing/screenshots/instancing.png rename to 2d/instancing/screenshots/instancing.png diff --git a/2d/sdf_font/default_environment.tres b/2d/sdf_font/default_environment.tres deleted file mode 100644 index 4f63af59e9..0000000000 --- a/2d/sdf_font/default_environment.tres +++ /dev/null @@ -1,3 +0,0 @@ -[gd_resource type="Environment" format=2] - -[resource] diff --git a/misc/tween/README.md b/2d/tween/README.md similarity index 100% rename from misc/tween/README.md rename to 2d/tween/README.md diff --git a/misc/tween/godot.png b/2d/tween/godot.png similarity index 100% rename from misc/tween/godot.png rename to 2d/tween/godot.png diff --git a/misc/tween/godot.png.import b/2d/tween/godot.png.import similarity index 100% rename from misc/tween/godot.png.import rename to 2d/tween/godot.png.import diff --git a/misc/tween/icon.png b/2d/tween/icon.png similarity index 100% rename from misc/tween/icon.png rename to 2d/tween/icon.png diff --git a/misc/instancing/icon.png.import b/2d/tween/icon.png.import similarity index 100% rename from misc/instancing/icon.png.import rename to 2d/tween/icon.png.import diff --git a/misc/tween/main.gd b/2d/tween/main.gd similarity index 100% rename from misc/tween/main.gd rename to 2d/tween/main.gd diff --git a/misc/tween/main.tscn b/2d/tween/main.tscn similarity index 100% rename from misc/tween/main.tscn rename to 2d/tween/main.tscn diff --git a/misc/tween/project.godot b/2d/tween/project.godot similarity index 100% rename from misc/tween/project.godot rename to 2d/tween/project.godot diff --git a/misc/instancing/screenshots/.gdignore b/2d/tween/screenshots/.gdignore similarity index 100% rename from misc/instancing/screenshots/.gdignore rename to 2d/tween/screenshots/.gdignore diff --git a/misc/tween/screenshots/tween.png b/2d/tween/screenshots/tween.png similarity index 100% rename from misc/tween/screenshots/tween.png rename to 2d/tween/screenshots/tween.png diff --git a/misc/regex/README.md b/gui/regex/README.md similarity index 100% rename from misc/regex/README.md rename to gui/regex/README.md diff --git a/misc/regex/icon.png b/gui/regex/icon.png similarity index 100% rename from misc/regex/icon.png rename to gui/regex/icon.png diff --git a/misc/regex/icon.png.import b/gui/regex/icon.png.import similarity index 100% rename from misc/regex/icon.png.import rename to gui/regex/icon.png.import diff --git a/misc/regex/project.godot b/gui/regex/project.godot similarity index 100% rename from misc/regex/project.godot rename to gui/regex/project.godot diff --git a/misc/regex/regex.gd b/gui/regex/regex.gd similarity index 100% rename from misc/regex/regex.gd rename to gui/regex/regex.gd diff --git a/misc/regex/regex.tscn b/gui/regex/regex.tscn similarity index 100% rename from misc/regex/regex.tscn rename to gui/regex/regex.tscn diff --git a/misc/regex/screenshots/.gdignore b/gui/regex/screenshots/.gdignore similarity index 100% rename from misc/regex/screenshots/.gdignore rename to gui/regex/screenshots/.gdignore diff --git a/misc/regex/screenshots/regex.png b/gui/regex/screenshots/regex.png similarity index 100% rename from misc/regex/screenshots/regex.png rename to gui/regex/screenshots/regex.png diff --git a/2d/sdf_font/README.md b/gui/sdf_font/README.md similarity index 100% rename from 2d/sdf_font/README.md rename to gui/sdf_font/README.md diff --git a/2d/sdf_font/font.font b/gui/sdf_font/font.font similarity index 100% rename from 2d/sdf_font/font.font rename to gui/sdf_font/font.font diff --git a/2d/sdf_font/icon.png b/gui/sdf_font/icon.png similarity index 100% rename from 2d/sdf_font/icon.png rename to gui/sdf_font/icon.png diff --git a/misc/tween/icon.png.import b/gui/sdf_font/icon.png.import similarity index 100% rename from misc/tween/icon.png.import rename to gui/sdf_font/icon.png.import diff --git a/2d/sdf_font/project.godot b/gui/sdf_font/project.godot similarity index 92% rename from 2d/sdf_font/project.godot rename to gui/sdf_font/project.godot index 0cb4d220fa..d1c7908d25 100644 --- a/2d/sdf_font/project.godot +++ b/gui/sdf_font/project.godot @@ -34,4 +34,3 @@ singletons=[ ] [rendering] environment/default_clear_color=Color( 0.18, 0.1188, 0.15348, 1 ) -environment/default_environment="res://default_environment.tres" diff --git a/misc/tween/screenshots/.gdignore b/gui/sdf_font/screenshots/.gdignore similarity index 100% rename from misc/tween/screenshots/.gdignore rename to gui/sdf_font/screenshots/.gdignore diff --git a/2d/sdf_font/screenshots/sdf.png b/gui/sdf_font/screenshots/sdf.png similarity index 100% rename from 2d/sdf_font/screenshots/sdf.png rename to gui/sdf_font/screenshots/sdf.png diff --git a/2d/sdf_font/sdf_font_demo.tscn b/gui/sdf_font/sdf_font_demo.tscn similarity index 73% rename from 2d/sdf_font/sdf_font_demo.tscn rename to gui/sdf_font/sdf_font_demo.tscn index ff0b6234d8..64e6c42759 100644 --- a/2d/sdf_font/sdf_font_demo.tscn +++ b/gui/sdf_font/sdf_font_demo.tscn @@ -6,7 +6,7 @@ length = 15.0 loop = true tracks/0/type = "value" -tracks/0/path = NodePath(".:rotation_degrees") +tracks/0/path = NodePath(".:rect_rotation") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false @@ -22,7 +22,7 @@ tracks/0/keys = { length = 10.0 loop = true tracks/0/type = "value" -tracks/0/path = NodePath(".:scale") +tracks/0/path = NodePath(".:rect_scale") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false @@ -34,10 +34,18 @@ tracks/0/keys = { "values": [ Vector2( 1, 1 ), Vector2( 7, 7 ) ] } -[node name="SDFFontDemo" type="Node2D"] +[node name="SDFFontDemo" type="CenterContainer"] +anchor_right = 1.0 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} -[node name="Base" type="Position2D" parent="."] -position = Vector2( 500, 300 ) +[node name="Base" type="Control" parent="."] +margin_left = 512.0 +margin_top = 300.0 +margin_right = 512.0 +margin_bottom = 300.0 [node name="Rotate" type="AnimationPlayer" parent="Base"] autoplay = "rotate" @@ -48,11 +56,11 @@ anims/zoomin_zoomout = SubResource( 2 ) autoplay = "zoomin_zoomout" anims/zoomin_zoomout = SubResource( 2 ) -[node name="Label" type="Label" parent="Base"] -margin_left = -169.0 -margin_top = -49.0 -margin_right = 172.0 -margin_bottom = 56.0 +[node name="TextLabel" type="Label" parent="Base"] +margin_left = -128.0 +margin_top = -50.0 +margin_right = 128.0 +margin_bottom = 51.0 custom_fonts/font = ExtResource( 1 ) custom_colors/font_color = Color( 0.853858, 0.771714, 0.753746, 1 ) custom_colors/font_color_shadow = Color( 0.56592, 0.454525, 0.518426, 1 ) @@ -62,7 +70,3 @@ align = 1 __meta__ = { "_edit_use_anchors_": false } - -[node name="Camera2D" type="Camera2D" parent="."] -offset = Vector2( 512, 300 ) -current = true From 8dff86d3706837442252cc88c89fd9a323b7a8b5 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 3 Jul 2020 20:30:11 -0400 Subject: [PATCH 3/3] Add README files to categories --- 2d/README.md | 8 ++++++++ 2d/screen_space_shaders/README.md | 2 +- 3d/README.md | 7 +++++++ audio/README.md | 7 +++++++ gui/README.md | 8 ++++++++ gui/drag_and_drop/drag_drop_script.gd | 4 ++-- gui/rich_text_bbcode/rich_text_bbcode.gd | 2 +- gui/sdf_font/README.md | 2 +- loading/README.md | 7 +++++++ misc/README.md | 10 ++++++++++ mobile/README.md | 4 ++-- mono/README.md | 10 ++++++++++ networking/README.md | 7 +++++++ networking/multiplayer_bomber/README.md | 2 +- viewport/README.md | 9 +++++++++ visual_script/README.md | 8 ++++++++ 16 files changed, 89 insertions(+), 8 deletions(-) create mode 100644 2d/README.md create mode 100644 3d/README.md create mode 100644 audio/README.md create mode 100644 gui/README.md create mode 100644 loading/README.md create mode 100644 misc/README.md create mode 100644 networking/README.md create mode 100644 viewport/README.md create mode 100644 visual_script/README.md diff --git a/2d/README.md b/2d/README.md new file mode 100644 index 0000000000..eed4fa1151 --- /dev/null +++ b/2d/README.md @@ -0,0 +1,8 @@ +# 2D Demos + +These demos are all 2D, but otherwise do not have a common theme. + +Languages: Most have GDScript, some have +[GDSL](https://docs.godotengine.org/en/latest/tutorials/shading/shading_reference/shading_language.html) + +Renderers: 6 of them are GLES 3, but most are GLES 2 diff --git a/2d/screen_space_shaders/README.md b/2d/screen_space_shaders/README.md index d28835b241..bbf3b1bc06 100644 --- a/2d/screen_space_shaders/README.md +++ b/2d/screen_space_shaders/README.md @@ -5,7 +5,7 @@ Many common full-res effects are implemented here for reference. Language: [GDSL](https://docs.godotengine.org/en/latest/tutorials/shading/shading_reference/shading_language.html) and GDScript -Renderer: GLES 3 +Renderer: GLES 3 (the blur effect is not available in GLES 2, the rest work) ## Screenshots diff --git a/3d/README.md b/3d/README.md new file mode 100644 index 0000000000..2604466486 --- /dev/null +++ b/3d/README.md @@ -0,0 +1,7 @@ +# 3D Demos + +These demos are all 3D, but otherwise do not have a common theme. + +Languages: All are GDScript + +Renderers: Truck Town and Physics Tests are GLES 2, the rest are GLES 3 diff --git a/audio/README.md b/audio/README.md new file mode 100644 index 0000000000..8dacde66c3 --- /dev/null +++ b/audio/README.md @@ -0,0 +1,7 @@ +# Audio Demos + +These demos showcase various audio features. + +Languages: All are GDScript + +Renderers: All are GLES 2 diff --git a/gui/README.md b/gui/README.md new file mode 100644 index 0000000000..a50315de12 --- /dev/null +++ b/gui/README.md @@ -0,0 +1,8 @@ +# GUI Demos + +These demos showcase GUI features and text features via +[`Control`](https://docs.godotengine.org/en/latest/classes/class_control.html) nodes. + +Languages: All are GDScript, except SDF has no code + +Renderers: All are GLES 2 diff --git a/gui/drag_and_drop/drag_drop_script.gd b/gui/drag_and_drop/drag_drop_script.gd index 7845e23968..659d6b7361 100644 --- a/gui/drag_and_drop/drag_drop_script.gd +++ b/gui/drag_and_drop/drag_drop_script.gd @@ -1,12 +1,12 @@ extends ColorPickerButton func get_drag_data(_pos): - # Use another colorpicker as drag preview + # Use another colorpicker as drag preview. var cpb = ColorPickerButton.new() cpb.color = color cpb.rect_size = Vector2(50, 50) set_drag_preview(cpb) - # Return color as drag data + # Return color as drag data. return color diff --git a/gui/rich_text_bbcode/rich_text_bbcode.gd b/gui/rich_text_bbcode/rich_text_bbcode.gd index da0dfa25f3..735d65eb4b 100644 --- a/gui/rich_text_bbcode/rich_text_bbcode.gd +++ b/gui/rich_text_bbcode/rich_text_bbcode.gd @@ -2,7 +2,7 @@ extends Panel func _on_RichTextLabel_meta_clicked(meta): var err = OS.shell_open(meta) - if (err == OK): + if err == OK: print("Opened link '%s' successfully!" % meta) else: print("Failed opening the link '%s'!" % meta) diff --git a/gui/sdf_font/README.md b/gui/sdf_font/README.md index f07ca4d1bb..944213b185 100644 --- a/gui/sdf_font/README.md +++ b/gui/sdf_font/README.md @@ -4,7 +4,7 @@ This is a demo of Signed Distance Field fonts in Godot. The technique used allows the text to remain clear under arbitrary zooms and rotations. -Language: GDScript +Language: This demo contains no code. Renderer: GLES 3 (this effect is not available in GLES 2) diff --git a/loading/README.md b/loading/README.md new file mode 100644 index 0000000000..154713aa6d --- /dev/null +++ b/loading/README.md @@ -0,0 +1,7 @@ +# Loading Demos + +These demos demonstrate various ways to load scenes and other data. + +Languages: All are GDScript + +Renderers: All are GLES 2 diff --git a/misc/README.md b/misc/README.md new file mode 100644 index 0000000000..f4993cbcf6 --- /dev/null +++ b/misc/README.md @@ -0,0 +1,10 @@ +# Miscellaneous Demos + +These demos don't fit into any other category, so they go into this folder. + +Languages: All have GDScript, OpenSimplexNoise has +[GDSL](https://docs.godotengine.org/en/latest/tutorials/shading/shading_reference/shading_language.html), +OS test has some +[C#](https://docs.godotengine.org/en/latest/getting_started/scripting/c_sharp/index.html) + +Renderers: All are GLES 2 diff --git a/mobile/README.md b/mobile/README.md index e7d05b8ea2..7ee62066e4 100644 --- a/mobile/README.md +++ b/mobile/README.md @@ -4,6 +4,6 @@ These demos depend on features only available in mobile phones or tablets. The Android IAP demo only runs on Android. -Language: All are GDScript +Languages: All are GDScript -Renderer: All are GLES 2 +Renderers: All are GLES 2 diff --git a/mono/README.md b/mono/README.md index 9fae9115c1..12e2969892 100644 --- a/mono/README.md +++ b/mono/README.md @@ -1,3 +1,13 @@ +# Mono Demos + +These demos are written in [C#](https://docs.godotengine.org/en/latest/getting_started/scripting/c_sharp/index.html). +You must have the Mono version of Godot to run these. + +Languages: All have [C#](https://docs.godotengine.org/en/latest/getting_started/scripting/c_sharp/index.html), +2.5D has some GDScript + +Renderers: Dodge the Creeps is GLES 3, rest are GLES 2 + # Note: Godot 3.2.2 or newer is required While most of the demos work with any 3.2.x version, these demos require diff --git a/networking/README.md b/networking/README.md new file mode 100644 index 0000000000..3b39267f79 --- /dev/null +++ b/networking/README.md @@ -0,0 +1,7 @@ +# Networking Demos + +These demos showcase networking and/or multiplayer features. + +Languages: All have GDScript, WebRTC uses some GDNative + +Renderers: Multiplayer Bomber is GLES 3, rest are GLES 2 diff --git a/networking/multiplayer_bomber/README.md b/networking/multiplayer_bomber/README.md index dcedc37c39..6564dfbb89 100644 --- a/networking/multiplayer_bomber/README.md +++ b/networking/multiplayer_bomber/README.md @@ -6,7 +6,7 @@ should type in his address and press "play". Language: GDScript -Renderer: GLES 2 +Renderer: GLES 3 ## Screenshots diff --git a/viewport/README.md b/viewport/README.md new file mode 100644 index 0000000000..9c7c68ffa8 --- /dev/null +++ b/viewport/README.md @@ -0,0 +1,9 @@ +# Viewport Demos + +These demos showcase various ways to use the +[`Viewport`](https://docs.godotengine.org/en/stable/classes/class_viewport.html) node. + +Languages: All have GDScript, Dynamic Split Screen has +[GDSL](https://docs.godotengine.org/en/latest/tutorials/shading/shading_reference/shading_language.html) + +Renderers: 3D in 2D and GUI in 3D use GLES 3, the rest are GLES 2 diff --git a/visual_script/README.md b/visual_script/README.md new file mode 100644 index 0000000000..4f35c045a4 --- /dev/null +++ b/visual_script/README.md @@ -0,0 +1,8 @@ +# VisualScript Demos + +These demos are written in [VisualScript](https://docs.godotengine.org/en/latest/getting_started/scripting/visual_script/index.html). + +Languages: All are [VisualScript](https://docs.godotengine.org/en/latest/getting_started/scripting/visual_script/index.html), +Multitouch View has some GDScript + +Renderers: All are GLES 2