From 2507753ac6a3386a0b92c8568faefa8da7162888 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Thu, 5 Sep 2019 13:31:42 +0700 Subject: [PATCH] sample asset folder restructurization --- samples/CMakeLists.txt | 2 +- samples/bin/library/coin/coin-pma.atlas | 3 -- samples/bin/library/coin/coin-pma.png | 3 -- samples/bin/library/{ => fonts}/arial_bm.fnt | 0 samples/bin/library/{ => fonts}/arial_bm.png | 0 samples/bin/library/{ => fonts}/arial_sdf.fnt | 0 samples/bin/library/{ => fonts}/arial_sdf.png | 0 .../{ => materials}/font_bm_material.json | 2 +- .../{ => materials}/font_sdf_material.json | 2 +- .../spine_material_additive.json | 2 +- .../spine_material_multiply.json | 2 +- .../spine_material_normal.json | 2 +- .../spine_material_screen.json | 2 +- .../sprite_material_additive.json | 2 +- .../sprite_material_multiply.json | 2 +- .../sprite_material_normal.json | 2 +- .../sprite_material_screen.json | 2 +- .../library/{ => models/gnome}/gnome.e2d_mesh | 0 .../bin/library/{ => models/gnome}/gnome.png | 0 .../{ => models/gnome}/gnome_material.json | 2 +- .../{ => models/gnome}/gnome_model.json | 0 .../library/{ => prefabs}/camera_prefab.json | 0 .../coin_prefab.json} | 2 +- .../bin/library/prefabs/dragon_prefab.json | 18 +++++++++++ .../library/{ => prefabs}/gnome_prefab.json | 4 +-- .../{ => prefabs}/label_bm_prefab.json | 4 +-- .../{ => prefabs}/label_sdf_prefab.json | 4 +-- .../library/{ => prefabs}/model_prefab.json | 0 .../raptor_prefab.json} | 2 +- .../library/{ => prefabs}/ship_prefab.json | 2 +- samples/bin/library/prefabs/spine_prefab.json | 15 +++++++++ .../bin/library/prefabs/sprite_prefab.json | 13 ++++++++ samples/bin/library/scene_spine_prefab.json | 24 -------------- .../library/{ => scenes}/scene_prefab.json | 12 +++---- .../library/scenes/spine_scene_prefab.json | 32 +++++++++++++++++++ .../library/{ => shaders}/font_bm_shader.frag | 0 .../library/{ => shaders}/font_bm_shader.json | 0 .../library/{ => shaders}/font_bm_shader.vert | 0 .../{ => shaders}/font_sdf_shader.frag | 0 .../{ => shaders}/font_sdf_shader.json | 0 .../{ => shaders}/font_sdf_shader.vert | 0 .../library/{ => shaders}/model_shader.frag | 0 .../library/{ => shaders}/model_shader.json | 0 .../library/{ => shaders}/model_shader.vert | 0 .../library/{ => shaders}/spine_shader.frag | 0 .../library/{ => shaders}/spine_shader.json | 0 .../library/{ => shaders}/spine_shader.vert | 0 .../library/{ => shaders}/sprite_shader.frag | 0 .../library/{ => shaders}/sprite_shader.json | 0 .../library/{ => shaders}/sprite_shader.vert | 0 samples/bin/library/ship.png | 3 -- samples/bin/library/spine_prefab.json | 15 --------- .../library/{ => spines}/coin/coin-pro.skel | 0 samples/bin/library/spines/coin/coin.atlas | 3 ++ samples/bin/library/spines/coin/coin.png | 3 ++ .../coin_spine.json} | 2 +- .../bin/library/spines/dragon/dragon-ess.skel | 3 ++ .../bin/library/spines/dragon/dragon.atlas | 3 ++ samples/bin/library/spines/dragon/dragon.png | 3 ++ samples/bin/library/spines/dragon/dragon2.png | 3 ++ samples/bin/library/spines/dragon_spine.json | 5 +++ .../{ => spines}/raptor/raptor-pro.json-large | 0 .../{ => spines}/raptor/raptor-pro.skel | 0 .../library/{ => spines}/raptor/raptor.atlas | 0 .../library/{ => spines}/raptor/raptor.png | 0 .../raptor_spine.json} | 0 samples/bin/library/sprite_prefab.json | 13 -------- samples/bin/library/{ => sprites}/cube_0.png | 0 .../library/{ => sprites}/cube_0_sprite.json | 0 samples/bin/library/{ => sprites}/cube_1.png | 0 .../library/{ => sprites}/cube_1_sprite.json | 0 .../library/{ => sprites}/cube_flipbook.json | 0 .../library/{ => sprites}/ship_sprite.json | 0 samples/bin/library/{ => sprites}/ships.png | 0 .../library/{ => sprites}/ships_atlas.json | 0 samples/sources/sample_03/sample_03.cpp | 22 ++++++------- samples/sources/sample_04/sample_04.cpp | 2 +- .../sample_07.cpp => sample_06/sample_06.cpp} | 6 ++-- 78 files changed, 145 insertions(+), 103 deletions(-) delete mode 100644 samples/bin/library/coin/coin-pma.atlas delete mode 100644 samples/bin/library/coin/coin-pma.png rename samples/bin/library/{ => fonts}/arial_bm.fnt (100%) rename samples/bin/library/{ => fonts}/arial_bm.png (100%) rename samples/bin/library/{ => fonts}/arial_sdf.fnt (100%) rename samples/bin/library/{ => fonts}/arial_sdf.png (100%) rename samples/bin/library/{ => materials}/font_bm_material.json (84%) rename samples/bin/library/{ => materials}/font_sdf_material.json (84%) rename samples/bin/library/{ => materials}/spine_material_additive.json (84%) rename samples/bin/library/{ => materials}/spine_material_multiply.json (85%) rename samples/bin/library/{ => materials}/spine_material_normal.json (85%) rename samples/bin/library/{ => materials}/spine_material_screen.json (85%) rename samples/bin/library/{ => materials}/sprite_material_additive.json (84%) rename samples/bin/library/{ => materials}/sprite_material_multiply.json (85%) rename samples/bin/library/{ => materials}/sprite_material_normal.json (84%) rename samples/bin/library/{ => materials}/sprite_material_screen.json (84%) rename samples/bin/library/{ => models/gnome}/gnome.e2d_mesh (100%) rename samples/bin/library/{ => models/gnome}/gnome.png (100%) rename samples/bin/library/{ => models/gnome}/gnome_material.json (84%) rename samples/bin/library/{ => models/gnome}/gnome_model.json (100%) rename samples/bin/library/{ => prefabs}/camera_prefab.json (100%) rename samples/bin/library/{spine_coin_prefab.json => prefabs/coin_prefab.json} (88%) create mode 100644 samples/bin/library/prefabs/dragon_prefab.json rename samples/bin/library/{ => prefabs}/gnome_prefab.json (62%) rename samples/bin/library/{ => prefabs}/label_bm_prefab.json (70%) rename samples/bin/library/{ => prefabs}/label_sdf_prefab.json (69%) rename samples/bin/library/{ => prefabs}/model_prefab.json (100%) rename samples/bin/library/{spine_raptor_prefab.json => prefabs/raptor_prefab.json} (95%) rename samples/bin/library/{ => prefabs}/ship_prefab.json (67%) create mode 100644 samples/bin/library/prefabs/spine_prefab.json create mode 100644 samples/bin/library/prefabs/sprite_prefab.json delete mode 100644 samples/bin/library/scene_spine_prefab.json rename samples/bin/library/{ => scenes}/scene_prefab.json (80%) create mode 100644 samples/bin/library/scenes/spine_scene_prefab.json rename samples/bin/library/{ => shaders}/font_bm_shader.frag (100%) rename samples/bin/library/{ => shaders}/font_bm_shader.json (100%) rename samples/bin/library/{ => shaders}/font_bm_shader.vert (100%) rename samples/bin/library/{ => shaders}/font_sdf_shader.frag (100%) rename samples/bin/library/{ => shaders}/font_sdf_shader.json (100%) rename samples/bin/library/{ => shaders}/font_sdf_shader.vert (100%) rename samples/bin/library/{ => shaders}/model_shader.frag (100%) rename samples/bin/library/{ => shaders}/model_shader.json (100%) rename samples/bin/library/{ => shaders}/model_shader.vert (100%) rename samples/bin/library/{ => shaders}/spine_shader.frag (100%) rename samples/bin/library/{ => shaders}/spine_shader.json (100%) rename samples/bin/library/{ => shaders}/spine_shader.vert (100%) rename samples/bin/library/{ => shaders}/sprite_shader.frag (100%) rename samples/bin/library/{ => shaders}/sprite_shader.json (100%) rename samples/bin/library/{ => shaders}/sprite_shader.vert (100%) delete mode 100755 samples/bin/library/ship.png delete mode 100644 samples/bin/library/spine_prefab.json rename samples/bin/library/{ => spines}/coin/coin-pro.skel (100%) create mode 100644 samples/bin/library/spines/coin/coin.atlas create mode 100644 samples/bin/library/spines/coin/coin.png rename samples/bin/library/{spine_coin.json => spines/coin_spine.json} (65%) create mode 100644 samples/bin/library/spines/dragon/dragon-ess.skel create mode 100644 samples/bin/library/spines/dragon/dragon.atlas create mode 100644 samples/bin/library/spines/dragon/dragon.png create mode 100644 samples/bin/library/spines/dragon/dragon2.png create mode 100644 samples/bin/library/spines/dragon_spine.json rename samples/bin/library/{ => spines}/raptor/raptor-pro.json-large (100%) rename samples/bin/library/{ => spines}/raptor/raptor-pro.skel (100%) rename samples/bin/library/{ => spines}/raptor/raptor.atlas (100%) rename samples/bin/library/{ => spines}/raptor/raptor.png (100%) rename samples/bin/library/{spine_raptor.json => spines/raptor_spine.json} (100%) delete mode 100644 samples/bin/library/sprite_prefab.json rename samples/bin/library/{ => sprites}/cube_0.png (100%) rename samples/bin/library/{ => sprites}/cube_0_sprite.json (100%) rename samples/bin/library/{ => sprites}/cube_1.png (100%) rename samples/bin/library/{ => sprites}/cube_1_sprite.json (100%) rename samples/bin/library/{ => sprites}/cube_flipbook.json (100%) rename samples/bin/library/{ => sprites}/ship_sprite.json (100%) rename samples/bin/library/{ => sprites}/ships.png (100%) rename samples/bin/library/{ => sprites}/ships_atlas.json (100%) rename samples/sources/{sample_07/sample_07.cpp => sample_06/sample_06.cpp} (96%) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 6715c073..c44205a6 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -36,4 +36,4 @@ add_e2d_sample(02) add_e2d_sample(03) add_e2d_sample(04) add_e2d_sample(05) -add_e2d_sample(07) +add_e2d_sample(06) diff --git a/samples/bin/library/coin/coin-pma.atlas b/samples/bin/library/coin/coin-pma.atlas deleted file mode 100644 index 63ddfbec..00000000 --- a/samples/bin/library/coin/coin-pma.atlas +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:710b5d8aa292bf75c778d960a63f3b63857d2a7ab15541020cadf5bc5239656a -size 890 diff --git a/samples/bin/library/coin/coin-pma.png b/samples/bin/library/coin/coin-pma.png deleted file mode 100644 index 61759bb1..00000000 --- a/samples/bin/library/coin/coin-pma.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75e1d17fb84154f882a20d5e5069ab52d6d635ba7a9691e78b4f93c8128be35a -size 342389 diff --git a/samples/bin/library/arial_bm.fnt b/samples/bin/library/fonts/arial_bm.fnt similarity index 100% rename from samples/bin/library/arial_bm.fnt rename to samples/bin/library/fonts/arial_bm.fnt diff --git a/samples/bin/library/arial_bm.png b/samples/bin/library/fonts/arial_bm.png similarity index 100% rename from samples/bin/library/arial_bm.png rename to samples/bin/library/fonts/arial_bm.png diff --git a/samples/bin/library/arial_sdf.fnt b/samples/bin/library/fonts/arial_sdf.fnt similarity index 100% rename from samples/bin/library/arial_sdf.fnt rename to samples/bin/library/fonts/arial_sdf.fnt diff --git a/samples/bin/library/arial_sdf.png b/samples/bin/library/fonts/arial_sdf.png similarity index 100% rename from samples/bin/library/arial_sdf.png rename to samples/bin/library/fonts/arial_sdf.png diff --git a/samples/bin/library/font_bm_material.json b/samples/bin/library/materials/font_bm_material.json similarity index 84% rename from samples/bin/library/font_bm_material.json rename to samples/bin/library/materials/font_bm_material.json index 044249a8..7e65e10f 100644 --- a/samples/bin/library/font_bm_material.json +++ b/samples/bin/library/materials/font_bm_material.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "font_bm_shader.json", + "shader" : "../shaders/font_bm_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/font_sdf_material.json b/samples/bin/library/materials/font_sdf_material.json similarity index 84% rename from samples/bin/library/font_sdf_material.json rename to samples/bin/library/materials/font_sdf_material.json index b3b76807..0108ed2e 100644 --- a/samples/bin/library/font_sdf_material.json +++ b/samples/bin/library/materials/font_sdf_material.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "font_sdf_shader.json", + "shader" : "../shaders/font_sdf_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/spine_material_additive.json b/samples/bin/library/materials/spine_material_additive.json similarity index 84% rename from samples/bin/library/spine_material_additive.json rename to samples/bin/library/materials/spine_material_additive.json index 6520a75c..a131c4cc 100644 --- a/samples/bin/library/spine_material_additive.json +++ b/samples/bin/library/materials/spine_material_additive.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "spine_shader.json", + "shader" : "../shaders/spine_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/spine_material_multiply.json b/samples/bin/library/materials/spine_material_multiply.json similarity index 85% rename from samples/bin/library/spine_material_multiply.json rename to samples/bin/library/materials/spine_material_multiply.json index 634e3dc5..79d5b9dc 100644 --- a/samples/bin/library/spine_material_multiply.json +++ b/samples/bin/library/materials/spine_material_multiply.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "spine_shader.json", + "shader" : "../shaders/spine_shader.json", "state_block" : { "blending_state" : { "src_factor" : "dst_color", diff --git a/samples/bin/library/spine_material_normal.json b/samples/bin/library/materials/spine_material_normal.json similarity index 85% rename from samples/bin/library/spine_material_normal.json rename to samples/bin/library/materials/spine_material_normal.json index 75f5fa8f..6463264d 100644 --- a/samples/bin/library/spine_material_normal.json +++ b/samples/bin/library/materials/spine_material_normal.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "spine_shader.json", + "shader" : "../shaders/spine_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/spine_material_screen.json b/samples/bin/library/materials/spine_material_screen.json similarity index 85% rename from samples/bin/library/spine_material_screen.json rename to samples/bin/library/materials/spine_material_screen.json index 897633f2..7ffbe27b 100644 --- a/samples/bin/library/spine_material_screen.json +++ b/samples/bin/library/materials/spine_material_screen.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "spine_shader.json", + "shader" : "../shaders/spine_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/sprite_material_additive.json b/samples/bin/library/materials/sprite_material_additive.json similarity index 84% rename from samples/bin/library/sprite_material_additive.json rename to samples/bin/library/materials/sprite_material_additive.json index 3e798a0b..e2173c18 100644 --- a/samples/bin/library/sprite_material_additive.json +++ b/samples/bin/library/materials/sprite_material_additive.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "sprite_shader.json", + "shader" : "../shaders/sprite_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/sprite_material_multiply.json b/samples/bin/library/materials/sprite_material_multiply.json similarity index 85% rename from samples/bin/library/sprite_material_multiply.json rename to samples/bin/library/materials/sprite_material_multiply.json index 2190c6cb..5146b8d9 100644 --- a/samples/bin/library/sprite_material_multiply.json +++ b/samples/bin/library/materials/sprite_material_multiply.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "sprite_shader.json", + "shader" : "../shaders/sprite_shader.json", "state_block" : { "blending_state" : { "src_factor" : "dst_color", diff --git a/samples/bin/library/sprite_material_normal.json b/samples/bin/library/materials/sprite_material_normal.json similarity index 84% rename from samples/bin/library/sprite_material_normal.json rename to samples/bin/library/materials/sprite_material_normal.json index 58a6a793..984749ce 100644 --- a/samples/bin/library/sprite_material_normal.json +++ b/samples/bin/library/materials/sprite_material_normal.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "sprite_shader.json", + "shader" : "../shaders/sprite_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/sprite_material_screen.json b/samples/bin/library/materials/sprite_material_screen.json similarity index 84% rename from samples/bin/library/sprite_material_screen.json rename to samples/bin/library/materials/sprite_material_screen.json index e3356757..f755395f 100644 --- a/samples/bin/library/sprite_material_screen.json +++ b/samples/bin/library/materials/sprite_material_screen.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "sprite_shader.json", + "shader" : "../shaders/sprite_shader.json", "state_block" : { "blending_state" : { "src_factor" : "one", diff --git a/samples/bin/library/gnome.e2d_mesh b/samples/bin/library/models/gnome/gnome.e2d_mesh similarity index 100% rename from samples/bin/library/gnome.e2d_mesh rename to samples/bin/library/models/gnome/gnome.e2d_mesh diff --git a/samples/bin/library/gnome.png b/samples/bin/library/models/gnome/gnome.png similarity index 100% rename from samples/bin/library/gnome.png rename to samples/bin/library/models/gnome/gnome.png diff --git a/samples/bin/library/gnome_material.json b/samples/bin/library/models/gnome/gnome_material.json similarity index 84% rename from samples/bin/library/gnome_material.json rename to samples/bin/library/models/gnome/gnome_material.json index dbf77801..9d6a0430 100644 --- a/samples/bin/library/gnome_material.json +++ b/samples/bin/library/models/gnome/gnome_material.json @@ -1,6 +1,6 @@ { "passes" : [{ - "shader" : "model_shader.json", + "shader" : "../../shaders/model_shader.json", "state_block" : { "capabilities_state" : { "depth_test" : true diff --git a/samples/bin/library/gnome_model.json b/samples/bin/library/models/gnome/gnome_model.json similarity index 100% rename from samples/bin/library/gnome_model.json rename to samples/bin/library/models/gnome/gnome_model.json diff --git a/samples/bin/library/camera_prefab.json b/samples/bin/library/prefabs/camera_prefab.json similarity index 100% rename from samples/bin/library/camera_prefab.json rename to samples/bin/library/prefabs/camera_prefab.json diff --git a/samples/bin/library/spine_coin_prefab.json b/samples/bin/library/prefabs/coin_prefab.json similarity index 88% rename from samples/bin/library/spine_coin_prefab.json rename to samples/bin/library/prefabs/coin_prefab.json index d091ed3a..9150a31e 100644 --- a/samples/bin/library/spine_coin_prefab.json +++ b/samples/bin/library/prefabs/coin_prefab.json @@ -2,7 +2,7 @@ "prototype" : "spine_prefab.json", "components" : { "spine_player" : { - "model" : "spine_coin.json" + "model" : "../spines/coin_spine.json" }, "spine_player_cmd" : { "commands" : [{ diff --git a/samples/bin/library/prefabs/dragon_prefab.json b/samples/bin/library/prefabs/dragon_prefab.json new file mode 100644 index 00000000..af73e837 --- /dev/null +++ b/samples/bin/library/prefabs/dragon_prefab.json @@ -0,0 +1,18 @@ +{ + "prototype" : "spine_prefab.json", + "components" : { + "spine_player" : { + "model" : "../spines/dragon_spine.json" + }, + "spine_player_cmd" : { + "commands" : [{ + "type" : "set_anim_cmd", + "desc" : { + "track" : 0, + "name" : "flying", + "loop" : true + } + }] + } + } +} diff --git a/samples/bin/library/gnome_prefab.json b/samples/bin/library/prefabs/gnome_prefab.json similarity index 62% rename from samples/bin/library/gnome_prefab.json rename to samples/bin/library/prefabs/gnome_prefab.json index ed7e6306..238cb8a0 100644 --- a/samples/bin/library/gnome_prefab.json +++ b/samples/bin/library/prefabs/gnome_prefab.json @@ -3,11 +3,11 @@ "components" : { "renderer" : { "materials" : [ - "gnome_material.json" + "../models/gnome/gnome_material.json" ] }, "model_renderer" : { - "model" : "gnome_model.json" + "model" : "../models/gnome/gnome_model.json" } } } diff --git a/samples/bin/library/label_bm_prefab.json b/samples/bin/library/prefabs/label_bm_prefab.json similarity index 70% rename from samples/bin/library/label_bm_prefab.json rename to samples/bin/library/prefabs/label_bm_prefab.json index bc9a915b..dc46c3c9 100644 --- a/samples/bin/library/label_bm_prefab.json +++ b/samples/bin/library/prefabs/label_bm_prefab.json @@ -2,12 +2,12 @@ "components" : { "renderer" : { "materials" : [ - "font_bm_material.json" + "../materials/font_bm_material.json" ] }, "model_renderer" : {}, "label" : { - "font" : "arial_bm.fnt", + "font" : "../fonts/arial_bm.fnt", "text" : "Hello World!" }, "label.dirty" : {} diff --git a/samples/bin/library/label_sdf_prefab.json b/samples/bin/library/prefabs/label_sdf_prefab.json similarity index 69% rename from samples/bin/library/label_sdf_prefab.json rename to samples/bin/library/prefabs/label_sdf_prefab.json index 19c0f738..f9462f5d 100644 --- a/samples/bin/library/label_sdf_prefab.json +++ b/samples/bin/library/prefabs/label_sdf_prefab.json @@ -2,12 +2,12 @@ "components" : { "renderer" : { "materials" : [ - "font_sdf_material.json" + "../materials/font_sdf_material.json" ] }, "model_renderer" : {}, "label" : { - "font" : "arial_sdf.fnt", + "font" : "../fonts/arial_sdf.fnt", "text" : "Hello World!" }, "label.dirty" : {} diff --git a/samples/bin/library/model_prefab.json b/samples/bin/library/prefabs/model_prefab.json similarity index 100% rename from samples/bin/library/model_prefab.json rename to samples/bin/library/prefabs/model_prefab.json diff --git a/samples/bin/library/spine_raptor_prefab.json b/samples/bin/library/prefabs/raptor_prefab.json similarity index 95% rename from samples/bin/library/spine_raptor_prefab.json rename to samples/bin/library/prefabs/raptor_prefab.json index f8d1b0a9..89bdfc7d 100644 --- a/samples/bin/library/spine_raptor_prefab.json +++ b/samples/bin/library/prefabs/raptor_prefab.json @@ -2,7 +2,7 @@ "prototype" : "spine_prefab.json", "components" : { "spine_player" : { - "model" : "spine_raptor.json" + "model" : "../spines/raptor_spine.json" }, "spine_player_cmd" : { "commands" : [{ diff --git a/samples/bin/library/ship_prefab.json b/samples/bin/library/prefabs/ship_prefab.json similarity index 67% rename from samples/bin/library/ship_prefab.json rename to samples/bin/library/prefabs/ship_prefab.json index 4553ec5e..78a701a8 100644 --- a/samples/bin/library/ship_prefab.json +++ b/samples/bin/library/prefabs/ship_prefab.json @@ -2,7 +2,7 @@ "prototype" : "sprite_prefab.json", "components" : { "sprite_renderer" : { - "sprite" : "ship_sprite.json" + "sprite" : "../sprites/ship_sprite.json" } } } diff --git a/samples/bin/library/prefabs/spine_prefab.json b/samples/bin/library/prefabs/spine_prefab.json new file mode 100644 index 00000000..c42bb58d --- /dev/null +++ b/samples/bin/library/prefabs/spine_prefab.json @@ -0,0 +1,15 @@ +{ + "components" : { + "renderer" : {}, + "spine_player" : { + "materials" : { + "additive" : "../materials/spine_material_additive.json", + "multiply" : "../materials/spine_material_multiply.json", + "normal" : "../materials/spine_material_normal.json", + "screen" : "../materials/spine_material_screen.json" + } + }, + "spine_player_cmd" : {}, + "spine_player_evt" : {} + } +} diff --git a/samples/bin/library/prefabs/sprite_prefab.json b/samples/bin/library/prefabs/sprite_prefab.json new file mode 100644 index 00000000..a76ad645 --- /dev/null +++ b/samples/bin/library/prefabs/sprite_prefab.json @@ -0,0 +1,13 @@ +{ + "components" : { + "renderer" : {}, + "sprite_renderer" : { + "materials" : { + "additive" : "../materials/sprite_material_additive.json", + "multiply" : "../materials/sprite_material_multiply.json", + "normal" : "../materials/sprite_material_normal.json", + "screen" : "../materials/sprite_material_screen.json" + } + } + } +} diff --git a/samples/bin/library/scene_spine_prefab.json b/samples/bin/library/scene_spine_prefab.json deleted file mode 100644 index 7808c5ae..00000000 --- a/samples/bin/library/scene_spine_prefab.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "components" : { - "scene" : {} - }, - "children" : [{ - "prototype" : "camera_prefab.json" - },{ - "prototype" : "spine_coin_prefab.json", - "components" : { - "actor" : { - "translation" : [200,180,0], - "scale" : 0.25 - } - } - }, { - "prototype" : "spine_raptor_prefab.json", - "components" : { - "actor" : { - "translation" : [-80,-100,0], - "scale" : 0.25 - } - } - }] -} diff --git a/samples/bin/library/scene_prefab.json b/samples/bin/library/scenes/scene_prefab.json similarity index 80% rename from samples/bin/library/scene_prefab.json rename to samples/bin/library/scenes/scene_prefab.json index b81a3d72..f1d07b21 100644 --- a/samples/bin/library/scene_prefab.json +++ b/samples/bin/library/scenes/scene_prefab.json @@ -3,9 +3,9 @@ "scene" : {} }, "children" : [{ - "prototype" : "camera_prefab.json" + "prototype" : "../prefabs/camera_prefab.json" },{ - "prototype" : "gnome_prefab.json", + "prototype" : "../prefabs/gnome_prefab.json", "components" : { "actor" : { "translation" : [0,0,0], @@ -13,7 +13,7 @@ } } }, { - "prototype" : "ship_prefab.json", + "prototype" : "../prefabs/ship_prefab.json", "components" : { "sprite_renderer" : { "blending" : "additive" @@ -23,7 +23,7 @@ } } }, { - "prototype" : "ship_prefab.json", + "prototype" : "../prefabs/ship_prefab.json", "components" : { "sprite_renderer" : { "tint" : [255,0,0,255] @@ -33,7 +33,7 @@ } } }, { - "prototype" : "label_bm_prefab.json", + "prototype" : "../prefabs/label_bm_prefab.json", "components" : { "label" : { "text" : "bm font", @@ -47,7 +47,7 @@ } } }, { - "prototype" : "label_sdf_prefab.json", + "prototype" : "../prefabs/label_sdf_prefab.json", "components" : { "label" : { "text" : "sdf font", diff --git a/samples/bin/library/scenes/spine_scene_prefab.json b/samples/bin/library/scenes/spine_scene_prefab.json new file mode 100644 index 00000000..8eebb6fa --- /dev/null +++ b/samples/bin/library/scenes/spine_scene_prefab.json @@ -0,0 +1,32 @@ +{ + "components" : { + "scene" : {} + }, + "children" : [{ + "prototype" : "../prefabs/camera_prefab.json" + },{ + "prototype" : "../prefabs/coin_prefab.json", + "components" : { + "actor" : { + "translation" : [350,250,0], + "scale" : 0.25 + } + } + }, { + "prototype" : "../prefabs/raptor_prefab.json", + "components" : { + "actor" : { + "translation" : [300,-350,0], + "scale" : 0.25 + } + } + }, { + "prototype" : "../prefabs/dragon_prefab.json", + "components" : { + "actor" : { + "translation" : [-100,0,0], + "scale" : 0.9 + } + } + }] +} diff --git a/samples/bin/library/font_bm_shader.frag b/samples/bin/library/shaders/font_bm_shader.frag similarity index 100% rename from samples/bin/library/font_bm_shader.frag rename to samples/bin/library/shaders/font_bm_shader.frag diff --git a/samples/bin/library/font_bm_shader.json b/samples/bin/library/shaders/font_bm_shader.json similarity index 100% rename from samples/bin/library/font_bm_shader.json rename to samples/bin/library/shaders/font_bm_shader.json diff --git a/samples/bin/library/font_bm_shader.vert b/samples/bin/library/shaders/font_bm_shader.vert similarity index 100% rename from samples/bin/library/font_bm_shader.vert rename to samples/bin/library/shaders/font_bm_shader.vert diff --git a/samples/bin/library/font_sdf_shader.frag b/samples/bin/library/shaders/font_sdf_shader.frag similarity index 100% rename from samples/bin/library/font_sdf_shader.frag rename to samples/bin/library/shaders/font_sdf_shader.frag diff --git a/samples/bin/library/font_sdf_shader.json b/samples/bin/library/shaders/font_sdf_shader.json similarity index 100% rename from samples/bin/library/font_sdf_shader.json rename to samples/bin/library/shaders/font_sdf_shader.json diff --git a/samples/bin/library/font_sdf_shader.vert b/samples/bin/library/shaders/font_sdf_shader.vert similarity index 100% rename from samples/bin/library/font_sdf_shader.vert rename to samples/bin/library/shaders/font_sdf_shader.vert diff --git a/samples/bin/library/model_shader.frag b/samples/bin/library/shaders/model_shader.frag similarity index 100% rename from samples/bin/library/model_shader.frag rename to samples/bin/library/shaders/model_shader.frag diff --git a/samples/bin/library/model_shader.json b/samples/bin/library/shaders/model_shader.json similarity index 100% rename from samples/bin/library/model_shader.json rename to samples/bin/library/shaders/model_shader.json diff --git a/samples/bin/library/model_shader.vert b/samples/bin/library/shaders/model_shader.vert similarity index 100% rename from samples/bin/library/model_shader.vert rename to samples/bin/library/shaders/model_shader.vert diff --git a/samples/bin/library/spine_shader.frag b/samples/bin/library/shaders/spine_shader.frag similarity index 100% rename from samples/bin/library/spine_shader.frag rename to samples/bin/library/shaders/spine_shader.frag diff --git a/samples/bin/library/spine_shader.json b/samples/bin/library/shaders/spine_shader.json similarity index 100% rename from samples/bin/library/spine_shader.json rename to samples/bin/library/shaders/spine_shader.json diff --git a/samples/bin/library/spine_shader.vert b/samples/bin/library/shaders/spine_shader.vert similarity index 100% rename from samples/bin/library/spine_shader.vert rename to samples/bin/library/shaders/spine_shader.vert diff --git a/samples/bin/library/sprite_shader.frag b/samples/bin/library/shaders/sprite_shader.frag similarity index 100% rename from samples/bin/library/sprite_shader.frag rename to samples/bin/library/shaders/sprite_shader.frag diff --git a/samples/bin/library/sprite_shader.json b/samples/bin/library/shaders/sprite_shader.json similarity index 100% rename from samples/bin/library/sprite_shader.json rename to samples/bin/library/shaders/sprite_shader.json diff --git a/samples/bin/library/sprite_shader.vert b/samples/bin/library/shaders/sprite_shader.vert similarity index 100% rename from samples/bin/library/sprite_shader.vert rename to samples/bin/library/shaders/sprite_shader.vert diff --git a/samples/bin/library/ship.png b/samples/bin/library/ship.png deleted file mode 100755 index 27b569bf..00000000 --- a/samples/bin/library/ship.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65cbe87077ff41bd595d1e17d68240e3e18972ea0c018707d35c695d86389b0d -size 3513 diff --git a/samples/bin/library/spine_prefab.json b/samples/bin/library/spine_prefab.json deleted file mode 100644 index c90fe931..00000000 --- a/samples/bin/library/spine_prefab.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "components" : { - "renderer" : {}, - "spine_player" : { - "materials" : { - "additive" : "spine_material_additive.json", - "multiply" : "spine_material_multiply.json", - "normal" : "spine_material_normal.json", - "screen" : "spine_material_screen.json" - } - }, - "spine_player_cmd" : {}, - "spine_player_evt" : {} - } -} diff --git a/samples/bin/library/coin/coin-pro.skel b/samples/bin/library/spines/coin/coin-pro.skel similarity index 100% rename from samples/bin/library/coin/coin-pro.skel rename to samples/bin/library/spines/coin/coin-pro.skel diff --git a/samples/bin/library/spines/coin/coin.atlas b/samples/bin/library/spines/coin/coin.atlas new file mode 100644 index 00000000..89443c48 --- /dev/null +++ b/samples/bin/library/spines/coin/coin.atlas @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:833bc92c2a02695c326080b72f8636206ec53f361010a6b02324565b470f690b +size 831 diff --git a/samples/bin/library/spines/coin/coin.png b/samples/bin/library/spines/coin/coin.png new file mode 100644 index 00000000..d08611e0 --- /dev/null +++ b/samples/bin/library/spines/coin/coin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21bc65e3de306d698df5c6a6519786a430d8529bc58f01f87013c9927819f87a +size 402363 diff --git a/samples/bin/library/spine_coin.json b/samples/bin/library/spines/coin_spine.json similarity index 65% rename from samples/bin/library/spine_coin.json rename to samples/bin/library/spines/coin_spine.json index 7df2f2c7..2a0a6029 100644 --- a/samples/bin/library/spine_coin.json +++ b/samples/bin/library/spines/coin_spine.json @@ -1,5 +1,5 @@ { - "atlas" : "coin/coin-pma.atlas", + "atlas" : "coin/coin.atlas", "skeleton" : "coin/coin-pro.skel", "skeleton_scale" : 1.0 } diff --git a/samples/bin/library/spines/dragon/dragon-ess.skel b/samples/bin/library/spines/dragon/dragon-ess.skel new file mode 100644 index 00000000..24c19706 --- /dev/null +++ b/samples/bin/library/spines/dragon/dragon-ess.skel @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d299087ede92db92396af117f151e8f50abecb57094f34b031d0a389a53d1ad +size 7073 diff --git a/samples/bin/library/spines/dragon/dragon.atlas b/samples/bin/library/spines/dragon/dragon.atlas new file mode 100644 index 00000000..6765e4b3 --- /dev/null +++ b/samples/bin/library/spines/dragon/dragon.atlas @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa3a79e67d926b1e5f017ecd2f2bc2f73fa02a766f27cc83a6547f0c90556c58 +size 4224 diff --git a/samples/bin/library/spines/dragon/dragon.png b/samples/bin/library/spines/dragon/dragon.png new file mode 100644 index 00000000..70dfda26 --- /dev/null +++ b/samples/bin/library/spines/dragon/dragon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a45ac203747ffc4802c83860b20bcb380b405ea55734992defb5fb64f49bbfa0 +size 628537 diff --git a/samples/bin/library/spines/dragon/dragon2.png b/samples/bin/library/spines/dragon/dragon2.png new file mode 100644 index 00000000..50ed6210 --- /dev/null +++ b/samples/bin/library/spines/dragon/dragon2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86b1a3fcd15a538e08535f0fad4b6cc1c9595060aae0d558c0f2bcc1d09a2833 +size 194829 diff --git a/samples/bin/library/spines/dragon_spine.json b/samples/bin/library/spines/dragon_spine.json new file mode 100644 index 00000000..4997fae6 --- /dev/null +++ b/samples/bin/library/spines/dragon_spine.json @@ -0,0 +1,5 @@ +{ + "atlas" : "dragon/dragon.atlas", + "skeleton" : "dragon/dragon-ess.skel", + "skeleton_scale" : 1.0 +} diff --git a/samples/bin/library/raptor/raptor-pro.json-large b/samples/bin/library/spines/raptor/raptor-pro.json-large similarity index 100% rename from samples/bin/library/raptor/raptor-pro.json-large rename to samples/bin/library/spines/raptor/raptor-pro.json-large diff --git a/samples/bin/library/raptor/raptor-pro.skel b/samples/bin/library/spines/raptor/raptor-pro.skel similarity index 100% rename from samples/bin/library/raptor/raptor-pro.skel rename to samples/bin/library/spines/raptor/raptor-pro.skel diff --git a/samples/bin/library/raptor/raptor.atlas b/samples/bin/library/spines/raptor/raptor.atlas similarity index 100% rename from samples/bin/library/raptor/raptor.atlas rename to samples/bin/library/spines/raptor/raptor.atlas diff --git a/samples/bin/library/raptor/raptor.png b/samples/bin/library/spines/raptor/raptor.png similarity index 100% rename from samples/bin/library/raptor/raptor.png rename to samples/bin/library/spines/raptor/raptor.png diff --git a/samples/bin/library/spine_raptor.json b/samples/bin/library/spines/raptor_spine.json similarity index 100% rename from samples/bin/library/spine_raptor.json rename to samples/bin/library/spines/raptor_spine.json diff --git a/samples/bin/library/sprite_prefab.json b/samples/bin/library/sprite_prefab.json deleted file mode 100644 index e7ed0248..00000000 --- a/samples/bin/library/sprite_prefab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "components" : { - "renderer" : {}, - "sprite_renderer" : { - "materials" : { - "additive" : "sprite_material_additive.json", - "multiply" : "sprite_material_multiply.json", - "normal" : "sprite_material_normal.json", - "screen" : "sprite_material_screen.json" - } - } - } -} diff --git a/samples/bin/library/cube_0.png b/samples/bin/library/sprites/cube_0.png similarity index 100% rename from samples/bin/library/cube_0.png rename to samples/bin/library/sprites/cube_0.png diff --git a/samples/bin/library/cube_0_sprite.json b/samples/bin/library/sprites/cube_0_sprite.json similarity index 100% rename from samples/bin/library/cube_0_sprite.json rename to samples/bin/library/sprites/cube_0_sprite.json diff --git a/samples/bin/library/cube_1.png b/samples/bin/library/sprites/cube_1.png similarity index 100% rename from samples/bin/library/cube_1.png rename to samples/bin/library/sprites/cube_1.png diff --git a/samples/bin/library/cube_1_sprite.json b/samples/bin/library/sprites/cube_1_sprite.json similarity index 100% rename from samples/bin/library/cube_1_sprite.json rename to samples/bin/library/sprites/cube_1_sprite.json diff --git a/samples/bin/library/cube_flipbook.json b/samples/bin/library/sprites/cube_flipbook.json similarity index 100% rename from samples/bin/library/cube_flipbook.json rename to samples/bin/library/sprites/cube_flipbook.json diff --git a/samples/bin/library/ship_sprite.json b/samples/bin/library/sprites/ship_sprite.json similarity index 100% rename from samples/bin/library/ship_sprite.json rename to samples/bin/library/sprites/ship_sprite.json diff --git a/samples/bin/library/ships.png b/samples/bin/library/sprites/ships.png similarity index 100% rename from samples/bin/library/ships.png rename to samples/bin/library/sprites/ships.png diff --git a/samples/bin/library/ships_atlas.json b/samples/bin/library/sprites/ships_atlas.json similarity index 100% rename from samples/bin/library/ships_atlas.json rename to samples/bin/library/sprites/ships_atlas.json diff --git a/samples/sources/sample_03/sample_03.cpp b/samples/sources/sample_03/sample_03.cpp index 0c874b04..2d591ea3 100644 --- a/samples/sources/sample_03/sample_03.cpp +++ b/samples/sources/sample_03/sample_03.cpp @@ -72,11 +72,11 @@ namespace } private: bool create_scene() { - auto model_res = the().load_asset("gnome_model.json"); - auto model_mat = the().load_asset("gnome_material.json"); - auto sprite_res = the().load_asset("ship_sprite.json"); - auto sprite_mat = the().load_asset("sprite_material.json"); - auto flipbook_res = the().load_asset("cube_flipbook.json"); + auto model_res = the().load_asset("models/gnome/gnome_model.json"); + auto model_mat = the().load_asset("models/gnome/gnome_material.json"); + auto sprite_res = the().load_asset("sprites/ship_sprite.json"); + auto sprite_mat = the().load_asset("materials/sprite_material_normal.json"); + auto flipbook_res = the().load_asset("sprites/cube_flipbook.json"); if ( !model_res || !model_mat || !sprite_res || !sprite_mat || !flipbook_res ) { return false; @@ -111,9 +111,9 @@ namespace sprite_i->entity_filler() .component(rotator{v3f::unit_z()}) .component(node::create(sprite_i, scene_r)) - .component(renderer() - .materials({sprite_mat})) - .component(sprite_res); + .component() + .component(sprite_renderer(sprite_res) + .materials({{"normal", sprite_mat}})); node_iptr sprite_n = sprite_i->get_component().get().node(); sprite_n->translation(v3f{0,-50.f,0}); @@ -126,10 +126,10 @@ namespace flipbook_i->entity_filler() .component(node::create(flipbook_i, scene_r)) - .component(renderer() - .materials({sprite_mat})) + .component() .component(sprite_renderer() - .filtering(false)) + .filtering(false) + .materials({{"normal", sprite_mat}})) .component(flipbook_res) .component(flipbook_player() .play("idle") diff --git a/samples/sources/sample_04/sample_04.cpp b/samples/sources/sample_04/sample_04.cpp index 7bbf6f21..435f48ef 100644 --- a/samples/sources/sample_04/sample_04.cpp +++ b/samples/sources/sample_04/sample_04.cpp @@ -52,7 +52,7 @@ namespace } private: bool create_scene() { - auto scene_prefab_res = the().load_asset("scene_prefab.json"); + auto scene_prefab_res = the().load_asset("scenes/scene_prefab.json"); auto scene_go = scene_prefab_res ? the().instantiate(scene_prefab_res->content()) : nullptr; diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_06/sample_06.cpp similarity index 96% rename from samples/sources/sample_07/sample_07.cpp rename to samples/sources/sample_06/sample_06.cpp index 1e60e8c8..9947b56c 100644 --- a/samples/sources/sample_07/sample_07.cpp +++ b/samples/sources/sample_06/sample_06.cpp @@ -91,7 +91,7 @@ namespace } private: bool create_scene() { - auto scene_prefab_res = the().load_asset("scene_spine_prefab.json"); + auto scene_prefab_res = the().load_asset("scenes/spine_scene_prefab.json"); auto scene_go = scene_prefab_res ? the().instantiate(scene_prefab_res->content()) : nullptr; @@ -109,7 +109,9 @@ namespace int e2d_main(int argc, char *argv[]) { const auto starter_params = starter::parameters( - engine::parameters("sample_07", "enduro2d") + engine::parameters("sample_06", "enduro2d") + .window_params(engine::window_parameters() + .size({1024, 768})) .timer_params(engine::timer_parameters() .maximal_framerate(100))); modules::initialize(argc, argv, starter_params).start();