diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c429b3..df19b36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - **core:** Activate vsync by default. +- **examples:** Put together all assets. + ### Fixed - **world:** Remove a forgotten camera debug function diff --git a/examples/gameplay/plateform/assets/CREDITS.MD b/assets/credits.md similarity index 68% rename from examples/gameplay/plateform/assets/CREDITS.MD rename to assets/credits.md index 907650f..a847b44 100644 --- a/examples/gameplay/plateform/assets/CREDITS.MD +++ b/assets/credits.md @@ -1,4 +1,6 @@ -## PLATFORM EXEMPLE ASSET CREDITS +## Assets credits + +- SFX by [Joth](http://opengameart.org/users/joth) ### Sprites diff --git a/examples/basic/test_menus/assets/medium.lua b/assets/fonts/medium.lua similarity index 100% rename from examples/basic/test_menus/assets/medium.lua rename to assets/fonts/medium.lua diff --git a/examples/basic/test_menus/assets/medium.png b/assets/fonts/medium.png similarity index 100% rename from examples/basic/test_menus/assets/medium.png rename to assets/fonts/medium.png diff --git a/examples/menus/options/assets/music.ogg b/assets/music/options.ogg similarity index 100% rename from examples/menus/options/assets/music.ogg rename to assets/music/options.ogg diff --git a/examples/mainmenu/assets/menu_confirm.mp3 b/assets/sfx/menu_confirm.mp3 similarity index 100% rename from examples/mainmenu/assets/menu_confirm.mp3 rename to assets/sfx/menu_confirm.mp3 diff --git a/examples/mainmenu/assets/menu_error.mp3 b/assets/sfx/menu_error.mp3 similarity index 100% rename from examples/mainmenu/assets/menu_error.mp3 rename to assets/sfx/menu_error.mp3 diff --git a/examples/mainmenu/assets/menu_move.mp3 b/assets/sfx/menu_move.mp3 similarity index 100% rename from examples/mainmenu/assets/menu_move.mp3 rename to assets/sfx/menu_move.mp3 diff --git a/examples/gameplay/plateform/assets/coin5.lua b/assets/sprites/coin.lua similarity index 100% rename from examples/gameplay/plateform/assets/coin5.lua rename to assets/sprites/coin.lua diff --git a/examples/gameplay/plateform/assets/coin5.png b/assets/sprites/coin.png similarity index 100% rename from examples/gameplay/plateform/assets/coin5.png rename to assets/sprites/coin.png diff --git a/examples/basic/test_scene2/assets/debris.png b/assets/sprites/debris.png similarity index 100% rename from examples/basic/test_scene2/assets/debris.png rename to assets/sprites/debris.png diff --git a/examples/basic/test_scene2/assets/poof.lua b/assets/sprites/gfx/poof.lua similarity index 100% rename from examples/basic/test_scene2/assets/poof.lua rename to assets/sprites/gfx/poof.lua diff --git a/examples/basic/test_scene2/assets/poof.png b/assets/sprites/gfx/poof.png similarity index 100% rename from examples/basic/test_scene2/assets/poof.png rename to assets/sprites/gfx/poof.png diff --git a/examples/gameplay/plateform/assets/sparkle.lua b/assets/sprites/gfx/sparkle.lua similarity index 100% rename from examples/gameplay/plateform/assets/sparkle.lua rename to assets/sprites/gfx/sparkle.lua diff --git a/examples/gameplay/plateform/assets/sparkle.png b/assets/sprites/gfx/sparkle.png similarity index 100% rename from examples/gameplay/plateform/assets/sparkle.png rename to assets/sprites/gfx/sparkle.png diff --git a/examples/gameplay/plateform/assets/monkey_lad.lua b/assets/sprites/monkey_lad.lua similarity index 100% rename from examples/gameplay/plateform/assets/monkey_lad.lua rename to assets/sprites/monkey_lad.lua diff --git a/examples/gameplay/plateform/assets/monkey_lad.png b/assets/sprites/monkey_lad.png similarity index 100% rename from examples/gameplay/plateform/assets/monkey_lad.png rename to assets/sprites/monkey_lad.png diff --git a/examples/basic/test_scene2/assets/weapon.lua b/assets/sprites/weapon.lua similarity index 100% rename from examples/basic/test_scene2/assets/weapon.lua rename to assets/sprites/weapon.lua diff --git a/examples/basic/test_scene2/assets/weapon.png b/assets/sprites/weapon.png similarity index 100% rename from examples/basic/test_scene2/assets/weapon.png rename to assets/sprites/weapon.png diff --git a/examples/gameplay/action3D/assets/map.lua b/datas/maps/action3D/map.lua similarity index 100% rename from examples/gameplay/action3D/assets/map.lua rename to datas/maps/action3D/map.lua diff --git a/examples/gameplay/action3D/assets/map.tmx b/datas/maps/action3D/map.tmx similarity index 100% rename from examples/gameplay/action3D/assets/map.tmx rename to datas/maps/action3D/map.tmx diff --git a/examples/gameplay/action3D/assets/tileset_basic_terrain.png b/datas/maps/action3D/tileset_basic_terrain.png similarity index 100% rename from examples/gameplay/action3D/assets/tileset_basic_terrain.png rename to datas/maps/action3D/tileset_basic_terrain.png diff --git a/examples/gameplay/action3D/assets/tileset_basic_terrain.tsx b/datas/maps/action3D/tileset_basic_terrain.tsx similarity index 100% rename from examples/gameplay/action3D/assets/tileset_basic_terrain.tsx rename to datas/maps/action3D/tileset_basic_terrain.tsx diff --git a/examples/gameplay/action3D/assets/tileset_mountains.png b/datas/maps/action3D/tileset_mountains.png similarity index 100% rename from examples/gameplay/action3D/assets/tileset_mountains.png rename to datas/maps/action3D/tileset_mountains.png diff --git a/examples/gameplay/action3D/assets/tileset_mountains.tsx b/datas/maps/action3D/tileset_mountains.tsx similarity index 100% rename from examples/gameplay/action3D/assets/tileset_mountains.tsx rename to datas/maps/action3D/tileset_mountains.tsx diff --git a/examples/gameplay/action3D/assets/tileset_mountains2.png b/datas/maps/action3D/tileset_mountains2.png similarity index 100% rename from examples/gameplay/action3D/assets/tileset_mountains2.png rename to datas/maps/action3D/tileset_mountains2.png diff --git a/examples/gameplay/action3D/assets/tileset_other.png b/datas/maps/action3D/tileset_other.png similarity index 100% rename from examples/gameplay/action3D/assets/tileset_other.png rename to datas/maps/action3D/tileset_other.png diff --git a/examples/gameplay/action3D/assets/tileset_other.tsx b/datas/maps/action3D/tileset_other.tsx similarity index 100% rename from examples/gameplay/action3D/assets/tileset_other.tsx rename to datas/maps/action3D/tileset_other.tsx diff --git a/examples/gameplay/action3D/assets/tileset_water.png b/datas/maps/action3D/tileset_water.png similarity index 100% rename from examples/gameplay/action3D/assets/tileset_water.png rename to datas/maps/action3D/tileset_water.png diff --git a/examples/gameplay/plateform/assets/monkeylad_further.png b/datas/maps/plateformer/monkeylad_further.png similarity index 100% rename from examples/gameplay/plateform/assets/monkeylad_further.png rename to datas/maps/plateformer/monkeylad_further.png diff --git a/examples/gameplay/plateform/assets/monkeylad_further.tsx b/datas/maps/plateformer/monkeylad_further.tsx similarity index 100% rename from examples/gameplay/plateform/assets/monkeylad_further.tsx rename to datas/maps/plateformer/monkeylad_further.tsx diff --git a/examples/gameplay/plateform/assets/platformer.lua b/datas/maps/plateformer/platformer.lua similarity index 100% rename from examples/gameplay/plateform/assets/platformer.lua rename to datas/maps/plateformer/platformer.lua diff --git a/examples/gameplay/plateform/assets/platformer.tmx b/datas/maps/plateformer/platformer.tmx similarity index 100% rename from examples/gameplay/plateform/assets/platformer.tmx rename to datas/maps/plateformer/platformer.tmx diff --git a/examples/gameplay/moveplayer/assets/arena.lua b/datas/maps/topdown/arena.lua similarity index 100% rename from examples/gameplay/moveplayer/assets/arena.lua rename to datas/maps/topdown/arena.lua diff --git a/examples/gameplay/moveplayer/assets/arena.tmx b/datas/maps/topdown/arena.tmx similarity index 100% rename from examples/gameplay/moveplayer/assets/arena.tmx rename to datas/maps/topdown/arena.tmx diff --git a/examples/gameplay/moveplayer/assets/overworld.png b/datas/maps/topdown/overworld.png similarity index 100% rename from examples/gameplay/moveplayer/assets/overworld.png rename to datas/maps/topdown/overworld.png diff --git a/examples/gameplay/moveplayer/assets/overworld.tsx b/datas/maps/topdown/overworld.tsx similarity index 100% rename from examples/gameplay/moveplayer/assets/overworld.tsx rename to datas/maps/topdown/overworld.tsx diff --git a/examples/basic/test_menus/init.lua b/examples/basic/test_menus/init.lua index 6aa0bc0..102ee08 100644 --- a/examples/basic/test_menus/init.lua +++ b/examples/basic/test_menus/init.lua @@ -33,7 +33,7 @@ local MenuWidget = Widget.Text:extend() function TestScene:new() TestScene.super.new(self) - self.assets:addImageFont("medium", "examples/basic/test_menus/assets/medium") + self.assets:addImageFont("medium", "assets/fonts/medium") MenuType(self.menusystem, "testMenu1", 32, 32, 100, 24*8, 4) MenuWidget(self, "testMenu1", "text_menu1") diff --git a/examples/basic/test_scene2/assets.lua b/examples/basic/test_scene2/assets.lua new file mode 100644 index 0000000..952d7f9 --- /dev/null +++ b/examples/basic/test_scene2/assets.lua @@ -0,0 +1,13 @@ +local folder = "examples/basic/test_scene2/" + +return { + ["images"] = { + {"debris", "assets/sprites/debris.png"} + }, + ["tilesets"] = { + {"weapon", "assets/sprites/weapon"} + }, + ["sprites"] = { + {"poof", "assets/sprites/gfx/poof"} + } +} diff --git a/examples/basic/test_scene2/assets/init.lua b/examples/basic/test_scene2/assets/init.lua deleted file mode 100644 index 9fffdc6..0000000 --- a/examples/basic/test_scene2/assets/init.lua +++ /dev/null @@ -1,13 +0,0 @@ -local folder = "examples/basic/test_scene2/" - -return { - ["images"] = { - {"debris", folder .. "assets/debris.png"} - }, - ["tilesets"] = { - {"weapon", folder .. "assets/weapon"} - }, - ["sprites"] = { - {"poof", folder .. "assets/poof"} - } -} diff --git a/examples/gameplay/action3D/init.lua b/examples/gameplay/action3D/init.lua index cff3461..098a6d3 100644 --- a/examples/gameplay/action3D/init.lua +++ b/examples/gameplay/action3D/init.lua @@ -33,7 +33,7 @@ function MovePlayer:new(playerNumber, cameraMode) MovePlayer.super.new(self) self.assets:batchImport("examples.gameplay.plateform.assets") - World(self, "examples.gameplay.action3D.actors", "examples/gameplay/action3D/assets/map.lua") + World(self, "examples.gameplay.action3D.actors", "datas/maps/action3D/map.lua") self.world:setPlayerNumber(playerNumber) self.world.cameras:setMode(cameraMode) diff --git a/examples/gameplay/moveplayer/init.lua b/examples/gameplay/moveplayer/init.lua index 02a871a..b115961 100644 --- a/examples/gameplay/moveplayer/init.lua +++ b/examples/gameplay/moveplayer/init.lua @@ -32,7 +32,7 @@ function MovePlayer:new(playerNumber, cameraMode) MovePlayer.super.new(self) - World(self, "examples.gameplay.moveplayer.actors", "examples/gameplay/moveplayer/assets/arena.lua") + World(self, "examples.gameplay.moveplayer.actors", "datas/maps/topdown/arena.lua") self.world:setPlayerNumber(playerNumber) self.world.cameras:setMode(cameraMode) diff --git a/examples/gameplay/moveplayer3D/assets/arena.lua b/examples/gameplay/moveplayer3D/assets/arena.lua deleted file mode 100644 index f7ac116..0000000 --- a/examples/gameplay/moveplayer3D/assets/arena.lua +++ /dev/null @@ -1,380 +0,0 @@ -return { - version = "1.2", - luaversion = "5.1", - tiledversion = "1.2.2", - orientation = "orthogonal", - renderorder = "right-down", - width = 30, - height = 30, - tilewidth = 16, - tileheight = 16, - nextlayerid = 5, - nextobjectid = 18, - properties = {}, - tilesets = { - { - name = "overworld", - firstgid = 1, - filename = "overworld.tsx", - tilewidth = 16, - tileheight = 16, - spacing = 0, - margin = 0, - columns = 32, - image = "overworld.png", - imagewidth = 512, - imageheight = 240, - tileoffset = { - x = 0, - y = 0 - }, - grid = { - orientation = "orthogonal", - width = 16, - height = 16 - }, - properties = {}, - terrains = {}, - tilecount = 480, - tiles = {} - } - }, - layers = { - { - type = "tilelayer", - id = 1, - name = "Calque de Tile 1", - x = 0, - y = 0, - width = 30, - height = 30, - visible = true, - opacity = 1, - offsetx = 0, - offsety = 0, - properties = {}, - encoding = "lua", - data = { - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 399, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 400, 3, - 3, 339, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, 337, 3, - 3, 339, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 434, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 339, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 337, 3, - 3, 431, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 432, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 - } - }, - { - type = "tilelayer", - id = 2, - name = "Rochers", - x = 0, - y = 0, - width = 30, - height = 30, - visible = true, - opacity = 1, - offsetx = 0, - offsety = 0, - properties = {}, - encoding = "lua", - data = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 84, 85, 0, 0, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 116, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - } - }, - { - type = "objectgroup", - id = 3, - name = "player", - visible = true, - opacity = 1, - offsetx = 0, - offsety = 0, - draworder = "topdown", - properties = {}, - objects = { - { - id = 1, - name = "", - type = "", - shape = "rectangle", - x = 48, - y = 80, - width = 16, - height = 16, - rotation = 0, - visible = true, - properties = { - ["id"] = 1 - } - }, - { - id = 2, - name = "", - type = "", - shape = "rectangle", - x = 416, - y = 80, - width = 16, - height = 16, - rotation = 0, - visible = true, - properties = { - ["id"] = 1 - } - }, - { - id = 3, - name = "", - type = "", - shape = "rectangle", - x = 48, - y = 416, - width = 16, - height = 16, - rotation = 0, - visible = true, - properties = { - ["id"] = 3 - } - }, - { - id = 4, - name = "", - type = "", - shape = "rectangle", - x = 416, - y = 416, - width = 16, - height = 16, - rotation = 0, - visible = true, - properties = { - ["id"] = 4 - } - } - } - }, - { - type = "objectgroup", - id = 4, - name = "wall", - visible = true, - opacity = 1, - offsetx = 0, - offsety = 0, - draworder = "topdown", - properties = {}, - objects = { - { - id = 5, - name = "", - type = "", - shape = "rectangle", - x = 0, - y = 0, - width = 480, - height = 64, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 6, - name = "", - type = "", - shape = "rectangle", - x = 448, - y = 64, - width = 32, - height = 416, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 7, - name = "", - type = "", - shape = "rectangle", - x = 32, - y = 448, - width = 416, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 8, - name = "", - type = "", - shape = "rectangle", - x = 0, - y = 64, - width = 32, - height = 416, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 9, - name = "", - type = "", - shape = "rectangle", - x = 112, - y = 128, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 10, - name = "", - type = "", - shape = "rectangle", - x = 272, - y = 128, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 12, - name = "", - type = "", - shape = "rectangle", - x = 368, - y = 112, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 13, - name = "", - type = "", - shape = "rectangle", - x = 192, - y = 224, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 14, - name = "", - type = "", - shape = "rectangle", - x = 352, - y = 272, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 15, - name = "", - type = "", - shape = "rectangle", - x = 256, - y = 368, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 16, - name = "", - type = "", - shape = "rectangle", - x = 128, - y = 384, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - }, - { - id = 17, - name = "", - type = "", - shape = "rectangle", - x = 80, - y = 288, - width = 32, - height = 32, - rotation = 0, - visible = true, - properties = {} - } - } - } - } -} diff --git a/examples/gameplay/moveplayer3D/assets/arena.tmx b/examples/gameplay/moveplayer3D/assets/arena.tmx deleted file mode 100644 index 29dee38..0000000 --- a/examples/gameplay/moveplayer3D/assets/arena.tmx +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, -3,399,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,400,3, -3,339,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,337,3, -3,339,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,339,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,337,3, -3,431,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,432,3, -3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 - - - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,84,85,0,0,0,0,0, -0,0,0,0,0,0,0,84,85,0,0,0,0,0,0,0,0,84,85,0,0,0,0,116,117,0,0,0,0,0, -0,0,0,0,0,0,0,116,117,0,0,0,0,0,0,0,0,116,117,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,84,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,116,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,84,85,0,0,0,0,0,0, -0,0,0,0,0,84,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,117,0,0,0,0,0,0, -0,0,0,0,0,116,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,84,85,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,84,85,0,0,0,0,0,0,116,117,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,116,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/gameplay/moveplayer3D/assets/overworld.png b/examples/gameplay/moveplayer3D/assets/overworld.png deleted file mode 100644 index 7823efb..0000000 Binary files a/examples/gameplay/moveplayer3D/assets/overworld.png and /dev/null differ diff --git a/examples/gameplay/moveplayer3D/assets/overworld.tsx b/examples/gameplay/moveplayer3D/assets/overworld.tsx deleted file mode 100644 index 9b3f454..0000000 --- a/examples/gameplay/moveplayer3D/assets/overworld.tsx +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/examples/gameplay/moveplayer3D/init.lua b/examples/gameplay/moveplayer3D/init.lua index cf553bd..58c8716 100644 --- a/examples/gameplay/moveplayer3D/init.lua +++ b/examples/gameplay/moveplayer3D/init.lua @@ -33,7 +33,7 @@ function MovePlayer:new(playerNumber, cameraMode) MovePlayer.super.new(self) self.assets:batchImport("examples.gameplay.plateform.assets") - World(self, "examples.gameplay.moveplayer3D.actors", "examples/gameplay/moveplayer3D/assets/arena.lua") + World(self, "examples.gameplay.moveplayer3D.actors", "datas/maps/topdown/arena.lua") self.world:setPlayerNumber(playerNumber) self.world.cameras:setMode(cameraMode) diff --git a/examples/gameplay/plateform/assets/playerhitbox.lua b/examples/gameplay/plateform/actors/hitboxes/player.lua similarity index 100% rename from examples/gameplay/plateform/assets/playerhitbox.lua rename to examples/gameplay/plateform/actors/hitboxes/player.lua diff --git a/examples/gameplay/plateform/actors/player.lua b/examples/gameplay/plateform/actors/player.lua index 67d5781..2541525 100644 --- a/examples/gameplay/plateform/actors/player.lua +++ b/examples/gameplay/plateform/actors/player.lua @@ -11,7 +11,7 @@ function Player:new(world, x, y, id) self.direction = 1 self.punchName = "" - self:setHitboxFile("examples.gameplay.plateform.assets.playerhitbox") + self:setHitboxFile("examples.gameplay.plateform.actors.hitboxes.player") end function Player:updateStart(dt) diff --git a/examples/gameplay/plateform/assets.lua b/examples/gameplay/plateform/assets.lua new file mode 100644 index 0000000..564953d --- /dev/null +++ b/examples/gameplay/plateform/assets.lua @@ -0,0 +1,15 @@ +return { + ["sprites"] = { + {"player", "assets/sprites/monkey_lad"}, + {"coin", "assets/sprites/coin"}, + {"sparkle", "assets/sprites/gfx/sparkle"} + }, + ["imagefonts"] = { + {"medium", "assets/fonts/medium"} + }, + ["sfx"] = { + {"navigate", "assets/sfx/menu_move.mp3"}, + {"confirm", "assets/sfx/menu_confirm.mp3"}, + {"cancel", "assets/sfx/menu_error.mp3"}, + } +} diff --git a/examples/gameplay/plateform/assets/init.lua b/examples/gameplay/plateform/assets/init.lua deleted file mode 100644 index 2d93581..0000000 --- a/examples/gameplay/plateform/assets/init.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - ["sprites"] = { - {"player", "examples/gameplay/plateform/assets/monkey_lad"}, - {"coin", "examples/gameplay/plateform/assets/coin5"}, - {"sparkle", "examples/gameplay/plateform/assets/sparkle"} - }, - ["imagefonts"] = { - {"medium", "examples/mainmenu/assets/medium"} - }, - ["sfx"] = { - {"navigate", "examples/mainmenu/assets/menu_move.mp3"}, - {"confirm", "examples/mainmenu/assets/menu_confirm.mp3"}, - {"cancel", "examples/mainmenu/assets/menu_error.mp3"}, - } -} diff --git a/examples/mainmenu/assets.lua b/examples/mainmenu/assets.lua new file mode 100644 index 0000000..427a2ed --- /dev/null +++ b/examples/mainmenu/assets.lua @@ -0,0 +1,10 @@ +return { + ["imagefonts"] = { + {"medium", "assets/fonts/medium"} + }, + ["sfx"] = { + {"navigate", "assets/sfx/menu_move.mp3"}, + {"confirm", "assets/sfx/menu_confirm.mp3"}, + {"cancel", "assets/sfx/menu_error.mp3"}, + } +} diff --git a/examples/mainmenu/assets/credits.md b/examples/mainmenu/assets/credits.md deleted file mode 100644 index 6de973d..0000000 --- a/examples/mainmenu/assets/credits.md +++ /dev/null @@ -1,3 +0,0 @@ -## Assets credits - -- SFX by [Joth](http://opengameart.org/users/joth) diff --git a/examples/mainmenu/assets/init.lua b/examples/mainmenu/assets/init.lua deleted file mode 100644 index 5c0bf82..0000000 --- a/examples/mainmenu/assets/init.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - ["imagefonts"] = { - {"medium", "examples/mainmenu/assets/medium"} - }, - ["sfx"] = { - {"navigate", "examples/mainmenu/assets/menu_move.mp3"}, - {"confirm", "examples/mainmenu/assets/menu_confirm.mp3"}, - {"cancel", "examples/mainmenu/assets/menu_error.mp3"}, - } -} diff --git a/examples/mainmenu/assets/medium.lua b/examples/mainmenu/assets/medium.lua deleted file mode 100644 index eed9950..0000000 --- a/examples/mainmenu/assets/medium.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - filename = "medium.png", - glyphs = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|} ", - extraspacing = 1, -} diff --git a/examples/mainmenu/assets/medium.png b/examples/mainmenu/assets/medium.png deleted file mode 100644 index 271fe5f..0000000 Binary files a/examples/mainmenu/assets/medium.png and /dev/null differ diff --git a/examples/menus/inventory/assets/medium.lua b/examples/menus/inventory/assets/medium.lua deleted file mode 100644 index eed9950..0000000 --- a/examples/menus/inventory/assets/medium.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - filename = "medium.png", - glyphs = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|} ", - extraspacing = 1, -} diff --git a/examples/menus/inventory/assets/medium.png b/examples/menus/inventory/assets/medium.png deleted file mode 100644 index 271fe5f..0000000 Binary files a/examples/menus/inventory/assets/medium.png and /dev/null differ diff --git a/examples/menus/inventory/init.lua b/examples/menus/inventory/init.lua index d3fa0f3..54ef075 100644 --- a/examples/menus/inventory/init.lua +++ b/examples/menus/inventory/init.lua @@ -34,7 +34,7 @@ local ExitWidget = Widget.Text:extend() function Inventory:new() Inventory.super.new(self) - self.assets:addImageFont("medium", "examples/menus/inventory/assets/medium") + self.assets:addImageFont("medium", "assets/fonts/medium") HListBox(self.menusystem, "main", 42, 32, 424-84, 32, 5) diff --git a/examples/menus/options/init.lua b/examples/menus/options/init.lua index 533e414..e21c294 100644 --- a/examples/menus/options/init.lua +++ b/examples/menus/options/init.lua @@ -29,12 +29,12 @@ local Widgets = require "examples.menus.options.widgets" function OptionsMenu:new() OptionsMenu.super.new(self) - self.assets:addImageFont("medium", "examples/mainmenu/assets/medium") - self.assets:setMusic("examples/menus/options/assets/music.ogg") + self.assets:addImageFont("medium", "assets/fonts/medium") + self.assets:setMusic("assets/music/music.ogg") - self.assets:addSFX("navigate", "examples/mainmenu/assets/menu_move.mp3") - self.assets:addSFX("confirm", "examples/mainmenu/assets/menu_confirm.mp3") - self.assets:addSFX("cancel", "examples/mainmenu/assets/menu_error.mp3") + self.assets:addSFX("navigate", "assets/sfx/menu_move.mp3") + self.assets:addSFX("confirm", "assets/sfx/menu_confirm.mp3") + self.assets:addSFX("cancel", "assets/sfx/menu_error.mp3") self.assets:playMusic()