From 2e753568b4024e6c84b9c49db6cfdcae20277b28 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 8 Nov 2022 02:55:34 +0100 Subject: fix anim offsets --- anim/door_close.json | 1330 +++++++++++++++++++++++++------------------------- anim/door_close.tga | Bin 1929330 -> 7678962 bytes src/anim-atlas.cpp | 7 +- 3 files changed, 668 insertions(+), 669 deletions(-) diff --git a/anim/door_close.json b/anim/door_close.json index 5b5d8e85..a360c457 100644 --- a/anim/door_close.json +++ b/anim/door_close.json @@ -6,1131 +6,1131 @@ { "frames": [ { - "ground": "67 x 58", + "ground": "128 x 115", "offset": "0 x 0", - "size": "55 x 50" + "size": "86 x 107" }, { - "ground": "67 x 58", - "offset": "55 x 0", - "size": "55 x 49" + "ground": "128 x 115", + "offset": "86 x 0", + "size": "86 x 107" }, { - "ground": "67 x 58", - "offset": "110 x 0", - "size": "55 x 49" + "ground": "128 x 115", + "offset": "172 x 0", + "size": "86 x 107" }, { - "ground": "67 x 57", - "offset": "165 x 0", - "size": "55 x 49" + "ground": "128 x 114", + "offset": "258 x 0", + "size": "87 x 106" }, { - "ground": "67 x 57", - "offset": "220 x 0", - "size": "55 x 49" + "ground": "129 x 114", + "offset": "345 x 0", + "size": "87 x 106" }, { - "ground": "68 x 57", - "offset": "275 x 0", - "size": "56 x 49" + "ground": "130 x 113", + "offset": "432 x 0", + "size": "88 x 105" }, { - "ground": "68 x 56", - "offset": "331 x 0", - "size": "56 x 48" + "ground": "130 x 112", + "offset": "520 x 0", + "size": "88 x 104" }, { - "ground": "68 x 56", - "offset": "387 x 0", - "size": "56 x 48" + "ground": "131 x 111", + "offset": "608 x 0", + "size": "89 x 103" }, { - "ground": "68 x 55", - "offset": "443 x 0", - "size": "57 x 47" + "ground": "132 x 110", + "offset": "697 x 0", + "size": "90 x 102" }, { - "ground": "69 x 55", - "offset": "500 x 0", - "size": "57 x 46" + "ground": "132 x 108", + "offset": "787 x 0", + "size": "91 x 100" }, { - "ground": "69 x 54", - "offset": "557 x 0", - "size": "57 x 46" + "ground": "133 x 106", + "offset": "878 x 0", + "size": "91 x 99" }, { - "ground": "69 x 53", - "offset": "614 x 0", - "size": "58 x 45" + "ground": "134 x 104", + "offset": "969 x 0", + "size": "92 x 97" }, { - "ground": "69 x 52", - "offset": "672 x 0", - "size": "58 x 44" + "ground": "134 x 102", + "offset": "1061 x 0", + "size": "93 x 95" }, { - "ground": "70 x 51", - "offset": "730 x 0", - "size": "58 x 43" + "ground": "134 x 100", + "offset": "1154 x 0", + "size": "93 x 93" }, { - "ground": "70 x 50", - "offset": "788 x 0", - "size": "58 x 42" + "ground": "134 x 97", + "offset": "1247 x 0", + "size": "93 x 90" }, { - "ground": "69 x 49", - "offset": "846 x 0", - "size": "58 x 41" + "ground": "134 x 95", + "offset": "1340 x 0", + "size": "93 x 88" }, { - "ground": "69 x 48", - "offset": "904 x 0", - "size": "58 x 40" + "ground": "134 x 92", + "offset": "1433 x 0", + "size": "92 x 86" }, { - "ground": "69 x 48", - "offset": "962 x 0", - "size": "57 x 40" + "ground": "133 x 92", + "offset": "1525 x 0", + "size": "93 x 89" }, { - "ground": "69 x 48", - "offset": "1019 x 0", - "size": "57 x 40" + "ground": "133 x 92", + "offset": "1618 x 0", + "size": "93 x 92" }, { - "ground": "68 x 48", - "offset": "1076 x 0", - "size": "57 x 41" + "ground": "131 x 92", + "offset": "1711 x 0", + "size": "93 x 95" }, { - "ground": "68 x 48", - "offset": "1133 x 0", - "size": "56 x 42" + "ground": "130 x 92", + "offset": "1804 x 0", + "size": "92 x 98" }, { - "ground": "67 x 48", - "offset": "1189 x 0", - "size": "55 x 43" + "ground": "127 x 92", + "offset": "1896 x 0", + "size": "90 x 101" }, { - "ground": "65 x 48", - "offset": "1244 x 0", - "size": "53 x 45" + "ground": "124 x 92", + "offset": "1986 x 0", + "size": "88 x 104" }, { - "ground": "64 x 48", - "offset": "1297 x 0", - "size": "52 x 46" + "ground": "121 x 92", + "offset": "2074 x 0", + "size": "85 x 107" }, { - "ground": "62 x 48", - "offset": "1349 x 0", - "size": "50 x 47" + "ground": "117 x 92", + "offset": "2159 x 0", + "size": "82 x 110" }, { - "ground": "60 x 48", - "offset": "1399 x 0", - "size": "48 x 48" + "ground": "112 x 92", + "offset": "2241 x 0", + "size": "79 x 113" }, { - "ground": "58 x 48", - "offset": "1447 x 0", - "size": "46 x 49" + "ground": "107 x 92", + "offset": "2320 x 0", + "size": "74 x 116" }, { - "ground": "55 x 48", - "offset": "1493 x 0", - "size": "44 x 50" + "ground": "101 x 92", + "offset": "2394 x 0", + "size": "70 x 118" }, { - "ground": "53 x 48", - "offset": "1537 x 0", - "size": "41 x 51" + "ground": "95 x 92", + "offset": "2464 x 0", + "size": "64 x 120" }, { - "ground": "50 x 48", - "offset": "1578 x 0", - "size": "38 x 52" + "ground": "88 x 92", + "offset": "2528 x 0", + "size": "59 x 122" }, { - "ground": "47 x 48", - "offset": "1616 x 0", - "size": "35 x 53" + "ground": "81 x 92", + "offset": "2587 x 0", + "size": "52 x 123" }, { - "ground": "44 x 48", - "offset": "1651 x 0", - "size": "32 x 53" + "ground": "74 x 92", + "offset": "2639 x 0", + "size": "46 x 124" }, { - "ground": "41 x 48", - "offset": "1683 x 0", - "size": "29 x 54" + "ground": "68 x 92", + "offset": "2685 x 0", + "size": "40 x 125" }, { - "ground": "38 x 48", - "offset": "1712 x 0", - "size": "27 x 54" + "ground": "62 x 92", + "offset": "2725 x 0", + "size": "34 x 126" }, { - "ground": "36 x 48", - "offset": "1739 x 0", - "size": "24 x 54" + "ground": "55 x 92", + "offset": "2759 x 0", + "size": "28 x 126" }, { - "ground": "33 x 48", - "offset": "1763 x 0", - "size": "21 x 54" + "ground": "49 x 92", + "offset": "2787 x 0", + "size": "22 x 126" }, { - "ground": "30 x 48", - "offset": "1784 x 0", - "size": "18 x 54" + "ground": "42 x 92", + "offset": "2809 x 0", + "size": "21 x 126" }, { - "ground": "28 x 48", - "offset": "1802 x 0", - "size": "16 x 54" + "ground": "37 x 92", + "offset": "2830 x 0", + "size": "22 x 126" }, { - "ground": "28 x 48", - "offset": "1818 x 0", - "size": "16 x 54" + "ground": "37 x 93", + "offset": "2852 x 0", + "size": "28 x 126" }, { - "ground": "28 x 48", - "offset": "1834 x 0", - "size": "16 x 54" + "ground": "37 x 93", + "offset": "2880 x 0", + "size": "33 x 126" }, { - "ground": "28 x 48", - "offset": "1850 x 0", - "size": "16 x 54" + "ground": "37 x 93", + "offset": "2913 x 0", + "size": "38 x 126" }, { - "ground": "28 x 49", - "offset": "1866 x 0", - "size": "18 x 54" + "ground": "37 x 94", + "offset": "2951 x 0", + "size": "42 x 125" }, { - "ground": "28 x 49", - "offset": "1884 x 0", - "size": "20 x 53" + "ground": "37 x 94", + "offset": "2993 x 0", + "size": "47 x 124" }, { - "ground": "28 x 49", - "offset": "1904 x 0", - "size": "21 x 53" + "ground": "37 x 94", + "offset": "3040 x 0", + "size": "50 x 124" }, { - "ground": "28 x 49", - "offset": "1925 x 0", - "size": "23 x 52" + "ground": "37 x 95", + "offset": "3090 x 0", + "size": "54 x 123" }, { - "ground": "28 x 49", - "offset": "1948 x 0", - "size": "24 x 52" + "ground": "36 x 95", + "offset": "3144 x 0", + "size": "56 x 122" }, { - "ground": "28 x 49", - "offset": "1972 x 0", - "size": "26 x 52" + "ground": "36 x 95", + "offset": "3200 x 0", + "size": "60 x 121" }, { - "ground": "28 x 49", - "offset": "1998 x 0", - "size": "27 x 52" + "ground": "36 x 95", + "offset": "3260 x 0", + "size": "62 x 120" }, { - "ground": "28 x 49", - "offset": "2025 x 0", - "size": "28 x 51" + "ground": "36 x 96", + "offset": "3322 x 0", + "size": "65 x 120" }, { - "ground": "28 x 49", - "offset": "2053 x 0", - "size": "29 x 51" + "ground": "36 x 96", + "offset": "3387 x 0", + "size": "67 x 119" }, { - "ground": "28 x 49", - "offset": "2082 x 0", - "size": "29 x 51" + "ground": "36 x 96", + "offset": "3454 x 0", + "size": "69 x 118" }, { - "ground": "28 x 50", - "offset": "2111 x 0", - "size": "30 x 50" + "ground": "36 x 96", + "offset": "3523 x 0", + "size": "70 x 118" }, { - "ground": "28 x 50", - "offset": "2141 x 0", - "size": "30 x 50" + "ground": "36 x 96", + "offset": "3593 x 0", + "size": "71 x 117" }, { - "ground": "28 x 50", - "offset": "2171 x 0", - "size": "31 x 50" + "ground": "36 x 96", + "offset": "3664 x 0", + "size": "72 x 117" }, { - "ground": "28 x 50", - "offset": "2202 x 0", - "size": "31 x 50" + "ground": "36 x 96", + "offset": "3736 x 0", + "size": "73 x 117" } ], - "ground": "1070 x 779", + "ground": "959 x 702", "name": "n" }, { "frames": [ { - "ground": "3 x 69", - "offset": "0 x 54", - "size": "23 x 52" + "ground": "-20 x 142", + "offset": "0 x 126", + "size": "54 x 123" }, { - "ground": "3 x 69", - "offset": "23 x 54", - "size": "23 x 52" + "ground": "-20 x 142", + "offset": "54 x 126", + "size": "54 x 123" }, { - "ground": "3 x 69", - "offset": "46 x 54", - "size": "23 x 52" + "ground": "-20 x 142", + "offset": "108 x 126", + "size": "54 x 123" }, { - "ground": "3 x 69", - "offset": "69 x 54", - "size": "23 x 53" + "ground": "-20 x 142", + "offset": "162 x 126", + "size": "53 x 123" }, { - "ground": "4 x 69", - "offset": "92 x 54", - "size": "22 x 53" + "ground": "-20 x 143", + "offset": "215 x 126", + "size": "52 x 123" }, { - "ground": "4 x 70", - "offset": "114 x 54", - "size": "21 x 53" + "ground": "-20 x 143", + "offset": "267 x 126", + "size": "50 x 124" }, { - "ground": "4 x 70", - "offset": "135 x 54", - "size": "21 x 53" + "ground": "-20 x 144", + "offset": "317 x 126", + "size": "49 x 124" }, { - "ground": "4 x 70", - "offset": "156 x 54", - "size": "20 x 53" + "ground": "-19 x 144", + "offset": "366 x 126", + "size": "46 x 124" }, { - "ground": "4 x 70", - "offset": "176 x 54", - "size": "19 x 53" + "ground": "-19 x 144", + "offset": "412 x 126", + "size": "44 x 125" }, { - "ground": "4 x 70", - "offset": "195 x 54", - "size": "18 x 54" + "ground": "-19 x 145", + "offset": "456 x 126", + "size": "42 x 125" }, { - "ground": "4 x 70", - "offset": "213 x 54", - "size": "17 x 54" + "ground": "-19 x 145", + "offset": "498 x 126", + "size": "39 x 125" }, { - "ground": "4 x 70", - "offset": "230 x 54", - "size": "15 x 54" + "ground": "-19 x 145", + "offset": "537 x 126", + "size": "36 x 126" }, { - "ground": "4 x 71", - "offset": "245 x 54", - "size": "14 x 54" + "ground": "-18 x 145", + "offset": "573 x 126", + "size": "32 x 126" }, { - "ground": "4 x 71", - "offset": "259 x 54", - "size": "12 x 54" + "ground": "-18 x 146", + "offset": "605 x 126", + "size": "28 x 126" }, { - "ground": "4 x 71", - "offset": "271 x 54", - "size": "10 x 54" + "ground": "-18 x 146", + "offset": "633 x 126", + "size": "24 x 126" }, { - "ground": "6 x 71", - "offset": "281 x 54", - "size": "9 x 54" + "ground": "-15 x 146", + "offset": "657 x 126", + "size": "22 x 126" }, { - "ground": "7 x 71", - "offset": "290 x 54", - "size": "9 x 54" + "ground": "-11 x 145", + "offset": "679 x 126", + "size": "21 x 126" }, { - "ground": "10 x 70", - "offset": "299 x 54", - "size": "10 x 54" + "ground": "-5 x 145", + "offset": "700 x 126", + "size": "23 x 126" }, { - "ground": "12 x 70", - "offset": "309 x 54", - "size": "12 x 54" + "ground": "0 x 145", + "offset": "723 x 126", + "size": "28 x 126" }, { - "ground": "14 x 70", - "offset": "321 x 54", - "size": "14 x 54" + "ground": "6 x 144", + "offset": "751 x 126", + "size": "34 x 126" }, { - "ground": "17 x 70", - "offset": "335 x 54", - "size": "17 x 54" + "ground": "11 x 143", + "offset": "785 x 126", + "size": "39 x 125" }, { - "ground": "19 x 69", - "offset": "352 x 54", - "size": "19 x 53" + "ground": "17 x 142", + "offset": "824 x 126", + "size": "45 x 125" }, { - "ground": "22 x 69", - "offset": "371 x 54", - "size": "21 x 53" + "ground": "22 x 140", + "offset": "869 x 126", + "size": "50 x 124" }, { - "ground": "24 x 68", - "offset": "392 x 54", - "size": "24 x 52" + "ground": "27 x 139", + "offset": "919 x 126", + "size": "55 x 123" }, { - "ground": "26 x 67", - "offset": "416 x 54", - "size": "26 x 52" + "ground": "33 x 137", + "offset": "974 x 126", + "size": "61 x 121" }, { - "ground": "29 x 66", - "offset": "442 x 54", - "size": "28 x 51" + "ground": "39 x 134", + "offset": "1035 x 126", + "size": "66 x 119" }, { - "ground": "31 x 65", - "offset": "470 x 54", - "size": "31 x 50" + "ground": "44 x 132", + "offset": "1101 x 126", + "size": "71 x 117" }, { - "ground": "33 x 63", - "offset": "501 x 54", - "size": "33 x 49" + "ground": "49 x 129", + "offset": "1172 x 126", + "size": "76 x 114" }, { - "ground": "35 x 62", - "offset": "534 x 54", - "size": "34 x 48" + "ground": "53 x 126", + "offset": "1248 x 126", + "size": "80 x 112" }, { - "ground": "36 x 61", - "offset": "568 x 54", - "size": "36 x 47" + "ground": "57 x 122", + "offset": "1328 x 126", + "size": "84 x 109" }, { - "ground": "38 x 59", - "offset": "604 x 54", - "size": "37 x 45" + "ground": "60 x 119", + "offset": "1412 x 126", + "size": "87 x 106" }, { - "ground": "39 x 58", - "offset": "641 x 54", - "size": "38 x 44" + "ground": "62 x 116", + "offset": "1499 x 126", + "size": "89 x 103" }, { - "ground": "40 x 56", - "offset": "679 x 54", - "size": "39 x 42" + "ground": "64 x 112", + "offset": "1588 x 126", + "size": "91 x 99" }, { - "ground": "40 x 55", - "offset": "718 x 54", - "size": "40 x 41" + "ground": "65 x 108", + "offset": "1679 x 126", + "size": "92 x 96" }, { - "ground": "40 x 53", - "offset": "758 x 54", - "size": "40 x 39" + "ground": "66 x 104", + "offset": "1771 x 126", + "size": "93 x 92" }, { - "ground": "40 x 52", - "offset": "798 x 54", - "size": "40 x 38" + "ground": "66 x 101", + "offset": "1864 x 126", + "size": "93 x 89" }, { - "ground": "40 x 50", - "offset": "838 x 54", - "size": "40 x 36" + "ground": "65 x 97", + "offset": "1957 x 126", + "size": "92 x 85" }, { - "ground": "40 x 50", - "offset": "878 x 54", - "size": "40 x 38" + "ground": "65 x 97", + "offset": "2049 x 126", + "size": "93 x 88" }, { - "ground": "39 x 50", - "offset": "918 x 54", - "size": "40 x 39" + "ground": "64 x 97", + "offset": "2142 x 126", + "size": "93 x 92" }, { - "ground": "39 x 50", - "offset": "958 x 54", - "size": "40 x 41" + "ground": "63 x 97", + "offset": "2235 x 126", + "size": "93 x 95" }, { - "ground": "38 x 50", - "offset": "998 x 54", - "size": "39 x 42" + "ground": "61 x 97", + "offset": "2328 x 126", + "size": "92 x 97" }, { - "ground": "37 x 50", - "offset": "1037 x 54", - "size": "39 x 43" + "ground": "59 x 97", + "offset": "2420 x 126", + "size": "91 x 100" }, { - "ground": "37 x 50", - "offset": "1076 x 54", - "size": "38 x 44" + "ground": "57 x 97", + "offset": "2511 x 126", + "size": "90 x 102" }, { - "ground": "36 x 50", - "offset": "1114 x 54", - "size": "38 x 45" + "ground": "55 x 97", + "offset": "2601 x 126", + "size": "88 x 104" }, { - "ground": "35 x 50", - "offset": "1152 x 54", - "size": "37 x 46" + "ground": "53 x 97", + "offset": "2689 x 126", + "size": "86 x 106" }, { - "ground": "34 x 50", - "offset": "1189 x 54", - "size": "36 x 46" + "ground": "51 x 97", + "offset": "2775 x 126", + "size": "85 x 108" }, { - "ground": "33 x 50", - "offset": "1225 x 54", - "size": "36 x 47" + "ground": "49 x 96", + "offset": "2860 x 126", + "size": "83 x 110" }, { - "ground": "32 x 50", - "offset": "1261 x 54", - "size": "35 x 47" + "ground": "47 x 96", + "offset": "2943 x 126", + "size": "81 x 111" }, { - "ground": "31 x 50", - "offset": "1296 x 54", - "size": "34 x 48" + "ground": "45 x 96", + "offset": "3024 x 126", + "size": "80 x 112" }, { - "ground": "30 x 50", - "offset": "1330 x 54", - "size": "34 x 48" + "ground": "43 x 96", + "offset": "3104 x 126", + "size": "78 x 113" }, { - "ground": "30 x 50", - "offset": "1364 x 54", - "size": "33 x 49" + "ground": "41 x 96", + "offset": "3182 x 126", + "size": "77 x 114" }, { - "ground": "29 x 50", - "offset": "1397 x 54", - "size": "32 x 49" + "ground": "40 x 96", + "offset": "3259 x 126", + "size": "76 x 114" }, { - "ground": "29 x 50", - "offset": "1429 x 54", - "size": "32 x 49" + "ground": "38 x 96", + "offset": "3335 x 126", + "size": "75 x 115" }, { - "ground": "28 x 50", - "offset": "1461 x 54", - "size": "32 x 49" + "ground": "38 x 96", + "offset": "3410 x 126", + "size": "74 x 116" }, { - "ground": "28 x 50", - "offset": "1493 x 54", - "size": "31 x 50" + "ground": "37 x 96", + "offset": "3484 x 126", + "size": "73 x 116" } ], - "ground": "1070 x 779", + "ground": "959 x 702", "name": "e" }, { "frames": [ { - "ground": "-6 x 38", - "offset": "0 x 108", - "size": "37 x 46" + "ground": "-42 x 68", + "offset": "0 x 252", + "size": "86 x 107" }, { - "ground": "-6 x 38", - "offset": "37 x 108", - "size": "37 x 46" + "ground": "-42 x 68", + "offset": "86 x 252", + "size": "86 x 107" }, { - "ground": "-6 x 38", - "offset": "74 x 108", - "size": "37 x 46" + "ground": "-42 x 68", + "offset": "172 x 252", + "size": "86 x 106" }, { - "ground": "-6 x 38", - "offset": "111 x 108", - "size": "37 x 45" + "ground": "-42 x 68", + "offset": "258 x 252", + "size": "87 x 106" }, { - "ground": "-6 x 38", - "offset": "148 x 108", - "size": "37 x 45" + "ground": "-42 x 68", + "offset": "345 x 252", + "size": "87 x 106" }, { - "ground": "-6 x 38", - "offset": "185 x 108", - "size": "38 x 45" + "ground": "-42 x 68", + "offset": "432 x 252", + "size": "88 x 105" }, { - "ground": "-6 x 38", - "offset": "223 x 108", - "size": "38 x 44" + "ground": "-42 x 68", + "offset": "520 x 252", + "size": "88 x 104" }, { - "ground": "-6 x 38", - "offset": "261 x 108", - "size": "38 x 44" + "ground": "-42 x 69", + "offset": "608 x 252", + "size": "89 x 103" }, { - "ground": "-6 x 38", - "offset": "299 x 108", - "size": "38 x 44" + "ground": "-42 x 69", + "offset": "697 x 252", + "size": "90 x 102" }, { - "ground": "-6 x 38", - "offset": "337 x 108", - "size": "39 x 43" + "ground": "-42 x 69", + "offset": "787 x 252", + "size": "91 x 100" }, { - "ground": "-6 x 38", - "offset": "376 x 108", - "size": "39 x 42" + "ground": "-42 x 69", + "offset": "878 x 252", + "size": "91 x 99" }, { - "ground": "-6 x 38", - "offset": "415 x 108", - "size": "39 x 41" + "ground": "-42 x 69", + "offset": "969 x 252", + "size": "92 x 97" }, { - "ground": "-6 x 38", - "offset": "454 x 108", - "size": "40 x 41" + "ground": "-42 x 69", + "offset": "1061 x 252", + "size": "92 x 95" }, { - "ground": "-6 x 38", - "offset": "494 x 108", - "size": "40 x 40" + "ground": "-42 x 69", + "offset": "1153 x 252", + "size": "93 x 92" }, { - "ground": "-6 x 38", - "offset": "534 x 108", - "size": "40 x 39" + "ground": "-42 x 69", + "offset": "1246 x 252", + "size": "93 x 90" }, { - "ground": "-6 x 38", - "offset": "574 x 108", - "size": "40 x 37" + "ground": "-42 x 69", + "offset": "1339 x 252", + "size": "93 x 88" }, { - "ground": "-6 x 38", - "offset": "614 x 108", - "size": "40 x 37" + "ground": "-42 x 70", + "offset": "1432 x 252", + "size": "92 x 85" }, { - "ground": "-5 x 40", - "offset": "654 x 108", - "size": "40 x 38" + "ground": "-41 x 73", + "offset": "1524 x 252", + "size": "93 x 89" }, { - "ground": "-5 x 41", - "offset": "694 x 108", - "size": "40 x 39" + "ground": "-40 x 76", + "offset": "1617 x 252", + "size": "93 x 92" }, { - "ground": "-5 x 42", - "offset": "734 x 108", - "size": "40 x 41" + "ground": "-39 x 79", + "offset": "1710 x 252", + "size": "93 x 95" }, { - "ground": "-4 x 44", - "offset": "774 x 108", - "size": "39 x 42" + "ground": "-38 x 82", + "offset": "1803 x 252", + "size": "92 x 98" }, { - "ground": "-4 x 45", - "offset": "813 x 108", - "size": "39 x 43" + "ground": "-37 x 86", + "offset": "1895 x 252", + "size": "90 x 101" }, { - "ground": "-3 x 47", - "offset": "852 x 108", - "size": "38 x 45" + "ground": "-36 x 89", + "offset": "1985 x 252", + "size": "88 x 104" }, { - "ground": "-3 x 48", - "offset": "890 x 108", - "size": "37 x 46" + "ground": "-36 x 92", + "offset": "2073 x 252", + "size": "85 x 107" }, { - "ground": "-3 x 49", - "offset": "927 x 108", - "size": "35 x 47" + "ground": "-35 x 95", + "offset": "2158 x 252", + "size": "82 x 110" }, { - "ground": "-2 x 50", - "offset": "962 x 108", - "size": "34 x 48" + "ground": "-34 x 98", + "offset": "2240 x 252", + "size": "79 x 113" }, { - "ground": "-2 x 51", - "offset": "996 x 108", - "size": "32 x 49" + "ground": "-33 x 101", + "offset": "2319 x 252", + "size": "74 x 116" }, { - "ground": "-2 x 52", - "offset": "1028 x 108", - "size": "30 x 50" + "ground": "-32 x 103", + "offset": "2393 x 252", + "size": "70 x 118" }, { - "ground": "-1 x 53", - "offset": "1058 x 108", - "size": "27 x 51" + "ground": "-31 x 105", + "offset": "2463 x 252", + "size": "64 x 120" }, { - "ground": "-1 x 54", - "offset": "1085 x 108", - "size": "25 x 52" + "ground": "-30 x 107", + "offset": "2527 x 252", + "size": "59 x 122" }, { - "ground": "-1 x 55", - "offset": "1110 x 108", - "size": "22 x 53" + "ground": "-30 x 108", + "offset": "2586 x 252", + "size": "52 x 123" }, { - "ground": "0 x 55", - "offset": "1132 x 108", - "size": "20 x 53" + "ground": "-29 x 109", + "offset": "2638 x 252", + "size": "46 x 124" }, { - "ground": "0 x 56", - "offset": "1152 x 108", - "size": "17 x 54" + "ground": "-28 x 110", + "offset": "2684 x 252", + "size": "40 x 125" }, { - "ground": "0 x 56", - "offset": "1169 x 108", - "size": "15 x 54" + "ground": "-28 x 111", + "offset": "2724 x 252", + "size": "34 x 126" }, { - "ground": "0 x 56", - "offset": "1184 x 108", - "size": "12 x 54" + "ground": "-28 x 111", + "offset": "2758 x 252", + "size": "28 x 126" }, { - "ground": "1 x 56", - "offset": "1196 x 108", - "size": "9 x 54" + "ground": "-27 x 111", + "offset": "2786 x 252", + "size": "22 x 126" }, { - "ground": "3 x 56", - "offset": "1205 x 108", - "size": "9 x 54" + "ground": "-21 x 111", + "offset": "2808 x 252", + "size": "21 x 126" }, { - "ground": "5 x 56", - "offset": "1214 x 108", - "size": "10 x 54" + "ground": "-16 x 111", + "offset": "2829 x 252", + "size": "22 x 126" }, { - "ground": "8 x 56", - "offset": "1224 x 108", - "size": "12 x 54" + "ground": "-10 x 110", + "offset": "2851 x 252", + "size": "28 x 126" }, { - "ground": "10 x 55", - "offset": "1236 x 108", - "size": "14 x 54" + "ground": "-4 x 110", + "offset": "2879 x 252", + "size": "33 x 126" }, { - "ground": "12 x 55", - "offset": "1250 x 108", - "size": "16 x 54" + "ground": "1 x 109", + "offset": "2912 x 252", + "size": "38 x 126" }, { - "ground": "14 x 55", - "offset": "1266 x 108", - "size": "18 x 53" + "ground": "5 x 108", + "offset": "2950 x 252", + "size": "42 x 125" }, { - "ground": "16 x 54", - "offset": "1284 x 108", - "size": "20 x 53" + "ground": "9 x 107", + "offset": "2992 x 252", + "size": "47 x 124" }, { - "ground": "18 x 54", - "offset": "1304 x 108", - "size": "21 x 53" + "ground": "13 x 106", + "offset": "3039 x 252", + "size": "50 x 124" }, { - "ground": "19 x 53", - "offset": "1325 x 108", - "size": "23 x 53" + "ground": "17 x 105", + "offset": "3089 x 252", + "size": "54 x 123" }, { - "ground": "20 x 53", - "offset": "1348 x 108", - "size": "24 x 52" + "ground": "20 x 104", + "offset": "3143 x 252", + "size": "56 x 122" }, { - "ground": "22 x 52", - "offset": "1372 x 108", - "size": "26 x 52" + "ground": "23 x 103", + "offset": "3199 x 252", + "size": "60 x 121" }, { - "ground": "23 x 52", - "offset": "1398 x 108", - "size": "27 x 52" + "ground": "25 x 102", + "offset": "3259 x 252", + "size": "62 x 120" }, { - "ground": "24 x 51", - "offset": "1425 x 108", - "size": "28 x 51" + "ground": "28 x 101", + "offset": "3321 x 252", + "size": "65 x 120" }, { - "ground": "25 x 51", - "offset": "1453 x 108", - "size": "29 x 51" + "ground": "30 x 100", + "offset": "3386 x 252", + "size": "67 x 119" }, { - "ground": "26 x 51", - "offset": "1482 x 108", - "size": "29 x 51" + "ground": "32 x 99", + "offset": "3453 x 252", + "size": "69 x 118" }, { - "ground": "26 x 50", - "offset": "1511 x 108", - "size": "30 x 50" + "ground": "33 x 98", + "offset": "3522 x 252", + "size": "70 x 118" }, { - "ground": "27 x 50", - "offset": "1541 x 108", - "size": "30 x 50" + "ground": "34 x 97", + "offset": "3592 x 252", + "size": "71 x 117" }, { - "ground": "27 x 50", - "offset": "1571 x 108", - "size": "31 x 50" + "ground": "35 x 97", + "offset": "3663 x 252", + "size": "72 x 117" }, { - "ground": "27 x 50", - "offset": "1602 x 108", - "size": "31 x 50" + "ground": "36 x 97", + "offset": "3735 x 252", + "size": "72 x 116" } ], - "ground": "1070 x 779", + "ground": "959 x 702", "name": "s" }, { "frames": [ { - "ground": "44 x 33", - "offset": "0 x 162", - "size": "23 x 53" + "ground": "74 x 57", + "offset": "0 x 378", + "size": "54 x 123" }, { - "ground": "44 x 33", - "offset": "23 x 162", - "size": "23 x 53" + "ground": "74 x 57", + "offset": "54 x 378", + "size": "54 x 123" }, { - "ground": "43 x 33", - "offset": "46 x 162", - "size": "23 x 53" + "ground": "73 x 57", + "offset": "108 x 378", + "size": "54 x 123" }, { - "ground": "43 x 33", - "offset": "69 x 162", - "size": "23 x 53" + "ground": "72 x 57", + "offset": "162 x 378", + "size": "53 x 123" }, { - "ground": "42 x 33", - "offset": "92 x 162", - "size": "22 x 53" + "ground": "71 x 57", + "offset": "215 x 378", + "size": "52 x 123" }, { - "ground": "42 x 33", - "offset": "114 x 162", - "size": "21 x 53" + "ground": "69 x 57", + "offset": "267 x 378", + "size": "50 x 124" }, { - "ground": "41 x 33", - "offset": "135 x 162", - "size": "21 x 53" + "ground": "68 x 57", + "offset": "317 x 378", + "size": "49 x 124" }, { - "ground": "40 x 33", - "offset": "156 x 162", - "size": "20 x 53" + "ground": "65 x 57", + "offset": "366 x 378", + "size": "46 x 124" }, { - "ground": "39 x 33", - "offset": "176 x 162", - "size": "19 x 53" + "ground": "63 x 57", + "offset": "412 x 378", + "size": "45 x 125" }, { - "ground": "38 x 33", - "offset": "195 x 162", - "size": "18 x 54" + "ground": "60 x 57", + "offset": "457 x 378", + "size": "42 x 125" }, { - "ground": "37 x 33", - "offset": "213 x 162", - "size": "17 x 54" + "ground": "57 x 57", + "offset": "499 x 378", + "size": "39 x 125" }, { - "ground": "35 x 33", - "offset": "230 x 162", - "size": "15 x 54" + "ground": "54 x 57", + "offset": "538 x 378", + "size": "36 x 126" }, { - "ground": "34 x 33", - "offset": "245 x 162", - "size": "14 x 54" + "ground": "50 x 57", + "offset": "574 x 378", + "size": "32 x 126" }, { - "ground": "32 x 33", - "offset": "259 x 162", - "size": "12 x 54" + "ground": "46 x 57", + "offset": "606 x 378", + "size": "28 x 126" }, { - "ground": "30 x 33", - "offset": "271 x 162", - "size": "10 x 54" + "ground": "41 x 57", + "offset": "634 x 378", + "size": "24 x 126" }, { - "ground": "28 x 33", - "offset": "281 x 162", - "size": "9 x 54" + "ground": "37 x 58", + "offset": "658 x 378", + "size": "22 x 126" }, { - "ground": "26 x 33", - "offset": "290 x 162", - "size": "9 x 54" + "ground": "32 x 58", + "offset": "680 x 378", + "size": "22 x 126" }, { - "ground": "24 x 33", - "offset": "299 x 162", - "size": "10 x 54" + "ground": "28 x 58", + "offset": "702 x 378", + "size": "23 x 126" }, { - "ground": "24 x 33", - "offset": "309 x 162", - "size": "12 x 54" + "ground": "27 x 58", + "offset": "725 x 378", + "size": "28 x 126" }, { - "ground": "24 x 34", - "offset": "321 x 162", - "size": "14 x 54" + "ground": "27 x 59", + "offset": "753 x 378", + "size": "34 x 126" }, { - "ground": "24 x 34", - "offset": "335 x 162", - "size": "17 x 54" + "ground": "27 x 59", + "offset": "787 x 378", + "size": "39 x 125" }, { - "ground": "24 x 34", - "offset": "352 x 162", - "size": "19 x 53" + "ground": "27 x 60", + "offset": "826 x 378", + "size": "45 x 125" }, { - "ground": "24 x 34", - "offset": "371 x 162", - "size": "21 x 53" + "ground": "27 x 60", + "offset": "871 x 378", + "size": "50 x 124" }, { - "ground": "24 x 34", - "offset": "392 x 162", - "size": "24 x 52" + "ground": "27 x 61", + "offset": "921 x 378", + "size": "55 x 123" }, { - "ground": "24 x 35", - "offset": "416 x 162", - "size": "26 x 52" + "ground": "27 x 61", + "offset": "976 x 378", + "size": "61 x 121" }, { - "ground": "24 x 35", - "offset": "442 x 162", - "size": "28 x 51" + "ground": "27 x 62", + "offset": "1037 x 378", + "size": "66 x 119" }, { - "ground": "23 x 35", - "offset": "470 x 162", - "size": "30 x 50" + "ground": "26 x 62", + "offset": "1103 x 378", + "size": "71 x 117" }, { - "ground": "23 x 35", - "offset": "500 x 162", - "size": "33 x 49" + "ground": "26 x 62", + "offset": "1174 x 378", + "size": "76 x 114" }, { - "ground": "23 x 35", - "offset": "533 x 162", - "size": "34 x 48" + "ground": "26 x 63", + "offset": "1250 x 378", + "size": "80 x 112" }, { - "ground": "23 x 35", - "offset": "567 x 162", - "size": "36 x 47" + "ground": "26 x 63", + "offset": "1330 x 378", + "size": "84 x 109" }, { - "ground": "23 x 36", - "offset": "603 x 162", - "size": "37 x 45" + "ground": "26 x 64", + "offset": "1414 x 378", + "size": "87 x 106" }, { - "ground": "23 x 36", - "offset": "640 x 162", - "size": "38 x 44" + "ground": "26 x 64", + "offset": "1501 x 378", + "size": "89 x 103" }, { - "ground": "23 x 36", - "offset": "678 x 162", - "size": "39 x 42" + "ground": "26 x 64", + "offset": "1590 x 378", + "size": "91 x 99" }, { - "ground": "23 x 36", - "offset": "717 x 162", - "size": "39 x 41" + "ground": "26 x 64", + "offset": "1681 x 378", + "size": "92 x 96" }, { - "ground": "24 x 36", - "offset": "756 x 162", - "size": "40 x 40" + "ground": "27 x 65", + "offset": "1773 x 378", + "size": "93 x 92" }, { - "ground": "24 x 36", - "offset": "796 x 162", - "size": "40 x 38" + "ground": "27 x 65", + "offset": "1866 x 378", + "size": "93 x 89" }, { - "ground": "24 x 36", - "offset": "836 x 162", - "size": "40 x 37" + "ground": "27 x 65", + "offset": "1959 x 378", + "size": "93 x 85" }, { - "ground": "24 x 37", - "offset": "876 x 162", - "size": "40 x 38" + "ground": "28 x 68", + "offset": "2052 x 378", + "size": "93 x 88" }, { - "ground": "24 x 39", - "offset": "916 x 162", - "size": "40 x 39" + "ground": "28 x 71", + "offset": "2145 x 378", + "size": "93 x 92" }, { - "ground": "25 x 40", - "offset": "956 x 162", - "size": "40 x 40" + "ground": "30 x 74", + "offset": "2238 x 378", + "size": "93 x 94" }, { - "ground": "25 x 41", - "offset": "996 x 162", - "size": "39 x 42" + "ground": "30 x 77", + "offset": "2331 x 378", + "size": "92 x 97" }, { - "ground": "25 x 43", - "offset": "1035 x 162", - "size": "39 x 43" + "ground": "31 x 80", + "offset": "2423 x 378", + "size": "91 x 100" }, { - "ground": "26 x 44", - "offset": "1074 x 162", - "size": "38 x 44" + "ground": "32 x 82", + "offset": "2514 x 378", + "size": "89 x 102" }, { - "ground": "26 x 45", - "offset": "1112 x 162", - "size": "38 x 45" + "ground": "32 x 84", + "offset": "2603 x 378", + "size": "88 x 104" }, { - "ground": "26 x 45", - "offset": "1150 x 162", - "size": "37 x 46" + "ground": "33 x 87", + "offset": "2691 x 378", + "size": "86 x 106" }, { - "ground": "26 x 46", - "offset": "1187 x 162", - "size": "36 x 46" + "ground": "33 x 88", + "offset": "2777 x 378", + "size": "85 x 108" }, { - "ground": "27 x 47", - "offset": "1223 x 162", - "size": "36 x 47" + "ground": "34 x 90", + "offset": "2862 x 378", + "size": "83 x 110" }, { - "ground": "27 x 47", - "offset": "1259 x 162", - "size": "35 x 47" + "ground": "34 x 91", + "offset": "2945 x 378", + "size": "81 x 111" }, { - "ground": "27 x 48", - "offset": "1294 x 162", - "size": "34 x 48" + "ground": "35 x 92", + "offset": "3026 x 378", + "size": "80 x 112" }, { - "ground": "27 x 48", - "offset": "1328 x 162", - "size": "34 x 48" + "ground": "35 x 93", + "offset": "3106 x 378", + "size": "78 x 113" }, { - "ground": "27 x 49", - "offset": "1362 x 162", - "size": "33 x 49" + "ground": "35 x 94", + "offset": "3184 x 378", + "size": "77 x 114" }, { - "ground": "27 x 49", - "offset": "1395 x 162", - "size": "32 x 49" + "ground": "36 x 95", + "offset": "3261 x 378", + "size": "76 x 115" }, { - "ground": "27 x 49", - "offset": "1427 x 162", - "size": "32 x 49" + "ground": "36 x 95", + "offset": "3337 x 378", + "size": "75 x 115" }, { - "ground": "27 x 49", - "offset": "1459 x 162", - "size": "32 x 50" + "ground": "36 x 96", + "offset": "3412 x 378", + "size": "74 x 116" }, { - "ground": "28 x 50", - "offset": "1491 x 162", - "size": "31 x 50" + "ground": "36 x 96", + "offset": "3486 x 378", + "size": "74 x 116" } ], - "ground": "1070 x 779", + "ground": "959 x 702", "name": "w" } ], "height": 0, "nframes": 55, "object_name": "door", - "pixel_size": "2233 x 216", - "width": 55 + "pixel_size": "3809 x 504", + "width": 86 } diff --git a/anim/door_close.tga b/anim/door_close.tga index cc037b43..f91e9eb2 100644 Binary files a/anim/door_close.tga and b/anim/door_close.tga differ diff --git a/src/anim-atlas.cpp b/src/anim-atlas.cpp index 4b502208..8326ac5e 100644 --- a/src/anim-atlas.cpp +++ b/src/anim-atlas.cpp @@ -86,12 +86,11 @@ auto anim_atlas::frame_quad(const Vector3& center, rotation r, std::size_t i) co const auto f = frame(r, i); const auto size = Vector2d(f.size); const double gx = f.ground[0]*.5, gy = f.ground[1]*.5; - //auto gx = 0, gy = 0; const double sx = size[0]*.5, sy = size[1]*.5; const auto bottom_right = Vector2(tile_shader::unproject({ sx - gx, sy - gy })), - top_right = Vector2(tile_shader::unproject({ sx - gx, -sy - gy })), - bottom_left = Vector2(tile_shader::unproject({ -sx - gx, sy - gy })), - top_left = Vector2(tile_shader::unproject({ -sx - gx, -sy - gy })); + top_right = Vector2(tile_shader::unproject({ sx - gx, - gy })), + bottom_left = Vector2(tile_shader::unproject({ - gx, sy - gy })), + top_left = Vector2(tile_shader::unproject({ - gx, - gy })); const auto cx = center[0], cy = center[1], cz = center[2]; return {{ { cx + bottom_right[0], cy + bottom_right[1], cz }, -- cgit v1.2.3