diff --git a/doc/demo_animation/animation.md b/doc/demo10_animation/animation.md similarity index 100% rename from doc/demo_animation/animation.md rename to doc/demo10_animation/animation.md diff --git a/doc/demo_gui/gui.md b/doc/demo12_gui/gui.md similarity index 100% rename from doc/demo_gui/gui.md rename to doc/demo12_gui/gui.md diff --git a/doc/demo_gui/image/gui1.png b/doc/demo12_gui/image/gui1.png similarity index 100% rename from doc/demo_gui/image/gui1.png rename to doc/demo12_gui/image/gui1.png diff --git a/doc/demo_gui/image/gui1.png.import b/doc/demo12_gui/image/gui1.png.import similarity index 70% rename from doc/demo_gui/image/gui1.png.import rename to doc/demo12_gui/image/gui1.png.import index 468b8b4..b83f379 100644 --- a/doc/demo_gui/image/gui1.png.import +++ b/doc/demo12_gui/image/gui1.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui1.png-2dc707455017fe3a7134409974094e3d.stex" +path="res://.import/gui1.png-53ceefd375d86fe2a6841b2aaa0f55f1.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui1.png" -dest_files=[ "res://.import/gui1.png-2dc707455017fe3a7134409974094e3d.stex" ] +source_file="res://doc/demo12_gui/image/gui1.png" +dest_files=[ "res://.import/gui1.png-53ceefd375d86fe2a6841b2aaa0f55f1.stex" ] [params] diff --git a/doc/demo_gui/image/gui10.png b/doc/demo12_gui/image/gui10.png similarity index 100% rename from doc/demo_gui/image/gui10.png rename to doc/demo12_gui/image/gui10.png diff --git a/doc/demo_gui/image/gui10.png.import b/doc/demo12_gui/image/gui10.png.import similarity index 70% rename from doc/demo_gui/image/gui10.png.import rename to doc/demo12_gui/image/gui10.png.import index f79e9a0..86413b9 100644 --- a/doc/demo_gui/image/gui10.png.import +++ b/doc/demo12_gui/image/gui10.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui10.png-4f0ab5b43dd23594053a21f1dc2b1c59.stex" +path="res://.import/gui10.png-8fa508e38bc8dcd32f9ff4fec7b7b60c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui10.png" -dest_files=[ "res://.import/gui10.png-4f0ab5b43dd23594053a21f1dc2b1c59.stex" ] +source_file="res://doc/demo12_gui/image/gui10.png" +dest_files=[ "res://.import/gui10.png-8fa508e38bc8dcd32f9ff4fec7b7b60c.stex" ] [params] diff --git a/doc/demo_gui/image/gui11.png b/doc/demo12_gui/image/gui11.png similarity index 100% rename from doc/demo_gui/image/gui11.png rename to doc/demo12_gui/image/gui11.png diff --git a/doc/demo_gui/image/gui11.png.import b/doc/demo12_gui/image/gui11.png.import similarity index 70% rename from doc/demo_gui/image/gui11.png.import rename to doc/demo12_gui/image/gui11.png.import index cb3ea97..18b8152 100644 --- a/doc/demo_gui/image/gui11.png.import +++ b/doc/demo12_gui/image/gui11.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui11.png-50686685ef04938b301ffd6ada55bc91.stex" +path="res://.import/gui11.png-9d7bafc00ad26f955fc1bd8e75874c2e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui11.png" -dest_files=[ "res://.import/gui11.png-50686685ef04938b301ffd6ada55bc91.stex" ] +source_file="res://doc/demo12_gui/image/gui11.png" +dest_files=[ "res://.import/gui11.png-9d7bafc00ad26f955fc1bd8e75874c2e.stex" ] [params] diff --git a/doc/demo_gui/image/gui12.png b/doc/demo12_gui/image/gui12.png similarity index 100% rename from doc/demo_gui/image/gui12.png rename to doc/demo12_gui/image/gui12.png diff --git a/doc/demo_gui/image/gui12.png.import b/doc/demo12_gui/image/gui12.png.import similarity index 70% rename from doc/demo_gui/image/gui12.png.import rename to doc/demo12_gui/image/gui12.png.import index 849a75e..5f161f7 100644 --- a/doc/demo_gui/image/gui12.png.import +++ b/doc/demo12_gui/image/gui12.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui12.png-d492dc2142172405ac69377abab825f0.stex" +path="res://.import/gui12.png-3baf788eb21156180872ec9edad22a6e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui12.png" -dest_files=[ "res://.import/gui12.png-d492dc2142172405ac69377abab825f0.stex" ] +source_file="res://doc/demo12_gui/image/gui12.png" +dest_files=[ "res://.import/gui12.png-3baf788eb21156180872ec9edad22a6e.stex" ] [params] diff --git a/doc/demo_gui/image/gui13.png b/doc/demo12_gui/image/gui13.png similarity index 100% rename from doc/demo_gui/image/gui13.png rename to doc/demo12_gui/image/gui13.png diff --git a/doc/demo_gui/image/gui13.png.import b/doc/demo12_gui/image/gui13.png.import similarity index 70% rename from doc/demo_gui/image/gui13.png.import rename to doc/demo12_gui/image/gui13.png.import index fe3fd84..e2b142a 100644 --- a/doc/demo_gui/image/gui13.png.import +++ b/doc/demo12_gui/image/gui13.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui13.png-167600ea5dcb9dfb02abc5ecda0f3973.stex" +path="res://.import/gui13.png-621843054074a9e54cd4993c5c8d78d9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui13.png" -dest_files=[ "res://.import/gui13.png-167600ea5dcb9dfb02abc5ecda0f3973.stex" ] +source_file="res://doc/demo12_gui/image/gui13.png" +dest_files=[ "res://.import/gui13.png-621843054074a9e54cd4993c5c8d78d9.stex" ] [params] diff --git a/doc/demo_gui/image/gui14.png b/doc/demo12_gui/image/gui14.png similarity index 100% rename from doc/demo_gui/image/gui14.png rename to doc/demo12_gui/image/gui14.png diff --git a/doc/demo_gui/image/gui14.png.import b/doc/demo12_gui/image/gui14.png.import similarity index 70% rename from doc/demo_gui/image/gui14.png.import rename to doc/demo12_gui/image/gui14.png.import index 1d68e02..0d64679 100644 --- a/doc/demo_gui/image/gui14.png.import +++ b/doc/demo12_gui/image/gui14.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui14.png-11d9cd3bdd320dfb9feafbbe34d58710.stex" +path="res://.import/gui14.png-5f0729f3c7639d668890958d6cafcaca.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui14.png" -dest_files=[ "res://.import/gui14.png-11d9cd3bdd320dfb9feafbbe34d58710.stex" ] +source_file="res://doc/demo12_gui/image/gui14.png" +dest_files=[ "res://.import/gui14.png-5f0729f3c7639d668890958d6cafcaca.stex" ] [params] diff --git a/doc/demo_gui/image/gui15.png b/doc/demo12_gui/image/gui15.png similarity index 100% rename from doc/demo_gui/image/gui15.png rename to doc/demo12_gui/image/gui15.png diff --git a/doc/demo_gui/image/gui15.png.import b/doc/demo12_gui/image/gui15.png.import similarity index 70% rename from doc/demo_gui/image/gui15.png.import rename to doc/demo12_gui/image/gui15.png.import index b92190c..a66d25b 100644 --- a/doc/demo_gui/image/gui15.png.import +++ b/doc/demo12_gui/image/gui15.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui15.png-a69a715dcea818629d6e3c3364c6e891.stex" +path="res://.import/gui15.png-f31a48eeb01723e09a2581329dcce3a3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui15.png" -dest_files=[ "res://.import/gui15.png-a69a715dcea818629d6e3c3364c6e891.stex" ] +source_file="res://doc/demo12_gui/image/gui15.png" +dest_files=[ "res://.import/gui15.png-f31a48eeb01723e09a2581329dcce3a3.stex" ] [params] diff --git a/doc/demo_gui/image/gui2.png b/doc/demo12_gui/image/gui2.png similarity index 100% rename from doc/demo_gui/image/gui2.png rename to doc/demo12_gui/image/gui2.png diff --git a/doc/demo_gui/image/gui2.png.import b/doc/demo12_gui/image/gui2.png.import similarity index 70% rename from doc/demo_gui/image/gui2.png.import rename to doc/demo12_gui/image/gui2.png.import index 30793bd..7abb72a 100644 --- a/doc/demo_gui/image/gui2.png.import +++ b/doc/demo12_gui/image/gui2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui2.png-5890f2fbd5b106b63af97457f8fc54ef.stex" +path="res://.import/gui2.png-31e70e163f133e6026d9f78bf61a3a1f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui2.png" -dest_files=[ "res://.import/gui2.png-5890f2fbd5b106b63af97457f8fc54ef.stex" ] +source_file="res://doc/demo12_gui/image/gui2.png" +dest_files=[ "res://.import/gui2.png-31e70e163f133e6026d9f78bf61a3a1f.stex" ] [params] diff --git a/doc/demo_gui/image/gui3.png b/doc/demo12_gui/image/gui3.png similarity index 100% rename from doc/demo_gui/image/gui3.png rename to doc/demo12_gui/image/gui3.png diff --git a/doc/demo_gui/image/gui3.png.import b/doc/demo12_gui/image/gui3.png.import similarity index 70% rename from doc/demo_gui/image/gui3.png.import rename to doc/demo12_gui/image/gui3.png.import index a866a87..f8cac02 100644 --- a/doc/demo_gui/image/gui3.png.import +++ b/doc/demo12_gui/image/gui3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui3.png-ed7869da72835b236413a3a8f02a686d.stex" +path="res://.import/gui3.png-f6ba982836c72d4b6ef7fa74896a26ad.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui3.png" -dest_files=[ "res://.import/gui3.png-ed7869da72835b236413a3a8f02a686d.stex" ] +source_file="res://doc/demo12_gui/image/gui3.png" +dest_files=[ "res://.import/gui3.png-f6ba982836c72d4b6ef7fa74896a26ad.stex" ] [params] diff --git a/doc/demo_gui/image/gui4.png b/doc/demo12_gui/image/gui4.png similarity index 100% rename from doc/demo_gui/image/gui4.png rename to doc/demo12_gui/image/gui4.png diff --git a/doc/demo_gui/image/gui4.png.import b/doc/demo12_gui/image/gui4.png.import similarity index 70% rename from doc/demo_gui/image/gui4.png.import rename to doc/demo12_gui/image/gui4.png.import index 0f77334..3519281 100644 --- a/doc/demo_gui/image/gui4.png.import +++ b/doc/demo12_gui/image/gui4.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui4.png-1a3cbe79aef26566c723b225677d76d5.stex" +path="res://.import/gui4.png-992dc9df69b32c329535196e47954a78.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui4.png" -dest_files=[ "res://.import/gui4.png-1a3cbe79aef26566c723b225677d76d5.stex" ] +source_file="res://doc/demo12_gui/image/gui4.png" +dest_files=[ "res://.import/gui4.png-992dc9df69b32c329535196e47954a78.stex" ] [params] diff --git a/doc/demo_gui/image/gui5.png b/doc/demo12_gui/image/gui5.png similarity index 100% rename from doc/demo_gui/image/gui5.png rename to doc/demo12_gui/image/gui5.png diff --git a/doc/demo_gui/image/gui5.png.import b/doc/demo12_gui/image/gui5.png.import similarity index 70% rename from doc/demo_gui/image/gui5.png.import rename to doc/demo12_gui/image/gui5.png.import index 3fca166..dab7878 100644 --- a/doc/demo_gui/image/gui5.png.import +++ b/doc/demo12_gui/image/gui5.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui5.png-e96f353a53d9d118a411e6fd75d6f3ab.stex" +path="res://.import/gui5.png-30f1e4ecf2549cc211cb650cc8620d1d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui5.png" -dest_files=[ "res://.import/gui5.png-e96f353a53d9d118a411e6fd75d6f3ab.stex" ] +source_file="res://doc/demo12_gui/image/gui5.png" +dest_files=[ "res://.import/gui5.png-30f1e4ecf2549cc211cb650cc8620d1d.stex" ] [params] diff --git a/doc/demo_gui/image/gui6.png b/doc/demo12_gui/image/gui6.png similarity index 100% rename from doc/demo_gui/image/gui6.png rename to doc/demo12_gui/image/gui6.png diff --git a/doc/demo_gui/image/gui6.png.import b/doc/demo12_gui/image/gui6.png.import similarity index 70% rename from doc/demo_gui/image/gui6.png.import rename to doc/demo12_gui/image/gui6.png.import index b0db4cd..c4b39bd 100644 --- a/doc/demo_gui/image/gui6.png.import +++ b/doc/demo12_gui/image/gui6.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui6.png-6c5e420f42774c5b034188f334d2e58e.stex" +path="res://.import/gui6.png-447f98c48577a2de89848cee02c448c1.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui6.png" -dest_files=[ "res://.import/gui6.png-6c5e420f42774c5b034188f334d2e58e.stex" ] +source_file="res://doc/demo12_gui/image/gui6.png" +dest_files=[ "res://.import/gui6.png-447f98c48577a2de89848cee02c448c1.stex" ] [params] diff --git a/doc/demo_gui/image/gui7.png b/doc/demo12_gui/image/gui7.png similarity index 100% rename from doc/demo_gui/image/gui7.png rename to doc/demo12_gui/image/gui7.png diff --git a/doc/demo_gui/image/gui7.png.import b/doc/demo12_gui/image/gui7.png.import similarity index 70% rename from doc/demo_gui/image/gui7.png.import rename to doc/demo12_gui/image/gui7.png.import index e25a6b0..d6512d4 100644 --- a/doc/demo_gui/image/gui7.png.import +++ b/doc/demo12_gui/image/gui7.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui7.png-480ed10cf5b6a8e2a9bafba4897707e4.stex" +path="res://.import/gui7.png-9327c0954c3a08a90702f1400c8338b0.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui7.png" -dest_files=[ "res://.import/gui7.png-480ed10cf5b6a8e2a9bafba4897707e4.stex" ] +source_file="res://doc/demo12_gui/image/gui7.png" +dest_files=[ "res://.import/gui7.png-9327c0954c3a08a90702f1400c8338b0.stex" ] [params] diff --git a/doc/demo_gui/image/gui8.png b/doc/demo12_gui/image/gui8.png similarity index 100% rename from doc/demo_gui/image/gui8.png rename to doc/demo12_gui/image/gui8.png diff --git a/doc/demo_gui/image/gui8.png.import b/doc/demo12_gui/image/gui8.png.import similarity index 70% rename from doc/demo_gui/image/gui8.png.import rename to doc/demo12_gui/image/gui8.png.import index 62b957d..085153b 100644 --- a/doc/demo_gui/image/gui8.png.import +++ b/doc/demo12_gui/image/gui8.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui8.png-18980ab27fcf2e8600ae1732a022c3f9.stex" +path="res://.import/gui8.png-75138c579445138e0a00e7ed3636933f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui8.png" -dest_files=[ "res://.import/gui8.png-18980ab27fcf2e8600ae1732a022c3f9.stex" ] +source_file="res://doc/demo12_gui/image/gui8.png" +dest_files=[ "res://.import/gui8.png-75138c579445138e0a00e7ed3636933f.stex" ] [params] diff --git a/doc/demo_gui/image/gui9.png b/doc/demo12_gui/image/gui9.png similarity index 100% rename from doc/demo_gui/image/gui9.png rename to doc/demo12_gui/image/gui9.png diff --git a/doc/demo_gui/image/gui9.png.import b/doc/demo12_gui/image/gui9.png.import similarity index 70% rename from doc/demo_gui/image/gui9.png.import rename to doc/demo12_gui/image/gui9.png.import index c6180cf..a2a2589 100644 --- a/doc/demo_gui/image/gui9.png.import +++ b/doc/demo12_gui/image/gui9.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gui9.png-3004fd932b5f7bcc7f0d77f661976e3e.stex" +path="res://.import/gui9.png-bb8bbc3f1e04b7a82369c2012b2ef82d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_gui/image/gui9.png" -dest_files=[ "res://.import/gui9.png-3004fd932b5f7bcc7f0d77f661976e3e.stex" ] +source_file="res://doc/demo12_gui/image/gui9.png" +dest_files=[ "res://.import/gui9.png-bb8bbc3f1e04b7a82369c2012b2ef82d.stex" ] [params] diff --git a/doc/demo_gui/image/viewport1.png.import b/doc/demo12_gui/image/viewport1.png.import similarity index 100% rename from doc/demo_gui/image/viewport1.png.import rename to doc/demo12_gui/image/viewport1.png.import diff --git a/doc/demo_gui/image/viewport10.png.import b/doc/demo12_gui/image/viewport10.png.import similarity index 100% rename from doc/demo_gui/image/viewport10.png.import rename to doc/demo12_gui/image/viewport10.png.import diff --git a/doc/demo_gui/image/viewport11.png.import b/doc/demo12_gui/image/viewport11.png.import similarity index 100% rename from doc/demo_gui/image/viewport11.png.import rename to doc/demo12_gui/image/viewport11.png.import diff --git a/doc/demo_gui/image/viewport2.png.import b/doc/demo12_gui/image/viewport2.png.import similarity index 100% rename from doc/demo_gui/image/viewport2.png.import rename to doc/demo12_gui/image/viewport2.png.import diff --git a/doc/demo_gui/image/viewport3.png.import b/doc/demo12_gui/image/viewport3.png.import similarity index 100% rename from doc/demo_gui/image/viewport3.png.import rename to doc/demo12_gui/image/viewport3.png.import diff --git a/doc/demo_gui/image/viewport4.png.import b/doc/demo12_gui/image/viewport4.png.import similarity index 100% rename from doc/demo_gui/image/viewport4.png.import rename to doc/demo12_gui/image/viewport4.png.import diff --git a/doc/demo_gui/image/viewport5.png.import b/doc/demo12_gui/image/viewport5.png.import similarity index 100% rename from doc/demo_gui/image/viewport5.png.import rename to doc/demo12_gui/image/viewport5.png.import diff --git a/doc/demo_gui/image/viewport6.png.import b/doc/demo12_gui/image/viewport6.png.import similarity index 100% rename from doc/demo_gui/image/viewport6.png.import rename to doc/demo12_gui/image/viewport6.png.import diff --git a/doc/demo_gui/image/viewport7.png.import b/doc/demo12_gui/image/viewport7.png.import similarity index 100% rename from doc/demo_gui/image/viewport7.png.import rename to doc/demo12_gui/image/viewport7.png.import diff --git a/doc/demo_gui/image/viewport8.png.import b/doc/demo12_gui/image/viewport8.png.import similarity index 100% rename from doc/demo_gui/image/viewport8.png.import rename to doc/demo12_gui/image/viewport8.png.import diff --git a/doc/demo_gui/image/viewport9.png.import b/doc/demo12_gui/image/viewport9.png.import similarity index 100% rename from doc/demo_gui/image/viewport9.png.import rename to doc/demo12_gui/image/viewport9.png.import diff --git a/doc/demo_camera/camera.md b/doc/demo13_camera/camera.md similarity index 100% rename from doc/demo_camera/camera.md rename to doc/demo13_camera/camera.md diff --git a/doc/demo_camera/image/camera1.png b/doc/demo13_camera/image/camera1.png similarity index 100% rename from doc/demo_camera/image/camera1.png rename to doc/demo13_camera/image/camera1.png diff --git a/doc/demo_camera/image/camera1.png.import b/doc/demo13_camera/image/camera1.png.import similarity index 70% rename from doc/demo_camera/image/camera1.png.import rename to doc/demo13_camera/image/camera1.png.import index 6e03c84..729b322 100644 --- a/doc/demo_camera/image/camera1.png.import +++ b/doc/demo13_camera/image/camera1.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/camera1.png-fc07482130a119c95de10708c448e724.stex" +path="res://.import/camera1.png-33ccbfc11fe8852d2d9d08ffeaa0b94d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/camera1.png" -dest_files=[ "res://.import/camera1.png-fc07482130a119c95de10708c448e724.stex" ] +source_file="res://doc/demo13_camera/image/camera1.png" +dest_files=[ "res://.import/camera1.png-33ccbfc11fe8852d2d9d08ffeaa0b94d.stex" ] [params] diff --git a/doc/demo_camera/image/camera2.png b/doc/demo13_camera/image/camera2.png similarity index 100% rename from doc/demo_camera/image/camera2.png rename to doc/demo13_camera/image/camera2.png diff --git a/doc/demo_camera/image/camera2.png.import b/doc/demo13_camera/image/camera2.png.import similarity index 70% rename from doc/demo_camera/image/camera2.png.import rename to doc/demo13_camera/image/camera2.png.import index 1c1905a..03adde0 100644 --- a/doc/demo_camera/image/camera2.png.import +++ b/doc/demo13_camera/image/camera2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/camera2.png-b7f6d03a65a87b21e6da053438af7baf.stex" +path="res://.import/camera2.png-193de544d35e2c49679afeb9befa9844.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/camera2.png" -dest_files=[ "res://.import/camera2.png-b7f6d03a65a87b21e6da053438af7baf.stex" ] +source_file="res://doc/demo13_camera/image/camera2.png" +dest_files=[ "res://.import/camera2.png-193de544d35e2c49679afeb9befa9844.stex" ] [params] diff --git a/doc/demo_camera/image/camera3.png b/doc/demo13_camera/image/camera3.png similarity index 100% rename from doc/demo_camera/image/camera3.png rename to doc/demo13_camera/image/camera3.png diff --git a/doc/demo_camera/image/camera3.png.import b/doc/demo13_camera/image/camera3.png.import similarity index 70% rename from doc/demo_camera/image/camera3.png.import rename to doc/demo13_camera/image/camera3.png.import index ca14dce..ad941e6 100644 --- a/doc/demo_camera/image/camera3.png.import +++ b/doc/demo13_camera/image/camera3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/camera3.png-6f029d8cbea7358313c06a7783ed296e.stex" +path="res://.import/camera3.png-e11c73a07416db965141ddfa7369a0e5.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/camera3.png" -dest_files=[ "res://.import/camera3.png-6f029d8cbea7358313c06a7783ed296e.stex" ] +source_file="res://doc/demo13_camera/image/camera3.png" +dest_files=[ "res://.import/camera3.png-e11c73a07416db965141ddfa7369a0e5.stex" ] [params] diff --git a/doc/demo_camera/image/camera4.png b/doc/demo13_camera/image/camera4.png similarity index 100% rename from doc/demo_camera/image/camera4.png rename to doc/demo13_camera/image/camera4.png diff --git a/doc/demo_camera/image/camera4.png.import b/doc/demo13_camera/image/camera4.png.import similarity index 70% rename from doc/demo_camera/image/camera4.png.import rename to doc/demo13_camera/image/camera4.png.import index e541469..a07f0aa 100644 --- a/doc/demo_camera/image/camera4.png.import +++ b/doc/demo13_camera/image/camera4.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/camera4.png-be6140df61be3aab9d4d3e994a887832.stex" +path="res://.import/camera4.png-e1e0c6964ba24835906b123b664baeb0.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/camera4.png" -dest_files=[ "res://.import/camera4.png-be6140df61be3aab9d4d3e994a887832.stex" ] +source_file="res://doc/demo13_camera/image/camera4.png" +dest_files=[ "res://.import/camera4.png-e1e0c6964ba24835906b123b664baeb0.stex" ] [params] diff --git a/doc/demo_camera/image/camera5.png b/doc/demo13_camera/image/camera5.png similarity index 100% rename from doc/demo_camera/image/camera5.png rename to doc/demo13_camera/image/camera5.png diff --git a/doc/demo_camera/image/camera5.png.import b/doc/demo13_camera/image/camera5.png.import similarity index 70% rename from doc/demo_camera/image/camera5.png.import rename to doc/demo13_camera/image/camera5.png.import index 1327d1b..0b9a0bc 100644 --- a/doc/demo_camera/image/camera5.png.import +++ b/doc/demo13_camera/image/camera5.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/camera5.png-d2509bf3fe9eac03d7b171408b260ba3.stex" +path="res://.import/camera5.png-4e2e69274fa52311647a545542732d41.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/camera5.png" -dest_files=[ "res://.import/camera5.png-d2509bf3fe9eac03d7b171408b260ba3.stex" ] +source_file="res://doc/demo13_camera/image/camera5.png" +dest_files=[ "res://.import/camera5.png-4e2e69274fa52311647a545542732d41.stex" ] [params] diff --git a/doc/demo_camera/image/camera6.png b/doc/demo13_camera/image/camera6.png similarity index 100% rename from doc/demo_camera/image/camera6.png rename to doc/demo13_camera/image/camera6.png diff --git a/doc/demo_camera/image/camera6.png.import b/doc/demo13_camera/image/camera6.png.import similarity index 70% rename from doc/demo_camera/image/camera6.png.import rename to doc/demo13_camera/image/camera6.png.import index 06ccc43..db50520 100644 --- a/doc/demo_camera/image/camera6.png.import +++ b/doc/demo13_camera/image/camera6.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/camera6.png-7a0846a8f5b1356d31ba860bee967b51.stex" +path="res://.import/camera6.png-3f50d1b46c1e0199ec118d24d9a3e853.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/camera6.png" -dest_files=[ "res://.import/camera6.png-7a0846a8f5b1356d31ba860bee967b51.stex" ] +source_file="res://doc/demo13_camera/image/camera6.png" +dest_files=[ "res://.import/camera6.png-3f50d1b46c1e0199ec118d24d9a3e853.stex" ] [params] diff --git a/doc/demo_camera/image/canvaslayers.png b/doc/demo13_camera/image/canvaslayers.png similarity index 100% rename from doc/demo_camera/image/canvaslayers.png rename to doc/demo13_camera/image/canvaslayers.png diff --git a/doc/demo_camera/image/canvaslayers.png.import b/doc/demo13_camera/image/canvaslayers.png.import similarity index 67% rename from doc/demo_camera/image/canvaslayers.png.import rename to doc/demo13_camera/image/canvaslayers.png.import index 39eab5b..4f30f9c 100644 --- a/doc/demo_camera/image/canvaslayers.png.import +++ b/doc/demo13_camera/image/canvaslayers.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/canvaslayers.png-74d5cfd5f0971dd06d4bebbecb1192df.stex" +path="res://.import/canvaslayers.png-f793fb311369dec0ce0831b29252b80d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/canvaslayers.png" -dest_files=[ "res://.import/canvaslayers.png-74d5cfd5f0971dd06d4bebbecb1192df.stex" ] +source_file="res://doc/demo13_camera/image/canvaslayers.png" +dest_files=[ "res://.import/canvaslayers.png-f793fb311369dec0ce0831b29252b80d.stex" ] [params] diff --git a/doc/demo_camera/image/viewport1.png b/doc/demo13_camera/image/viewport1.png similarity index 100% rename from doc/demo_camera/image/viewport1.png rename to doc/demo13_camera/image/viewport1.png diff --git a/doc/demo_camera/image/viewport1.png.import b/doc/demo13_camera/image/viewport1.png.import similarity index 68% rename from doc/demo_camera/image/viewport1.png.import rename to doc/demo13_camera/image/viewport1.png.import index fd77a1c..a4989af 100644 --- a/doc/demo_camera/image/viewport1.png.import +++ b/doc/demo13_camera/image/viewport1.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport1.png-3695208b412824287d5782e72c830540.stex" +path="res://.import/viewport1.png-8ce67eef8b65fe22f28a6d0dba3eae69.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport1.png" -dest_files=[ "res://.import/viewport1.png-3695208b412824287d5782e72c830540.stex" ] +source_file="res://doc/demo13_camera/image/viewport1.png" +dest_files=[ "res://.import/viewport1.png-8ce67eef8b65fe22f28a6d0dba3eae69.stex" ] [params] diff --git a/doc/demo_camera/image/viewport10.png b/doc/demo13_camera/image/viewport10.png similarity index 100% rename from doc/demo_camera/image/viewport10.png rename to doc/demo13_camera/image/viewport10.png diff --git a/doc/demo_camera/image/viewport10.png.import b/doc/demo13_camera/image/viewport10.png.import similarity index 68% rename from doc/demo_camera/image/viewport10.png.import rename to doc/demo13_camera/image/viewport10.png.import index c1c722a..074974f 100644 --- a/doc/demo_camera/image/viewport10.png.import +++ b/doc/demo13_camera/image/viewport10.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport10.png-5d19078ce5f7a81a3f9441a0f24f9627.stex" +path="res://.import/viewport10.png-93be39893371380f3f6d4c531e4e3dd9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport10.png" -dest_files=[ "res://.import/viewport10.png-5d19078ce5f7a81a3f9441a0f24f9627.stex" ] +source_file="res://doc/demo13_camera/image/viewport10.png" +dest_files=[ "res://.import/viewport10.png-93be39893371380f3f6d4c531e4e3dd9.stex" ] [params] diff --git a/doc/demo_camera/image/viewport11.png b/doc/demo13_camera/image/viewport11.png similarity index 100% rename from doc/demo_camera/image/viewport11.png rename to doc/demo13_camera/image/viewport11.png diff --git a/doc/demo_camera/image/viewport11.png.import b/doc/demo13_camera/image/viewport11.png.import similarity index 68% rename from doc/demo_camera/image/viewport11.png.import rename to doc/demo13_camera/image/viewport11.png.import index 5052a41..782a0f4 100644 --- a/doc/demo_camera/image/viewport11.png.import +++ b/doc/demo13_camera/image/viewport11.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport11.png-49c34f067db449d6d361b85bed4577d6.stex" +path="res://.import/viewport11.png-9daa346eb340293cf898bda09cb44062.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport11.png" -dest_files=[ "res://.import/viewport11.png-49c34f067db449d6d361b85bed4577d6.stex" ] +source_file="res://doc/demo13_camera/image/viewport11.png" +dest_files=[ "res://.import/viewport11.png-9daa346eb340293cf898bda09cb44062.stex" ] [params] diff --git a/doc/demo_camera/image/viewport2.png b/doc/demo13_camera/image/viewport2.png similarity index 100% rename from doc/demo_camera/image/viewport2.png rename to doc/demo13_camera/image/viewport2.png diff --git a/doc/demo_camera/image/viewport2.png.import b/doc/demo13_camera/image/viewport2.png.import similarity index 68% rename from doc/demo_camera/image/viewport2.png.import rename to doc/demo13_camera/image/viewport2.png.import index c77d8ef..6808f8e 100644 --- a/doc/demo_camera/image/viewport2.png.import +++ b/doc/demo13_camera/image/viewport2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport2.png-f6c9974766f9212697348273936e3a9e.stex" +path="res://.import/viewport2.png-ddb97fe5349855c2aeacda48f5e9bcbc.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport2.png" -dest_files=[ "res://.import/viewport2.png-f6c9974766f9212697348273936e3a9e.stex" ] +source_file="res://doc/demo13_camera/image/viewport2.png" +dest_files=[ "res://.import/viewport2.png-ddb97fe5349855c2aeacda48f5e9bcbc.stex" ] [params] diff --git a/doc/demo_camera/image/viewport3.png b/doc/demo13_camera/image/viewport3.png similarity index 100% rename from doc/demo_camera/image/viewport3.png rename to doc/demo13_camera/image/viewport3.png diff --git a/doc/demo_camera/image/viewport9.png.import b/doc/demo13_camera/image/viewport3.png.import similarity index 69% rename from doc/demo_camera/image/viewport9.png.import rename to doc/demo13_camera/image/viewport3.png.import index 0d7a622..df2ec19 100644 --- a/doc/demo_camera/image/viewport9.png.import +++ b/doc/demo13_camera/image/viewport3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport9.png-8d0e6342ecc800abe9c3ec63869b061c.stex" +path="res://.import/viewport3.png-fa7fd6fcb1321fdfc2cb471bfa77c01c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport9.png" -dest_files=[ "res://.import/viewport9.png-8d0e6342ecc800abe9c3ec63869b061c.stex" ] +source_file="res://doc/demo13_camera/image/viewport3.png" +dest_files=[ "res://.import/viewport3.png-fa7fd6fcb1321fdfc2cb471bfa77c01c.stex" ] [params] diff --git a/doc/demo_camera/image/viewport4.png b/doc/demo13_camera/image/viewport4.png similarity index 100% rename from doc/demo_camera/image/viewport4.png rename to doc/demo13_camera/image/viewport4.png diff --git a/doc/demo_camera/image/viewport4.png.import b/doc/demo13_camera/image/viewport4.png.import similarity index 68% rename from doc/demo_camera/image/viewport4.png.import rename to doc/demo13_camera/image/viewport4.png.import index 6e5a02d..ae36a2b 100644 --- a/doc/demo_camera/image/viewport4.png.import +++ b/doc/demo13_camera/image/viewport4.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport4.png-cfa3982b37b69b519cfd84d7fa2f28de.stex" +path="res://.import/viewport4.png-ca68286fa4d0624e45d5d0df4fd3c116.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport4.png" -dest_files=[ "res://.import/viewport4.png-cfa3982b37b69b519cfd84d7fa2f28de.stex" ] +source_file="res://doc/demo13_camera/image/viewport4.png" +dest_files=[ "res://.import/viewport4.png-ca68286fa4d0624e45d5d0df4fd3c116.stex" ] [params] diff --git a/doc/demo_camera/image/viewport5.png b/doc/demo13_camera/image/viewport5.png similarity index 100% rename from doc/demo_camera/image/viewport5.png rename to doc/demo13_camera/image/viewport5.png diff --git a/doc/demo_camera/image/viewport5.png.import b/doc/demo13_camera/image/viewport5.png.import similarity index 68% rename from doc/demo_camera/image/viewport5.png.import rename to doc/demo13_camera/image/viewport5.png.import index 5be65b2..27e953c 100644 --- a/doc/demo_camera/image/viewport5.png.import +++ b/doc/demo13_camera/image/viewport5.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport5.png-c6d38332a54784c90267212faf71ce3a.stex" +path="res://.import/viewport5.png-a2f416a1a19da9cdea6766c306fc9ec7.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport5.png" -dest_files=[ "res://.import/viewport5.png-c6d38332a54784c90267212faf71ce3a.stex" ] +source_file="res://doc/demo13_camera/image/viewport5.png" +dest_files=[ "res://.import/viewport5.png-a2f416a1a19da9cdea6766c306fc9ec7.stex" ] [params] diff --git a/doc/demo_camera/image/viewport6.png b/doc/demo13_camera/image/viewport6.png similarity index 100% rename from doc/demo_camera/image/viewport6.png rename to doc/demo13_camera/image/viewport6.png diff --git a/doc/demo_camera/image/viewport6.png.import b/doc/demo13_camera/image/viewport6.png.import similarity index 68% rename from doc/demo_camera/image/viewport6.png.import rename to doc/demo13_camera/image/viewport6.png.import index 6589b4f..fc47f2e 100644 --- a/doc/demo_camera/image/viewport6.png.import +++ b/doc/demo13_camera/image/viewport6.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport6.png-b03b6d5926778cef31f4809b939681ab.stex" +path="res://.import/viewport6.png-9b2b8f79e81213d16e4296580f1dc6dc.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport6.png" -dest_files=[ "res://.import/viewport6.png-b03b6d5926778cef31f4809b939681ab.stex" ] +source_file="res://doc/demo13_camera/image/viewport6.png" +dest_files=[ "res://.import/viewport6.png-9b2b8f79e81213d16e4296580f1dc6dc.stex" ] [params] diff --git a/doc/demo_camera/image/viewport7.png b/doc/demo13_camera/image/viewport7.png similarity index 100% rename from doc/demo_camera/image/viewport7.png rename to doc/demo13_camera/image/viewport7.png diff --git a/doc/demo_camera/image/viewport7.png.import b/doc/demo13_camera/image/viewport7.png.import similarity index 68% rename from doc/demo_camera/image/viewport7.png.import rename to doc/demo13_camera/image/viewport7.png.import index e3ed28b..584b2d9 100644 --- a/doc/demo_camera/image/viewport7.png.import +++ b/doc/demo13_camera/image/viewport7.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport7.png-de0248d21b4efb61417bd60bdb0c41d3.stex" +path="res://.import/viewport7.png-18af5e3dd85beb430065ac4ea6c12277.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport7.png" -dest_files=[ "res://.import/viewport7.png-de0248d21b4efb61417bd60bdb0c41d3.stex" ] +source_file="res://doc/demo13_camera/image/viewport7.png" +dest_files=[ "res://.import/viewport7.png-18af5e3dd85beb430065ac4ea6c12277.stex" ] [params] diff --git a/doc/demo_camera/image/viewport8.png b/doc/demo13_camera/image/viewport8.png similarity index 100% rename from doc/demo_camera/image/viewport8.png rename to doc/demo13_camera/image/viewport8.png diff --git a/doc/demo_camera/image/viewport8.png.import b/doc/demo13_camera/image/viewport8.png.import similarity index 68% rename from doc/demo_camera/image/viewport8.png.import rename to doc/demo13_camera/image/viewport8.png.import index a99334c..7ff9126 100644 --- a/doc/demo_camera/image/viewport8.png.import +++ b/doc/demo13_camera/image/viewport8.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/viewport8.png-cedcfc816b6e093adad0fc6f983c6a27.stex" +path="res://.import/viewport8.png-02df38d9c303e3217b60073d08bfcac6.stex" metadata={ "vram_texture": false } [deps] -source_file="res://doc/demo_camera/image/viewport8.png" -dest_files=[ "res://.import/viewport8.png-cedcfc816b6e093adad0fc6f983c6a27.stex" ] +source_file="res://doc/demo13_camera/image/viewport8.png" +dest_files=[ "res://.import/viewport8.png-02df38d9c303e3217b60073d08bfcac6.stex" ] [params] diff --git a/doc/demo_camera/image/viewport9.png b/doc/demo13_camera/image/viewport9.png similarity index 100% rename from doc/demo_camera/image/viewport9.png rename to doc/demo13_camera/image/viewport9.png diff --git a/doc/demo13_camera/image/viewport9.png.import b/doc/demo13_camera/image/viewport9.png.import new file mode 100644 index 0000000..7efba01 --- /dev/null +++ b/doc/demo13_camera/image/viewport9.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/viewport9.png-33b577de77e9f429edd901b2c59052ed.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://doc/demo13_camera/image/viewport9.png" +dest_files=[ "res://.import/viewport9.png-33b577de77e9f429edd901b2c59052ed.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/doc/demo_camera/image/viewport3.png.import b/doc/demo_camera/image/viewport3.png.import deleted file mode 100644 index 3981285..0000000 --- a/doc/demo_camera/image/viewport3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/viewport3.png-ab73905cd1f8e50dcafbc07f68bb7e29.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://doc/demo_camera/image/viewport3.png" -dest_files=[ "res://.import/viewport3.png-ab73905cd1f8e50dcafbc07f68bb7e29.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/scene/demo_animation/animation.tscn b/scene/demo10_animation/animation.tscn similarity index 67% rename from scene/demo_animation/animation.tscn rename to scene/demo10_animation/animation.tscn index 8d68324..5b7bf77 100644 --- a/scene/demo_animation/animation.tscn +++ b/scene/demo10_animation/animation.tscn @@ -1,15 +1,15 @@ [gd_scene load_steps=14 format=2] -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://scene/demo_animation/image/run-6.png" type="Texture" id=2] -[ext_resource path="res://scene/demo_animation/image/run-5.png" type="Texture" id=3] -[ext_resource path="res://scene/demo_animation/image/run-7.png" type="Texture" id=4] -[ext_resource path="res://scene/demo_animation/image/run-8.png" type="Texture" id=5] -[ext_resource path="res://scene/demo_animation/image/run-4.png" type="Texture" id=6] -[ext_resource path="res://scene/demo_animation/image/run-3.png" type="Texture" id=7] -[ext_resource path="res://scene/demo_animation/image/player.png" type="Texture" id=8] -[ext_resource path="res://scene/demo_animation/image/run-1.png" type="Texture" id=9] -[ext_resource path="res://scene/demo_animation/image/run-2.png" type="Texture" id=10] +[ext_resource path="res://scene/demo10_animation/image/run-6.png" type="Texture" id=1] +[ext_resource path="res://scene/demo10_animation/image/run-5.png" type="Texture" id=2] +[ext_resource path="res://scene/demo10_animation/image/run-7.png" type="Texture" id=3] +[ext_resource path="res://icon.png" type="Texture" id=4] +[ext_resource path="res://scene/demo10_animation/image/run-8.png" type="Texture" id=5] +[ext_resource path="res://scene/demo10_animation/image/player.png" type="Texture" id=6] +[ext_resource path="res://scene/demo10_animation/image/run-4.png" type="Texture" id=7] +[ext_resource path="res://scene/demo10_animation/image/run-3.png" type="Texture" id=8] +[ext_resource path="res://scene/demo10_animation/image/run-1.png" type="Texture" id=9] +[ext_resource path="res://scene/demo10_animation/image/run-2.png" type="Texture" id=10] [sub_resource type="Animation" id=1] resource_name = "my_animation_1" @@ -52,7 +52,7 @@ tracks/2/keys = { "values": [ Vector2( 1, 1 ), Vector2( 3, 3 ) ] } -[sub_resource type="Animation" id=3] +[sub_resource type="Animation" id=2] resource_name = "animation_2" length = 0.6 loop = true @@ -69,9 +69,9 @@ tracks/0/keys = { "values": [ 0, 1, 2, 3, 4, 5 ] } -[sub_resource type="SpriteFrames" id=2] +[sub_resource type="SpriteFrames" id=3] animations = [ { -"frames": [ ExtResource( 9 ), ExtResource( 10 ), ExtResource( 7 ), ExtResource( 6 ), ExtResource( 3 ), ExtResource( 2 ), ExtResource( 4 ), ExtResource( 5 ) ], +"frames": [ ExtResource( 9 ), ExtResource( 10 ), ExtResource( 8 ), ExtResource( 7 ), ExtResource( 2 ), ExtResource( 1 ), ExtResource( 3 ), ExtResource( 5 ) ], "loop": true, "name": "default", "speed": 7.0 @@ -85,7 +85,7 @@ animations = [ { position = Vector2( 315.475, 141.204 ) rotation = 6.28319 scale = Vector2( 1.06651, 1.06651 ) -texture = ExtResource( 1 ) +texture = ExtResource( 4 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="Animation_1"] autoplay = "my_animation_1" @@ -96,12 +96,12 @@ anims/my_animation_1 = SubResource( 1 ) [node name="player" type="Sprite" parent="Animation_2"] position = Vector2( 317.132, 336.313 ) scale = Vector2( 1.86179, 1.57452 ) -texture = ExtResource( 8 ) +texture = ExtResource( 6 ) hframes = 60 [node name="AnimationPlayer" type="AnimationPlayer" parent="Animation_2"] autoplay = "animation_2" -anims/animation_2 = SubResource( 3 ) +anims/animation_2 = SubResource( 2 ) [node name="Animation_3" type="Node2D" parent="."] position = Vector2( 308.251, 522.067 ) @@ -110,6 +110,6 @@ __meta__ = { } [node name="AnimatedSprite" type="AnimatedSprite" parent="Animation_3"] -frames = SubResource( 2 ) +frames = SubResource( 3 ) frame = 5 playing = true diff --git a/scene/demo_animation/image/player.png b/scene/demo10_animation/image/player.png similarity index 100% rename from scene/demo_animation/image/player.png rename to scene/demo10_animation/image/player.png diff --git a/scene/demo_animation/image/player.png.import b/scene/demo10_animation/image/player.png.import similarity index 69% rename from scene/demo_animation/image/player.png.import rename to scene/demo10_animation/image/player.png.import index d05457b..c9fe29f 100644 --- a/scene/demo_animation/image/player.png.import +++ b/scene/demo10_animation/image/player.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/player.png-8d333ef9f63ff35d07991f79c4882af4.stex" +path="res://.import/player.png-e28fee2dde34564549f6b47bedcbb62e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/player.png" -dest_files=[ "res://.import/player.png-8d333ef9f63ff35d07991f79c4882af4.stex" ] +source_file="res://scene/demo10_animation/image/player.png" +dest_files=[ "res://.import/player.png-e28fee2dde34564549f6b47bedcbb62e.stex" ] [params] diff --git a/scene/demo_animation/image/run-1.png b/scene/demo10_animation/image/run-1.png similarity index 100% rename from scene/demo_animation/image/run-1.png rename to scene/demo10_animation/image/run-1.png diff --git a/scene/demo_animation/image/run-1.png.import b/scene/demo10_animation/image/run-1.png.import similarity index 69% rename from scene/demo_animation/image/run-1.png.import rename to scene/demo10_animation/image/run-1.png.import index 9926696..6f687c6 100644 --- a/scene/demo_animation/image/run-1.png.import +++ b/scene/demo10_animation/image/run-1.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-1.png-c8c4261865e1c9461267878914fb8958.stex" +path="res://.import/run-1.png-3280c05cb0e4f0094bf9a065f1c420ed.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-1.png" -dest_files=[ "res://.import/run-1.png-c8c4261865e1c9461267878914fb8958.stex" ] +source_file="res://scene/demo10_animation/image/run-1.png" +dest_files=[ "res://.import/run-1.png-3280c05cb0e4f0094bf9a065f1c420ed.stex" ] [params] diff --git a/scene/demo_animation/image/run-2.png b/scene/demo10_animation/image/run-2.png similarity index 100% rename from scene/demo_animation/image/run-2.png rename to scene/demo10_animation/image/run-2.png diff --git a/scene/demo_animation/image/run-2.png.import b/scene/demo10_animation/image/run-2.png.import similarity index 69% rename from scene/demo_animation/image/run-2.png.import rename to scene/demo10_animation/image/run-2.png.import index bea0a5d..1f00714 100644 --- a/scene/demo_animation/image/run-2.png.import +++ b/scene/demo10_animation/image/run-2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-2.png-3eaaa5bac8bdcecafdeafe66d725f0a9.stex" +path="res://.import/run-2.png-c6dd0e2a0fd44ecce64d51822fe106eb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-2.png" -dest_files=[ "res://.import/run-2.png-3eaaa5bac8bdcecafdeafe66d725f0a9.stex" ] +source_file="res://scene/demo10_animation/image/run-2.png" +dest_files=[ "res://.import/run-2.png-c6dd0e2a0fd44ecce64d51822fe106eb.stex" ] [params] diff --git a/scene/demo_animation/image/run-3.png b/scene/demo10_animation/image/run-3.png similarity index 100% rename from scene/demo_animation/image/run-3.png rename to scene/demo10_animation/image/run-3.png diff --git a/scene/demo_animation/image/run-3.png.import b/scene/demo10_animation/image/run-3.png.import similarity index 69% rename from scene/demo_animation/image/run-3.png.import rename to scene/demo10_animation/image/run-3.png.import index 43d77fc..c4f8d28 100644 --- a/scene/demo_animation/image/run-3.png.import +++ b/scene/demo10_animation/image/run-3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-3.png-3b974bc55df257fd7f11b527e92a7d9a.stex" +path="res://.import/run-3.png-a7f3ee534265c5117fb56b89486b5e55.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-3.png" -dest_files=[ "res://.import/run-3.png-3b974bc55df257fd7f11b527e92a7d9a.stex" ] +source_file="res://scene/demo10_animation/image/run-3.png" +dest_files=[ "res://.import/run-3.png-a7f3ee534265c5117fb56b89486b5e55.stex" ] [params] diff --git a/scene/demo_animation/image/run-4.png b/scene/demo10_animation/image/run-4.png similarity index 100% rename from scene/demo_animation/image/run-4.png rename to scene/demo10_animation/image/run-4.png diff --git a/scene/demo_animation/image/run-4.png.import b/scene/demo10_animation/image/run-4.png.import similarity index 69% rename from scene/demo_animation/image/run-4.png.import rename to scene/demo10_animation/image/run-4.png.import index 1a51903..c888ffe 100644 --- a/scene/demo_animation/image/run-4.png.import +++ b/scene/demo10_animation/image/run-4.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-4.png-48b19458851f833631468c1e08a4ccf2.stex" +path="res://.import/run-4.png-5f322ba121a10ba33f069dd9c25a1035.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-4.png" -dest_files=[ "res://.import/run-4.png-48b19458851f833631468c1e08a4ccf2.stex" ] +source_file="res://scene/demo10_animation/image/run-4.png" +dest_files=[ "res://.import/run-4.png-5f322ba121a10ba33f069dd9c25a1035.stex" ] [params] diff --git a/scene/demo_animation/image/run-5.png b/scene/demo10_animation/image/run-5.png similarity index 100% rename from scene/demo_animation/image/run-5.png rename to scene/demo10_animation/image/run-5.png diff --git a/scene/demo_animation/image/run-5.png.import b/scene/demo10_animation/image/run-5.png.import similarity index 69% rename from scene/demo_animation/image/run-5.png.import rename to scene/demo10_animation/image/run-5.png.import index 3fc6dba..b90b9ce 100644 --- a/scene/demo_animation/image/run-5.png.import +++ b/scene/demo10_animation/image/run-5.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-5.png-ea3c86f9a267e44f7795d22e5073396a.stex" +path="res://.import/run-5.png-6dc8b7d6582a966a0b43c5375057d646.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-5.png" -dest_files=[ "res://.import/run-5.png-ea3c86f9a267e44f7795d22e5073396a.stex" ] +source_file="res://scene/demo10_animation/image/run-5.png" +dest_files=[ "res://.import/run-5.png-6dc8b7d6582a966a0b43c5375057d646.stex" ] [params] diff --git a/scene/demo_animation/image/run-6.png b/scene/demo10_animation/image/run-6.png similarity index 100% rename from scene/demo_animation/image/run-6.png rename to scene/demo10_animation/image/run-6.png diff --git a/scene/demo_animation/image/run-6.png.import b/scene/demo10_animation/image/run-6.png.import similarity index 69% rename from scene/demo_animation/image/run-6.png.import rename to scene/demo10_animation/image/run-6.png.import index bda6995..eda4d52 100644 --- a/scene/demo_animation/image/run-6.png.import +++ b/scene/demo10_animation/image/run-6.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-6.png-6cee5001d59395e1425db3952af2185b.stex" +path="res://.import/run-6.png-af2f504c10c840072a12547b0a3c767b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-6.png" -dest_files=[ "res://.import/run-6.png-6cee5001d59395e1425db3952af2185b.stex" ] +source_file="res://scene/demo10_animation/image/run-6.png" +dest_files=[ "res://.import/run-6.png-af2f504c10c840072a12547b0a3c767b.stex" ] [params] diff --git a/scene/demo_animation/image/run-7.png b/scene/demo10_animation/image/run-7.png similarity index 100% rename from scene/demo_animation/image/run-7.png rename to scene/demo10_animation/image/run-7.png diff --git a/scene/demo_animation/image/run-7.png.import b/scene/demo10_animation/image/run-7.png.import similarity index 69% rename from scene/demo_animation/image/run-7.png.import rename to scene/demo10_animation/image/run-7.png.import index b5f65ab..a316dde 100644 --- a/scene/demo_animation/image/run-7.png.import +++ b/scene/demo10_animation/image/run-7.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-7.png-35916c4a2e0ce14a69ef3ee9f817859a.stex" +path="res://.import/run-7.png-778e3a530cfcb29ce7258e12c61126fb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-7.png" -dest_files=[ "res://.import/run-7.png-35916c4a2e0ce14a69ef3ee9f817859a.stex" ] +source_file="res://scene/demo10_animation/image/run-7.png" +dest_files=[ "res://.import/run-7.png-778e3a530cfcb29ce7258e12c61126fb.stex" ] [params] diff --git a/scene/demo_animation/image/run-8.png b/scene/demo10_animation/image/run-8.png similarity index 100% rename from scene/demo_animation/image/run-8.png rename to scene/demo10_animation/image/run-8.png diff --git a/scene/demo_animation/image/run-8.png.import b/scene/demo10_animation/image/run-8.png.import similarity index 69% rename from scene/demo_animation/image/run-8.png.import rename to scene/demo10_animation/image/run-8.png.import index f3c4268..439a0ab 100644 --- a/scene/demo_animation/image/run-8.png.import +++ b/scene/demo10_animation/image/run-8.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/run-8.png-adb9835e5f9a8db3d487d347e434f1df.stex" +path="res://.import/run-8.png-3d745ba5b7d037dda1ae54f02d2b148c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://scene/demo_animation/image/run-8.png" -dest_files=[ "res://.import/run-8.png-adb9835e5f9a8db3d487d347e434f1df.stex" ] +source_file="res://scene/demo10_animation/image/run-8.png" +dest_files=[ "res://.import/run-8.png-3d745ba5b7d037dda1ae54f02d2b148c.stex" ] [params] diff --git a/scene/demo_camera/mini.tscn b/scene/demo13_camera/mini.tscn similarity index 62% rename from scene/demo_camera/mini.tscn rename to scene/demo13_camera/mini.tscn index 09081f8..87d0352 100644 --- a/scene/demo_camera/mini.tscn +++ b/scene/demo13_camera/mini.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scene/demo_camera/move_camera.tscn" type="PackedScene" id=1] -[ext_resource path="res://scene/demo_camera/mini_viewport.tscn" type="PackedScene" id=2] +[ext_resource path="res://scene/demo13_camera/move_camera.tscn" type="PackedScene" id=1] +[ext_resource path="res://scene/demo13_camera/mini_viewport.tscn" type="PackedScene" id=2] [node name="Node2D" type="Node2D"] diff --git a/scene/demo_camera/mini_viewport.tscn b/scene/demo13_camera/mini_viewport.tscn similarity index 88% rename from scene/demo_camera/mini_viewport.tscn rename to scene/demo13_camera/mini_viewport.tscn index 0688d5f..a5973a5 100644 --- a/scene/demo_camera/mini_viewport.tscn +++ b/scene/demo13_camera/mini_viewport.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://scene/demo_camera/move_camera.tscn" type="PackedScene" id=1] +[ext_resource path="res://scene/demo13_camera/move_camera.tscn" type="PackedScene" id=1] [node name="Control" type="Control"] anchor_right = 1.0 diff --git a/scene/demo_camera/move_camera.tscn b/scene/demo13_camera/move_camera.tscn similarity index 89% rename from scene/demo_camera/move_camera.tscn rename to scene/demo13_camera/move_camera.tscn index 56b5bac..7ccccaf 100644 --- a/scene/demo_camera/move_camera.tscn +++ b/scene/demo13_camera/move_camera.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://script/demo_camera/player.gd" type="Script" id=1] +[ext_resource path="res://script/demo13_camera/player.gd" type="Script" id=1] [ext_resource path="res://icon.png" type="Texture" id=2] [node name="Node2D" type="Node2D"] diff --git a/scene/demo_camera/simple_viewport.tscn b/scene/demo13_camera/simple_viewport.tscn similarity index 92% rename from scene/demo_camera/simple_viewport.tscn rename to scene/demo13_camera/simple_viewport.tscn index 5dc0084..d16c6aa 100644 --- a/scene/demo_camera/simple_viewport.tscn +++ b/scene/demo13_camera/simple_viewport.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://script/demo_camera/player.gd" type="Script" id=1] +[ext_resource path="res://script/demo13_camera/player.gd" type="Script" id=1] [ext_resource path="res://icon.png" type="Texture" id=2] [node name="Node2D" type="Node2D"] diff --git a/scene/demo_camera/switch_camera.tscn b/scene/demo13_camera/switch_camera.tscn similarity index 93% rename from scene/demo_camera/switch_camera.tscn rename to scene/demo13_camera/switch_camera.tscn index 56165c0..650c7b3 100644 --- a/scene/demo_camera/switch_camera.tscn +++ b/scene/demo13_camera/switch_camera.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://script/demo_camera/switch_camera.gd" type="Script" id=1] +[ext_resource path="res://script/demo13_camera/switch_camera.gd" type="Script" id=1] [ext_resource path="res://icon.png" type="Texture" id=2] [node name="Node2D" type="Node2D"] diff --git a/script/demo_camera/player.gd b/script/demo13_camera/player.gd similarity index 100% rename from script/demo_camera/player.gd rename to script/demo13_camera/player.gd diff --git a/script/demo_camera/switch_camera.gd b/script/demo13_camera/switch_camera.gd similarity index 100% rename from script/demo_camera/switch_camera.gd rename to script/demo13_camera/switch_camera.gd diff --git a/zfoo/util/NodeUtils.gd b/zfoo/util/NodeUtils.gd index 6867e49..821107a 100644 --- a/zfoo/util/NodeUtils.gd +++ b/zfoo/util/NodeUtils.gd @@ -1,5 +1,6 @@ extends Object +const StringUtils = preload("res://zfoo/util/StringUtils.gd") # 移除node节点 static func removeNode(node: Node) -> void: @@ -19,3 +20,17 @@ static func addScene(node: Node, scene: PackedScene) -> Node: var sceneNode = scene.instance() node.add_child(sceneNode) return sceneNode + +# 转换场景 +static func changeScene(sceneTree: SceneTree, scenePath: String) -> void: + var error = sceneTree.change_scene(scenePath) + if error == OK: + pass + printerr(StringUtils.format("SceneTree[{}]加载场景[scenePath:{}]异常[{}]", [sceneTree, scenePath, error])) + + +static func changeSceneTo(sceneTree: SceneTree, scene: PackedScene) -> void: + var error = sceneTree.change_scene_to(scene) + if error == OK: + pass + printerr(StringUtils.format("SceneTree[{}]加载场景[scene:{}]异常[{}]", [sceneTree, scene, error]))