From 98ecfdd1ad673cf15af702cae7176ce653fee086 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 28 Nov 2022 16:15:53 +0100 Subject: move scenery to its own directory --- CMakeLists.txt | 2 +- anim/scenery.json | 2 - anim/scenery/door-close.json | 1156 ------------------------------------------ anim/scenery/door-close.tga | Bin 4613654 -> 0 bytes anim/scenery/door.blend | Bin 1018604 -> 0 bytes loader/atlas.cpp | 4 +- loader/impl.hpp | 2 +- loader/json.cpp | 2 +- loader/loader.cpp | 1 + loader/loader.hpp | 4 +- scenery/door-close.json | 1156 ++++++++++++++++++++++++++++++++++++++++++ scenery/door-close.tga | Bin 0 -> 4613654 bytes scenery/door.blend | Bin 0 -> 1018604 bytes scenery/scenery.json | 2 + serialize/scenery.cpp | 5 +- 15 files changed, 1168 insertions(+), 1168 deletions(-) delete mode 100644 anim/scenery.json delete mode 100644 anim/scenery/door-close.json delete mode 100644 anim/scenery/door-close.tga delete mode 100644 anim/scenery/door.blend create mode 100644 scenery/door-close.json create mode 100644 scenery/door-close.tga create mode 100644 scenery/door.blend create mode 100644 scenery/scenery.json diff --git a/CMakeLists.txt b/CMakeLists.txt index d8e2c929..ef050d54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,7 @@ add_subdirectory(main) add_subdirectory(editor) add_subdirectory(test) -install(DIRECTORY images anim DESTINATION "share/floormat") +install(DIRECTORY images anim scenery DESTINATION "share/floormat") fm_run_hook(fm-userconfig-post) get_cmake_property(_variableNames VARIABLES) diff --git a/anim/scenery.json b/anim/scenery.json deleted file mode 100644 index 0d4f101c..00000000 --- a/anim/scenery.json +++ /dev/null @@ -1,2 +0,0 @@ -[ -] diff --git a/anim/scenery/door-close.json b/anim/scenery/door-close.json deleted file mode 100644 index e0f92396..00000000 --- a/anim/scenery/door-close.json +++ /dev/null @@ -1,1156 +0,0 @@ -{ - "actionframe": 0, - "anim_name": "close", - "fps": 24, - "groups": [ - { - "frames": [ - { - "ground": "126 x 121", - "offset": "0 x 0", - "size": "86 x 106" - }, - { - "ground": "126 x 120", - "offset": "86 x 0", - "size": "86 x 106" - }, - { - "ground": "126 x 120", - "offset": "172 x 0", - "size": "86 x 106" - }, - { - "ground": "126 x 120", - "offset": "258 x 0", - "size": "87 x 106" - }, - { - "ground": "127 x 119", - "offset": "345 x 0", - "size": "87 x 105" - }, - { - "ground": "127 x 118", - "offset": "432 x 0", - "size": "88 x 104" - }, - { - "ground": "128 x 117", - "offset": "520 x 0", - "size": "88 x 103" - }, - { - "ground": "129 x 116", - "offset": "608 x 0", - "size": "89 x 102" - }, - { - "ground": "130 x 114", - "offset": "697 x 0", - "size": "90 x 101" - }, - { - "ground": "130 x 112", - "offset": "787 x 0", - "size": "91 x 99" - }, - { - "ground": "131 x 110", - "offset": "878 x 0", - "size": "91 x 97" - }, - { - "ground": "132 x 108", - "offset": "969 x 0", - "size": "92 x 95" - }, - { - "ground": "132 x 106", - "offset": "1061 x 0", - "size": "93 x 93" - }, - { - "ground": "132 x 103", - "offset": "1154 x 0", - "size": "93 x 90" - }, - { - "ground": "132 x 100", - "offset": "1247 x 0", - "size": "93 x 87" - }, - { - "ground": "132 x 97", - "offset": "1340 x 0", - "size": "93 x 84" - }, - { - "ground": "132 x 94", - "offset": "1433 x 0", - "size": "92 x 82" - }, - { - "ground": "131 x 94", - "offset": "1525 x 0", - "size": "93 x 85" - }, - { - "ground": "131 x 94", - "offset": "1618 x 0", - "size": "93 x 89" - }, - { - "ground": "129 x 94", - "offset": "1711 x 0", - "size": "93 x 93" - }, - { - "ground": "127 x 94", - "offset": "1804 x 0", - "size": "92 x 96" - }, - { - "ground": "125 x 94", - "offset": "1896 x 0", - "size": "90 x 100" - }, - { - "ground": "122 x 94", - "offset": "1986 x 0", - "size": "88 x 103" - }, - { - "ground": "119 x 93", - "offset": "2074 x 0", - "size": "85 x 107" - }, - { - "ground": "114 x 93", - "offset": "2159 x 0", - "size": "82 x 110" - }, - { - "ground": "110 x 93", - "offset": "2241 x 0", - "size": "79 x 113" - }, - { - "ground": "105 x 93", - "offset": "2320 x 0", - "size": "74 x 117" - }, - { - "ground": "99 x 93", - "offset": "2394 x 0", - "size": "70 x 119" - }, - { - "ground": "93 x 93", - "offset": "2464 x 0", - "size": "64 x 121" - }, - { - "ground": "86 x 93", - "offset": "2528 x 0", - "size": "59 x 123" - }, - { - "ground": "79 x 93", - "offset": "2587 x 0", - "size": "52 x 125" - }, - { - "ground": "72 x 93", - "offset": "2639 x 0", - "size": "46 x 126" - }, - { - "ground": "66 x 93", - "offset": "2685 x 0", - "size": "40 x 128" - }, - { - "ground": "60 x 93", - "offset": "2725 x 0", - "size": "34 x 128" - }, - { - "ground": "53 x 93", - "offset": "2759 x 0", - "size": "28 x 129" - }, - { - "ground": "47 x 93", - "offset": "2787 x 0", - "size": "22 x 129" - }, - { - "ground": "40 x 93", - "offset": "2809 x 0", - "size": "21 x 128" - }, - { - "ground": "35 x 94", - "offset": "2830 x 0", - "size": "22 x 129" - }, - { - "ground": "35 x 94", - "offset": "2852 x 0", - "size": "28 x 129" - }, - { - "ground": "35 x 95", - "offset": "2880 x 0", - "size": "33 x 128" - }, - { - "ground": "35 x 95", - "offset": "2913 x 0", - "size": "38 x 128" - }, - { - "ground": "35 x 96", - "offset": "2951 x 0", - "size": "42 x 128" - }, - { - "ground": "35 x 96", - "offset": "2993 x 0", - "size": "47 x 127" - }, - { - "ground": "35 x 97", - "offset": "3040 x 0", - "size": "50 x 126" - }, - { - "ground": "35 x 97", - "offset": "3090 x 0", - "size": "54 x 125" - }, - { - "ground": "34 x 97", - "offset": "3144 x 0", - "size": "56 x 124" - }, - { - "ground": "34 x 98", - "offset": "3200 x 0", - "size": "60 x 123" - }, - { - "ground": "34 x 98", - "offset": "3260 x 0", - "size": "62 x 122" - }, - { - "ground": "34 x 98", - "offset": "3322 x 0", - "size": "65 x 121" - }, - { - "ground": "34 x 98", - "offset": "3387 x 0", - "size": "67 x 120" - }, - { - "ground": "34 x 98", - "offset": "3454 x 0", - "size": "69 x 120" - }, - { - "ground": "34 x 98", - "offset": "3523 x 0", - "size": "70 x 119" - }, - { - "ground": "34 x 99", - "offset": "3593 x 0", - "size": "71 x 118" - }, - { - "ground": "34 x 99", - "offset": "3664 x 0", - "size": "72 x 118" - }, - { - "ground": "34 x 99", - "offset": "3736 x 0", - "size": "73 x 117" - } - ], - "ground": "951 x 556", - "name": "n", - "offset": [ - 0, - -32, - 0 - ] - }, - { - "frames": [ - { - "ground": "-22 x 141", - "offset": "0 x 129", - "size": "54 x 114" - }, - { - "ground": "-22 x 141", - "offset": "54 x 129", - "size": "54 x 114" - }, - { - "ground": "-22 x 141", - "offset": "108 x 129", - "size": "54 x 114" - }, - { - "ground": "-22 x 141", - "offset": "162 x 129", - "size": "53 x 114" - }, - { - "ground": "-22 x 141", - "offset": "215 x 129", - "size": "52 x 114" - }, - { - "ground": "-22 x 141", - "offset": "267 x 129", - "size": "50 x 114" - }, - { - "ground": "-22 x 141", - "offset": "317 x 129", - "size": "49 x 114" - }, - { - "ground": "-21 x 141", - "offset": "366 x 129", - "size": "46 x 114" - }, - { - "ground": "-21 x 141", - "offset": "412 x 129", - "size": "44 x 114" - }, - { - "ground": "-21 x 141", - "offset": "456 x 129", - "size": "42 x 114" - }, - { - "ground": "-21 x 141", - "offset": "498 x 129", - "size": "39 x 114" - }, - { - "ground": "-21 x 141", - "offset": "537 x 129", - "size": "36 x 114" - }, - { - "ground": "-20 x 141", - "offset": "573 x 129", - "size": "32 x 115" - }, - { - "ground": "-20 x 141", - "offset": "605 x 129", - "size": "28 x 115" - }, - { - "ground": "-20 x 141", - "offset": "633 x 129", - "size": "24 x 115" - }, - { - "ground": "-17 x 141", - "offset": "657 x 129", - "size": "22 x 115" - }, - { - "ground": "-13 x 141", - "offset": "679 x 129", - "size": "21 x 115" - }, - { - "ground": "-7 x 141", - "offset": "700 x 129", - "size": "23 x 115" - }, - { - "ground": "-2 x 141", - "offset": "723 x 129", - "size": "28 x 116" - }, - { - "ground": "4 x 141", - "offset": "751 x 129", - "size": "34 x 116" - }, - { - "ground": "9 x 141", - "offset": "785 x 129", - "size": "39 x 117" - }, - { - "ground": "15 x 141", - "offset": "824 x 129", - "size": "45 x 117" - }, - { - "ground": "20 x 141", - "offset": "869 x 129", - "size": "50 x 118" - }, - { - "ground": "25 x 141", - "offset": "919 x 129", - "size": "55 x 118" - }, - { - "ground": "31 x 141", - "offset": "974 x 129", - "size": "61 x 119" - }, - { - "ground": "37 x 141", - "offset": "1035 x 129", - "size": "66 x 120" - }, - { - "ground": "42 x 139", - "offset": "1101 x 129", - "size": "71 x 118" - }, - { - "ground": "47 x 136", - "offset": "1172 x 129", - "size": "76 x 115" - }, - { - "ground": "51 x 133", - "offset": "1248 x 129", - "size": "80 x 112" - }, - { - "ground": "55 x 129", - "offset": "1328 x 129", - "size": "84 x 109" - }, - { - "ground": "58 x 125", - "offset": "1412 x 129", - "size": "87 x 105" - }, - { - "ground": "60 x 121", - "offset": "1499 x 129", - "size": "89 x 102" - }, - { - "ground": "62 x 117", - "offset": "1588 x 129", - "size": "91 x 97" - }, - { - "ground": "63 x 112", - "offset": "1679 x 129", - "size": "92 x 94" - }, - { - "ground": "64 x 108", - "offset": "1771 x 129", - "size": "93 x 90" - }, - { - "ground": "64 x 104", - "offset": "1864 x 129", - "size": "93 x 86" - }, - { - "ground": "63 x 100", - "offset": "1957 x 129", - "size": "92 x 82" - }, - { - "ground": "63 x 99", - "offset": "2049 x 129", - "size": "93 x 85" - }, - { - "ground": "62 x 99", - "offset": "2142 x 129", - "size": "93 x 89" - }, - { - "ground": "61 x 99", - "offset": "2235 x 129", - "size": "93 x 92" - }, - { - "ground": "59 x 99", - "offset": "2328 x 129", - "size": "92 x 95" - }, - { - "ground": "57 x 99", - "offset": "2420 x 129", - "size": "91 x 98" - }, - { - "ground": "55 x 99", - "offset": "2511 x 129", - "size": "90 x 101" - }, - { - "ground": "53 x 99", - "offset": "2601 x 129", - "size": "88 x 104" - }, - { - "ground": "51 x 99", - "offset": "2689 x 129", - "size": "86 x 106" - }, - { - "ground": "49 x 99", - "offset": "2775 x 129", - "size": "85 x 108" - }, - { - "ground": "47 x 99", - "offset": "2860 x 129", - "size": "83 x 110" - }, - { - "ground": "45 x 99", - "offset": "2943 x 129", - "size": "81 x 111" - }, - { - "ground": "42 x 99", - "offset": "3024 x 129", - "size": "80 x 113" - }, - { - "ground": "41 x 99", - "offset": "3104 x 129", - "size": "78 x 114" - }, - { - "ground": "39 x 99", - "offset": "3182 x 129", - "size": "77 x 115" - }, - { - "ground": "38 x 99", - "offset": "3259 x 129", - "size": "76 x 116" - }, - { - "ground": "36 x 99", - "offset": "3335 x 129", - "size": "75 x 116" - }, - { - "ground": "36 x 99", - "offset": "3410 x 129", - "size": "74 x 117" - }, - { - "ground": "35 x 99", - "offset": "3484 x 129", - "size": "73 x 117" - } - ], - "ground": "951 x 556", - "name": "e", - "offset": [ - 32, - 0, - 0 - ] - }, - { - "frames": [ - { - "ground": "-44 x 66", - "offset": "0 x 249", - "size": "86 x 107" - }, - { - "ground": "-44 x 66", - "offset": "86 x 249", - "size": "86 x 106" - }, - { - "ground": "-44 x 66", - "offset": "172 x 249", - "size": "86 x 106" - }, - { - "ground": "-44 x 66", - "offset": "258 x 249", - "size": "87 x 106" - }, - { - "ground": "-44 x 66", - "offset": "345 x 249", - "size": "87 x 105" - }, - { - "ground": "-44 x 67", - "offset": "432 x 249", - "size": "88 x 104" - }, - { - "ground": "-44 x 67", - "offset": "520 x 249", - "size": "88 x 103" - }, - { - "ground": "-44 x 67", - "offset": "608 x 249", - "size": "89 x 102" - }, - { - "ground": "-44 x 67", - "offset": "697 x 249", - "size": "90 x 101" - }, - { - "ground": "-44 x 67", - "offset": "787 x 249", - "size": "91 x 99" - }, - { - "ground": "-44 x 67", - "offset": "878 x 249", - "size": "91 x 97" - }, - { - "ground": "-44 x 67", - "offset": "969 x 249", - "size": "92 x 95" - }, - { - "ground": "-44 x 67", - "offset": "1061 x 249", - "size": "92 x 93" - }, - { - "ground": "-44 x 68", - "offset": "1153 x 249", - "size": "93 x 90" - }, - { - "ground": "-44 x 68", - "offset": "1246 x 249", - "size": "93 x 87" - }, - { - "ground": "-44 x 68", - "offset": "1339 x 249", - "size": "93 x 84" - }, - { - "ground": "-44 x 68", - "offset": "1432 x 249", - "size": "92 x 82" - }, - { - "ground": "-43 x 72", - "offset": "1524 x 249", - "size": "93 x 85" - }, - { - "ground": "-42 x 76", - "offset": "1617 x 249", - "size": "93 x 89" - }, - { - "ground": "-41 x 79", - "offset": "1710 x 249", - "size": "93 x 92" - }, - { - "ground": "-40 x 83", - "offset": "1803 x 249", - "size": "92 x 96" - }, - { - "ground": "-39 x 87", - "offset": "1895 x 249", - "size": "90 x 100" - }, - { - "ground": "-38 x 90", - "offset": "1985 x 249", - "size": "88 x 103" - }, - { - "ground": "-38 x 94", - "offset": "2073 x 249", - "size": "85 x 107" - }, - { - "ground": "-37 x 97", - "offset": "2158 x 249", - "size": "82 x 110" - }, - { - "ground": "-36 x 101", - "offset": "2240 x 249", - "size": "79 x 113" - }, - { - "ground": "-35 x 104", - "offset": "2319 x 249", - "size": "74 x 116" - }, - { - "ground": "-34 x 106", - "offset": "2393 x 249", - "size": "70 x 119" - }, - { - "ground": "-33 x 109", - "offset": "2463 x 249", - "size": "64 x 121" - }, - { - "ground": "-32 x 111", - "offset": "2527 x 249", - "size": "59 x 124" - }, - { - "ground": "-32 x 112", - "offset": "2586 x 249", - "size": "52 x 125" - }, - { - "ground": "-31 x 114", - "offset": "2638 x 249", - "size": "46 x 127" - }, - { - "ground": "-31 x 115", - "offset": "2684 x 249", - "size": "40 x 128" - }, - { - "ground": "-30 x 116", - "offset": "2724 x 249", - "size": "34 x 128" - }, - { - "ground": "-30 x 116", - "offset": "2758 x 249", - "size": "28 x 129" - }, - { - "ground": "-29 x 116", - "offset": "2786 x 249", - "size": "22 x 129" - }, - { - "ground": "-23 x 116", - "offset": "2808 x 249", - "size": "21 x 128" - }, - { - "ground": "-18 x 115", - "offset": "2829 x 249", - "size": "22 x 129" - }, - { - "ground": "-12 x 115", - "offset": "2851 x 249", - "size": "28 x 129" - }, - { - "ground": "-6 x 114", - "offset": "2879 x 249", - "size": "33 x 129" - }, - { - "ground": "-1 x 113", - "offset": "2912 x 249", - "size": "38 x 128" - }, - { - "ground": "3 x 112", - "offset": "2950 x 249", - "size": "42 x 127" - }, - { - "ground": "7 x 111", - "offset": "2992 x 249", - "size": "47 x 127" - }, - { - "ground": "11 x 110", - "offset": "3039 x 249", - "size": "50 x 126" - }, - { - "ground": "15 x 109", - "offset": "3089 x 249", - "size": "54 x 125" - }, - { - "ground": "18 x 107", - "offset": "3143 x 249", - "size": "56 x 124" - }, - { - "ground": "21 x 106", - "offset": "3199 x 249", - "size": "60 x 123" - }, - { - "ground": "23 x 105", - "offset": "3259 x 249", - "size": "62 x 122" - }, - { - "ground": "26 x 104", - "offset": "3321 x 249", - "size": "65 x 121" - }, - { - "ground": "28 x 103", - "offset": "3386 x 249", - "size": "67 x 120" - }, - { - "ground": "30 x 102", - "offset": "3453 x 249", - "size": "69 x 119" - }, - { - "ground": "31 x 101", - "offset": "3522 x 249", - "size": "70 x 119" - }, - { - "ground": "32 x 100", - "offset": "3592 x 249", - "size": "71 x 118" - }, - { - "ground": "33 x 100", - "offset": "3663 x 249", - "size": "72 x 118" - }, - { - "ground": "34 x 99", - "offset": "3735 x 249", - "size": "72 x 118" - } - ], - "ground": "951 x 556", - "name": "s", - "offset": [ - 0, - 32, - 0 - ] - }, - { - "frames": [ - { - "ground": "72 x 54", - "offset": "0 x 378", - "size": "54 x 125" - }, - { - "ground": "71 x 54", - "offset": "54 x 378", - "size": "54 x 125" - }, - { - "ground": "71 x 54", - "offset": "108 x 378", - "size": "54 x 125" - }, - { - "ground": "70 x 53", - "offset": "162 x 378", - "size": "53 x 125" - }, - { - "ground": "69 x 54", - "offset": "215 x 378", - "size": "52 x 125" - }, - { - "ground": "67 x 54", - "offset": "267 x 378", - "size": "50 x 126" - }, - { - "ground": "66 x 54", - "offset": "317 x 378", - "size": "49 x 126" - }, - { - "ground": "63 x 54", - "offset": "366 x 378", - "size": "46 x 127" - }, - { - "ground": "61 x 54", - "offset": "412 x 378", - "size": "45 x 127" - }, - { - "ground": "58 x 54", - "offset": "457 x 378", - "size": "42 x 127" - }, - { - "ground": "55 x 54", - "offset": "499 x 378", - "size": "39 x 128" - }, - { - "ground": "52 x 54", - "offset": "538 x 378", - "size": "36 x 128" - }, - { - "ground": "48 x 54", - "offset": "574 x 378", - "size": "32 x 128" - }, - { - "ground": "44 x 54", - "offset": "606 x 378", - "size": "28 x 129" - }, - { - "ground": "39 x 54", - "offset": "634 x 378", - "size": "24 x 129" - }, - { - "ground": "35 x 54", - "offset": "658 x 378", - "size": "22 x 129" - }, - { - "ground": "30 x 54", - "offset": "680 x 378", - "size": "22 x 128" - }, - { - "ground": "26 x 54", - "offset": "702 x 378", - "size": "23 x 129" - }, - { - "ground": "25 x 55", - "offset": "725 x 378", - "size": "28 x 129" - }, - { - "ground": "25 x 55", - "offset": "753 x 378", - "size": "34 x 128" - }, - { - "ground": "25 x 56", - "offset": "787 x 378", - "size": "39 x 128" - }, - { - "ground": "25 x 56", - "offset": "826 x 378", - "size": "45 x 127" - }, - { - "ground": "25 x 57", - "offset": "871 x 378", - "size": "50 x 126" - }, - { - "ground": "25 x 58", - "offset": "921 x 378", - "size": "55 x 125" - }, - { - "ground": "25 x 58", - "offset": "976 x 378", - "size": "61 x 123" - }, - { - "ground": "25 x 59", - "offset": "1037 x 378", - "size": "66 x 121" - }, - { - "ground": "24 x 59", - "offset": "1103 x 378", - "size": "71 x 118" - }, - { - "ground": "24 x 60", - "offset": "1174 x 378", - "size": "76 x 115" - }, - { - "ground": "24 x 60", - "offset": "1250 x 378", - "size": "80 x 112" - }, - { - "ground": "24 x 61", - "offset": "1330 x 378", - "size": "84 x 109" - }, - { - "ground": "24 x 61", - "offset": "1414 x 378", - "size": "87 x 105" - }, - { - "ground": "24 x 61", - "offset": "1501 x 378", - "size": "89 x 102" - }, - { - "ground": "24 x 62", - "offset": "1590 x 378", - "size": "91 x 98" - }, - { - "ground": "24 x 62", - "offset": "1681 x 378", - "size": "92 x 94" - }, - { - "ground": "25 x 62", - "offset": "1773 x 378", - "size": "93 x 90" - }, - { - "ground": "25 x 62", - "offset": "1866 x 378", - "size": "93 x 85" - }, - { - "ground": "25 x 62", - "offset": "1959 x 378", - "size": "93 x 82" - }, - { - "ground": "26 x 66", - "offset": "2052 x 378", - "size": "93 x 85" - }, - { - "ground": "26 x 70", - "offset": "2145 x 378", - "size": "93 x 89" - }, - { - "ground": "27 x 73", - "offset": "2238 x 378", - "size": "93 x 92" - }, - { - "ground": "28 x 77", - "offset": "2331 x 378", - "size": "92 x 95" - }, - { - "ground": "29 x 80", - "offset": "2423 x 378", - "size": "91 x 98" - }, - { - "ground": "30 x 82", - "offset": "2514 x 378", - "size": "89 x 101" - }, - { - "ground": "30 x 85", - "offset": "2603 x 378", - "size": "88 x 104" - }, - { - "ground": "31 x 87", - "offset": "2691 x 378", - "size": "86 x 106" - }, - { - "ground": "31 x 89", - "offset": "2777 x 378", - "size": "85 x 108" - }, - { - "ground": "32 x 91", - "offset": "2862 x 378", - "size": "83 x 110" - }, - { - "ground": "32 x 93", - "offset": "2945 x 378", - "size": "81 x 111" - }, - { - "ground": "33 x 94", - "offset": "3026 x 378", - "size": "80 x 112" - }, - { - "ground": "33 x 95", - "offset": "3106 x 378", - "size": "78 x 114" - }, - { - "ground": "33 x 96", - "offset": "3184 x 378", - "size": "77 x 114" - }, - { - "ground": "34 x 97", - "offset": "3261 x 378", - "size": "76 x 115" - }, - { - "ground": "34 x 98", - "offset": "3337 x 378", - "size": "75 x 116" - }, - { - "ground": "34 x 98", - "offset": "3412 x 378", - "size": "74 x 117" - }, - { - "ground": "34 x 99", - "offset": "3486 x 378", - "size": "74 x 117" - } - ], - "ground": "951 x 556", - "name": "w", - "offset": [ - -32, - 0, - 0 - ] - } - ], - "height": 0, - "nframes": 55, - "object_name": "door", - "pixel_size": "3809 x 507", - "width": 86 -} diff --git a/anim/scenery/door-close.tga b/anim/scenery/door-close.tga deleted file mode 100644 index 62aaaa69..00000000 Binary files a/anim/scenery/door-close.tga and /dev/null differ diff --git a/anim/scenery/door.blend b/anim/scenery/door.blend deleted file mode 100644 index 5aa0998c..00000000 Binary files a/anim/scenery/door.blend and /dev/null differ diff --git a/loader/atlas.cpp b/loader/atlas.cpp index f68ca820..584d6b5a 100644 --- a/loader/atlas.cpp +++ b/loader/atlas.cpp @@ -29,7 +29,7 @@ ArrayView loader_impl::anim_atlas_list() return anim_atlases; } -std::shared_ptr loader_impl::anim_atlas(StringView name) +std::shared_ptr loader_impl::anim_atlas(StringView name, StringView dir) { fm_assert(check_atlas_name(name)); @@ -37,7 +37,7 @@ std::shared_ptr loader_impl::anim_atlas(StringView name) return it->second; else { - const auto path = Path::join(ANIM_PATH, Path::splitExtension(name).first()); + const auto path = Path::join(dir, Path::splitExtension(name).first()); auto anim_info = deserialize_anim(path + ".json"); for (anim_group& group : anim_info.groups) diff --git a/loader/impl.hpp b/loader/impl.hpp index 04b9733f..6a49269f 100644 --- a/loader/impl.hpp +++ b/loader/impl.hpp @@ -29,7 +29,7 @@ struct loader_impl final : loader_ Trade::ImageData2D texture(StringView prefix, StringView filename); std::shared_ptr tile_atlas(StringView filename, Vector2ub size) override; ArrayView anim_atlas_list() override; - std::shared_ptr anim_atlas(StringView name) override; + std::shared_ptr anim_atlas(StringView name, StringView dir) override; void get_anim_atlas_list(); diff --git a/loader/json.cpp b/loader/json.cpp index 7ee661f7..1a698a38 100644 --- a/loader/json.cpp +++ b/loader/json.cpp @@ -23,7 +23,7 @@ std::vector> loader_::tile_atlases(StringView std::vector loader_::sceneries() { - return json_helper::from_json>(Path::join(ANIM_PATH, "scenery.json")); + return json_helper::from_json>(Path::join(SCENERY_PATH, "scenery.json")); } } // namespace floormat diff --git a/loader/loader.cpp b/loader/loader.cpp index a2fcd161..a07f96be 100644 --- a/loader/loader.cpp +++ b/loader/loader.cpp @@ -24,5 +24,6 @@ loader_::~loader_() = default; const StringView loader_::IMAGE_PATH = "share/floormat/images/"_s; const StringView loader_::ANIM_PATH = "share/floormat/anim/"_s; +const StringView loader_::SCENERY_PATH = "share/floormat/scenery/"_s; } // namespace floormat diff --git a/loader/loader.hpp b/loader/loader.hpp index b8ac12e2..93ac5654 100644 --- a/loader/loader.hpp +++ b/loader/loader.hpp @@ -1,6 +1,7 @@ #pragma once #include #include +#include namespace Magnum { using Vector2ub = Math::Vector2; } namespace floormat::Serialize { struct serialized_scenery; } @@ -16,7 +17,7 @@ struct loader_ virtual StringView shader(StringView filename) = 0; virtual std::shared_ptr tile_atlas(StringView filename, Vector2ub size) = 0; virtual ArrayView anim_atlas_list() = 0; - virtual std::shared_ptr anim_atlas(StringView name) = 0; + virtual std::shared_ptr anim_atlas(StringView name, StringView dir = ANIM_PATH) = 0; static void destroy(); static loader_& default_loader() noexcept; static std::vector> tile_atlases(StringView filename); @@ -29,6 +30,7 @@ struct loader_ static const StringView IMAGE_PATH; static const StringView ANIM_PATH; + static const StringView SCENERY_PATH; protected: loader_(); diff --git a/scenery/door-close.json b/scenery/door-close.json new file mode 100644 index 00000000..e0f92396 --- /dev/null +++ b/scenery/door-close.json @@ -0,0 +1,1156 @@ +{ + "actionframe": 0, + "anim_name": "close", + "fps": 24, + "groups": [ + { + "frames": [ + { + "ground": "126 x 121", + "offset": "0 x 0", + "size": "86 x 106" + }, + { + "ground": "126 x 120", + "offset": "86 x 0", + "size": "86 x 106" + }, + { + "ground": "126 x 120", + "offset": "172 x 0", + "size": "86 x 106" + }, + { + "ground": "126 x 120", + "offset": "258 x 0", + "size": "87 x 106" + }, + { + "ground": "127 x 119", + "offset": "345 x 0", + "size": "87 x 105" + }, + { + "ground": "127 x 118", + "offset": "432 x 0", + "size": "88 x 104" + }, + { + "ground": "128 x 117", + "offset": "520 x 0", + "size": "88 x 103" + }, + { + "ground": "129 x 116", + "offset": "608 x 0", + "size": "89 x 102" + }, + { + "ground": "130 x 114", + "offset": "697 x 0", + "size": "90 x 101" + }, + { + "ground": "130 x 112", + "offset": "787 x 0", + "size": "91 x 99" + }, + { + "ground": "131 x 110", + "offset": "878 x 0", + "size": "91 x 97" + }, + { + "ground": "132 x 108", + "offset": "969 x 0", + "size": "92 x 95" + }, + { + "ground": "132 x 106", + "offset": "1061 x 0", + "size": "93 x 93" + }, + { + "ground": "132 x 103", + "offset": "1154 x 0", + "size": "93 x 90" + }, + { + "ground": "132 x 100", + "offset": "1247 x 0", + "size": "93 x 87" + }, + { + "ground": "132 x 97", + "offset": "1340 x 0", + "size": "93 x 84" + }, + { + "ground": "132 x 94", + "offset": "1433 x 0", + "size": "92 x 82" + }, + { + "ground": "131 x 94", + "offset": "1525 x 0", + "size": "93 x 85" + }, + { + "ground": "131 x 94", + "offset": "1618 x 0", + "size": "93 x 89" + }, + { + "ground": "129 x 94", + "offset": "1711 x 0", + "size": "93 x 93" + }, + { + "ground": "127 x 94", + "offset": "1804 x 0", + "size": "92 x 96" + }, + { + "ground": "125 x 94", + "offset": "1896 x 0", + "size": "90 x 100" + }, + { + "ground": "122 x 94", + "offset": "1986 x 0", + "size": "88 x 103" + }, + { + "ground": "119 x 93", + "offset": "2074 x 0", + "size": "85 x 107" + }, + { + "ground": "114 x 93", + "offset": "2159 x 0", + "size": "82 x 110" + }, + { + "ground": "110 x 93", + "offset": "2241 x 0", + "size": "79 x 113" + }, + { + "ground": "105 x 93", + "offset": "2320 x 0", + "size": "74 x 117" + }, + { + "ground": "99 x 93", + "offset": "2394 x 0", + "size": "70 x 119" + }, + { + "ground": "93 x 93", + "offset": "2464 x 0", + "size": "64 x 121" + }, + { + "ground": "86 x 93", + "offset": "2528 x 0", + "size": "59 x 123" + }, + { + "ground": "79 x 93", + "offset": "2587 x 0", + "size": "52 x 125" + }, + { + "ground": "72 x 93", + "offset": "2639 x 0", + "size": "46 x 126" + }, + { + "ground": "66 x 93", + "offset": "2685 x 0", + "size": "40 x 128" + }, + { + "ground": "60 x 93", + "offset": "2725 x 0", + "size": "34 x 128" + }, + { + "ground": "53 x 93", + "offset": "2759 x 0", + "size": "28 x 129" + }, + { + "ground": "47 x 93", + "offset": "2787 x 0", + "size": "22 x 129" + }, + { + "ground": "40 x 93", + "offset": "2809 x 0", + "size": "21 x 128" + }, + { + "ground": "35 x 94", + "offset": "2830 x 0", + "size": "22 x 129" + }, + { + "ground": "35 x 94", + "offset": "2852 x 0", + "size": "28 x 129" + }, + { + "ground": "35 x 95", + "offset": "2880 x 0", + "size": "33 x 128" + }, + { + "ground": "35 x 95", + "offset": "2913 x 0", + "size": "38 x 128" + }, + { + "ground": "35 x 96", + "offset": "2951 x 0", + "size": "42 x 128" + }, + { + "ground": "35 x 96", + "offset": "2993 x 0", + "size": "47 x 127" + }, + { + "ground": "35 x 97", + "offset": "3040 x 0", + "size": "50 x 126" + }, + { + "ground": "35 x 97", + "offset": "3090 x 0", + "size": "54 x 125" + }, + { + "ground": "34 x 97", + "offset": "3144 x 0", + "size": "56 x 124" + }, + { + "ground": "34 x 98", + "offset": "3200 x 0", + "size": "60 x 123" + }, + { + "ground": "34 x 98", + "offset": "3260 x 0", + "size": "62 x 122" + }, + { + "ground": "34 x 98", + "offset": "3322 x 0", + "size": "65 x 121" + }, + { + "ground": "34 x 98", + "offset": "3387 x 0", + "size": "67 x 120" + }, + { + "ground": "34 x 98", + "offset": "3454 x 0", + "size": "69 x 120" + }, + { + "ground": "34 x 98", + "offset": "3523 x 0", + "size": "70 x 119" + }, + { + "ground": "34 x 99", + "offset": "3593 x 0", + "size": "71 x 118" + }, + { + "ground": "34 x 99", + "offset": "3664 x 0", + "size": "72 x 118" + }, + { + "ground": "34 x 99", + "offset": "3736 x 0", + "size": "73 x 117" + } + ], + "ground": "951 x 556", + "name": "n", + "offset": [ + 0, + -32, + 0 + ] + }, + { + "frames": [ + { + "ground": "-22 x 141", + "offset": "0 x 129", + "size": "54 x 114" + }, + { + "ground": "-22 x 141", + "offset": "54 x 129", + "size": "54 x 114" + }, + { + "ground": "-22 x 141", + "offset": "108 x 129", + "size": "54 x 114" + }, + { + "ground": "-22 x 141", + "offset": "162 x 129", + "size": "53 x 114" + }, + { + "ground": "-22 x 141", + "offset": "215 x 129", + "size": "52 x 114" + }, + { + "ground": "-22 x 141", + "offset": "267 x 129", + "size": "50 x 114" + }, + { + "ground": "-22 x 141", + "offset": "317 x 129", + "size": "49 x 114" + }, + { + "ground": "-21 x 141", + "offset": "366 x 129", + "size": "46 x 114" + }, + { + "ground": "-21 x 141", + "offset": "412 x 129", + "size": "44 x 114" + }, + { + "ground": "-21 x 141", + "offset": "456 x 129", + "size": "42 x 114" + }, + { + "ground": "-21 x 141", + "offset": "498 x 129", + "size": "39 x 114" + }, + { + "ground": "-21 x 141", + "offset": "537 x 129", + "size": "36 x 114" + }, + { + "ground": "-20 x 141", + "offset": "573 x 129", + "size": "32 x 115" + }, + { + "ground": "-20 x 141", + "offset": "605 x 129", + "size": "28 x 115" + }, + { + "ground": "-20 x 141", + "offset": "633 x 129", + "size": "24 x 115" + }, + { + "ground": "-17 x 141", + "offset": "657 x 129", + "size": "22 x 115" + }, + { + "ground": "-13 x 141", + "offset": "679 x 129", + "size": "21 x 115" + }, + { + "ground": "-7 x 141", + "offset": "700 x 129", + "size": "23 x 115" + }, + { + "ground": "-2 x 141", + "offset": "723 x 129", + "size": "28 x 116" + }, + { + "ground": "4 x 141", + "offset": "751 x 129", + "size": "34 x 116" + }, + { + "ground": "9 x 141", + "offset": "785 x 129", + "size": "39 x 117" + }, + { + "ground": "15 x 141", + "offset": "824 x 129", + "size": "45 x 117" + }, + { + "ground": "20 x 141", + "offset": "869 x 129", + "size": "50 x 118" + }, + { + "ground": "25 x 141", + "offset": "919 x 129", + "size": "55 x 118" + }, + { + "ground": "31 x 141", + "offset": "974 x 129", + "size": "61 x 119" + }, + { + "ground": "37 x 141", + "offset": "1035 x 129", + "size": "66 x 120" + }, + { + "ground": "42 x 139", + "offset": "1101 x 129", + "size": "71 x 118" + }, + { + "ground": "47 x 136", + "offset": "1172 x 129", + "size": "76 x 115" + }, + { + "ground": "51 x 133", + "offset": "1248 x 129", + "size": "80 x 112" + }, + { + "ground": "55 x 129", + "offset": "1328 x 129", + "size": "84 x 109" + }, + { + "ground": "58 x 125", + "offset": "1412 x 129", + "size": "87 x 105" + }, + { + "ground": "60 x 121", + "offset": "1499 x 129", + "size": "89 x 102" + }, + { + "ground": "62 x 117", + "offset": "1588 x 129", + "size": "91 x 97" + }, + { + "ground": "63 x 112", + "offset": "1679 x 129", + "size": "92 x 94" + }, + { + "ground": "64 x 108", + "offset": "1771 x 129", + "size": "93 x 90" + }, + { + "ground": "64 x 104", + "offset": "1864 x 129", + "size": "93 x 86" + }, + { + "ground": "63 x 100", + "offset": "1957 x 129", + "size": "92 x 82" + }, + { + "ground": "63 x 99", + "offset": "2049 x 129", + "size": "93 x 85" + }, + { + "ground": "62 x 99", + "offset": "2142 x 129", + "size": "93 x 89" + }, + { + "ground": "61 x 99", + "offset": "2235 x 129", + "size": "93 x 92" + }, + { + "ground": "59 x 99", + "offset": "2328 x 129", + "size": "92 x 95" + }, + { + "ground": "57 x 99", + "offset": "2420 x 129", + "size": "91 x 98" + }, + { + "ground": "55 x 99", + "offset": "2511 x 129", + "size": "90 x 101" + }, + { + "ground": "53 x 99", + "offset": "2601 x 129", + "size": "88 x 104" + }, + { + "ground": "51 x 99", + "offset": "2689 x 129", + "size": "86 x 106" + }, + { + "ground": "49 x 99", + "offset": "2775 x 129", + "size": "85 x 108" + }, + { + "ground": "47 x 99", + "offset": "2860 x 129", + "size": "83 x 110" + }, + { + "ground": "45 x 99", + "offset": "2943 x 129", + "size": "81 x 111" + }, + { + "ground": "42 x 99", + "offset": "3024 x 129", + "size": "80 x 113" + }, + { + "ground": "41 x 99", + "offset": "3104 x 129", + "size": "78 x 114" + }, + { + "ground": "39 x 99", + "offset": "3182 x 129", + "size": "77 x 115" + }, + { + "ground": "38 x 99", + "offset": "3259 x 129", + "size": "76 x 116" + }, + { + "ground": "36 x 99", + "offset": "3335 x 129", + "size": "75 x 116" + }, + { + "ground": "36 x 99", + "offset": "3410 x 129", + "size": "74 x 117" + }, + { + "ground": "35 x 99", + "offset": "3484 x 129", + "size": "73 x 117" + } + ], + "ground": "951 x 556", + "name": "e", + "offset": [ + 32, + 0, + 0 + ] + }, + { + "frames": [ + { + "ground": "-44 x 66", + "offset": "0 x 249", + "size": "86 x 107" + }, + { + "ground": "-44 x 66", + "offset": "86 x 249", + "size": "86 x 106" + }, + { + "ground": "-44 x 66", + "offset": "172 x 249", + "size": "86 x 106" + }, + { + "ground": "-44 x 66", + "offset": "258 x 249", + "size": "87 x 106" + }, + { + "ground": "-44 x 66", + "offset": "345 x 249", + "size": "87 x 105" + }, + { + "ground": "-44 x 67", + "offset": "432 x 249", + "size": "88 x 104" + }, + { + "ground": "-44 x 67", + "offset": "520 x 249", + "size": "88 x 103" + }, + { + "ground": "-44 x 67", + "offset": "608 x 249", + "size": "89 x 102" + }, + { + "ground": "-44 x 67", + "offset": "697 x 249", + "size": "90 x 101" + }, + { + "ground": "-44 x 67", + "offset": "787 x 249", + "size": "91 x 99" + }, + { + "ground": "-44 x 67", + "offset": "878 x 249", + "size": "91 x 97" + }, + { + "ground": "-44 x 67", + "offset": "969 x 249", + "size": "92 x 95" + }, + { + "ground": "-44 x 67", + "offset": "1061 x 249", + "size": "92 x 93" + }, + { + "ground": "-44 x 68", + "offset": "1153 x 249", + "size": "93 x 90" + }, + { + "ground": "-44 x 68", + "offset": "1246 x 249", + "size": "93 x 87" + }, + { + "ground": "-44 x 68", + "offset": "1339 x 249", + "size": "93 x 84" + }, + { + "ground": "-44 x 68", + "offset": "1432 x 249", + "size": "92 x 82" + }, + { + "ground": "-43 x 72", + "offset": "1524 x 249", + "size": "93 x 85" + }, + { + "ground": "-42 x 76", + "offset": "1617 x 249", + "size": "93 x 89" + }, + { + "ground": "-41 x 79", + "offset": "1710 x 249", + "size": "93 x 92" + }, + { + "ground": "-40 x 83", + "offset": "1803 x 249", + "size": "92 x 96" + }, + { + "ground": "-39 x 87", + "offset": "1895 x 249", + "size": "90 x 100" + }, + { + "ground": "-38 x 90", + "offset": "1985 x 249", + "size": "88 x 103" + }, + { + "ground": "-38 x 94", + "offset": "2073 x 249", + "size": "85 x 107" + }, + { + "ground": "-37 x 97", + "offset": "2158 x 249", + "size": "82 x 110" + }, + { + "ground": "-36 x 101", + "offset": "2240 x 249", + "size": "79 x 113" + }, + { + "ground": "-35 x 104", + "offset": "2319 x 249", + "size": "74 x 116" + }, + { + "ground": "-34 x 106", + "offset": "2393 x 249", + "size": "70 x 119" + }, + { + "ground": "-33 x 109", + "offset": "2463 x 249", + "size": "64 x 121" + }, + { + "ground": "-32 x 111", + "offset": "2527 x 249", + "size": "59 x 124" + }, + { + "ground": "-32 x 112", + "offset": "2586 x 249", + "size": "52 x 125" + }, + { + "ground": "-31 x 114", + "offset": "2638 x 249", + "size": "46 x 127" + }, + { + "ground": "-31 x 115", + "offset": "2684 x 249", + "size": "40 x 128" + }, + { + "ground": "-30 x 116", + "offset": "2724 x 249", + "size": "34 x 128" + }, + { + "ground": "-30 x 116", + "offset": "2758 x 249", + "size": "28 x 129" + }, + { + "ground": "-29 x 116", + "offset": "2786 x 249", + "size": "22 x 129" + }, + { + "ground": "-23 x 116", + "offset": "2808 x 249", + "size": "21 x 128" + }, + { + "ground": "-18 x 115", + "offset": "2829 x 249", + "size": "22 x 129" + }, + { + "ground": "-12 x 115", + "offset": "2851 x 249", + "size": "28 x 129" + }, + { + "ground": "-6 x 114", + "offset": "2879 x 249", + "size": "33 x 129" + }, + { + "ground": "-1 x 113", + "offset": "2912 x 249", + "size": "38 x 128" + }, + { + "ground": "3 x 112", + "offset": "2950 x 249", + "size": "42 x 127" + }, + { + "ground": "7 x 111", + "offset": "2992 x 249", + "size": "47 x 127" + }, + { + "ground": "11 x 110", + "offset": "3039 x 249", + "size": "50 x 126" + }, + { + "ground": "15 x 109", + "offset": "3089 x 249", + "size": "54 x 125" + }, + { + "ground": "18 x 107", + "offset": "3143 x 249", + "size": "56 x 124" + }, + { + "ground": "21 x 106", + "offset": "3199 x 249", + "size": "60 x 123" + }, + { + "ground": "23 x 105", + "offset": "3259 x 249", + "size": "62 x 122" + }, + { + "ground": "26 x 104", + "offset": "3321 x 249", + "size": "65 x 121" + }, + { + "ground": "28 x 103", + "offset": "3386 x 249", + "size": "67 x 120" + }, + { + "ground": "30 x 102", + "offset": "3453 x 249", + "size": "69 x 119" + }, + { + "ground": "31 x 101", + "offset": "3522 x 249", + "size": "70 x 119" + }, + { + "ground": "32 x 100", + "offset": "3592 x 249", + "size": "71 x 118" + }, + { + "ground": "33 x 100", + "offset": "3663 x 249", + "size": "72 x 118" + }, + { + "ground": "34 x 99", + "offset": "3735 x 249", + "size": "72 x 118" + } + ], + "ground": "951 x 556", + "name": "s", + "offset": [ + 0, + 32, + 0 + ] + }, + { + "frames": [ + { + "ground": "72 x 54", + "offset": "0 x 378", + "size": "54 x 125" + }, + { + "ground": "71 x 54", + "offset": "54 x 378", + "size": "54 x 125" + }, + { + "ground": "71 x 54", + "offset": "108 x 378", + "size": "54 x 125" + }, + { + "ground": "70 x 53", + "offset": "162 x 378", + "size": "53 x 125" + }, + { + "ground": "69 x 54", + "offset": "215 x 378", + "size": "52 x 125" + }, + { + "ground": "67 x 54", + "offset": "267 x 378", + "size": "50 x 126" + }, + { + "ground": "66 x 54", + "offset": "317 x 378", + "size": "49 x 126" + }, + { + "ground": "63 x 54", + "offset": "366 x 378", + "size": "46 x 127" + }, + { + "ground": "61 x 54", + "offset": "412 x 378", + "size": "45 x 127" + }, + { + "ground": "58 x 54", + "offset": "457 x 378", + "size": "42 x 127" + }, + { + "ground": "55 x 54", + "offset": "499 x 378", + "size": "39 x 128" + }, + { + "ground": "52 x 54", + "offset": "538 x 378", + "size": "36 x 128" + }, + { + "ground": "48 x 54", + "offset": "574 x 378", + "size": "32 x 128" + }, + { + "ground": "44 x 54", + "offset": "606 x 378", + "size": "28 x 129" + }, + { + "ground": "39 x 54", + "offset": "634 x 378", + "size": "24 x 129" + }, + { + "ground": "35 x 54", + "offset": "658 x 378", + "size": "22 x 129" + }, + { + "ground": "30 x 54", + "offset": "680 x 378", + "size": "22 x 128" + }, + { + "ground": "26 x 54", + "offset": "702 x 378", + "size": "23 x 129" + }, + { + "ground": "25 x 55", + "offset": "725 x 378", + "size": "28 x 129" + }, + { + "ground": "25 x 55", + "offset": "753 x 378", + "size": "34 x 128" + }, + { + "ground": "25 x 56", + "offset": "787 x 378", + "size": "39 x 128" + }, + { + "ground": "25 x 56", + "offset": "826 x 378", + "size": "45 x 127" + }, + { + "ground": "25 x 57", + "offset": "871 x 378", + "size": "50 x 126" + }, + { + "ground": "25 x 58", + "offset": "921 x 378", + "size": "55 x 125" + }, + { + "ground": "25 x 58", + "offset": "976 x 378", + "size": "61 x 123" + }, + { + "ground": "25 x 59", + "offset": "1037 x 378", + "size": "66 x 121" + }, + { + "ground": "24 x 59", + "offset": "1103 x 378", + "size": "71 x 118" + }, + { + "ground": "24 x 60", + "offset": "1174 x 378", + "size": "76 x 115" + }, + { + "ground": "24 x 60", + "offset": "1250 x 378", + "size": "80 x 112" + }, + { + "ground": "24 x 61", + "offset": "1330 x 378", + "size": "84 x 109" + }, + { + "ground": "24 x 61", + "offset": "1414 x 378", + "size": "87 x 105" + }, + { + "ground": "24 x 61", + "offset": "1501 x 378", + "size": "89 x 102" + }, + { + "ground": "24 x 62", + "offset": "1590 x 378", + "size": "91 x 98" + }, + { + "ground": "24 x 62", + "offset": "1681 x 378", + "size": "92 x 94" + }, + { + "ground": "25 x 62", + "offset": "1773 x 378", + "size": "93 x 90" + }, + { + "ground": "25 x 62", + "offset": "1866 x 378", + "size": "93 x 85" + }, + { + "ground": "25 x 62", + "offset": "1959 x 378", + "size": "93 x 82" + }, + { + "ground": "26 x 66", + "offset": "2052 x 378", + "size": "93 x 85" + }, + { + "ground": "26 x 70", + "offset": "2145 x 378", + "size": "93 x 89" + }, + { + "ground": "27 x 73", + "offset": "2238 x 378", + "size": "93 x 92" + }, + { + "ground": "28 x 77", + "offset": "2331 x 378", + "size": "92 x 95" + }, + { + "ground": "29 x 80", + "offset": "2423 x 378", + "size": "91 x 98" + }, + { + "ground": "30 x 82", + "offset": "2514 x 378", + "size": "89 x 101" + }, + { + "ground": "30 x 85", + "offset": "2603 x 378", + "size": "88 x 104" + }, + { + "ground": "31 x 87", + "offset": "2691 x 378", + "size": "86 x 106" + }, + { + "ground": "31 x 89", + "offset": "2777 x 378", + "size": "85 x 108" + }, + { + "ground": "32 x 91", + "offset": "2862 x 378", + "size": "83 x 110" + }, + { + "ground": "32 x 93", + "offset": "2945 x 378", + "size": "81 x 111" + }, + { + "ground": "33 x 94", + "offset": "3026 x 378", + "size": "80 x 112" + }, + { + "ground": "33 x 95", + "offset": "3106 x 378", + "size": "78 x 114" + }, + { + "ground": "33 x 96", + "offset": "3184 x 378", + "size": "77 x 114" + }, + { + "ground": "34 x 97", + "offset": "3261 x 378", + "size": "76 x 115" + }, + { + "ground": "34 x 98", + "offset": "3337 x 378", + "size": "75 x 116" + }, + { + "ground": "34 x 98", + "offset": "3412 x 378", + "size": "74 x 117" + }, + { + "ground": "34 x 99", + "offset": "3486 x 378", + "size": "74 x 117" + } + ], + "ground": "951 x 556", + "name": "w", + "offset": [ + -32, + 0, + 0 + ] + } + ], + "height": 0, + "nframes": 55, + "object_name": "door", + "pixel_size": "3809 x 507", + "width": 86 +} diff --git a/scenery/door-close.tga b/scenery/door-close.tga new file mode 100644 index 00000000..62aaaa69 Binary files /dev/null and b/scenery/door-close.tga differ diff --git a/scenery/door.blend b/scenery/door.blend new file mode 100644 index 00000000..5aa0998c Binary files /dev/null and b/scenery/door.blend differ diff --git a/scenery/scenery.json b/scenery/scenery.json new file mode 100644 index 00000000..0d4f101c --- /dev/null +++ b/scenery/scenery.json @@ -0,0 +1,2 @@ +[ +] diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp index 0089e411..e12df693 100644 --- a/serialize/scenery.cpp +++ b/serialize/scenery.cpp @@ -3,10 +3,7 @@ #include "compat/assert.hpp" #include "loader/loader.hpp" #include "serialize/corrade-string.hpp" -#include "serialize/json-helper.hpp" -#include #include -#include #include namespace { @@ -106,7 +103,7 @@ void adl_serializer::from_json(const json& j, scenery_proto& val) StringView atlas_name = j["atlas-name"]; fm_assert(!atlas_name.isEmpty()); - auto atlas = loader.anim_atlas(Path::join("scenery", atlas_name)); + auto atlas = loader.anim_atlas(atlas_name, loader_::SCENERY_PATH); auto& f = val.frame; f = {}; -- cgit v1.2.3