aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-04-05 15:05:36 +0100
committerYann Herklotz <ymherklotz@gmail.com>2018-04-05 15:05:36 +0100
commitaeeca45ae53c2382354f26fb4dae02fbda62b314 (patch)
tree04e94114d58b2fa726943c590d3261ed472507ea /tests
parent0d10ba12062144a270a368ef9bffd88517a6c27c (diff)
downloadYAGE-aeeca45ae53c2382354f26fb4dae02fbda62b314.tar.gz
YAGE-aeeca45ae53c2382354f26fb4dae02fbda62b314.zip
Adding test abstraction and fixing tests
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/spritesheet/floor_atlas.json2046
-rw-r--r--tests/spritesheet/test.cpp12
-rw-r--r--tests/testshared.h33
4 files changed, 1061 insertions, 1031 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5b7d6fd3..707492aa 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -33,3 +33,4 @@ make_test(syncqueue 1)
make_test(active 1)
make_test(struct ${SIMULATION_RUNS})
make_test(engine ${SIMULATION_RUNS})
+make_test(render ${SIMULATION_RUNS})
diff --git a/tests/spritesheet/floor_atlas.json b/tests/spritesheet/floor_atlas.json
index ff9f0aa1..e6defd22 100644
--- a/tests/spritesheet/floor_atlas.json
+++ b/tests/spritesheet/floor_atlas.json
@@ -1,1026 +1,1026 @@
{
- "width": 512,
- "height": 352,
- "sprites": {
- "sandstone_floor6.png": {
- "x": 0,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "pedestal_ne.png": {
- "x": 32,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "marble_floor4.png": {
- "x": 64,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "pebble_brown2.png": {
- "x": 96,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "sandstone_floor4.png": {
- "x": 128,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "hive2.png": {
- "x": 160,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "lair1.png": {
- "x": 192,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "crystal_floor3.png": {
- "x": 224,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "volcanic_floor1.png": {
- "x": 256,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "snake2.png": {
- "x": 288,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "lava2.png": {
- "x": 320,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "cobble_blood5.png": {
- "x": 352,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "dirt_ne.png": {
- "x": 384,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "mesh2.png": {
- "x": 416,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "cobble_blood7.png": {
- "x": 448,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "sandstone_floor2.png": {
- "x": 480,
- "y": 0,
- "width": 32,
- "height": 32
- },
- "dirt_e.png": {
- "x": 0,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "pedestal_se.png": {
- "x": 32,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "rough_red0.png": {
- "x": 64,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "grey_dirt2.png": {
- "x": 96,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "bog_green2.png": {
- "x": 128,
- "y": 32,
-n "width": 32,
- "height": 32
- },
- "floor_sand_stone3.png": {
- "x": 160,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "tomb0.png": {
- "x": 192,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "pedestal_sw.png": {
- "x": 224,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "pebble_brown3.png": {
- "x": 256,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "floor_vines3.png": {
- "x": 288,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "pebble_brown1.png": {
- "x": 320,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "crystal_floor0.png": {
- "x": 352,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "rect_gray3.png": {
- "x": 384,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "floor_sand_stone4.png": {
- "x": 416,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "floor_sand_stone0.png": {
- "x": 448,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "cobble_blood6.png": {
- "x": 480,
- "y": 32,
- "width": 32,
- "height": 32
- },
- "floor_nerves2.png": {
- "x": 0,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "ice2.png": {
- "x": 32,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "lair0.png": {
- "x": 64,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "rough_red1.png": {
- "x": 96,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "pebble_brown0.png": {
- "x": 128,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "snake3.png": {
- "x": 160,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "volcanic_floor2.png": {
- "x": 192,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "pebble_brown7.png": {
- "x": 224,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "floor_sand_stone1.png": {
- "x": 256,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "floor_nerves6.png": {
- "x": 288,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "cobble_blood10.png": {
- "x": 320,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "dirt_n.png": {
- "x": 352,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "mesh0.png": {
- "x": 384,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "sandstone_floor7.png": {
- "x": 416,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "volcanic_floor6.png": {
- "x": 448,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "sandstone_floor0.png": {
- "x": 480,
- "y": 64,
- "width": 32,
- "height": 32
- },
- "rough_red3.png": {
- "x": 0,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "pedestal_e.png": {
- "x": 32,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "ice1.png": {
- "x": 64,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "floor_nerves0.png": {
- "x": 96,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "swamp0.png": {
- "x": 128,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "dirt2.png": {
- "x": 160,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "floor_sand_stone6.png": {
- "x": 192,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "pedestal_s.png": {
- "x": 224,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "pedestal_full.png": {
- "x": 256,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "volcanic_floor4.png": {
- "x": 288,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "pebble_brown4.png": {
- "x": 320,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "dirt1.png": {
- "x": 352,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "sandstone_floor5.png": {
- "x": 384,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "rough_red2.png": {
- "x": 416,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "rect_gray0.png": {
- "x": 448,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "rect_gray2.png": {
- "x": 480,
- "y": 96,
- "width": 32,
- "height": 32
- },
- "floor_nerves5.png": {
- "x": 0,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "swamp2.png": {
- "x": 32,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "grey_dirt7.png": {
- "x": 64,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "cobble_blood8.png": {
- "x": 96,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "grey_dirt0.png": {
- "x": 128,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "cobble_blood1.png": {
- "x": 160,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "volcanic_floor3.png": {
- "x": 192,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "lair2.png": {
- "x": 224,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "lava0.png": {
- "x": 256,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "cobble_blood4.png": {
- "x": 288,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "grey_dirt1.png": {
- "x": 320,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "pedestal_nw.png": {
- "x": 352,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "crystal_floor5.png": {
- "x": 384,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "bog_green3.png": {
- "x": 416,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "marble_floor2.png": {
- "x": 448,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "mesh3.png": {
- "x": 480,
- "y": 128,
- "width": 32,
- "height": 32
- },
- "pedestal_w.png": {
- "x": 0,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "swamp1.png": {
- "x": 32,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "snake0.png": {
- "x": 64,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "crystal_floor4.png": {
- "x": 96,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "cobble_blood12.png": {
- "x": 128,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "floor_vines4.png": {
- "x": 160,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "floor_vines2.png": {
- "x": 192,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "floor_nerves1.png": {
- "x": 224,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "snake1.png": {
- "x": 256,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "dirt_sw.png": {
- "x": 288,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "dirt0.png": {
- "x": 320,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "hive0.png": {
- "x": 352,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "grey_dirt3.png": {
- "x": 384,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "floor_nerves3.png": {
- "x": 416,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "marble_floor5.png": {
- "x": 448,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "bog_green1.png": {
- "x": 480,
- "y": 160,
- "width": 32,
- "height": 32
- },
- "sandstone_floor3.png": {
- "x": 0,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "bog_green0.png": {
- "x": 32,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "pedestal_n.png": {
- "x": 64,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "hive1.png": {
- "x": 96,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "pebble_brown6.png": {
- "x": 128,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "floor_sand_stone2.png": {
- "x": 160,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "cobble_blood3.png": {
- "x": 192,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "sandstone_floor9.png": {
- "x": 224,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "swamp3.png": {
- "x": 256,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "ice0.png": {
- "x": 288,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "marble_floor3.png": {
- "x": 320,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "volcanic_floor5.png": {
- "x": 352,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "floor_vines6.png": {
- "x": 384,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "tutorial_pad.png": {
- "x": 416,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "dirt_nw.png": {
- "x": 448,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "floor_vines0.png": {
- "x": 480,
- "y": 192,
- "width": 32,
- "height": 32
- },
- "grey_dirt4.png": {
- "x": 0,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "marble_floor6.png": {
- "x": 32,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "grey_dirt6.png": {
- "x": 64,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "crystal_floor1.png": {
- "x": 96,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "cobble_blood9.png": {
- "x": 128,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "ice3.png": {
- "x": 160,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "floor_nerves4.png": {
- "x": 192,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "dirt_w.png": {
- "x": 224,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "pebble_brown5.png": {
- "x": 256,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "lair3.png": {
- "x": 288,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "rect_gray1.png": {
- "x": 320,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "tomb3.png": {
- "x": 352,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "floor_vines1.png": {
- "x": 384,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "grey_dirt5.png": {
- "x": 416,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "floor_vines5.png": {
- "x": 448,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "sandstone_floor1.png": {
- "x": 480,
- "y": 224,
- "width": 32,
- "height": 32
- },
- "floor_sand_stone5.png": {
- "x": 0,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "dirt_se.png": {
- "x": 32,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_full.png": {
- "x": 64,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass1.png": {
- "x": 96,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_yellow2.png": {
- "x": 128,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_s.png": {
- "x": 160,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_se.png": {
- "x": 192,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_red2.png": {
- "x": 224,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass2.png": {
- "x": 256,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass0-dirt-mix2.png": {
- "x": 288,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_blue3.png": {
- "x": 320,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_blue2.png": {
- "x": 352,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_blue1.png": {
- "x": 384,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass0-dirt-mix1.png": {
- "x": 416,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_red1.png": {
- "x": 448,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_yellow3.png": {
- "x": 480,
- "y": 256,
- "width": 32,
- "height": 32
- },
- "grass/grass_sw.png": {
- "x": 0,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_yellow1.png": {
- "x": 32,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass_nw.png": {
- "x": 64,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass_w.png": {
- "x": 96,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass_n.png": {
- "x": 128,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass_e.png": {
- "x": 160,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass_ne.png": {
- "x": 192,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass0-dirt-mix3.png": {
- "x": 224,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass0.png": {
- "x": 256,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "grass/grass_flowers_red3.png": {
- "x": 288,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "crystal_floor2.png": {
- "x": 320,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "tomb2.png": {
- "x": 352,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "cobble_blood11.png": {
- "x": 384,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "cobble_blood2.png": {
- "x": 416,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "lava3.png": {
- "x": 448,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "volcanic_floor0.png": {
- "x": 480,
- "y": 288,
- "width": 32,
- "height": 32
- },
- "mesh1.png": {
- "x": 0,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "dirt_full.png": {
- "x": 32,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "lava1.png": {
- "x": 64,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "tomb1.png": {
- "x": 96,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "dirt_s.png": {
- "x": 128,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "marble_floor1.png": {
- "x": 160,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "floor_sand_stone7.png": {
- "x": 192,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "hive3.png": {
- "x": 224,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "pebble_brown8.png": {
- "x": 256,
- "y": 320,
- "width": 32,
- "height": 32
- },
- "sandstone_floor8.png": {
- "x": 288,
- "y": 320,
- "width": 32,
- "height": 32
+ "width": 512,
+ "height": 352,
+ "sprites": {
+ "sandstone_floor6.png": {
+ "x": 0,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_ne.png": {
+ "x": 32,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "marble_floor4.png": {
+ "x": 64,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown2.png": {
+ "x": 96,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor4.png": {
+ "x": 128,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "hive2.png": {
+ "x": 160,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "lair1.png": {
+ "x": 192,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "crystal_floor3.png": {
+ "x": 224,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "volcanic_floor1.png": {
+ "x": 256,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "snake2.png": {
+ "x": 288,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "lava2.png": {
+ "x": 320,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood5.png": {
+ "x": 352,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_ne.png": {
+ "x": 384,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "mesh2.png": {
+ "x": 416,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood7.png": {
+ "x": 448,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor2.png": {
+ "x": 480,
+ "y": 0,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_e.png": {
+ "x": 0,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_se.png": {
+ "x": 32,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "rough_red0.png": {
+ "x": 64,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt2.png": {
+ "x": 96,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "bog_green2.png": {
+ "x": 128,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone3.png": {
+ "x": 160,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "tomb0.png": {
+ "x": 192,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_sw.png": {
+ "x": 224,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown3.png": {
+ "x": 256,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "floor_vines3.png": {
+ "x": 288,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown1.png": {
+ "x": 320,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "crystal_floor0.png": {
+ "x": 352,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "rect_gray3.png": {
+ "x": 384,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone4.png": {
+ "x": 416,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone0.png": {
+ "x": 448,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood6.png": {
+ "x": 480,
+ "y": 32,
+ "width": 32,
+ "height": 32
+ },
+ "floor_nerves2.png": {
+ "x": 0,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "ice2.png": {
+ "x": 32,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "lair0.png": {
+ "x": 64,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "rough_red1.png": {
+ "x": 96,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown0.png": {
+ "x": 128,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "snake3.png": {
+ "x": 160,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "volcanic_floor2.png": {
+ "x": 192,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown7.png": {
+ "x": 224,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone1.png": {
+ "x": 256,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "floor_nerves6.png": {
+ "x": 288,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood10.png": {
+ "x": 320,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_n.png": {
+ "x": 352,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "mesh0.png": {
+ "x": 384,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor7.png": {
+ "x": 416,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "volcanic_floor6.png": {
+ "x": 448,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor0.png": {
+ "x": 480,
+ "y": 64,
+ "width": 32,
+ "height": 32
+ },
+ "rough_red3.png": {
+ "x": 0,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_e.png": {
+ "x": 32,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "ice1.png": {
+ "x": 64,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "floor_nerves0.png": {
+ "x": 96,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "swamp0.png": {
+ "x": 128,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "dirt2.png": {
+ "x": 160,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone6.png": {
+ "x": 192,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_s.png": {
+ "x": 224,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_full.png": {
+ "x": 256,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "volcanic_floor4.png": {
+ "x": 288,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown4.png": {
+ "x": 320,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "dirt1.png": {
+ "x": 352,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor5.png": {
+ "x": 384,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "rough_red2.png": {
+ "x": 416,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "rect_gray0.png": {
+ "x": 448,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "rect_gray2.png": {
+ "x": 480,
+ "y": 96,
+ "width": 32,
+ "height": 32
+ },
+ "floor_nerves5.png": {
+ "x": 0,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "swamp2.png": {
+ "x": 32,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt7.png": {
+ "x": 64,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood8.png": {
+ "x": 96,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt0.png": {
+ "x": 128,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood1.png": {
+ "x": 160,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "volcanic_floor3.png": {
+ "x": 192,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "lair2.png": {
+ "x": 224,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "lava0.png": {
+ "x": 256,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood4.png": {
+ "x": 288,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt1.png": {
+ "x": 320,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_nw.png": {
+ "x": 352,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "crystal_floor5.png": {
+ "x": 384,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "bog_green3.png": {
+ "x": 416,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "marble_floor2.png": {
+ "x": 448,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "mesh3.png": {
+ "x": 480,
+ "y": 128,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_w.png": {
+ "x": 0,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "swamp1.png": {
+ "x": 32,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "snake0.png": {
+ "x": 64,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "crystal_floor4.png": {
+ "x": 96,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood12.png": {
+ "x": 128,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "floor_vines4.png": {
+ "x": 160,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "floor_vines2.png": {
+ "x": 192,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "floor_nerves1.png": {
+ "x": 224,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "snake1.png": {
+ "x": 256,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_sw.png": {
+ "x": 288,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "dirt0.png": {
+ "x": 320,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "hive0.png": {
+ "x": 352,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt3.png": {
+ "x": 384,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "floor_nerves3.png": {
+ "x": 416,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "marble_floor5.png": {
+ "x": 448,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "bog_green1.png": {
+ "x": 480,
+ "y": 160,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor3.png": {
+ "x": 0,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "bog_green0.png": {
+ "x": 32,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "pedestal_n.png": {
+ "x": 64,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "hive1.png": {
+ "x": 96,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown6.png": {
+ "x": 128,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone2.png": {
+ "x": 160,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood3.png": {
+ "x": 192,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor9.png": {
+ "x": 224,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "swamp3.png": {
+ "x": 256,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "ice0.png": {
+ "x": 288,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "marble_floor3.png": {
+ "x": 320,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "volcanic_floor5.png": {
+ "x": 352,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "floor_vines6.png": {
+ "x": 384,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "tutorial_pad.png": {
+ "x": 416,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_nw.png": {
+ "x": 448,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "floor_vines0.png": {
+ "x": 480,
+ "y": 192,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt4.png": {
+ "x": 0,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "marble_floor6.png": {
+ "x": 32,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt6.png": {
+ "x": 64,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "crystal_floor1.png": {
+ "x": 96,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood9.png": {
+ "x": 128,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "ice3.png": {
+ "x": 160,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "floor_nerves4.png": {
+ "x": 192,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_w.png": {
+ "x": 224,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown5.png": {
+ "x": 256,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "lair3.png": {
+ "x": 288,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "rect_gray1.png": {
+ "x": 320,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "tomb3.png": {
+ "x": 352,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "floor_vines1.png": {
+ "x": 384,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "grey_dirt5.png": {
+ "x": 416,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "floor_vines5.png": {
+ "x": 448,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor1.png": {
+ "x": 480,
+ "y": 224,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone5.png": {
+ "x": 0,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_se.png": {
+ "x": 32,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_full.png": {
+ "x": 64,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass1.png": {
+ "x": 96,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_yellow2.png": {
+ "x": 128,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_s.png": {
+ "x": 160,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_se.png": {
+ "x": 192,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_red2.png": {
+ "x": 224,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass2.png": {
+ "x": 256,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass0-dirt-mix2.png": {
+ "x": 288,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_blue3.png": {
+ "x": 320,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_blue2.png": {
+ "x": 352,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_blue1.png": {
+ "x": 384,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass0-dirt-mix1.png": {
+ "x": 416,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_red1.png": {
+ "x": 448,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_yellow3.png": {
+ "x": 480,
+ "y": 256,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_sw.png": {
+ "x": 0,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_yellow1.png": {
+ "x": 32,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_nw.png": {
+ "x": 64,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_w.png": {
+ "x": 96,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_n.png": {
+ "x": 128,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_e.png": {
+ "x": 160,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_ne.png": {
+ "x": 192,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass0-dirt-mix3.png": {
+ "x": 224,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass0.png": {
+ "x": 256,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "grass/grass_flowers_red3.png": {
+ "x": 288,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "crystal_floor2.png": {
+ "x": 320,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "tomb2.png": {
+ "x": 352,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood11.png": {
+ "x": 384,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "cobble_blood2.png": {
+ "x": 416,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "lava3.png": {
+ "x": 448,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "volcanic_floor0.png": {
+ "x": 480,
+ "y": 288,
+ "width": 32,
+ "height": 32
+ },
+ "mesh1.png": {
+ "x": 0,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_full.png": {
+ "x": 32,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "lava1.png": {
+ "x": 64,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "tomb1.png": {
+ "x": 96,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "dirt_s.png": {
+ "x": 128,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "marble_floor1.png": {
+ "x": 160,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "floor_sand_stone7.png": {
+ "x": 192,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "hive3.png": {
+ "x": 224,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "pebble_brown8.png": {
+ "x": 256,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ },
+ "sandstone_floor8.png": {
+ "x": 288,
+ "y": 320,
+ "width": 32,
+ "height": 32
+ }
}
- }
}
diff --git a/tests/spritesheet/test.cpp b/tests/spritesheet/test.cpp
index 4d4cc1a4..7fe4e77f 100644
--- a/tests/spritesheet/test.cpp
+++ b/tests/spritesheet/test.cpp
@@ -6,21 +6,17 @@
* ----------------------------------------------------------------------------
*/
-/** @file */
-
#include <gtest/gtest.h>
#include <yage/yage.h>
+#include "../testshared.h"
+
using namespace yage;
TEST(SpriteSheet, Load)
{
- /// @todo add a test to test the spritesheet loading
+ SpriteSheet sp("tests/spritesheet/floor_atlas.png", "tests/spritesheet/floor_atlas.json");
ASSERT_TRUE(true);
}
-int main(int argc, char **argv)
-{
- testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
-}
+OPENGL_TEST_MAIN(LogLevel::DEBUG)
diff --git a/tests/testshared.h b/tests/testshared.h
new file mode 100644
index 00000000..4418072c
--- /dev/null
+++ b/tests/testshared.h
@@ -0,0 +1,33 @@
+/** ---------------------------------------------------------------------------
+ * @file: testshared.h
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef TEST_TESTSHARED_H
+#define TEST_TESTSHARED_H
+
+#define OPENGL_TEST_MAIN(LOGLEVEL) \
+ int main(int argc, char **argv) \
+ { \
+ yLogger.setLevel(LOGLEVEL); \
+ ::testing::InitGoogleTest(&argc, argv); \
+ ::yage::init(); \
+ ::yage::Window x; \
+ x.create("Window", 800, 600); \
+ auto ret = RUN_ALL_TESTS(); \
+ ::yage::quit(); \
+ return ret; \
+ }
+
+#define TEST_MAIN(LOGLEVEL) \
+ int main(int argc, char **argv) \
+ { \
+ yLogger.setLevel(LOGLEVEL); \
+ testing::InitGoogleTest(&argc, argv); \
+ return RUN_ALL_TESTS(); \
+ }
+
+#endif