diff --git a/fonts/demo_f_hires/demo_f_hires.old.png b/fonts/demo_f_hires/demo_f_hires.old.png index e3cfcd5..7f01f2b 100644 Binary files a/fonts/demo_f_hires/demo_f_hires.old.png and b/fonts/demo_f_hires/demo_f_hires.old.png differ diff --git a/fonts/demo_f_hires/demo_f_hires.old.yy b/fonts/demo_f_hires/demo_f_hires.old.yy index 11e5df4..cf37962 100644 --- a/fonts/demo_f_hires/demo_f_hires.old.yy +++ b/fonts/demo_f_hires/demo_f_hires.old.yy @@ -7,9 +7,9 @@ "interpreter": 0, "pointRounding": 0, "applyKerning": 0, - "fontName": "Arial", - "styleName": "Regular", - "size": 12.0, + "fontName": "Atkinson Hyperlegible", + "styleName": "Bold", + "size": 24.0, "bold": false, "italic": false, "charset": 0, @@ -24,178 +24,106 @@ "path": "texturegroups/Default", }, "ascenderOffset": 0, - "ascender": 14, + "ascender": 27, "glyphs": { - "32": {"x":2,"y":2,"w":4,"h":18,"character":32,"shift":4,"offset":0,}, - "33": {"x":165,"y":42,"w":3,"h":18,"character":33,"shift":4,"offset":1,}, - "34": {"x":158,"y":42,"w":5,"h":18,"character":34,"shift":6,"offset":0,}, - "35": {"x":147,"y":42,"w":9,"h":18,"character":35,"shift":9,"offset":0,}, - "36": {"x":136,"y":42,"w":9,"h":18,"character":36,"shift":9,"offset":0,}, - "37": {"x":120,"y":42,"w":14,"h":18,"character":37,"shift":14,"offset":0,}, - "38": {"x":107,"y":42,"w":11,"h":18,"character":38,"shift":11,"offset":0,}, - "39": {"x":102,"y":42,"w":3,"h":18,"character":39,"shift":3,"offset":0,}, - "40": {"x":95,"y":42,"w":5,"h":18,"character":40,"shift":5,"offset":0,}, - "41": {"x":88,"y":42,"w":5,"h":18,"character":41,"shift":5,"offset":0,}, - "42": {"x":170,"y":42,"w":6,"h":18,"character":42,"shift":6,"offset":0,}, - "43": {"x":77,"y":42,"w":9,"h":18,"character":43,"shift":9,"offset":0,}, - "44": {"x":61,"y":42,"w":3,"h":18,"character":44,"shift":4,"offset":1,}, - "45": {"x":54,"y":42,"w":5,"h":18,"character":45,"shift":5,"offset":0,}, - "46": {"x":49,"y":42,"w":3,"h":18,"character":46,"shift":4,"offset":1,}, - "47": {"x":42,"y":42,"w":5,"h":18,"character":47,"shift":4,"offset":0,}, - "48": {"x":31,"y":42,"w":9,"h":18,"character":48,"shift":9,"offset":0,}, - "49": {"x":24,"y":42,"w":5,"h":18,"character":49,"shift":9,"offset":1,}, - "50": {"x":13,"y":42,"w":9,"h":18,"character":50,"shift":9,"offset":0,}, - "51": {"x":2,"y":42,"w":9,"h":18,"character":51,"shift":9,"offset":0,}, - "52": {"x":240,"y":22,"w":9,"h":18,"character":52,"shift":9,"offset":0,}, - "53": {"x":66,"y":42,"w":9,"h":18,"character":53,"shift":9,"offset":0,}, - "54": {"x":178,"y":42,"w":9,"h":18,"character":54,"shift":9,"offset":0,}, - "55": {"x":189,"y":42,"w":9,"h":18,"character":55,"shift":9,"offset":0,}, - "56": {"x":200,"y":42,"w":9,"h":18,"character":56,"shift":9,"offset":0,}, - "57": {"x":186,"y":62,"w":9,"h":18,"character":57,"shift":9,"offset":0,}, - "58": {"x":181,"y":62,"w":3,"h":18,"character":58,"shift":4,"offset":1,}, - "59": {"x":176,"y":62,"w":3,"h":18,"character":59,"shift":4,"offset":1,}, - "60": {"x":165,"y":62,"w":9,"h":18,"character":60,"shift":9,"offset":0,}, - "61": {"x":154,"y":62,"w":9,"h":18,"character":61,"shift":9,"offset":0,}, - "62": {"x":143,"y":62,"w":9,"h":18,"character":62,"shift":9,"offset":0,}, - "63": {"x":132,"y":62,"w":9,"h":18,"character":63,"shift":9,"offset":0,}, - "64": {"x":114,"y":62,"w":16,"h":18,"character":64,"shift":16,"offset":0,}, - "65": {"x":100,"y":62,"w":12,"h":18,"character":65,"shift":11,"offset":-1,}, - "66": {"x":89,"y":62,"w":9,"h":18,"character":66,"shift":11,"offset":1,}, - "67": {"x":76,"y":62,"w":11,"h":18,"character":67,"shift":12,"offset":0,}, - "68": {"x":64,"y":62,"w":10,"h":18,"character":68,"shift":12,"offset":1,}, - "69": {"x":53,"y":62,"w":9,"h":18,"character":69,"shift":11,"offset":1,}, - "70": {"x":42,"y":62,"w":9,"h":18,"character":70,"shift":10,"offset":1,}, - "71": {"x":28,"y":62,"w":12,"h":18,"character":71,"shift":12,"offset":0,}, - "72": {"x":16,"y":62,"w":10,"h":18,"character":72,"shift":12,"offset":1,}, - "73": {"x":11,"y":62,"w":3,"h":18,"character":73,"shift":4,"offset":1,}, - "74": {"x":2,"y":62,"w":7,"h":18,"character":74,"shift":8,"offset":0,}, - "75": {"x":235,"y":42,"w":10,"h":18,"character":75,"shift":11,"offset":1,}, - "76": {"x":225,"y":42,"w":8,"h":18,"character":76,"shift":9,"offset":1,}, - "77": {"x":211,"y":42,"w":12,"h":18,"character":77,"shift":13,"offset":1,}, - "78": {"x":228,"y":22,"w":10,"h":18,"character":78,"shift":12,"offset":1,}, - "79": {"x":214,"y":22,"w":12,"h":18,"character":79,"shift":12,"offset":0,}, - "80": {"x":203,"y":22,"w":9,"h":18,"character":80,"shift":11,"offset":1,}, - "81": {"x":232,"y":2,"w":12,"h":18,"character":81,"shift":12,"offset":0,}, - "82": {"x":213,"y":2,"w":11,"h":18,"character":82,"shift":12,"offset":1,}, - "83": {"x":201,"y":2,"w":10,"h":18,"character":83,"shift":11,"offset":0,}, - "84": {"x":189,"y":2,"w":10,"h":18,"character":84,"shift":10,"offset":0,}, - "85": {"x":177,"y":2,"w":10,"h":18,"character":85,"shift":12,"offset":1,}, - "86": {"x":164,"y":2,"w":11,"h":18,"character":86,"shift":11,"offset":0,}, - "87": {"x":147,"y":2,"w":15,"h":18,"character":87,"shift":15,"offset":0,}, - "88": {"x":134,"y":2,"w":11,"h":18,"character":88,"shift":11,"offset":0,}, - "89": {"x":121,"y":2,"w":11,"h":18,"character":89,"shift":11,"offset":0,}, - "90": {"x":109,"y":2,"w":10,"h":18,"character":90,"shift":10,"offset":0,}, - "91": {"x":226,"y":2,"w":4,"h":18,"character":91,"shift":4,"offset":1,}, - "92": {"x":102,"y":2,"w":5,"h":18,"character":92,"shift":4,"offset":0,}, - "93": {"x":89,"y":2,"w":4,"h":18,"character":93,"shift":4,"offset":0,}, - "94": {"x":79,"y":2,"w":8,"h":18,"character":94,"shift":8,"offset":0,}, - "95": {"x":66,"y":2,"w":11,"h":18,"character":95,"shift":9,"offset":-1,}, - "96": {"x":60,"y":2,"w":4,"h":18,"character":96,"shift":5,"offset":0,}, - "97": {"x":49,"y":2,"w":9,"h":18,"character":97,"shift":9,"offset":0,}, - "98": {"x":39,"y":2,"w":8,"h":18,"character":98,"shift":9,"offset":1,}, - "99": {"x":29,"y":2,"w":8,"h":18,"character":99,"shift":8,"offset":0,}, - "100": {"x":19,"y":2,"w":8,"h":18,"character":100,"shift":9,"offset":0,}, - "101": {"x":8,"y":2,"w":9,"h":18,"character":101,"shift":9,"offset":0,}, - "102": {"x":95,"y":2,"w":5,"h":18,"character":102,"shift":4,"offset":0,}, - "103": {"x":2,"y":22,"w":8,"h":18,"character":103,"shift":9,"offset":0,}, - "104": {"x":97,"y":22,"w":7,"h":18,"character":104,"shift":9,"offset":1,}, - "105": {"x":12,"y":22,"w":2,"h":18,"character":105,"shift":4,"offset":1,}, - "106": {"x":187,"y":22,"w":4,"h":18,"character":106,"shift":4,"offset":-1,}, - "107": {"x":178,"y":22,"w":7,"h":18,"character":107,"shift":8,"offset":1,}, - "108": {"x":174,"y":22,"w":2,"h":18,"character":108,"shift":4,"offset":1,}, - "109": {"x":160,"y":22,"w":12,"h":18,"character":109,"shift":13,"offset":1,}, - "110": {"x":151,"y":22,"w":7,"h":18,"character":110,"shift":9,"offset":1,}, - "111": {"x":140,"y":22,"w":9,"h":18,"character":111,"shift":9,"offset":0,}, - "112": {"x":130,"y":22,"w":8,"h":18,"character":112,"shift":9,"offset":1,}, - "113": {"x":120,"y":22,"w":8,"h":18,"character":113,"shift":9,"offset":0,}, - "114": {"x":113,"y":22,"w":5,"h":18,"character":114,"shift":5,"offset":1,}, - "115": {"x":193,"y":22,"w":8,"h":18,"character":115,"shift":8,"offset":0,}, - "116": {"x":106,"y":22,"w":5,"h":18,"character":116,"shift":4,"offset":0,}, - "117": {"x":88,"y":22,"w":7,"h":18,"character":117,"shift":9,"offset":1,}, - "118": {"x":78,"y":22,"w":8,"h":18,"character":118,"shift":8,"offset":0,}, - "119": {"x":64,"y":22,"w":12,"h":18,"character":119,"shift":12,"offset":0,}, - "120": {"x":54,"y":22,"w":8,"h":18,"character":120,"shift":8,"offset":0,}, - "121": {"x":44,"y":22,"w":8,"h":18,"character":121,"shift":8,"offset":0,}, - "122": {"x":34,"y":22,"w":8,"h":18,"character":122,"shift":8,"offset":0,}, - "123": {"x":27,"y":22,"w":5,"h":18,"character":123,"shift":5,"offset":0,}, - "124": {"x":23,"y":22,"w":2,"h":18,"character":124,"shift":4,"offset":1,}, - "125": {"x":16,"y":22,"w":5,"h":18,"character":125,"shift":5,"offset":0,}, - "126": {"x":197,"y":62,"w":9,"h":18,"character":126,"shift":9,"offset":0,}, - "9647": {"x":208,"y":62,"w":10,"h":18,"character":9647,"shift":16,"offset":3,}, + "32": {"x":2,"y":2,"w":10,"h":38,"character":32,"shift":10,"offset":0,}, + "33": {"x":240,"y":82,"w":7,"h":38,"character":33,"shift":9,"offset":1,}, + "34": {"x":227,"y":82,"w":11,"h":38,"character":34,"shift":13,"offset":1,}, + "35": {"x":200,"y":82,"w":25,"h":38,"character":35,"shift":25,"offset":0,}, + "36": {"x":178,"y":82,"w":20,"h":38,"character":36,"shift":20,"offset":0,}, + "37": {"x":145,"y":82,"w":31,"h":38,"character":37,"shift":31,"offset":0,}, + "38": {"x":120,"y":82,"w":23,"h":38,"character":38,"shift":22,"offset":0,}, + "39": {"x":113,"y":82,"w":5,"h":38,"character":39,"shift":7,"offset":1,}, + "40": {"x":101,"y":82,"w":10,"h":38,"character":40,"shift":12,"offset":1,}, + "41": {"x":89,"y":82,"w":10,"h":38,"character":41,"shift":12,"offset":1,}, + "42": {"x":249,"y":82,"w":12,"h":38,"character":42,"shift":14,"offset":1,}, + "43": {"x":69,"y":82,"w":18,"h":38,"character":43,"shift":20,"offset":1,}, + "44": {"x":40,"y":82,"w":7,"h":38,"character":44,"shift":9,"offset":1,}, + "45": {"x":27,"y":82,"w":11,"h":38,"character":45,"shift":13,"offset":1,}, + "46": {"x":18,"y":82,"w":7,"h":38,"character":46,"shift":9,"offset":1,}, + "47": {"x":2,"y":82,"w":14,"h":38,"character":47,"shift":14,"offset":0,}, + "48": {"x":479,"y":42,"w":19,"h":38,"character":48,"shift":21,"offset":1,}, + "49": {"x":466,"y":42,"w":11,"h":38,"character":49,"shift":14,"offset":1,}, + "50": {"x":447,"y":42,"w":17,"h":38,"character":50,"shift":19,"offset":1,}, + "51": {"x":428,"y":42,"w":17,"h":38,"character":51,"shift":19,"offset":1,}, + "52": {"x":407,"y":42,"w":19,"h":38,"character":52,"shift":20,"offset":0,}, + "53": {"x":49,"y":82,"w":18,"h":38,"character":53,"shift":20,"offset":1,}, + "54": {"x":263,"y":82,"w":18,"h":38,"character":54,"shift":20,"offset":1,}, + "55": {"x":283,"y":82,"w":17,"h":38,"character":55,"shift":17,"offset":0,}, + "56": {"x":302,"y":82,"w":18,"h":38,"character":56,"shift":20,"offset":1,}, + "57": {"x":211,"y":122,"w":16,"h":38,"character":57,"shift":18,"offset":1,}, + "58": {"x":202,"y":122,"w":7,"h":38,"character":58,"shift":9,"offset":1,}, + "59": {"x":193,"y":122,"w":7,"h":38,"character":59,"shift":9,"offset":1,}, + "60": {"x":174,"y":122,"w":17,"h":38,"character":60,"shift":18,"offset":1,}, + "61": {"x":154,"y":122,"w":18,"h":38,"character":61,"shift":20,"offset":1,}, + "62": {"x":135,"y":122,"w":17,"h":38,"character":62,"shift":18,"offset":1,}, + "63": {"x":115,"y":122,"w":18,"h":38,"character":63,"shift":20,"offset":1,}, + "64": {"x":91,"y":122,"w":22,"h":38,"character":64,"shift":24,"offset":1,}, + "65": {"x":67,"y":122,"w":22,"h":38,"character":65,"shift":22,"offset":0,}, + "66": {"x":46,"y":122,"w":19,"h":38,"character":66,"shift":21,"offset":1,}, + "67": {"x":24,"y":122,"w":20,"h":38,"character":67,"shift":22,"offset":1,}, + "68": {"x":2,"y":122,"w":20,"h":38,"character":68,"shift":22,"offset":1,}, + "69": {"x":485,"y":82,"w":17,"h":38,"character":69,"shift":19,"offset":1,}, + "70": {"x":467,"y":82,"w":16,"h":38,"character":70,"shift":17,"offset":1,}, + "71": {"x":444,"y":82,"w":21,"h":38,"character":71,"shift":23,"offset":1,}, + "72": {"x":422,"y":82,"w":20,"h":38,"character":72,"shift":22,"offset":1,}, + "73": {"x":408,"y":82,"w":12,"h":38,"character":73,"shift":15,"offset":1,}, + "74": {"x":389,"y":82,"w":17,"h":38,"character":74,"shift":18,"offset":0,}, + "75": {"x":367,"y":82,"w":20,"h":38,"character":75,"shift":21,"offset":1,}, + "76": {"x":349,"y":82,"w":16,"h":38,"character":76,"shift":17,"offset":1,}, + "77": {"x":322,"y":82,"w":25,"h":38,"character":77,"shift":27,"offset":1,}, + "78": {"x":385,"y":42,"w":20,"h":38,"character":78,"shift":22,"offset":1,}, + "79": {"x":360,"y":42,"w":23,"h":38,"character":79,"shift":24,"offset":1,}, + "80": {"x":339,"y":42,"w":19,"h":38,"character":80,"shift":20,"offset":1,}, + "81": {"x":418,"y":2,"w":24,"h":38,"character":81,"shift":25,"offset":1,}, + "82": {"x":385,"y":2,"w":20,"h":38,"character":82,"shift":21,"offset":1,}, + "83": {"x":363,"y":2,"w":20,"h":38,"character":83,"shift":20,"offset":0,}, + "84": {"x":341,"y":2,"w":20,"h":38,"character":84,"shift":20,"offset":0,}, + "85": {"x":320,"y":2,"w":19,"h":38,"character":85,"shift":21,"offset":1,}, + "86": {"x":297,"y":2,"w":21,"h":38,"character":86,"shift":21,"offset":0,}, + "87": {"x":267,"y":2,"w":28,"h":38,"character":87,"shift":28,"offset":0,}, + "88": {"x":242,"y":2,"w":23,"h":38,"character":88,"shift":22,"offset":0,}, + "89": {"x":218,"y":2,"w":22,"h":38,"character":89,"shift":22,"offset":0,}, + "90": {"x":198,"y":2,"w":18,"h":38,"character":90,"shift":20,"offset":1,}, + "91": {"x":407,"y":2,"w":9,"h":38,"character":91,"shift":11,"offset":1,}, + "92": {"x":182,"y":2,"w":14,"h":38,"character":92,"shift":14,"offset":0,}, + "93": {"x":157,"y":2,"w":9,"h":38,"character":93,"shift":11,"offset":1,}, + "94": {"x":138,"y":2,"w":17,"h":38,"character":94,"shift":19,"offset":1,}, + "95": {"x":122,"y":2,"w":14,"h":38,"character":95,"shift":14,"offset":0,}, + "96": {"x":112,"y":2,"w":8,"h":38,"character":96,"shift":10,"offset":1,}, + "97": {"x":93,"y":2,"w":17,"h":38,"character":97,"shift":18,"offset":0,}, + "98": {"x":73,"y":2,"w":18,"h":38,"character":98,"shift":19,"offset":1,}, + "99": {"x":54,"y":2,"w":17,"h":38,"character":99,"shift":17,"offset":0,}, + "100": {"x":34,"y":2,"w":18,"h":38,"character":100,"shift":19,"offset":0,}, + "101": {"x":14,"y":2,"w":18,"h":38,"character":101,"shift":18,"offset":0,}, + "102": {"x":168,"y":2,"w":12,"h":38,"character":102,"shift":12,"offset":0,}, + "103": {"x":444,"y":2,"w":18,"h":38,"character":103,"shift":19,"offset":0,}, + "104": {"x":122,"y":42,"w":16,"h":38,"character":104,"shift":18,"offset":1,}, + "105": {"x":464,"y":2,"w":10,"h":38,"character":105,"shift":10,"offset":0,}, + "106": {"x":307,"y":42,"w":11,"h":38,"character":106,"shift":8,"offset":-3,}, + "107": {"x":288,"y":42,"w":17,"h":38,"character":107,"shift":18,"offset":1,}, + "108": {"x":277,"y":42,"w":9,"h":38,"character":108,"shift":10,"offset":1,}, + "109": {"x":249,"y":42,"w":26,"h":38,"character":109,"shift":28,"offset":1,}, + "110": {"x":231,"y":42,"w":16,"h":38,"character":110,"shift":18,"offset":1,}, + "111": {"x":211,"y":42,"w":18,"h":38,"character":111,"shift":18,"offset":0,}, + "112": {"x":191,"y":42,"w":18,"h":38,"character":112,"shift":19,"offset":1,}, + "113": {"x":167,"y":42,"w":22,"h":38,"character":113,"shift":19,"offset":0,}, + "114": {"x":154,"y":42,"w":11,"h":38,"character":114,"shift":12,"offset":1,}, + "115": {"x":320,"y":42,"w":17,"h":38,"character":115,"shift":17,"offset":0,}, + "116": {"x":140,"y":42,"w":12,"h":38,"character":116,"shift":12,"offset":0,}, + "117": {"x":104,"y":42,"w":16,"h":38,"character":117,"shift":18,"offset":1,}, + "118": {"x":85,"y":42,"w":17,"h":38,"character":118,"shift":17,"offset":0,}, + "119": {"x":59,"y":42,"w":24,"h":38,"character":119,"shift":23,"offset":0,}, + "120": {"x":39,"y":42,"w":18,"h":38,"character":120,"shift":17,"offset":0,}, + "121": {"x":20,"y":42,"w":17,"h":38,"character":121,"shift":17,"offset":0,}, + "122": {"x":2,"y":42,"w":16,"h":38,"character":122,"shift":17,"offset":0,}, + "123": {"x":497,"y":2,"w":11,"h":38,"character":123,"shift":12,"offset":0,}, + "124": {"x":489,"y":2,"w":6,"h":38,"character":124,"shift":7,"offset":1,}, + "125": {"x":476,"y":2,"w":11,"h":38,"character":125,"shift":12,"offset":1,}, + "126": {"x":229,"y":122,"w":15,"h":38,"character":126,"shift":17,"offset":1,}, + "9647": {"x":246,"y":122,"w":19,"h":38,"character":9647,"shift":31,"offset":6,}, }, - "kerningPairs": [ - {"first":32,"second":65,"amount":-1,}, - {"first":32,"second":902,"amount":-1,}, - {"first":32,"second":913,"amount":-1,}, - {"first":32,"second":916,"amount":-1,}, - {"first":32,"second":923,"amount":-1,}, - {"first":49,"second":49,"amount":-1,}, - {"first":65,"second":32,"amount":-1,}, - {"first":65,"second":84,"amount":-1,}, - {"first":65,"second":86,"amount":-1,}, - {"first":65,"second":89,"amount":-1,}, - {"first":65,"second":160,"amount":-1,}, - {"first":65,"second":8217,"amount":-1,}, - {"first":70,"second":44,"amount":-1,}, - {"first":70,"second":46,"amount":-1,}, - {"first":70,"second":65,"amount":-1,}, - {"first":76,"second":84,"amount":-1,}, - {"first":76,"second":86,"amount":-1,}, - {"first":76,"second":87,"amount":-1,}, - {"first":76,"second":89,"amount":-1,}, - {"first":76,"second":8217,"amount":-1,}, - {"first":80,"second":44,"amount":-1,}, - {"first":80,"second":46,"amount":-1,}, - {"first":80,"second":65,"amount":-1,}, - {"first":84,"second":44,"amount":-1,}, - {"first":84,"second":45,"amount":-1,}, - {"first":84,"second":46,"amount":-1,}, - {"first":84,"second":58,"amount":-1,}, - {"first":84,"second":59,"amount":-1,}, - {"first":84,"second":65,"amount":-1,}, - {"first":84,"second":97,"amount":-1,}, - {"first":84,"second":99,"amount":-1,}, - {"first":84,"second":101,"amount":-1,}, - {"first":84,"second":111,"amount":-1,}, - {"first":84,"second":115,"amount":-1,}, - {"first":84,"second":119,"amount":-1,}, - {"first":84,"second":121,"amount":-1,}, - {"first":84,"second":173,"amount":-1,}, - {"first":84,"second":894,"amount":-1,}, - {"first":86,"second":44,"amount":-1,}, - {"first":86,"second":45,"amount":-1,}, - {"first":86,"second":46,"amount":-1,}, - {"first":86,"second":65,"amount":-1,}, - {"first":86,"second":97,"amount":-1,}, - {"first":86,"second":101,"amount":-1,}, - {"first":86,"second":111,"amount":-1,}, - {"first":86,"second":173,"amount":-1,}, - {"first":87,"second":44,"amount":-1,}, - {"first":87,"second":46,"amount":-1,}, - {"first":89,"second":44,"amount":-1,}, - {"first":89,"second":45,"amount":-1,}, - {"first":89,"second":46,"amount":-1,}, - {"first":89,"second":58,"amount":-1,}, - {"first":89,"second":59,"amount":-1,}, - {"first":89,"second":65,"amount":-1,}, - {"first":89,"second":97,"amount":-1,}, - {"first":89,"second":101,"amount":-1,}, - {"first":89,"second":111,"amount":-1,}, - {"first":89,"second":112,"amount":-1,}, - {"first":89,"second":113,"amount":-1,}, - {"first":89,"second":117,"amount":-1,}, - {"first":89,"second":118,"amount":-1,}, - {"first":89,"second":173,"amount":-1,}, - {"first":89,"second":894,"amount":-1,}, - {"first":114,"second":44,"amount":-1,}, - {"first":114,"second":46,"amount":-1,}, - {"first":118,"second":44,"amount":-1,}, - {"first":118,"second":46,"amount":-1,}, - {"first":119,"second":44,"amount":-1,}, - {"first":119,"second":46,"amount":-1,}, - {"first":121,"second":44,"amount":-1,}, - {"first":121,"second":46,"amount":-1,}, - ], + "kerningPairs": [], "ranges": [ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, @@ -204,7 +132,7 @@ "canGenerateBitmap": true, "maintainGms1Font": false, "parent": { - "name": "demo_Fonts", - "path": "folders/demo_Fonts.yy", + "name": "demonstration", + "path": "folders/demonstration.yy", }, } \ No newline at end of file diff --git a/fonts/demo_f_hires/demo_f_hires.png b/fonts/demo_f_hires/demo_f_hires.png index 7f01f2b..f16bdf6 100644 Binary files a/fonts/demo_f_hires/demo_f_hires.png and b/fonts/demo_f_hires/demo_f_hires.png differ diff --git a/fonts/demo_f_hires/demo_f_hires.yy b/fonts/demo_f_hires/demo_f_hires.yy index cf37962..72b3e17 100644 --- a/fonts/demo_f_hires/demo_f_hires.yy +++ b/fonts/demo_f_hires/demo_f_hires.yy @@ -2,137 +2,137 @@ "resourceType": "GMFont", "resourceVersion": "1.0", "name": "demo_f_hires", - "hinting": 0, - "glyphOperations": 0, - "interpreter": 0, - "pointRounding": 0, + "AntiAlias": 1, "applyKerning": 0, - "fontName": "Atkinson Hyperlegible", - "styleName": "Bold", - "size": 24.0, + "ascender": 39, + "ascenderOffset": 0, "bold": false, - "italic": false, + "canGenerateBitmap": true, "charset": 0, - "AntiAlias": 1, "first": 0, - "last": 0, - "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", - "includeTTF": false, - "TTFName": "", - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "ascenderOffset": 0, - "ascender": 27, + "fontName": "Atkinson Hyperlegible", + "glyphOperations": 0, "glyphs": { - "32": {"x":2,"y":2,"w":10,"h":38,"character":32,"shift":10,"offset":0,}, - "33": {"x":240,"y":82,"w":7,"h":38,"character":33,"shift":9,"offset":1,}, - "34": {"x":227,"y":82,"w":11,"h":38,"character":34,"shift":13,"offset":1,}, - "35": {"x":200,"y":82,"w":25,"h":38,"character":35,"shift":25,"offset":0,}, - "36": {"x":178,"y":82,"w":20,"h":38,"character":36,"shift":20,"offset":0,}, - "37": {"x":145,"y":82,"w":31,"h":38,"character":37,"shift":31,"offset":0,}, - "38": {"x":120,"y":82,"w":23,"h":38,"character":38,"shift":22,"offset":0,}, - "39": {"x":113,"y":82,"w":5,"h":38,"character":39,"shift":7,"offset":1,}, - "40": {"x":101,"y":82,"w":10,"h":38,"character":40,"shift":12,"offset":1,}, - "41": {"x":89,"y":82,"w":10,"h":38,"character":41,"shift":12,"offset":1,}, - "42": {"x":249,"y":82,"w":12,"h":38,"character":42,"shift":14,"offset":1,}, - "43": {"x":69,"y":82,"w":18,"h":38,"character":43,"shift":20,"offset":1,}, - "44": {"x":40,"y":82,"w":7,"h":38,"character":44,"shift":9,"offset":1,}, - "45": {"x":27,"y":82,"w":11,"h":38,"character":45,"shift":13,"offset":1,}, - "46": {"x":18,"y":82,"w":7,"h":38,"character":46,"shift":9,"offset":1,}, - "47": {"x":2,"y":82,"w":14,"h":38,"character":47,"shift":14,"offset":0,}, - "48": {"x":479,"y":42,"w":19,"h":38,"character":48,"shift":21,"offset":1,}, - "49": {"x":466,"y":42,"w":11,"h":38,"character":49,"shift":14,"offset":1,}, - "50": {"x":447,"y":42,"w":17,"h":38,"character":50,"shift":19,"offset":1,}, - "51": {"x":428,"y":42,"w":17,"h":38,"character":51,"shift":19,"offset":1,}, - "52": {"x":407,"y":42,"w":19,"h":38,"character":52,"shift":20,"offset":0,}, - "53": {"x":49,"y":82,"w":18,"h":38,"character":53,"shift":20,"offset":1,}, - "54": {"x":263,"y":82,"w":18,"h":38,"character":54,"shift":20,"offset":1,}, - "55": {"x":283,"y":82,"w":17,"h":38,"character":55,"shift":17,"offset":0,}, - "56": {"x":302,"y":82,"w":18,"h":38,"character":56,"shift":20,"offset":1,}, - "57": {"x":211,"y":122,"w":16,"h":38,"character":57,"shift":18,"offset":1,}, - "58": {"x":202,"y":122,"w":7,"h":38,"character":58,"shift":9,"offset":1,}, - "59": {"x":193,"y":122,"w":7,"h":38,"character":59,"shift":9,"offset":1,}, - "60": {"x":174,"y":122,"w":17,"h":38,"character":60,"shift":18,"offset":1,}, - "61": {"x":154,"y":122,"w":18,"h":38,"character":61,"shift":20,"offset":1,}, - "62": {"x":135,"y":122,"w":17,"h":38,"character":62,"shift":18,"offset":1,}, - "63": {"x":115,"y":122,"w":18,"h":38,"character":63,"shift":20,"offset":1,}, - "64": {"x":91,"y":122,"w":22,"h":38,"character":64,"shift":24,"offset":1,}, - "65": {"x":67,"y":122,"w":22,"h":38,"character":65,"shift":22,"offset":0,}, - "66": {"x":46,"y":122,"w":19,"h":38,"character":66,"shift":21,"offset":1,}, - "67": {"x":24,"y":122,"w":20,"h":38,"character":67,"shift":22,"offset":1,}, - "68": {"x":2,"y":122,"w":20,"h":38,"character":68,"shift":22,"offset":1,}, - "69": {"x":485,"y":82,"w":17,"h":38,"character":69,"shift":19,"offset":1,}, - "70": {"x":467,"y":82,"w":16,"h":38,"character":70,"shift":17,"offset":1,}, - "71": {"x":444,"y":82,"w":21,"h":38,"character":71,"shift":23,"offset":1,}, - "72": {"x":422,"y":82,"w":20,"h":38,"character":72,"shift":22,"offset":1,}, - "73": {"x":408,"y":82,"w":12,"h":38,"character":73,"shift":15,"offset":1,}, - "74": {"x":389,"y":82,"w":17,"h":38,"character":74,"shift":18,"offset":0,}, - "75": {"x":367,"y":82,"w":20,"h":38,"character":75,"shift":21,"offset":1,}, - "76": {"x":349,"y":82,"w":16,"h":38,"character":76,"shift":17,"offset":1,}, - "77": {"x":322,"y":82,"w":25,"h":38,"character":77,"shift":27,"offset":1,}, - "78": {"x":385,"y":42,"w":20,"h":38,"character":78,"shift":22,"offset":1,}, - "79": {"x":360,"y":42,"w":23,"h":38,"character":79,"shift":24,"offset":1,}, - "80": {"x":339,"y":42,"w":19,"h":38,"character":80,"shift":20,"offset":1,}, - "81": {"x":418,"y":2,"w":24,"h":38,"character":81,"shift":25,"offset":1,}, - "82": {"x":385,"y":2,"w":20,"h":38,"character":82,"shift":21,"offset":1,}, - "83": {"x":363,"y":2,"w":20,"h":38,"character":83,"shift":20,"offset":0,}, - "84": {"x":341,"y":2,"w":20,"h":38,"character":84,"shift":20,"offset":0,}, - "85": {"x":320,"y":2,"w":19,"h":38,"character":85,"shift":21,"offset":1,}, - "86": {"x":297,"y":2,"w":21,"h":38,"character":86,"shift":21,"offset":0,}, - "87": {"x":267,"y":2,"w":28,"h":38,"character":87,"shift":28,"offset":0,}, - "88": {"x":242,"y":2,"w":23,"h":38,"character":88,"shift":22,"offset":0,}, - "89": {"x":218,"y":2,"w":22,"h":38,"character":89,"shift":22,"offset":0,}, - "90": {"x":198,"y":2,"w":18,"h":38,"character":90,"shift":20,"offset":1,}, - "91": {"x":407,"y":2,"w":9,"h":38,"character":91,"shift":11,"offset":1,}, - "92": {"x":182,"y":2,"w":14,"h":38,"character":92,"shift":14,"offset":0,}, - "93": {"x":157,"y":2,"w":9,"h":38,"character":93,"shift":11,"offset":1,}, - "94": {"x":138,"y":2,"w":17,"h":38,"character":94,"shift":19,"offset":1,}, - "95": {"x":122,"y":2,"w":14,"h":38,"character":95,"shift":14,"offset":0,}, - "96": {"x":112,"y":2,"w":8,"h":38,"character":96,"shift":10,"offset":1,}, - "97": {"x":93,"y":2,"w":17,"h":38,"character":97,"shift":18,"offset":0,}, - "98": {"x":73,"y":2,"w":18,"h":38,"character":98,"shift":19,"offset":1,}, - "99": {"x":54,"y":2,"w":17,"h":38,"character":99,"shift":17,"offset":0,}, - "100": {"x":34,"y":2,"w":18,"h":38,"character":100,"shift":19,"offset":0,}, - "101": {"x":14,"y":2,"w":18,"h":38,"character":101,"shift":18,"offset":0,}, - "102": {"x":168,"y":2,"w":12,"h":38,"character":102,"shift":12,"offset":0,}, - "103": {"x":444,"y":2,"w":18,"h":38,"character":103,"shift":19,"offset":0,}, - "104": {"x":122,"y":42,"w":16,"h":38,"character":104,"shift":18,"offset":1,}, - "105": {"x":464,"y":2,"w":10,"h":38,"character":105,"shift":10,"offset":0,}, - "106": {"x":307,"y":42,"w":11,"h":38,"character":106,"shift":8,"offset":-3,}, - "107": {"x":288,"y":42,"w":17,"h":38,"character":107,"shift":18,"offset":1,}, - "108": {"x":277,"y":42,"w":9,"h":38,"character":108,"shift":10,"offset":1,}, - "109": {"x":249,"y":42,"w":26,"h":38,"character":109,"shift":28,"offset":1,}, - "110": {"x":231,"y":42,"w":16,"h":38,"character":110,"shift":18,"offset":1,}, - "111": {"x":211,"y":42,"w":18,"h":38,"character":111,"shift":18,"offset":0,}, - "112": {"x":191,"y":42,"w":18,"h":38,"character":112,"shift":19,"offset":1,}, - "113": {"x":167,"y":42,"w":22,"h":38,"character":113,"shift":19,"offset":0,}, - "114": {"x":154,"y":42,"w":11,"h":38,"character":114,"shift":12,"offset":1,}, - "115": {"x":320,"y":42,"w":17,"h":38,"character":115,"shift":17,"offset":0,}, - "116": {"x":140,"y":42,"w":12,"h":38,"character":116,"shift":12,"offset":0,}, - "117": {"x":104,"y":42,"w":16,"h":38,"character":117,"shift":18,"offset":1,}, - "118": {"x":85,"y":42,"w":17,"h":38,"character":118,"shift":17,"offset":0,}, - "119": {"x":59,"y":42,"w":24,"h":38,"character":119,"shift":23,"offset":0,}, - "120": {"x":39,"y":42,"w":18,"h":38,"character":120,"shift":17,"offset":0,}, - "121": {"x":20,"y":42,"w":17,"h":38,"character":121,"shift":17,"offset":0,}, - "122": {"x":2,"y":42,"w":16,"h":38,"character":122,"shift":17,"offset":0,}, - "123": {"x":497,"y":2,"w":11,"h":38,"character":123,"shift":12,"offset":0,}, - "124": {"x":489,"y":2,"w":6,"h":38,"character":124,"shift":7,"offset":1,}, - "125": {"x":476,"y":2,"w":11,"h":38,"character":125,"shift":12,"offset":1,}, - "126": {"x":229,"y":122,"w":15,"h":38,"character":126,"shift":17,"offset":1,}, - "9647": {"x":246,"y":122,"w":19,"h":38,"character":9647,"shift":31,"offset":6,}, + "32": {"character":32,"h":54,"offset":0,"shift":15,"w":15,"x":2,"y":2,}, + "33": {"character":33,"h":54,"offset":1,"shift":13,"w":10,"x":189,"y":170,}, + "34": {"character":34,"h":54,"offset":1,"shift":19,"w":16,"x":171,"y":170,}, + "35": {"character":35,"h":54,"offset":1,"shift":35,"w":34,"x":135,"y":170,}, + "36": {"character":36,"h":54,"offset":1,"shift":28,"w":27,"x":106,"y":170,}, + "37": {"character":37,"h":54,"offset":1,"shift":44,"w":43,"x":61,"y":170,}, + "38": {"character":38,"h":54,"offset":1,"shift":32,"w":31,"x":28,"y":170,}, + "39": {"character":39,"h":54,"offset":1,"shift":10,"w":8,"x":18,"y":170,}, + "40": {"character":40,"h":54,"offset":1,"shift":17,"w":14,"x":2,"y":170,}, + "41": {"character":41,"h":54,"offset":1,"shift":17,"w":14,"x":485,"y":114,}, + "42": {"character":42,"h":54,"offset":2,"shift":20,"w":16,"x":201,"y":170,}, + "43": {"character":43,"h":54,"offset":2,"shift":28,"w":24,"x":459,"y":114,}, + "44": {"character":44,"h":54,"offset":1,"shift":13,"w":10,"x":420,"y":114,}, + "45": {"character":45,"h":54,"offset":1,"shift":19,"w":16,"x":402,"y":114,}, + "46": {"character":46,"h":54,"offset":1,"shift":13,"w":10,"x":390,"y":114,}, + "47": {"character":47,"h":54,"offset":0,"shift":20,"w":20,"x":368,"y":114,}, + "48": {"character":48,"h":54,"offset":2,"shift":30,"w":27,"x":339,"y":114,}, + "49": {"character":49,"h":54,"offset":2,"shift":20,"w":14,"x":323,"y":114,}, + "50": {"character":50,"h":54,"offset":1,"shift":27,"w":24,"x":297,"y":114,}, + "51": {"character":51,"h":54,"offset":1,"shift":27,"w":25,"x":270,"y":114,}, + "52": {"character":52,"h":54,"offset":1,"shift":28,"w":26,"x":242,"y":114,}, + "53": {"character":53,"h":54,"offset":1,"shift":28,"w":25,"x":432,"y":114,}, + "54": {"character":54,"h":54,"offset":2,"shift":29,"w":25,"x":219,"y":170,}, + "55": {"character":55,"h":54,"offset":0,"shift":25,"w":24,"x":246,"y":170,}, + "56": {"character":56,"h":54,"offset":1,"shift":28,"w":26,"x":272,"y":170,}, + "57": {"character":57,"h":54,"offset":1,"shift":25,"w":23,"x":342,"y":226,}, + "58": {"character":58,"h":54,"offset":1,"shift":13,"w":10,"x":330,"y":226,}, + "59": {"character":59,"h":54,"offset":1,"shift":13,"w":10,"x":318,"y":226,}, + "60": {"character":60,"h":54,"offset":1,"shift":26,"w":24,"x":292,"y":226,}, + "61": {"character":61,"h":54,"offset":2,"shift":28,"w":24,"x":266,"y":226,}, + "62": {"character":62,"h":54,"offset":1,"shift":26,"w":24,"x":240,"y":226,}, + "63": {"character":63,"h":54,"offset":1,"shift":28,"w":25,"x":213,"y":226,}, + "64": {"character":64,"h":54,"offset":1,"shift":34,"w":32,"x":179,"y":226,}, + "65": {"character":65,"h":54,"offset":0,"shift":31,"w":32,"x":145,"y":226,}, + "66": {"character":66,"h":54,"offset":1,"shift":29,"w":27,"x":116,"y":226,}, + "67": {"character":67,"h":54,"offset":1,"shift":31,"w":29,"x":85,"y":226,}, + "68": {"character":68,"h":54,"offset":1,"shift":31,"w":29,"x":54,"y":226,}, + "69": {"character":69,"h":54,"offset":1,"shift":26,"w":25,"x":27,"y":226,}, + "70": {"character":70,"h":54,"offset":1,"shift":25,"w":23,"x":2,"y":226,}, + "71": {"character":71,"h":54,"offset":1,"shift":33,"w":30,"x":469,"y":170,}, + "72": {"character":72,"h":54,"offset":1,"shift":31,"w":28,"x":439,"y":170,}, + "73": {"character":73,"h":54,"offset":2,"shift":21,"w":17,"x":420,"y":170,}, + "74": {"character":74,"h":54,"offset":0,"shift":25,"w":24,"x":394,"y":170,}, + "75": {"character":75,"h":54,"offset":1,"shift":30,"w":29,"x":363,"y":170,}, + "76": {"character":76,"h":54,"offset":1,"shift":24,"w":23,"x":338,"y":170,}, + "77": {"character":77,"h":54,"offset":1,"shift":38,"w":36,"x":300,"y":170,}, + "78": {"character":78,"h":54,"offset":1,"shift":32,"w":29,"x":211,"y":114,}, + "79": {"character":79,"h":54,"offset":1,"shift":35,"w":33,"x":176,"y":114,}, + "80": {"character":80,"h":54,"offset":1,"shift":29,"w":27,"x":147,"y":114,}, + "81": {"character":81,"h":54,"offset":1,"shift":35,"w":35,"x":76,"y":58,}, + "82": {"character":82,"h":54,"offset":1,"shift":30,"w":28,"x":31,"y":58,}, + "83": {"character":83,"h":54,"offset":1,"shift":28,"w":27,"x":2,"y":58,}, + "84": {"character":84,"h":54,"offset":0,"shift":28,"w":28,"x":461,"y":2,}, + "85": {"character":85,"h":54,"offset":1,"shift":30,"w":27,"x":432,"y":2,}, + "86": {"character":86,"h":54,"offset":0,"shift":30,"w":30,"x":400,"y":2,}, + "87": {"character":87,"h":54,"offset":0,"shift":40,"w":40,"x":358,"y":2,}, + "88": {"character":88,"h":54,"offset":0,"shift":32,"w":32,"x":324,"y":2,}, + "89": {"character":89,"h":54,"offset":0,"shift":31,"w":31,"x":291,"y":2,}, + "90": {"character":90,"h":54,"offset":1,"shift":28,"w":26,"x":263,"y":2,}, + "91": {"character":91,"h":54,"offset":1,"shift":15,"w":13,"x":61,"y":58,}, + "92": {"character":92,"h":54,"offset":0,"shift":20,"w":20,"x":241,"y":2,}, + "93": {"character":93,"h":54,"offset":1,"shift":15,"w":13,"x":208,"y":2,}, + "94": {"character":94,"h":54,"offset":2,"shift":27,"w":23,"x":183,"y":2,}, + "95": {"character":95,"h":54,"offset":0,"shift":19,"w":20,"x":161,"y":2,}, + "96": {"character":96,"h":54,"offset":2,"shift":14,"w":10,"x":149,"y":2,}, + "97": {"character":97,"h":54,"offset":0,"shift":25,"w":24,"x":123,"y":2,}, + "98": {"character":98,"h":54,"offset":2,"shift":27,"w":24,"x":97,"y":2,}, + "99": {"character":99,"h":54,"offset":1,"shift":24,"w":22,"x":73,"y":2,}, + "100": {"character":100,"h":54,"offset":1,"shift":27,"w":25,"x":46,"y":2,}, + "101": {"character":101,"h":54,"offset":1,"shift":26,"w":25,"x":19,"y":2,}, + "102": {"character":102,"h":54,"offset":0,"shift":17,"w":16,"x":223,"y":2,}, + "103": {"character":103,"h":54,"offset":1,"shift":27,"w":24,"x":113,"y":58,}, + "104": {"character":104,"h":54,"offset":2,"shift":26,"w":22,"x":359,"y":58,}, + "105": {"character":105,"h":54,"offset":1,"shift":14,"w":12,"x":139,"y":58,}, + "106": {"character":106,"h":54,"offset":-4,"shift":12,"w":15,"x":105,"y":114,}, + "107": {"character":107,"h":54,"offset":2,"shift":26,"w":24,"x":79,"y":114,}, + "108": {"character":108,"h":54,"offset":2,"shift":14,"w":13,"x":64,"y":114,}, + "109": {"character":109,"h":54,"offset":2,"shift":40,"w":36,"x":26,"y":114,}, + "110": {"character":110,"h":54,"offset":2,"shift":26,"w":22,"x":2,"y":114,}, + "111": {"character":111,"h":54,"offset":1,"shift":26,"w":24,"x":477,"y":58,}, + "112": {"character":112,"h":54,"offset":2,"shift":27,"w":24,"x":451,"y":58,}, + "113": {"character":113,"h":54,"offset":1,"shift":27,"w":30,"x":419,"y":58,}, + "114": {"character":114,"h":54,"offset":2,"shift":17,"w":15,"x":402,"y":58,}, + "115": {"character":115,"h":54,"offset":0,"shift":24,"w":23,"x":122,"y":114,}, + "116": {"character":116,"h":54,"offset":0,"shift":17,"w":17,"x":383,"y":58,}, + "117": {"character":117,"h":54,"offset":2,"shift":26,"w":22,"x":335,"y":58,}, + "118": {"character":118,"h":54,"offset":0,"shift":24,"w":24,"x":309,"y":58,}, + "119": {"character":119,"h":54,"offset":0,"shift":33,"w":33,"x":274,"y":58,}, + "120": {"character":120,"h":54,"offset":0,"shift":24,"w":25,"x":247,"y":58,}, + "121": {"character":121,"h":54,"offset":0,"shift":23,"w":24,"x":221,"y":58,}, + "122": {"character":122,"h":54,"offset":1,"shift":23,"w":22,"x":197,"y":58,}, + "123": {"character":123,"h":54,"offset":1,"shift":17,"w":15,"x":180,"y":58,}, + "124": {"character":124,"h":54,"offset":1,"shift":11,"w":8,"x":170,"y":58,}, + "125": {"character":125,"h":54,"offset":1,"shift":17,"w":15,"x":153,"y":58,}, + "126": {"character":126,"h":54,"offset":1,"shift":24,"w":22,"x":367,"y":226,}, + "9647": {"character":9647,"h":54,"offset":9,"shift":44,"w":26,"x":391,"y":226,}, }, + "hinting": 0, + "includeTTF": false, + "interpreter": 0, + "italic": false, "kerningPairs": [], + "last": 0, + "maintainGms1Font": false, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "pointRounding": 0, "ranges": [ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, ], "regenerateBitmap": false, - "canGenerateBitmap": true, - "maintainGms1Font": false, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "size": 34.0, + "styleName": "Bold", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "TTFName": "", } \ No newline at end of file diff --git a/fonts/demo_f_pixel/demo_f_pixel.yy b/fonts/demo_f_pixel/demo_f_pixel.yy index c5dc37f..2f13c89 100644 --- a/fonts/demo_f_pixel/demo_f_pixel.yy +++ b/fonts/demo_f_pixel/demo_f_pixel.yy @@ -2,137 +2,137 @@ "resourceType": "GMFont", "resourceVersion": "1.0", "name": "demo_f_pixel", - "hinting": 0, - "glyphOperations": 0, - "interpreter": 0, - "pointRounding": 0, + "AntiAlias": 0, "applyKerning": 0, - "fontName": "04b03", - "styleName": "Regular", - "size": 6.0, + "ascender": 0, + "ascenderOffset": 0, "bold": false, - "italic": false, + "canGenerateBitmap": true, "charset": 0, - "AntiAlias": 0, "first": 0, - "last": 0, - "sampleText": "created by:\r\nstann.co", - "includeTTF": false, - "TTFName": "", - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "ascenderOffset": 0, - "ascender": 0, + "fontName": "04b03", + "glyphOperations": 0, "glyphs": { - "32": {"x":2,"y":2,"w":4,"h":8,"character":32,"shift":4,"offset":0,}, - "33": {"x":2,"y":32,"w":1,"h":8,"character":33,"shift":2,"offset":0,}, - "34": {"x":122,"y":22,"w":3,"h":8,"character":34,"shift":4,"offset":0,}, - "35": {"x":115,"y":22,"w":5,"h":8,"character":35,"shift":6,"offset":0,}, - "36": {"x":109,"y":22,"w":4,"h":8,"character":36,"shift":5,"offset":0,}, - "37": {"x":102,"y":22,"w":5,"h":8,"character":37,"shift":6,"offset":0,}, - "38": {"x":95,"y":22,"w":5,"h":8,"character":38,"shift":6,"offset":0,}, - "39": {"x":92,"y":22,"w":1,"h":8,"character":39,"shift":2,"offset":0,}, - "40": {"x":88,"y":22,"w":2,"h":8,"character":40,"shift":3,"offset":0,}, - "41": {"x":84,"y":22,"w":2,"h":8,"character":41,"shift":3,"offset":0,}, - "42": {"x":5,"y":32,"w":3,"h":8,"character":42,"shift":4,"offset":0,}, - "43": {"x":79,"y":22,"w":3,"h":8,"character":43,"shift":4,"offset":0,}, - "44": {"x":69,"y":22,"w":2,"h":8,"character":44,"shift":3,"offset":0,}, - "45": {"x":64,"y":22,"w":3,"h":8,"character":45,"shift":4,"offset":0,}, - "46": {"x":61,"y":22,"w":1,"h":8,"character":46,"shift":2,"offset":0,}, - "47": {"x":54,"y":22,"w":5,"h":8,"character":47,"shift":6,"offset":0,}, - "48": {"x":48,"y":22,"w":4,"h":8,"character":48,"shift":5,"offset":0,}, - "49": {"x":44,"y":22,"w":2,"h":8,"character":49,"shift":3,"offset":0,}, - "50": {"x":38,"y":22,"w":4,"h":8,"character":50,"shift":5,"offset":0,}, - "51": {"x":32,"y":22,"w":4,"h":8,"character":51,"shift":5,"offset":0,}, - "52": {"x":26,"y":22,"w":4,"h":8,"character":52,"shift":5,"offset":0,}, - "53": {"x":73,"y":22,"w":4,"h":8,"character":53,"shift":5,"offset":0,}, - "54": {"x":10,"y":32,"w":4,"h":8,"character":54,"shift":5,"offset":0,}, - "55": {"x":16,"y":32,"w":4,"h":8,"character":55,"shift":5,"offset":0,}, - "56": {"x":22,"y":32,"w":4,"h":8,"character":56,"shift":5,"offset":0,}, - "57": {"x":13,"y":42,"w":4,"h":8,"character":57,"shift":5,"offset":0,}, - "58": {"x":10,"y":42,"w":1,"h":8,"character":58,"shift":2,"offset":0,}, - "59": {"x":7,"y":42,"w":1,"h":8,"character":59,"shift":2,"offset":0,}, - "60": {"x":2,"y":42,"w":3,"h":8,"character":60,"shift":4,"offset":0,}, - "61": {"x":120,"y":32,"w":3,"h":8,"character":61,"shift":4,"offset":0,}, - "62": {"x":115,"y":32,"w":3,"h":8,"character":62,"shift":4,"offset":0,}, - "63": {"x":109,"y":32,"w":4,"h":8,"character":63,"shift":5,"offset":0,}, - "64": {"x":102,"y":32,"w":5,"h":8,"character":64,"shift":6,"offset":0,}, - "65": {"x":96,"y":32,"w":4,"h":8,"character":65,"shift":5,"offset":0,}, - "66": {"x":90,"y":32,"w":4,"h":8,"character":66,"shift":5,"offset":0,}, - "67": {"x":85,"y":32,"w":3,"h":8,"character":67,"shift":4,"offset":0,}, - "68": {"x":79,"y":32,"w":4,"h":8,"character":68,"shift":5,"offset":0,}, - "69": {"x":74,"y":32,"w":3,"h":8,"character":69,"shift":4,"offset":0,}, - "70": {"x":69,"y":32,"w":3,"h":8,"character":70,"shift":4,"offset":0,}, - "71": {"x":63,"y":32,"w":4,"h":8,"character":71,"shift":5,"offset":0,}, - "72": {"x":57,"y":32,"w":4,"h":8,"character":72,"shift":5,"offset":0,}, - "73": {"x":52,"y":32,"w":3,"h":8,"character":73,"shift":4,"offset":0,}, - "74": {"x":46,"y":32,"w":4,"h":8,"character":74,"shift":5,"offset":0,}, - "75": {"x":40,"y":32,"w":4,"h":8,"character":75,"shift":5,"offset":0,}, - "76": {"x":35,"y":32,"w":3,"h":8,"character":76,"shift":4,"offset":0,}, - "77": {"x":28,"y":32,"w":5,"h":8,"character":77,"shift":6,"offset":0,}, - "78": {"x":20,"y":22,"w":4,"h":8,"character":78,"shift":5,"offset":0,}, - "79": {"x":14,"y":22,"w":4,"h":8,"character":79,"shift":5,"offset":0,}, - "80": {"x":8,"y":22,"w":4,"h":8,"character":80,"shift":5,"offset":0,}, - "81": {"x":2,"y":12,"w":4,"h":8,"character":81,"shift":5,"offset":0,}, - "82": {"x":115,"y":2,"w":4,"h":8,"character":82,"shift":5,"offset":0,}, - "83": {"x":109,"y":2,"w":4,"h":8,"character":83,"shift":5,"offset":0,}, - "84": {"x":104,"y":2,"w":3,"h":8,"character":84,"shift":4,"offset":0,}, - "85": {"x":98,"y":2,"w":4,"h":8,"character":85,"shift":5,"offset":0,}, - "86": {"x":92,"y":2,"w":4,"h":8,"character":86,"shift":5,"offset":0,}, - "87": {"x":85,"y":2,"w":5,"h":8,"character":87,"shift":6,"offset":0,}, - "88": {"x":79,"y":2,"w":4,"h":8,"character":88,"shift":5,"offset":0,}, - "89": {"x":73,"y":2,"w":4,"h":8,"character":89,"shift":5,"offset":0,}, - "90": {"x":68,"y":2,"w":3,"h":8,"character":90,"shift":4,"offset":0,}, - "91": {"x":121,"y":2,"w":2,"h":8,"character":91,"shift":3,"offset":0,}, - "92": {"x":61,"y":2,"w":5,"h":8,"character":92,"shift":6,"offset":0,}, - "93": {"x":52,"y":2,"w":2,"h":8,"character":93,"shift":3,"offset":0,}, - "94": {"x":47,"y":2,"w":3,"h":8,"character":94,"shift":4,"offset":0,}, - "95": {"x":41,"y":2,"w":4,"h":8,"character":95,"shift":5,"offset":0,}, - "96": {"x":37,"y":2,"w":2,"h":8,"character":96,"shift":3,"offset":0,}, - "97": {"x":31,"y":2,"w":4,"h":8,"character":97,"shift":5,"offset":0,}, - "98": {"x":25,"y":2,"w":4,"h":8,"character":98,"shift":5,"offset":0,}, - "99": {"x":20,"y":2,"w":3,"h":8,"character":99,"shift":4,"offset":0,}, - "100": {"x":14,"y":2,"w":4,"h":8,"character":100,"shift":5,"offset":0,}, - "101": {"x":8,"y":2,"w":4,"h":8,"character":101,"shift":5,"offset":0,}, - "102": {"x":56,"y":2,"w":3,"h":8,"character":102,"shift":4,"offset":0,}, - "103": {"x":8,"y":12,"w":4,"h":8,"character":103,"shift":5,"offset":0,}, - "104": {"x":66,"y":12,"w":4,"h":8,"character":104,"shift":5,"offset":0,}, - "105": {"x":14,"y":12,"w":1,"h":8,"character":105,"shift":2,"offset":0,}, - "106": {"x":122,"y":12,"w":2,"h":8,"character":106,"shift":3,"offset":0,}, - "107": {"x":116,"y":12,"w":4,"h":8,"character":107,"shift":5,"offset":0,}, - "108": {"x":113,"y":12,"w":1,"h":8,"character":108,"shift":2,"offset":0,}, - "109": {"x":106,"y":12,"w":5,"h":8,"character":109,"shift":6,"offset":0,}, - "110": {"x":100,"y":12,"w":4,"h":8,"character":110,"shift":5,"offset":0,}, - "111": {"x":94,"y":12,"w":4,"h":8,"character":111,"shift":5,"offset":0,}, - "112": {"x":88,"y":12,"w":4,"h":8,"character":112,"shift":5,"offset":0,}, - "113": {"x":82,"y":12,"w":4,"h":8,"character":113,"shift":5,"offset":0,}, - "114": {"x":77,"y":12,"w":3,"h":8,"character":114,"shift":4,"offset":0,}, - "115": {"x":2,"y":22,"w":4,"h":8,"character":115,"shift":5,"offset":0,}, - "116": {"x":72,"y":12,"w":3,"h":8,"character":116,"shift":4,"offset":0,}, - "117": {"x":60,"y":12,"w":4,"h":8,"character":117,"shift":5,"offset":0,}, - "118": {"x":54,"y":12,"w":4,"h":8,"character":118,"shift":5,"offset":0,}, - "119": {"x":47,"y":12,"w":5,"h":8,"character":119,"shift":6,"offset":0,}, - "120": {"x":42,"y":12,"w":3,"h":8,"character":120,"shift":4,"offset":0,}, - "121": {"x":36,"y":12,"w":4,"h":8,"character":121,"shift":5,"offset":0,}, - "122": {"x":30,"y":12,"w":4,"h":8,"character":122,"shift":5,"offset":0,}, - "123": {"x":25,"y":12,"w":3,"h":8,"character":123,"shift":4,"offset":0,}, - "124": {"x":22,"y":12,"w":1,"h":8,"character":124,"shift":2,"offset":0,}, - "125": {"x":17,"y":12,"w":3,"h":8,"character":125,"shift":4,"offset":0,}, - "126": {"x":19,"y":42,"w":4,"h":8,"character":126,"shift":5,"offset":0,}, - "9647": {"x":25,"y":42,"w":4,"h":8,"character":9647,"shift":8,"offset":2,}, + "32": {"character":32,"h":8,"offset":0,"shift":4,"w":4,"x":2,"y":2,}, + "33": {"character":33,"h":8,"offset":0,"shift":2,"w":1,"x":2,"y":32,}, + "34": {"character":34,"h":8,"offset":0,"shift":4,"w":3,"x":122,"y":22,}, + "35": {"character":35,"h":8,"offset":0,"shift":6,"w":5,"x":115,"y":22,}, + "36": {"character":36,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":22,}, + "37": {"character":37,"h":8,"offset":0,"shift":6,"w":5,"x":102,"y":22,}, + "38": {"character":38,"h":8,"offset":0,"shift":6,"w":5,"x":95,"y":22,}, + "39": {"character":39,"h":8,"offset":0,"shift":2,"w":1,"x":92,"y":22,}, + "40": {"character":40,"h":8,"offset":0,"shift":3,"w":2,"x":88,"y":22,}, + "41": {"character":41,"h":8,"offset":0,"shift":3,"w":2,"x":84,"y":22,}, + "42": {"character":42,"h":8,"offset":0,"shift":4,"w":3,"x":5,"y":32,}, + "43": {"character":43,"h":8,"offset":0,"shift":4,"w":3,"x":79,"y":22,}, + "44": {"character":44,"h":8,"offset":0,"shift":3,"w":2,"x":69,"y":22,}, + "45": {"character":45,"h":8,"offset":0,"shift":4,"w":3,"x":64,"y":22,}, + "46": {"character":46,"h":8,"offset":0,"shift":2,"w":1,"x":61,"y":22,}, + "47": {"character":47,"h":8,"offset":0,"shift":6,"w":5,"x":54,"y":22,}, + "48": {"character":48,"h":8,"offset":0,"shift":5,"w":4,"x":48,"y":22,}, + "49": {"character":49,"h":8,"offset":0,"shift":3,"w":2,"x":44,"y":22,}, + "50": {"character":50,"h":8,"offset":0,"shift":5,"w":4,"x":38,"y":22,}, + "51": {"character":51,"h":8,"offset":0,"shift":5,"w":4,"x":32,"y":22,}, + "52": {"character":52,"h":8,"offset":0,"shift":5,"w":4,"x":26,"y":22,}, + "53": {"character":53,"h":8,"offset":0,"shift":5,"w":4,"x":73,"y":22,}, + "54": {"character":54,"h":8,"offset":0,"shift":5,"w":4,"x":10,"y":32,}, + "55": {"character":55,"h":8,"offset":0,"shift":5,"w":4,"x":16,"y":32,}, + "56": {"character":56,"h":8,"offset":0,"shift":5,"w":4,"x":22,"y":32,}, + "57": {"character":57,"h":8,"offset":0,"shift":5,"w":4,"x":13,"y":42,}, + "58": {"character":58,"h":8,"offset":0,"shift":2,"w":1,"x":10,"y":42,}, + "59": {"character":59,"h":8,"offset":0,"shift":2,"w":1,"x":7,"y":42,}, + "60": {"character":60,"h":8,"offset":0,"shift":4,"w":3,"x":2,"y":42,}, + "61": {"character":61,"h":8,"offset":0,"shift":4,"w":3,"x":120,"y":32,}, + "62": {"character":62,"h":8,"offset":0,"shift":4,"w":3,"x":115,"y":32,}, + "63": {"character":63,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":32,}, + "64": {"character":64,"h":8,"offset":0,"shift":6,"w":5,"x":102,"y":32,}, + "65": {"character":65,"h":8,"offset":0,"shift":5,"w":4,"x":96,"y":32,}, + "66": {"character":66,"h":8,"offset":0,"shift":5,"w":4,"x":90,"y":32,}, + "67": {"character":67,"h":8,"offset":0,"shift":4,"w":3,"x":85,"y":32,}, + "68": {"character":68,"h":8,"offset":0,"shift":5,"w":4,"x":79,"y":32,}, + "69": {"character":69,"h":8,"offset":0,"shift":4,"w":3,"x":74,"y":32,}, + "70": {"character":70,"h":8,"offset":0,"shift":4,"w":3,"x":69,"y":32,}, + "71": {"character":71,"h":8,"offset":0,"shift":5,"w":4,"x":63,"y":32,}, + "72": {"character":72,"h":8,"offset":0,"shift":5,"w":4,"x":57,"y":32,}, + "73": {"character":73,"h":8,"offset":0,"shift":4,"w":3,"x":52,"y":32,}, + "74": {"character":74,"h":8,"offset":0,"shift":5,"w":4,"x":46,"y":32,}, + "75": {"character":75,"h":8,"offset":0,"shift":5,"w":4,"x":40,"y":32,}, + "76": {"character":76,"h":8,"offset":0,"shift":4,"w":3,"x":35,"y":32,}, + "77": {"character":77,"h":8,"offset":0,"shift":6,"w":5,"x":28,"y":32,}, + "78": {"character":78,"h":8,"offset":0,"shift":5,"w":4,"x":20,"y":22,}, + "79": {"character":79,"h":8,"offset":0,"shift":5,"w":4,"x":14,"y":22,}, + "80": {"character":80,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":22,}, + "81": {"character":81,"h":8,"offset":0,"shift":5,"w":4,"x":2,"y":12,}, + "82": {"character":82,"h":8,"offset":0,"shift":5,"w":4,"x":115,"y":2,}, + "83": {"character":83,"h":8,"offset":0,"shift":5,"w":4,"x":109,"y":2,}, + "84": {"character":84,"h":8,"offset":0,"shift":4,"w":3,"x":104,"y":2,}, + "85": {"character":85,"h":8,"offset":0,"shift":5,"w":4,"x":98,"y":2,}, + "86": {"character":86,"h":8,"offset":0,"shift":5,"w":4,"x":92,"y":2,}, + "87": {"character":87,"h":8,"offset":0,"shift":6,"w":5,"x":85,"y":2,}, + "88": {"character":88,"h":8,"offset":0,"shift":5,"w":4,"x":79,"y":2,}, + "89": {"character":89,"h":8,"offset":0,"shift":5,"w":4,"x":73,"y":2,}, + "90": {"character":90,"h":8,"offset":0,"shift":4,"w":3,"x":68,"y":2,}, + "91": {"character":91,"h":8,"offset":0,"shift":3,"w":2,"x":121,"y":2,}, + "92": {"character":92,"h":8,"offset":0,"shift":6,"w":5,"x":61,"y":2,}, + "93": {"character":93,"h":8,"offset":0,"shift":3,"w":2,"x":52,"y":2,}, + "94": {"character":94,"h":8,"offset":0,"shift":4,"w":3,"x":47,"y":2,}, + "95": {"character":95,"h":8,"offset":0,"shift":5,"w":4,"x":41,"y":2,}, + "96": {"character":96,"h":8,"offset":0,"shift":3,"w":2,"x":37,"y":2,}, + "97": {"character":97,"h":8,"offset":0,"shift":5,"w":4,"x":31,"y":2,}, + "98": {"character":98,"h":8,"offset":0,"shift":5,"w":4,"x":25,"y":2,}, + "99": {"character":99,"h":8,"offset":0,"shift":4,"w":3,"x":20,"y":2,}, + "100": {"character":100,"h":8,"offset":0,"shift":5,"w":4,"x":14,"y":2,}, + "101": {"character":101,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":2,}, + "102": {"character":102,"h":8,"offset":0,"shift":4,"w":3,"x":56,"y":2,}, + "103": {"character":103,"h":8,"offset":0,"shift":5,"w":4,"x":8,"y":12,}, + "104": {"character":104,"h":8,"offset":0,"shift":5,"w":4,"x":66,"y":12,}, + "105": {"character":105,"h":8,"offset":0,"shift":2,"w":1,"x":14,"y":12,}, + "106": {"character":106,"h":8,"offset":0,"shift":3,"w":2,"x":122,"y":12,}, + "107": {"character":107,"h":8,"offset":0,"shift":5,"w":4,"x":116,"y":12,}, + "108": {"character":108,"h":8,"offset":0,"shift":2,"w":1,"x":113,"y":12,}, + "109": {"character":109,"h":8,"offset":0,"shift":6,"w":5,"x":106,"y":12,}, + "110": {"character":110,"h":8,"offset":0,"shift":5,"w":4,"x":100,"y":12,}, + "111": {"character":111,"h":8,"offset":0,"shift":5,"w":4,"x":94,"y":12,}, + "112": {"character":112,"h":8,"offset":0,"shift":5,"w":4,"x":88,"y":12,}, + "113": {"character":113,"h":8,"offset":0,"shift":5,"w":4,"x":82,"y":12,}, + "114": {"character":114,"h":8,"offset":0,"shift":4,"w":3,"x":77,"y":12,}, + "115": {"character":115,"h":8,"offset":0,"shift":5,"w":4,"x":2,"y":22,}, + "116": {"character":116,"h":8,"offset":0,"shift":4,"w":3,"x":72,"y":12,}, + "117": {"character":117,"h":8,"offset":0,"shift":5,"w":4,"x":60,"y":12,}, + "118": {"character":118,"h":8,"offset":0,"shift":5,"w":4,"x":54,"y":12,}, + "119": {"character":119,"h":8,"offset":0,"shift":6,"w":5,"x":47,"y":12,}, + "120": {"character":120,"h":8,"offset":0,"shift":4,"w":3,"x":42,"y":12,}, + "121": {"character":121,"h":8,"offset":0,"shift":5,"w":4,"x":36,"y":12,}, + "122": {"character":122,"h":8,"offset":0,"shift":5,"w":4,"x":30,"y":12,}, + "123": {"character":123,"h":8,"offset":0,"shift":4,"w":3,"x":25,"y":12,}, + "124": {"character":124,"h":8,"offset":0,"shift":2,"w":1,"x":22,"y":12,}, + "125": {"character":125,"h":8,"offset":0,"shift":4,"w":3,"x":17,"y":12,}, + "126": {"character":126,"h":8,"offset":0,"shift":5,"w":4,"x":19,"y":42,}, + "9647": {"character":9647,"h":8,"offset":2,"shift":8,"w":4,"x":25,"y":42,}, }, + "hinting": 0, + "includeTTF": false, + "interpreter": 0, + "italic": false, "kerningPairs": [], + "last": 0, + "maintainGms1Font": false, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "pointRounding": 0, "ranges": [ {"lower":32,"upper":127,}, {"lower":9647,"upper":9647,}, ], "regenerateBitmap": false, - "canGenerateBitmap": true, - "maintainGms1Font": false, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "sampleText": "created by:\r\nstann.co", + "size": 6.0, + "styleName": "Regular", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "TTFName": "", } \ No newline at end of file diff --git a/objects/__obj_stanncam_manager/Create_0.gml b/objects/__obj_stanncam_manager/Create_0.gml new file mode 100644 index 0000000..9a11ef2 --- /dev/null +++ b/objects/__obj_stanncam_manager/Create_0.gml @@ -0,0 +1,5 @@ +/// @description gets created by stanncam init, maintains all cameras +resolution_w = 0; +resolution_h = 0; +number_of_cams = 0; +keep_aspect_ratio = true; \ No newline at end of file diff --git a/objects/__obj_stanncam_manager/Draw_76.gml b/objects/__obj_stanncam_manager/Draw_76.gml new file mode 100644 index 0000000..190ae8a --- /dev/null +++ b/objects/__obj_stanncam_manager/Draw_76.gml @@ -0,0 +1,5 @@ +/// @description +for (var i = 0; i < array_length(global.stanncams); ++i) { + if (global.stanncams[i] == -1) continue; + global.stanncams[i].__predraw(); +} \ No newline at end of file diff --git a/objects/__obj_stanncam_manager/Other_4.gml b/objects/__obj_stanncam_manager/Other_4.gml new file mode 100644 index 0000000..b8d1f80 --- /dev/null +++ b/objects/__obj_stanncam_manager/Other_4.gml @@ -0,0 +1,7 @@ +/// @description +view_enabled = true; +for (var i = 0; i < array_length(global.stanncams); ++i) { + if (global.stanncams[i] == -1) continue; + global.stanncams[i].__check_viewports(); +} +__stanncam_update_resolution(); diff --git a/objects/__obj_stanncam_manager/Step_2.gml b/objects/__obj_stanncam_manager/Step_2.gml new file mode 100644 index 0000000..a7b55e6 --- /dev/null +++ b/objects/__obj_stanncam_manager/Step_2.gml @@ -0,0 +1,5 @@ +/// @description +for (var i = 0; i < array_length(global.stanncams); ++i) { + if (global.stanncams[i] == -1) continue; + global.stanncams[i].__step(); +} \ No newline at end of file diff --git a/objects/obj_stanncam/obj_stanncam.yy b/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy similarity index 74% rename from objects/obj_stanncam/obj_stanncam.yy rename to objects/__obj_stanncam_manager/__obj_stanncam_manager.yy index 638251d..9595b21 100644 --- a/objects/obj_stanncam/obj_stanncam.yy +++ b/objects/__obj_stanncam_manager/__obj_stanncam_manager.yy @@ -1,36 +1,36 @@ { "resourceType": "GMObject", "resourceVersion": "1.0", - "name": "obj_stanncam", - "spriteId": null, - "solid": false, - "visible": true, - "managed": true, - "spriteMaskId": null, - "persistent": true, - "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, - "physicsAngularDamping": 0.1, - "physicsFriction": 0.2, - "physicsStartAwake": true, - "physicsKinematic": false, - "physicsShapePoints": [], + "name": "__obj_stanncam_manager", "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":2,"eventType":3,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":4,"eventType":7,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":77,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":7,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":76,"eventType":8,"isDnD":false,}, ], - "properties": [], + "managed": true, "overriddenProperties": [], "parent": { "name": "Objects", "path": "folders/Objects.yy", }, + "parentObjectId": null, + "persistent": true, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, } \ No newline at end of file diff --git a/objects/obj_ball/Step_0.gml b/objects/demo_obj_ball/Step_0.gml similarity index 100% rename from objects/obj_ball/Step_0.gml rename to objects/demo_obj_ball/Step_0.gml diff --git a/objects/obj_ball/obj_ball.yy b/objects/demo_obj_ball/demo_obj_ball.yy similarity index 89% rename from objects/obj_ball/obj_ball.yy rename to objects/demo_obj_ball/demo_obj_ball.yy index 3641c74..70e19bb 100644 --- a/objects/obj_ball/obj_ball.yy +++ b/objects/demo_obj_ball/demo_obj_ball.yy @@ -1,36 +1,36 @@ { "resourceType": "GMObject", "resourceVersion": "1.0", - "name": "obj_ball", - "spriteId": { - "name": "spr_ball", - "path": "sprites/spr_ball/spr_ball.yy", - }, - "solid": false, - "visible": true, + "name": "demo_obj_ball", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + ], "managed": true, - "spriteMaskId": null, - "persistent": false, + "overriddenProperties": [], + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, + "persistent": false, "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, "physicsFriction": 0.2, - "physicsStartAwake": true, + "physicsGroup": 1, "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, "physicsShapePoints": [], - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, - ], + "physicsStartAwake": true, "properties": [], - "overriddenProperties": [], - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "solid": false, + "spriteId": { + "name": "spr_ball", + "path": "sprites/spr_ball/spr_ball.yy", }, + "spriteMaskId": null, + "visible": true, } \ No newline at end of file diff --git a/objects/demo_obj_camera/Alarm_0.gml b/objects/demo_obj_camera/Alarm_0.gml new file mode 100644 index 0000000..838ee2a --- /dev/null +++ b/objects/demo_obj_camera/Alarm_0.gml @@ -0,0 +1,2 @@ +/// @description +pointer = false; diff --git a/objects/demo_obj_camera/Create_0.gml b/objects/demo_obj_camera/Create_0.gml new file mode 100644 index 0000000..870f0a2 --- /dev/null +++ b/objects/demo_obj_camera/Create_0.gml @@ -0,0 +1,33 @@ +/// @description +//camera +stanncam_init(320,240,1920,1080); +cam1 = new stanncam(demo_obj_player.x,demo_obj_player.y,global.game_w,global.game_h); +cam1.follow = demo_obj_player; + +cam2 = -1; + +split_screen = false; + +//pointer +pointer = false; +pointer_x = 0; +pointer_y = 0; + +zoom_mode = 0; +zoom_text = "no zooming" + +speed_mode = 1; + +game_res = 2; +gui_hires = false; +gui_res = 0; + +resolutions = [ +{ w:400 , h:400 }, //1:1 +{ w:500 , h:250 }, //2:1 +{ w:320 , h:180 }, //16:9 +{ w:640 , h:360 }, +{ w:1280 , h:720 }, +{ w:1920 , h:1080 }, +{ w:2560 , h:1440 } +] \ No newline at end of file diff --git a/objects/demo_obj_camera/Draw_64.gml b/objects/demo_obj_camera/Draw_64.gml new file mode 100644 index 0000000..c982f58 --- /dev/null +++ b/objects/demo_obj_camera/Draw_64.gml @@ -0,0 +1,81 @@ +/// @description +//chooses pixel font or hires font +if(gui_hires){ + draw_set_font(demo_f_hires); + var offset = 45; + var outline_width = 4; + var precision = 16; + draw_set_color(c_white) + +} else { + draw_set_font(demo_f_pixel); + var offset = 8; + var outline_width = 1; + var precision = 8; + draw_set_color(c_white) + +} + +//draws helper text +draw_set_halign(fa_left); +draw_set_valign(fa_top); +draw_text_outline(1,1,"[arrow keys] move character",outline_width,precision); +var following = (cam1.follow != undefined) ? "following" : "not following" +draw_text_outline(1,offset,"[space] " + following,outline_width,precision); +draw_text_outline(1,offset*2,"[ALT] toggle hi-res GUI",outline_width,precision); +draw_text_outline(1,offset*3,"[LMB] move cam to pos (when not following)",outline_width,precision); +draw_text_outline(1,offset*4,"[RMB] "+ zoom_text,outline_width,precision); +var constrained = (cam1.room_constrain) ? "camera constrained to room" : "camera not constrained to room"; +draw_text_outline(1,offset*5,"[CTRL] "+ constrained,outline_width,precision); +draw_text_outline(1,offset*6,"[F] camera shake",outline_width,precision); +draw_text_outline(1,offset*7,"[Tab] camera speed "+ string(cam1.spd),outline_width,precision); + +//draw current resolution text +draw_set_halign(fa_right) +draw_text_outline(global.gui_w-1,1,"game resolution: "+string(__obj_stanncam_manager.display_res_w)+" x "+string(__obj_stanncam_manager.display_res_h)+" [F1]",outline_width,precision); +draw_text_outline(global.gui_w-1,offset,"GUI resolution: "+string(global.gui_w)+" x "+string(global.gui_h)+" [F2]",outline_width,precision); +draw_text_outline(global.gui_w-1,offset*2,"Keep aspect ratio: "+string(stanncam_get_keep_aspect_ratio())+" [F3]",outline_width,precision); +draw_text_outline(global.gui_w-1,offset*3,"fullscreen: "+string(window_get_fullscreen())+" [F4]",outline_width,precision); +draw_text_outline(global.gui_w-1,offset*4,"split-screen: "+string(split_screen)+" [F5]",outline_width,precision); + +//point at player, when it's outside camera bounds +if(cam1.out_of_bounds(demo_obj_player.x,demo_obj_player.y,8)){ + var _x = cam1.room_to_gui_x(demo_obj_player.x); + var _y = cam1.room_to_gui_y(demo_obj_player.y); + + var margin = (gui_hires) ? 50 : 20; + + var gui_scale_x = stanncam_get_gui_scale_x(); + var gui_scale_y = stanncam_get_gui_scale_y(); + + _x = clamp(_x,margin,cam1.width * gui_scale_x -margin); + _y = clamp(_y,margin,cam1.height * gui_scale_y -margin); + + var dir = point_direction(_x,_y,cam1.room_to_gui_x(demo_obj_player.x),cam1.room_to_gui_y(demo_obj_player.y)); + + if(gui_hires){ + draw_sprite_ext(spr_arrow,0,_x,_y,1,1,dir-90,-1,1); + }else{ + draw_sprite_ext(spr_arrow_small,0,_x,_y,1,1,dir-90,-1,1); + } +} else { + //draws pointer over players head + var arrow_x = cam1.room_to_gui_x(demo_obj_player.x); + var arrow_y = cam1.room_to_gui_y(demo_obj_player.y); + if(gui_hires){ + draw_sprite_ext(spr_arrow,1,arrow_x,arrow_y-64,0.5,0.5,180,-1,1); + } else { + draw_sprite_ext(spr_arrow_small,1,arrow_x,arrow_y-12,1,1,180,-1,1); + } +} + +//draw pointer on mouse location +if(pointer){ + var arrow_x = cam1.room_to_gui_x( pointer_x ); + var arrow_y = cam1.room_to_gui_y( pointer_y ); + if(gui_hires){ + draw_sprite_ext(spr_arrow,0,arrow_x,arrow_y,1,1,180,-1,1); + } else { + draw_sprite_ext(spr_arrow_small,0,arrow_x,arrow_y,1,1,180,-1,1); + } +} \ No newline at end of file diff --git a/objects/demo_obj_camera/Draw_77.gml b/objects/demo_obj_camera/Draw_77.gml new file mode 100644 index 0000000..e75a25c --- /dev/null +++ b/objects/demo_obj_camera/Draw_77.gml @@ -0,0 +1,7 @@ +/// @description +if(split_screen){ + cam1.draw(0,0); + cam2.draw(global.game_w/2,0); +}else{ + cam1.draw(0,0); +} \ No newline at end of file diff --git a/objects/demo_obj_camera/Step_0.gml b/objects/demo_obj_camera/Step_0.gml new file mode 100644 index 0000000..0df775c --- /dev/null +++ b/objects/demo_obj_camera/Step_0.gml @@ -0,0 +1,125 @@ +/// @description +//toggle following player +if(keyboard_check_pressed(vk_space)){ + if(cam1.follow != undefined) cam1.follow = undefined; + else cam1.follow = demo_obj_player; +} + +//toggle splitscreen +if(keyboard_check_pressed(vk_f5)){ + split_screen = !split_screen; + if(split_screen){ + cam1.set_size(global.game_w/2,global.game_h); + + cam2 = cam1.clone(); + cam2.follow = demo_obj_player2; + }else{ + if(!cam2.is_destroyed()) cam2.destroy(); + cam1.set_size(global.game_w,global.game_h); + } +} + +//toggle hires gui +if(keyboard_check_pressed(vk_alt)){ + gui_hires = !gui_hires; + if(gui_hires){ + stanncam_set_gui_resolution(1920,1080); + }else{ + stanncam_set_gui_resolution(global.game_w,global.game_h); + } +} + +//moves camera to mouse press location +if(mouse_check_button_pressed(mb_left)){ + cam1.move(cam1.get_mouse_x(),cam1.get_mouse_y(),room_speed*1); + alarm[0] = room_speed*1.1; + pointer = true; + pointer_x = cam1.get_mouse_x(); + pointer_y = cam1.get_mouse_y(); +} + +//toggle zoom in +if(mouse_check_button_pressed(mb_right)){ + zoom_mode++; + if(zoom_mode > 2) zoom_mode = 0; + + switch (zoom_mode) { + case 0: + //no zooming + zoom_text = "no zooming"; + cam1.zoom(1,room_speed*1); + demo_obj_tv.tv.zoom(1,room_speed*1); + break; + case 1: + //zoom in + zoom_text = "zoomed in"; + cam1.zoom(0.5,room_speed*1); + demo_obj_tv.tv.zoom(0.5,room_speed*1); + break; + case 2: + //zoom out + zoom_text = "zoomed out"; + cam1.zoom(2,room_speed*1); + demo_obj_tv.tv.zoom(2,room_speed*1); + break; + } +} + +//toggle camera speed +if(keyboard_check_pressed(vk_tab)){ + speed_mode++; + if(speed_mode > 3) speed_mode = 0; + + switch (speed_mode) { + case 0: + //speed 0.5 + cam1.set_speed(0.5,50); + break; + case 1: + //speed 2 + cam1.set_speed(1,50); + break; + case 2: + //speed 10 + cam1.set_speed(2,50); + break; + case 3: + //speed 10 + cam1.set_speed(10,50); + break; + } +} + +//toggle if the camera is constrained to the room size +if(keyboard_check_pressed(vk_control)){ + if(cam1.room_constrain) cam1.room_constrain = false; + else cam1.room_constrain = true; +} + +//do a screenshake +if(keyboard_check_pressed(ord("F"))){ + cam1.shake_screen(30,room_speed*1); +} + +//switch resolutions +if(keyboard_check_pressed(vk_f1)) +{ + game_res++; + if(game_res > 6) game_res = 0; + stanncam_set_resolution(resolutions[game_res].w,resolutions[game_res].h); +} + +//switch gui resolutions +if(keyboard_check_pressed(vk_f2)){ + gui_res++ + if(gui_res > 6) gui_res = 0; + var gui_w = resolutions[gui_res].w; + var gui_h = resolutions[gui_res].h; + stanncam_set_gui_resolution(gui_w,gui_h); +} + +//toggle fullscreen +if(keyboard_check_pressed(vk_f3)) stanncam_toggle_keep_aspect_ratio(); + +//toggle fullscreen +if(keyboard_check_pressed(vk_f4)) stanncam_toggle_fullscreen(); \ No newline at end of file diff --git a/objects/demo_obj_camera/demo_obj_camera.yy b/objects/demo_obj_camera/demo_obj_camera.yy new file mode 100644 index 0000000..f781c03 --- /dev/null +++ b/objects/demo_obj_camera/demo_obj_camera.yy @@ -0,0 +1,37 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "demo_obj_camera", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "parentObjectId": null, + "persistent": true, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/demo_obj_player/Create_0.gml b/objects/demo_obj_player/Create_0.gml index cb45683..bd7cfa9 100644 --- a/objects/demo_obj_player/Create_0.gml +++ b/objects/demo_obj_player/Create_0.gml @@ -1,4 +1,6 @@ /// @description + +//player hspd = 0; vspd = 0; @@ -6,27 +8,4 @@ spd = 1.5; anim_spd = sprite_get_speed(spr_player_moving); -subimg = 0; - -//pointer -pointer = false; -pointer_x = 0; -pointer_y = 0; - -zoom_mode = 0; -zoom_text = "no zooming" - -speed_mode = 1; - -game_res = 2; -gui_res = 4; - -resolutions = [ -{ w:400 , h:400 }, //1:1 -{ w:500 , h:250 }, //2:1 -{ w:320 , h:180 }, //16:9 -{ w:640 , h:360 }, -{ w:1280 , h:720 }, -{ w:1920 , h:1080 }, -{ w:2560 , h:1440 } -] \ No newline at end of file +subimg = 0; \ No newline at end of file diff --git a/objects/demo_obj_player/Draw_64.gml b/objects/demo_obj_player/Draw_64.gml deleted file mode 100644 index f546c96..0000000 --- a/objects/demo_obj_player/Draw_64.gml +++ /dev/null @@ -1,77 +0,0 @@ -/// @description - -//chooses pixel font or hires font -if(obj_stanncam.gui_hires){ - draw_set_font(demo_f_hires); - var offset = 32; - var outline_width = 4; - draw_set_color(c_white) -} else { - draw_set_font(demo_f_pixel); - var offset = 8; - var outline_width = 0; - draw_set_color(c_black) -} - -//draws helper text -draw_set_halign(fa_left); -draw_set_valign(fa_top); -draw_text_outline(1,1,"[arrow keys] move character",outline_width); -var following = (global.camera_follow != undefined) ? "following" : "not following" -draw_text_outline(1,offset,"[space] " + following,outline_width); -draw_text_outline(1,offset*2,"[ALT] toggle hi-res GUI",outline_width); -draw_text_outline(1,offset*3,"[LMB] move cam to pos (when not following)",outline_width); -draw_text_outline(1,offset*4,"[RMB] "+ zoom_text,outline_width); -var constrained = (obj_stanncam.camera_constrain) ? "camera constrained to room" : "camera not constrained to room"; -draw_text_outline(1,offset*5,"[CTRL] "+ constrained,outline_width); -draw_text_outline(1,offset*6,"[S] camera shake",outline_width); -draw_text_outline(1,offset*7,"[Tab] camera speed "+ string(obj_stanncam.spd),outline_width); - -//draw current resolution text -draw_set_halign(fa_right) -draw_text_outline(display_get_gui_width()-1,1,"game resolution: "+string(global.view_w)+" x "+string(global.view_h)+" [F1]",outline_width); -draw_text_outline(display_get_gui_width()-1,offset,"GUI resolution: "+string(display_get_gui_width())+" x "+string(display_get_gui_height())+" [F2]",outline_width); -draw_text_outline(display_get_gui_width()-1,offset*2,"upscale: "+string(global.upscale)+" [F3]",outline_width); -draw_text_outline(display_get_gui_width()-1,offset*3,"fullscreen: "+string(window_get_fullscreen())+" [F4]",outline_width); - - -//draws pointer over players head -if(obj_stanncam.gui_hires){ - draw_sprite_ext(spr_arrow,1,stanncam_room_to_gui_x(x),stanncam_room_to_gui_y(y)-64,0.5,0.5,180,-1,1); -} else { - draw_sprite_ext(spr_arrow_small,1,stanncam_room_to_gui_x(x),stanncam_room_to_gui_y(y)-12,1,1,180,-1,1); -} - - -//point at player, when it's outside camera bounds -if(stanncam_out_of_bounds(x,y,8)){ - var _x = stanncam_room_to_gui_x(x); - var _y = stanncam_room_to_gui_y(y); - - var margin = (obj_stanncam.gui_hires) ? 50 : 20; - - _x = clamp(_x,margin,display_get_gui_width() -margin); - _y = clamp(_y,margin,display_get_gui_height()-margin); - - var dir = point_direction(_x,_y,stanncam_room_to_gui_x(x),stanncam_room_to_gui_y(y)); - - if(obj_stanncam.gui_hires){ - draw_sprite_ext(spr_arrow,0,_x,_y,1,1,dir-90,-1,1); - }else{ - draw_sprite_ext(spr_arrow_small,0,_x,_y,1,1,dir-90,-1,1); - } -} - -//draw pointer on mouse location -if(pointer){ - if(obj_stanncam.gui_hires){ - draw_sprite_ext(spr_arrow,0,stanncam_room_to_gui_x(pointer_x),stanncam_room_to_gui_y(pointer_y),1,1,180,-1,1); - } else { - draw_sprite_ext(spr_arrow_small,0,stanncam_room_to_gui_x(pointer_x),stanncam_room_to_gui_y(pointer_y),1,1,180,-1,1); - } -} - - - - - diff --git a/objects/demo_obj_player/Step_0.gml b/objects/demo_obj_player/Step_0.gml index bba88ee..1b87e58 100644 --- a/objects/demo_obj_player/Step_0.gml +++ b/objects/demo_obj_player/Step_0.gml @@ -8,119 +8,6 @@ y+= vspd; x = clamp(x,0,room_width); y = clamp(y,0,room_height); -//toggle following player -if(keyboard_check_pressed(vk_space)){ - if(global.camera_follow != undefined) global.camera_follow = undefined; - else global.camera_follow = demo_obj_player; -} - -//toggle hires gui -if(keyboard_check_pressed(vk_alt)){ - if(obj_stanncam.gui_hires) obj_stanncam.gui_hires = false - else obj_stanncam.gui_hires = true; - stanncam_update_resolution(); -} - -//moves camera to mouse press location -if(mouse_check_button_pressed(mb_left)){ - stanncam_move(mouse_x,mouse_y,room_speed*1); - alarm[0] = room_speed*1.1; - pointer = true; - pointer_x = mouse_x; - pointer_y = mouse_y; -} - -//toggle zoom in -if(mouse_check_button_pressed(mb_right)){ - zoom_mode++; - if(zoom_mode > 2) zoom_mode = 0; - - switch (zoom_mode) { - case 0: - //no zooming - zoom_text = "no zooming"; - stanncam_zoom(1,room_speed*1); - break; - case 1: - //zoom in - zoom_text = "zoomed in"; - stanncam_zoom(0.5,room_speed*1); - break; - case 2: - //zoom out - zoom_text = "zoomed out"; - stanncam_zoom(2,room_speed*1); - break; - } -} - -//toggle camera speed -if(keyboard_check_pressed(vk_tab)){ - speed_mode++; - if(speed_mode > 3) speed_mode = 0; - - switch (speed_mode) { - case 0: - //speed 0.5 - stanncam_speed(0.5,50); - break; - case 1: - //speed 2 - stanncam_speed(1,50); - break; - case 2: - //speed 10 - stanncam_speed(2,50); - break; - case 3: - //speed 10 - stanncam_speed(10,50); - break; - } -} - -//toggle if the camera is constrained to the room size -if(keyboard_check_pressed(vk_control)){ - if(obj_stanncam.camera_constrain) obj_stanncam.camera_constrain = false; - else obj_stanncam.camera_constrain = true; - -} - -//do a screenshake -if(keyboard_check_pressed(ord("S"))){ - stanncam_shake(30,room_speed*1); - -} - -//switch resolutions -if(keyboard_check_pressed(vk_f1)) -{ - game_res++ - if(game_res > 6) game_res = 0; - global.view_w = resolutions[game_res].w; - global.view_h = resolutions[game_res].h; - stanncam_update_resolution(); -} - -//switch gui resolutions -if(keyboard_check_pressed(vk_f2)){ - gui_res++ - if(gui_res > 6) gui_res = 0; - global.gui_w = resolutions[gui_res].w; - global.gui_h = resolutions[gui_res].h; - stanncam_update_resolution(); -} - -//switch upscaling -if(keyboard_check_pressed(vk_f3)) { - global.upscale++; - if(global.upscale > 4) global.upscale = 1; - stanncam_update_resolution(); -} - -//toggle fullscreen -if(keyboard_check_pressed(vk_f4)) stanncam_toggle_fullscreen(); - //Restart if(keyboard_check_pressed(ord("R"))) game_restart(); \ No newline at end of file diff --git a/objects/demo_obj_player/demo_obj_player.yy b/objects/demo_obj_player/demo_obj_player.yy index 3d7c40f..f2ce603 100644 --- a/objects/demo_obj_player/demo_obj_player.yy +++ b/objects/demo_obj_player/demo_obj_player.yy @@ -2,39 +2,37 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "demo_obj_player", - "spriteId": { - "name": "spr_player_idle", - "path": "sprites/spr_player_idle/spr_player_idle.yy", - }, - "solid": false, - "visible": true, + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + ], "managed": true, - "spriteMaskId": null, - "persistent": false, + "overriddenProperties": [], + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, "parentObjectId": null, - "physicsObject": false, - "physicsSensor": false, - "physicsShape": 1, - "physicsGroup": 1, - "physicsDensity": 0.5, - "physicsRestitution": 0.1, - "physicsLinearDamping": 0.1, + "persistent": false, "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, "physicsFriction": 0.2, - "physicsStartAwake": true, + "physicsGroup": 1, "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, "physicsShapePoints": [], - "eventList": [ - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,}, - ], + "physicsStartAwake": true, "properties": [], - "overriddenProperties": [], - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "solid": false, + "spriteId": { + "name": "spr_player_idle", + "path": "sprites/spr_player_idle/spr_player_idle.yy", }, + "spriteMaskId": null, + "visible": true, } \ No newline at end of file diff --git a/objects/demo_obj_player/Alarm_0.gml b/objects/demo_obj_player2/Alarm_0.gml similarity index 100% rename from objects/demo_obj_player/Alarm_0.gml rename to objects/demo_obj_player2/Alarm_0.gml diff --git a/objects/demo_obj_player2/Create_0.gml b/objects/demo_obj_player2/Create_0.gml new file mode 100644 index 0000000..4fa0b2d --- /dev/null +++ b/objects/demo_obj_player2/Create_0.gml @@ -0,0 +1,9 @@ +/// @description +hspd = 0; +vspd = 0; + +spd = 1.5; + +anim_spd = sprite_get_speed(spr_player_moving); + +subimg = 0; \ No newline at end of file diff --git a/objects/demo_obj_player2/Draw_0.gml b/objects/demo_obj_player2/Draw_0.gml new file mode 100644 index 0000000..c2f660f --- /dev/null +++ b/objects/demo_obj_player2/Draw_0.gml @@ -0,0 +1,5 @@ +/// @description +if(hspd != 0 || vspd != 0){ + draw_sprite(spr_player2_moving,subimg,x,y); +} else draw_sprite(spr_player2_idle,image_index,x,y); +subimg += anim_spd; \ No newline at end of file diff --git a/objects/demo_obj_player2/Step_0.gml b/objects/demo_obj_player2/Step_0.gml new file mode 100644 index 0000000..b8092e1 --- /dev/null +++ b/objects/demo_obj_player2/Step_0.gml @@ -0,0 +1,9 @@ +/// @description +hspd = (keyboard_check_direct(ord("D")) - keyboard_check_direct(ord("A"))) * spd; +vspd = (keyboard_check_direct(ord("S")) - keyboard_check_direct(ord("W"))) * spd; + +x+= hspd; +y+= vspd; + +x = clamp(x,0,room_width); +y = clamp(y,0,room_height); \ No newline at end of file diff --git a/objects/demo_obj_player2/demo_obj_player2.yy b/objects/demo_obj_player2/demo_obj_player2.yy new file mode 100644 index 0000000..9c5128b --- /dev/null +++ b/objects/demo_obj_player2/demo_obj_player2.yy @@ -0,0 +1,39 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "demo_obj_player2", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_player2_idle", + "path": "sprites/spr_player2_idle/spr_player2_idle.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/demo_obj_tv/Create_0.gml b/objects/demo_obj_tv/Create_0.gml new file mode 100644 index 0000000..3cf03ce --- /dev/null +++ b/objects/demo_obj_tv/Create_0.gml @@ -0,0 +1,9 @@ +/// @description +tv = new stanncam(0,0,56,56,true); + +tv.follow = demo_obj_player2; +tv.bounds_h = 1; +tv.bounds_w = 1; +tv.zoom(0.5,0); + +depth = depth+10; \ No newline at end of file diff --git a/objects/demo_obj_tv/Draw_0.gml b/objects/demo_obj_tv/Draw_0.gml new file mode 100644 index 0000000..25bc4c4 --- /dev/null +++ b/objects/demo_obj_tv/Draw_0.gml @@ -0,0 +1,3 @@ +/// @description +draw_self(); +draw_surface(tv.surface_extra,x+4,y+4); diff --git a/objects/demo_obj_tv/demo_obj_tv.yy b/objects/demo_obj_tv/demo_obj_tv.yy new file mode 100644 index 0000000..331de40 --- /dev/null +++ b/objects/demo_obj_tv/demo_obj_tv.yy @@ -0,0 +1,37 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "demo_obj_tv", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_tv", + "path": "sprites/spr_tv/spr_tv.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_stanncam/Create_0.gml b/objects/obj_stanncam/Create_0.gml deleted file mode 100644 index fe14dd2..0000000 --- a/objects/obj_stanncam/Create_0.gml +++ /dev/null @@ -1,41 +0,0 @@ -/// @description -#macro cam view_camera[0] - -#region change these global variables to whatever you need. -//if you change resolution or scale at runtime, run stanncam_update_resolution() after -global.view_w = 320; //game resolution width -global.view_h = 180; //game resolution height -global.gui_w = 1280; //gui resolution width -global.gui_h = 720; //gui resolution height -global.upscale = 4; //how much the game should be upscaled - -global.camera_follow = undefined; //what object the camera should follow -spd = 1; //how fast the camera follows an object -spd_threshold = 50; //the minimum distance the camera is away, for the speed to be in full effect -gui_hires = true; //if the gui should be independant of the game resolution -camera_constrain = false; //if camera should be constrained to the room size -//the camera bounding box, for the followed object to leave before the camera starts moving -bounds_w = 20; -bounds_h = 20; -#endregion - -#region inits neccesary variables -//zoom -zoom = 1; -zoom_x = 0; -zoom_y = 0; -zooming = false; - -//screen shake -shake_length = 0; -shake_magnitude = 0; -shake_time = 0; -shake_x = 0; -shake_y = 0; - -moving = false; -#endregion - -application_surface_draw_enable(false); - -stanncam_update_resolution(); \ No newline at end of file diff --git a/objects/obj_stanncam/Draw_77.gml b/objects/obj_stanncam/Draw_77.gml deleted file mode 100644 index 186cc76..0000000 --- a/objects/obj_stanncam/Draw_77.gml +++ /dev/null @@ -1,6 +0,0 @@ -/// @description draws the actual game - -//if you want a special background or foreground drawn, you can draw them with stretched surfaces before and after the application surface -//or if you want to use specific shaders, you can wrap the application surface inside it - -draw_surface_stretched(application_surface,0,0,display_width,display_height); \ No newline at end of file diff --git a/objects/obj_stanncam/Other_4.gml b/objects/obj_stanncam/Other_4.gml deleted file mode 100644 index dcb856d..0000000 --- a/objects/obj_stanncam/Other_4.gml +++ /dev/null @@ -1,4 +0,0 @@ -/// @description -view_enabled = true; -view_visible[0] = true; -camera_set_view_size(cam,global.view_w*zoom,global.view_h*zoom); \ No newline at end of file diff --git a/objects/obj_stanncam/Step_2.gml b/objects/obj_stanncam/Step_2.gml deleted file mode 100644 index 42a8d70..0000000 --- a/objects/obj_stanncam/Step_2.gml +++ /dev/null @@ -1,64 +0,0 @@ -/// @description -if (!is_undefined(global.camera_follow)){ - //update destination - xTo = global.camera_follow.x; - yTo = global.camera_follow.y; - - var dist_w = max(bounds_w,abs(xTo - x)) - bounds_w; - var dist_h = max(bounds_h,abs(yTo - y)) - bounds_h; - - //update camera position - if (abs(xTo - x) > bounds_w) - { - var _spd = (dist_w/spd_threshold)*spd; - if (x < xTo) x+=_spd; - else if (x > xTo) x-=_spd; - } - - if (abs(y - yTo) > bounds_h) - { - var _spd = (dist_h/spd_threshold)*spd; - if (y < yTo) y+=_spd; - else if (y > yTo) y-=_spd; - } -} else if(moving){ - //gradually moves camera into position based on duration - x = ease_in_out(t,xStart,xTo-xStart,duration); - y = ease_in_out(t,yStart,yTo-yStart,duration); - - t++; - if(x == xTo && y == yTo) moving = false; -} - -#region screen-shake -var stanncam_shake_ = shake(shake_time++,shake_magnitude,shake_length); -shake_x = stanncam_shake_; -shake_y = stanncam_shake_; -var vibration = stanncam_shake_ / 20; -gamepad_set_vibration(0,vibration,vibration); -#endregion - -#region constrains camera to room bounds -if(camera_constrain){ - x = clamp(x,(global.view_w/2),room_width -(global.view_w/2)); - y = clamp(y,(global.view_h/2),room_height-(global.view_h/2)); -} -#endregion - -#region zooming -if(zooming){ - //gradually zooms camera - zoom = ease_in_out(t_zoom,zoomStart,zoomTo-zoomStart,zoom_duration); - t_zoom++; - if(zoom == zoomTo) zooming = false; - camera_set_view_size(cam,global.view_w*zoom,global.view_h*zoom); - zoom_x = ((global.view_w*zoom) - global.view_w)/2; - zoom_y = ((global.view_h*zoom) - global.view_h)/2; -} -#endregion - -//update camera view -var new_x = x - (global.view_w / 2 + shake_x + zoom_x); -var new_y = y - (global.view_h / 2 + shake_y + zoom_y); - -camera_set_view_pos(cam, new_x, new_y); diff --git a/options/android/options_android.yy b/options/android/options_android.yy index 513b3c1..98c963d 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -2,75 +2,76 @@ "resourceType": "GMAndroidOptions", "resourceVersion": "1.0", "name": "Android", - "option_android_sync_amazon": false, - "option_android_display_name": "Created with GameMaker", - "option_android_version": "1.0.0.0", - "option_android_tools_from_version": false, - "option_android_build_tools": "", - "option_android_support_lib": "", - "option_android_target_sdk": "", - "option_android_minimum_sdk": "", - "option_android_compile_sdk": "", - "option_android_package_domain": "com", - "option_android_package_company": "company", - "option_android_package_product": "game", - "option_android_arch_armv7": false, + "option_android_application_tag_inject": "", "option_android_arch_arm64": true, + "option_android_arch_armv7": false, "option_android_arch_x86_64": false, - "option_android_orient_portrait": true, - "option_android_orient_portrait_flipped": true, - "option_android_orient_landscape": true, - "option_android_orient_landscape_flipped": true, - "option_android_gamepad_support": true, - "option_android_lint": false, - "option_android_install_location": 0, - "option_android_sleep_margin": 4, - "option_android_splash_screens_landscape": "${base_options_dir}/android/splash/landscape.png", - "option_android_splash_screens_portrait": "${base_options_dir}/android/splash/portrait.png", - "option_android_splash_time": 0, - "option_android_launchscreen_fill": 0, - "option_android_splashscreen_background_colour": 255, - "option_android_tv_banner": "${base_options_dir}/android/tv_banner.png", - "option_android_interpolate_pixels": false, - "option_android_screen_depth": 0, + "option_android_build_tools": "", + "option_android_compile_sdk": "", "option_android_device_support": 0, - "option_android_scale": 0, - "option_android_texture_page": "2048x2048", - "option_android_icon_ldpi": "${base_options_dir}/android/icons/ldpi.png", - "option_android_icon_mdpi": "${base_options_dir}/android/icons/mdpi.png", - "option_android_icon_hdpi": "${base_options_dir}/android/icons/hdpi.png", - "option_android_icon_xhdpi": "${base_options_dir}/android/icons/xhdpi.png", - "option_android_icon_xxhdpi": "${base_options_dir}/android/icons/xxhdpi.png", - "option_android_icon_xxxhdpi": "${base_options_dir}/android/icons/xxxhdpi.png", + "option_android_display_name": "Created with GameMaker", + "option_android_facebook_app_display_name": "", + "option_android_facebook_id": "", + "option_android_gamepad_support": true, + "option_android_google_apk_expansion": false, + "option_android_google_cloud_saving": false, + "option_android_google_dynamic_asset_delivery": false, + "option_android_google_licensing_public_key": "", + "option_android_google_services_app_id": "", "option_android_icon_adaptive_generate": false, + "option_android_icon_adaptive_hdpi": "${base_options_dir}/android/icons_adaptive/hdpi.png", "option_android_icon_adaptive_ldpi": "${base_options_dir}/android/icons_adaptive/ldpi.png", "option_android_icon_adaptive_mdpi": "${base_options_dir}/android/icons_adaptive/mdpi.png", - "option_android_icon_adaptive_hdpi": "${base_options_dir}/android/icons_adaptive/hdpi.png", "option_android_icon_adaptive_xhdpi": "${base_options_dir}/android/icons_adaptive/xhdpi.png", "option_android_icon_adaptive_xxhdpi": "${base_options_dir}/android/icons_adaptive/xxhdpi.png", "option_android_icon_adaptive_xxxhdpi": "${base_options_dir}/android/icons_adaptive/xxxhdpi.png", + "option_android_icon_adaptivebg_hdpi": "${base_options_dir}/android/icons_adaptivebg/hdpi.png", "option_android_icon_adaptivebg_ldpi": "${base_options_dir}/android/icons_adaptivebg/ldpi.png", "option_android_icon_adaptivebg_mdpi": "${base_options_dir}/android/icons_adaptivebg/mdpi.png", - "option_android_icon_adaptivebg_hdpi": "${base_options_dir}/android/icons_adaptivebg/hdpi.png", "option_android_icon_adaptivebg_xhdpi": "${base_options_dir}/android/icons_adaptivebg/xhdpi.png", "option_android_icon_adaptivebg_xxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxhdpi.png", "option_android_icon_adaptivebg_xxxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxxhdpi.png", - "option_android_use_facebook": false, - "option_android_facebook_id": "", - "option_android_facebook_app_display_name": "", - "option_android_google_cloud_saving": false, - "option_android_google_services_app_id": "", - "option_android_permission_write_external_storage": false, - "option_android_permission_read_phone_state": false, - "option_android_permission_network_state": false, - "option_android_permission_internet": true, + "option_android_icon_hdpi": "${base_options_dir}/android/icons/hdpi.png", + "option_android_icon_ldpi": "${base_options_dir}/android/icons/ldpi.png", + "option_android_icon_mdpi": "${base_options_dir}/android/icons/mdpi.png", + "option_android_icon_xhdpi": "${base_options_dir}/android/icons/xhdpi.png", + "option_android_icon_xxhdpi": "${base_options_dir}/android/icons/xxhdpi.png", + "option_android_icon_xxxhdpi": "${base_options_dir}/android/icons/xxxhdpi.png", + "option_android_install_location": 0, + "option_android_interpolate_pixels": false, + "option_android_launchscreen_fill": 0, + "option_android_lint": false, + "option_android_logcat": "yoyo:V DEBUG:V AndroidRuntime:V", + "option_android_minimum_sdk": "", + "option_android_orient_landscape": true, + "option_android_orient_landscape_flipped": true, + "option_android_orient_portrait": true, + "option_android_orient_portrait_flipped": true, + "option_android_package_company": "company", + "option_android_package_domain": "com", + "option_android_package_product": "game", "option_android_permission_bluetooth": true, + "option_android_permission_internet": true, + "option_android_permission_network_state": false, + "option_android_permission_read_phone_state": false, "option_android_permission_record_audio": false, - "option_android_application_tag_inject": "", - "option_android_google_apk_expansion": false, - "option_android_google_dynamic_asset_delivery": false, - "option_android_google_licensing_public_key": "", - "option_android_tv_isgame": true, + "option_android_permission_write_external_storage": false, "option_android_proguard_minifying": false, "option_android_proguard_shrinking": false, + "option_android_scale": 0, + "option_android_screen_depth": 0, + "option_android_sleep_margin": 4, + "option_android_splash_screens_landscape": "${base_options_dir}/android/splash/landscape.png", + "option_android_splash_screens_portrait": "${base_options_dir}/android/splash/portrait.png", + "option_android_splash_time": 0, + "option_android_splashscreen_background_colour": 255, + "option_android_support_lib": "", + "option_android_sync_amazon": false, + "option_android_target_sdk": "", + "option_android_texture_page": "2048x2048", + "option_android_tools_from_version": false, + "option_android_tv_banner": "${base_options_dir}/android/tv_banner.png", + "option_android_tv_isgame": true, + "option_android_use_facebook": false, + "option_android_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index 0521273..9fc994a 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -2,32 +2,32 @@ "resourceType": "GMHtml5Options", "resourceVersion": "1.0", "name": "HTML5", - "option_html5_browser_title": "Created with GameMaker Studio 2", - "option_html5_version": "1.0.0.0", - "option_html5_foldername": "html5game", - "option_html5_outputname": "index.html", - "option_html5_splash_png": "${base_options_dir}/html5/splash.png", - "option_html5_usesplash": false, - "option_html5_outputdebugtoconsole": true, - "option_html5_display_cursor": true, - "option_html5_localrunalert": true, - "option_html5_index": "", - "option_html5_loadingbar": "", - "option_html5_jsprepend": "", - "option_html5_icon": "${base_options_dir}/html5/fav.ico", "option_html5_allow_fullscreen": true, - "option_html5_interpolate_pixels": true, + "option_html5_browser_title": "Created with GameMaker Studio 2", "option_html5_centregame": false, - "option_html5_usebuiltinparticles": true, - "option_html5_usebuiltinfont": true, - "option_html5_webgl": 2, - "option_html5_scale": 0, - "option_html5_texture_page": "2048x2048", - "option_html5_use_facebook": false, - "option_html5_facebook_id": "", + "option_html5_display_cursor": true, "option_html5_facebook_app_display_name": "", + "option_html5_facebook_id": "", "option_html5_flurry_enable": false, "option_html5_flurry_id": "", + "option_html5_foldername": "html5game", "option_html5_google_analytics_enable": false, "option_html5_google_tracking_id": "", + "option_html5_icon": "${base_options_dir}/html5/fav.ico", + "option_html5_index": "", + "option_html5_interpolate_pixels": true, + "option_html5_jsprepend": "", + "option_html5_loadingbar": "", + "option_html5_localrunalert": true, + "option_html5_outputdebugtoconsole": true, + "option_html5_outputname": "index.html", + "option_html5_scale": 0, + "option_html5_splash_png": "${base_options_dir}/html5/splash.png", + "option_html5_texture_page": "2048x2048", + "option_html5_use_facebook": false, + "option_html5_usebuiltinfont": true, + "option_html5_usebuiltinparticles": true, + "option_html5_usesplash": false, + "option_html5_version": "1.0.0.0", + "option_html5_webgl": 2, } \ No newline at end of file diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index c8ed85c..382c05f 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -2,43 +2,45 @@ "resourceType": "GMiOSOptions", "resourceVersion": "1.3", "name": "iOS", - "option_ios_display_name": "Created with GameMaker", "option_ios_bundle_name": "com.company.game", - "option_ios_version": "1.0.0.0", - "option_ios_output_dir": "~/gamemakerstudio2", - "option_ios_team_id": "", - "option_ios_orientation_portrait": true, - "option_ios_orientation_portrait_flipped": true, - "option_ios_orientation_landscape": true, - "option_ios_orientation_landscape_flipped": true, - "option_ios_devices": 2, + "option_ios_cocoapods_checkbox": true, "option_ios_defer_home_indicator": false, - "option_ios_icon_iphone_app_120": "${base_options_dir}/ios/icons/app/iphone_120.png", - "option_ios_icon_iphone_app_180": "${base_options_dir}/ios/icons/app/iphone_180.png", - "option_ios_icon_ipad_app_76": "${base_options_dir}/ios/icons/app/ipad_76.png", + "option_ios_devices": 2, + "option_ios_display_name": "Created with GameMaker", + "option_ios_half_ipad1_textures": false, "option_ios_icon_ipad_app_152": "${base_options_dir}/ios/icons/app/ipad_152.png", - "option_ios_icon_ipad_pro_app_167": "${base_options_dir}/ios/icons/app/ipad_pro_167.png", - "option_ios_icon_iphone_notification_40": "${base_options_dir}/ios/icons/notification/iphone_40.png", - "option_ios_icon_iphone_notification_60": "${base_options_dir}/ios/icons/notification/iphone_60.png", + "option_ios_icon_ipad_app_76": "${base_options_dir}/ios/icons/app/ipad_76.png", "option_ios_icon_ipad_notification_20": "${base_options_dir}/ios/icons/notification/ipad_20.png", "option_ios_icon_ipad_notification_40": "${base_options_dir}/ios/icons/notification/ipad_40.png", - "option_ios_icon_iphone_spotlight_80": "${base_options_dir}/ios/icons/spotlight/iphone_80.png", - "option_ios_icon_iphone_spotlight_120": "${base_options_dir}/ios/icons/spotlight/iphone_120.png", + "option_ios_icon_ipad_pro_app_167": "${base_options_dir}/ios/icons/app/ipad_pro_167.png", + "option_ios_icon_ipad_settings_29": "${base_options_dir}/ios/icons/settings/ipad_29.png", + "option_ios_icon_ipad_settings_58": "${base_options_dir}/ios/icons/settings/ipad_58.png", "option_ios_icon_ipad_spotlight_40": "${base_options_dir}/ios/icons/spotlight/ipad_40.png", "option_ios_icon_ipad_spotlight_80": "${base_options_dir}/ios/icons/spotlight/ipad_80.png", + "option_ios_icon_iphone_app_120": "${base_options_dir}/ios/icons/app/iphone_120.png", + "option_ios_icon_iphone_app_180": "${base_options_dir}/ios/icons/app/iphone_180.png", + "option_ios_icon_iphone_notification_40": "${base_options_dir}/ios/icons/notification/iphone_40.png", + "option_ios_icon_iphone_notification_60": "${base_options_dir}/ios/icons/notification/iphone_60.png", "option_ios_icon_iphone_settings_58": "${base_options_dir}/ios/icons/settings/iphone_58.png", "option_ios_icon_iphone_settings_87": "${base_options_dir}/ios/icons/settings/iphone_87.png", - "option_ios_icon_ipad_settings_29": "${base_options_dir}/ios/icons/settings/ipad_29.png", - "option_ios_icon_ipad_settings_58": "${base_options_dir}/ios/icons/settings/ipad_58.png", + "option_ios_icon_iphone_spotlight_120": "${base_options_dir}/ios/icons/spotlight/iphone_120.png", + "option_ios_icon_iphone_spotlight_80": "${base_options_dir}/ios/icons/spotlight/iphone_80.png", "option_ios_icon_itunes_artwork_1024": "${base_options_dir}/ios/icons/itunes/itunes_1024.png", - "option_ios_splashscreen_background_colour": 255, + "option_ios_interpolate_pixels": false, + "option_ios_launchscreen_fill": 0, "option_ios_launchscreen_image": "${base_options_dir}/ios/splash/launchscreen.png", "option_ios_launchscreen_image_landscape": "${base_options_dir}/ios/splash/launchscreen-landscape.png", - "option_ios_launchscreen_fill": 0, - "option_ios_interpolate_pixels": false, - "option_ios_half_ipad1_textures": false, + "option_ios_min_version": "10.0", + "option_ios_orientation_landscape": true, + "option_ios_orientation_landscape_flipped": true, + "option_ios_orientation_portrait": true, + "option_ios_orientation_portrait_flipped": true, + "option_ios_output_dir": "~/gamemakerstudio2", + "option_ios_podfile_lock_path": "${options_dir}/ios/Podfile.lock", + "option_ios_podfile_path": "${options_dir}/ios/Podfile", "option_ios_scale": 0, + "option_ios_splashscreen_background_colour": 255, + "option_ios_team_id": "", "option_ios_texture_page": "2048x2048", - "option_ios_podfile_path": "${options_dir}/ios/Podfile", - "option_ios_podfile_lock_path": "${options_dir}/ios/Podfile.lock", + "option_ios_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index 625f218..652b3f5 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -2,23 +2,23 @@ "resourceType": "GMLinuxOptions", "resourceVersion": "1.0", "name": "Linux", + "option_linux_allow_fullscreen": false, + "option_linux_disable_sandbox": false, + "option_linux_display_cursor": true, "option_linux_display_name": "Created with GameMaker Studio 2", - "option_linux_version": "1.0.0.0", - "option_linux_maintainer_email": "", - "option_linux_homepage": "http://www.yoyogames.com", - "option_linux_short_desc": "", - "option_linux_long_desc": "", - "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png", "option_linux_display_splash": false, + "option_linux_enable_steam": false, + "option_linux_homepage": "http://www.yoyogames.com", "option_linux_icon": "${base_options_dir}/linux/icons/64.png", - "option_linux_start_fullscreen": false, - "option_linux_allow_fullscreen": false, "option_linux_interpolate_pixels": true, - "option_linux_display_cursor": true, - "option_linux_sync": false, + "option_linux_long_desc": "", + "option_linux_maintainer_email": "", "option_linux_resize_window": false, "option_linux_scale": 0, + "option_linux_short_desc": "", + "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png", + "option_linux_start_fullscreen": false, + "option_linux_sync": false, "option_linux_texture_page": "2048x2048", - "option_linux_enable_steam": false, - "option_linux_disable_sandbox": false, + "option_linux_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 1ceed04..5c7be78 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -2,33 +2,34 @@ "resourceType": "GMMacOptions", "resourceVersion": "1.0", "name": "macOS", - "option_mac_display_name": "Created with GameMaker Studio 2", + "option_mac_allow_fullscreen": false, + "option_mac_allow_incoming_network": false, + "option_mac_allow_outgoing_network": false, + "option_mac_app_category": "Games", "option_mac_app_id": "com.company.game", - "option_mac_version": "1.0.0.0", - "option_mac_output_dir": "~/gamemakerstudio2", - "option_mac_team_id": "", - "option_mac_signing_identity": "Developer ID Application:", + "option_mac_apple_sign_in": false, + "option_mac_arm64": true, + "option_mac_build_app_store": false, "option_mac_copyright": "", - "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png", + "option_mac_disable_sandbox": false, + "option_mac_display_cursor": true, + "option_mac_display_name": "Created with GameMaker Studio 2", + "option_mac_enable_retina": false, + "option_mac_enable_steam": false, "option_mac_icon_png": "${base_options_dir}/mac/icons/1024.png", "option_mac_installer_background_png": "${base_options_dir}/mac/splash/installer_background.png", - "option_mac_menu_dock": false, - "option_mac_display_cursor": true, - "option_mac_start_fullscreen": false, - "option_mac_allow_fullscreen": false, "option_mac_interpolate_pixels": true, - "option_mac_vsync": false, + "option_mac_menu_dock": false, + "option_mac_min_version": "10.10", + "option_mac_output_dir": "~/gamemakerstudio2", "option_mac_resize_window": false, - "option_mac_enable_retina": false, "option_mac_scale": 0, + "option_mac_signing_identity": "Developer ID Application:", + "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png", + "option_mac_start_fullscreen": false, + "option_mac_team_id": "", "option_mac_texture_page": "2048x2048", - "option_mac_build_app_store": false, - "option_mac_allow_incoming_network": false, - "option_mac_allow_outgoing_network": false, - "option_mac_app_category": "Games", - "option_mac_enable_steam": false, - "option_mac_disable_sandbox": false, + "option_mac_version": "1.0.0.0", + "option_mac_vsync": false, "option_mac_x86_64": true, - "option_mac_arm64": true, - "option_mac_apple_sign_in": false, } \ No newline at end of file diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 10e1d84..b985520 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -2,19 +2,19 @@ "resourceType": "GMMainOptions", "resourceVersion": "1.4", "name": "Main", + "option_author": "", + "option_collision_compatibility": false, + "option_copy_on_write_enabled": false, + "option_draw_colour": 4294967295, + "option_game_speed": 60, "option_gameguid": "0bb9e321-572e-4ddd-8293-fd87c33b4a2a", "option_gameid": "0", - "option_game_speed": 60, "option_mips_for_3d_textures": false, - "option_draw_colour": 4294967295, - "option_window_colour": 255, - "option_steam_app_id": "0", "option_sci_usesci": true, - "option_author": "", - "option_collision_compatibility": false, - "option_copy_on_write_enabled": false, "option_spine_licence": false, - "option_template_image": "${base_options_dir}/main/template_image.png", - "option_template_icon": "${base_options_dir}/main/template_icon.png", + "option_steam_app_id": "0", "option_template_description": null, + "option_template_icon": "${base_options_dir}/main/template_icon.png", + "option_template_image": "${base_options_dir}/main/template_image.png", + "option_window_colour": 255, } \ No newline at end of file diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 9571f96..88bc6d6 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -2,17 +2,17 @@ "resourceType": "GMOperaGXOptions", "resourceVersion": "1.0", "name": "operagx", - "option_operagx_version": "1.0.0.0", - "option_operagx_next_version": "1.0.0.0", - "option_operagx_game_name": "${project_name}", - "option_operagx_interpolate_pixels": true, - "option_operagx_scale": 0, - "option_operagx_texture_page": "2048x2048", "option_operagx_display_cursor": true, - "option_operagx_guid": "", - "option_operagx_team_name": "", - "option_operagx_team_id": "", "option_operagx_editUrl": "", + "option_operagx_game_name": "${project_name}", + "option_operagx_guid": "", "option_operagx_internalShareUrl": "", + "option_operagx_interpolate_pixels": true, + "option_operagx_next_version": "1.0.0.0", "option_operagx_publicShareUrl": "", + "option_operagx_scale": 0, + "option_operagx_team_id": "", + "option_operagx_team_name": "", + "option_operagx_texture_page": "2048x2048", + "option_operagx_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index 3de05de..7e17b25 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -2,25 +2,27 @@ "resourceType": "GMtvOSOptions", "resourceVersion": "1.3", "name": "tvOS", - "option_tvos_display_name": "Made in GameMaker", "option_tvos_bundle_name": "com.company.game", - "option_tvos_version": "1.0.0.0", - "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", - "option_tvos_team_id": "", + "option_tvos_cocoapods_checkbox": true, + "option_tvos_display_cursor": false, + "option_tvos_display_name": "Made in GameMaker", + "option_tvos_icon_1280": "${base_options_dir}/tvos/icons/1280.png", "option_tvos_icon_400": "${base_options_dir}/tvos/icons/400.png", "option_tvos_icon_400_2x": "${base_options_dir}/tvos/icons/400_2x.png", - "option_tvos_icon_1280": "${base_options_dir}/tvos/icons/1280.png", + "option_tvos_interpolate_pixels": true, + "option_tvos_min_version": "10.0", + "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", + "option_tvos_podfile_lock_path": "${options_dir}\\tvos\\Podfile.lock", + "option_tvos_podfile_path": "${options_dir}\\tvos\\Podfile", + "option_tvos_scale": 0, + "option_tvos_splash_time": 0, + "option_tvos_splashscreen": "${base_options_dir}/tvos/splash/splash.png", + "option_tvos_splashscreen_2x": "${base_options_dir}/tvos/splash/splash_2x.png", + "option_tvos_team_id": "", + "option_tvos_texture_page": "2048x2048", "option_tvos_topshelf": "${base_options_dir}/tvos/topshelf/topshelf.png", "option_tvos_topshelf_2x": "${base_options_dir}/tvos/topshelf/topshelf_2x.png", "option_tvos_topshelf_wide": "${base_options_dir}/tvos/topshelf/topshelf_wide.png", "option_tvos_topshelf_wide_2x": "${base_options_dir}/tvos/topshelf/topshelf_wide_2x.png", - "option_tvos_splashscreen": "${base_options_dir}/tvos/splash/splash.png", - "option_tvos_splashscreen_2x": "${base_options_dir}/tvos/splash/splash_2x.png", - "option_tvos_splash_time": 0, - "option_tvos_interpolate_pixels": true, - "option_tvos_scale": 0, - "option_tvos_texture_page": "2048x2048", - "option_tvos_display_cursor": false, - "option_tvos_podfile_path": "${options_dir}\\tvos\\Podfile", - "option_tvos_podfile_lock_path": "${options_dir}\\tvos\\Podfile.lock", + "option_tvos_version": "1.0.0.0", } \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 86f6b9d..27aa8ad 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -2,33 +2,33 @@ "resourceType": "GMWindowsOptions", "resourceVersion": "1.1", "name": "Windows", - "option_windows_display_name": "Created with GameMaker Studio 2", - "option_windows_executable_name": "${project_name}.exe", - "option_windows_version": "1.0.0.0", + "option_windows_allow_fullscreen_switching": false, + "option_windows_borderless": false, "option_windows_company_info": "YoYo Games Ltd", - "option_windows_product_info": "Created with GameMaker Studio 2", + "option_windows_copy_exe_to_dest": false, "option_windows_copyright_info": "", "option_windows_description_info": "A GameMaker Studio 2 Game", + "option_windows_disable_sandbox": false, "option_windows_display_cursor": true, + "option_windows_display_name": "Created with GameMaker Studio 2", + "option_windows_enable_steam": false, + "option_windows_executable_name": "${project_name}.exe", "option_windows_icon": "${base_options_dir}/windows/icons/icon.ico", - "option_windows_save_location": 0, - "option_windows_splash_screen": "${base_options_dir}/windows/splash/splash.png", - "option_windows_use_splash": false, - "option_windows_start_fullscreen": false, - "option_windows_allow_fullscreen_switching": false, - "option_windows_interpolate_pixels": false, - "option_windows_vsync": false, - "option_windows_resize_window": false, - "option_windows_borderless": false, - "option_windows_scale": 0, - "option_windows_copy_exe_to_dest": false, - "option_windows_sleep_margin": 10, - "option_windows_texture_page": "2048x2048", "option_windows_installer_finished": "${base_options_dir}/windows/installer/finished.bmp", "option_windows_installer_header": "${base_options_dir}/windows/installer/header.bmp", + "option_windows_interpolate_pixels": false, "option_windows_license": "${base_options_dir}/windows/installer/license.txt", "option_windows_nsis_file": "${base_options_dir}/windows/installer/nsis_script.nsi", - "option_windows_enable_steam": false, - "option_windows_disable_sandbox": false, + "option_windows_product_info": "Created with GameMaker Studio 2", + "option_windows_resize_window": false, + "option_windows_save_location": 0, + "option_windows_scale": 0, + "option_windows_sleep_margin": 10, + "option_windows_splash_screen": "${base_options_dir}/windows/splash/splash.png", + "option_windows_start_fullscreen": false, "option_windows_steam_use_alternative_launcher": false, + "option_windows_texture_page": "2048x2048", + "option_windows_use_splash": false, + "option_windows_version": "2.0.0.0", + "option_windows_vsync": false, } \ No newline at end of file diff --git a/readme.md b/readme.md index 2032148..e8b8cfc 100644 --- a/readme.md +++ b/readme.md @@ -15,9 +15,34 @@ https://user-images.githubusercontent.com/46312671/201537605-7193ed70-8db9-4647- go to the releases tab, and download the local package, and import it as a new project to see the example. Or import it into your own project, excluding everything in the **Demonstration** folder. -When imported, it will automatically be placed in the first room of your game. -you can change the initial resolution and other variables in the **STANNcam** objects **Create** event. -It is encouraged to change any and all of the code to better fit your needs! 👍 + +for using the camera it's good to have some manager object, maybe you use an init_game object, to put stanncam calls + +Inside create event write + +``stanncam_init(game_res_width,game_res_height,resolution_width,resolution_height,gui_width,gui_height)`` + +(the last 4 params are optional and can be changed later) + +this initializes the stanncam environment and creates a couple of global variables you can reference later + +``global.game_width`` + +``global.game_height`` + +``global.gui_width`` + +``global.gui_height`` + +gui and game size can be identical, but you can make them independent if you'd like + +and then you can create new cameras by writing + +``my_cam_name = new stanncam(camera_width,camera_height)`` + +and then to finish off inside a post_draw event (in your init_game object or similar) you can render the camera + +``my_cam_name.draw(0,0)`` ## Feedback/Contact If you have any issues, feedback or questions, you can write here on github, diff --git a/rooms/Room1/Room1.yy b/rooms/Room1/Room1.yy index 49ce28a..ce41fa2 100644 --- a/rooms/Room1/Room1.yy +++ b/rooms/Room1/Room1.yy @@ -2,49 +2,35 @@ "resourceType": "GMRoom", "resourceVersion": "1.0", "name": "Room1", - "isDnd": false, - "volume": 1.0, - "parentRoom": null, - "views": [ - {"inherit":false,"visible":true,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":420,"hview":240,"xport":0,"yport":0,"wport":420,"hport":240,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, - ], - "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","instances":[ - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_57DB5783","properties":[],"isDnd":false,"objectId":{"name":"demo_obj_player","path":"objects/demo_obj_player/demo_obj_player.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":176.0,"y":112.0,}, - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_4BF294D5","properties":[],"isDnd":false,"objectId":{"name":"obj_ball","path":"objects/obj_ball/obj_ball.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":256.0,"y":80.0,}, - ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - {"resourceType":"GMRTileLayer","resourceVersion":"1.1","name":"Tiles_1","tilesetId":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"x":0,"y":0,"tiles":{"TileDataFormat":1,"SerialiseWidth":14,"SerialiseHeight":8,"TileCompressedData":[ --112,1,],},"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Backgrounds_1","spriteId":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":true,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":1.0,"animationSpeedType":1,"userdefinedAnimFPS":false,"visible":true,"depth":200,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - ], - "inheritLayers": false, "creationCodeFile": "${project_dir}/rooms/Room1/RoomCreationCode.gml", "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, "instanceCreationOrder": [ - {"name":"inst_57DB5783","path":"rooms/Room1/Room1.yy",}, + {"name":"inst_6B735959","path":"rooms/Room1/Room1.yy",}, {"name":"inst_4BF294D5","path":"rooms/Room1/Room1.yy",}, + {"name":"inst_BEB4411","path":"rooms/Room1/Room1.yy",}, + {"name":"inst_606FE50A","path":"rooms/Room1/Room1.yy",}, + {"name":"inst_15296A95","path":"rooms/Room1/Room1.yy",}, ], - "inheritCreationOrder": false, - "sequenceId": null, - "roomSettings": { - "inheritRoomSettings": false, - "Width": 448, - "Height": 256, - "persistent": false, - }, - "viewSettings": { - "inheritViewSettings": false, - "enableViews": true, - "clearViewBackground": true, - "clearDisplayBuffer": true, + "isDnd": false, + "layers": [ + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_4BF294D5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"demo_obj_ball","path":"objects/demo_obj_ball/demo_obj_ball.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":112.0,"y":80.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_BEB4411","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"demo_obj_player","path":"objects/demo_obj_player/demo_obj_player.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":160.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_606FE50A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"demo_obj_player2","path":"objects/demo_obj_player2/demo_obj_player2.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":272.0,"y":144.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_15296A95","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"demo_obj_tv","path":"objects/demo_obj_tv/demo_obj_tv.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":304.0,"y":48.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_6B735959","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"demo_obj_camera","path":"objects/demo_obj_camera/demo_obj_camera.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":208.0,"y":112.0,}, + ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRTileLayer","resourceVersion":"1.1","name":"Tiles_1","depth":100,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"tiles":{"SerialiseHeight":8,"SerialiseWidth":14,"TileCompressedData":[ +-112,1,],"TileDataFormat":1,},"tilesetId":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"userdefinedDepth":false,"visible":true,"x":0,"y":0,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Backgrounds_1","animationFPS":1.0,"animationSpeedType":1,"colour":4294967295,"depth":200,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, + ], + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", }, + "parentRoom": null, "physicsSettings": { "inheritPhysicsSettings": false, "PhysicsWorld": false, @@ -52,8 +38,28 @@ "PhysicsWorldGravityY": 10.0, "PhysicsWorldPixToMetres": 0.1, }, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "roomSettings": { + "Height": 256, + "inheritRoomSettings": false, + "persistent": false, + "Width": 448, + }, + "sequenceId": null, + "views": [ + {"hborder":32,"hport":10,"hspeed":-1,"hview":10,"inherit":false,"objectId":null,"vborder":32,"visible":true,"vspeed":-1,"wport":10,"wview":10,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":240,"hspeed":-1,"hview":240,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":420,"wview":420,"xport":0,"xview":0,"yport":0,"yview":0,}, + ], + "viewSettings": { + "clearDisplayBuffer": true, + "clearViewBackground": true, + "enableViews": true, + "inheritViewSettings": false, }, + "volume": 1.0, } \ No newline at end of file diff --git a/rooms/Room1/RoomCreationCode.gml b/rooms/Room1/RoomCreationCode.gml index e4a5d0c..787f176 100644 --- a/rooms/Room1/RoomCreationCode.gml +++ b/rooms/Room1/RoomCreationCode.gml @@ -1 +1 @@ -global.camera_follow = demo_obj_player; \ No newline at end of file +//global.camera_follow = demo_obj_player; \ No newline at end of file diff --git a/scripts/draw_text_outline/draw_text_outline.gml b/scripts/draw_text_outline/draw_text_outline.gml index 3f38994..a462150 100644 --- a/scripts/draw_text_outline/draw_text_outline.gml +++ b/scripts/draw_text_outline/draw_text_outline.gml @@ -2,12 +2,21 @@ function draw_text_outline(x_,y_,text,width = 1, precision = 16,col = c_black){ var prev_color = draw_get_color(); draw_set_color(col); - var rot = 360 / precision; - for (var i = 0; i < precision; ++i) { - t_x = x_ + lengthdir_x(width,rot*i) - t_y = y_ + lengthdir_y(width,rot*i) - draw_text(t_x,t_y,text); + var rot = 360 / precision; + + if(precision > 8){ + for (var i = 0; i < precision; ++i) { + var t_x = x_ + lengthdir_x(width,rot*i) + var t_y = y_ + lengthdir_y(width,rot*i) + draw_text(t_x,t_y,text); + } + } else { + for (var i = 0; i < precision; ++i) { + var t_x = x_ + sign(lengthdir_x(width,rot*i)); + var t_y = y_ + sign(lengthdir_y(width,rot*i)); + draw_text(t_x,t_y,text); + } } draw_set_color(prev_color); diff --git a/scripts/draw_text_outline/draw_text_outline.yy b/scripts/draw_text_outline/draw_text_outline.yy index f0df8e8..fc0c89f 100644 --- a/scripts/draw_text_outline/draw_text_outline.yy +++ b/scripts/draw_text_outline/draw_text_outline.yy @@ -2,8 +2,8 @@ "resourceType": "GMScript", "resourceVersion": "1.0", "name": "draw_text_outline", - "isDnD": false, "isCompatibility": false, + "isDnD": false, "parent": { "name": "demonstration", "path": "folders/demonstration.yy", diff --git a/scripts/ease_in_out/ease_in_out.yy b/scripts/ease_in_out/ease_in_out.yy index 7bec19e..c153227 100644 --- a/scripts/ease_in_out/ease_in_out.yy +++ b/scripts/ease_in_out/ease_in_out.yy @@ -2,8 +2,8 @@ "resourceType": "GMScript", "resourceVersion": "1.0", "name": "ease_in_out", - "isDnD": false, "isCompatibility": false, + "isDnD": false, "parent": { "name": "Scripts", "path": "folders/Scripts.yy", diff --git a/scripts/shake/shake.yy b/scripts/shake/shake.yy index 02e7b8d..d38ef41 100644 --- a/scripts/shake/shake.yy +++ b/scripts/shake/shake.yy @@ -2,8 +2,8 @@ "resourceType": "GMScript", "resourceVersion": "1.0", "name": "shake", - "isDnD": false, "isCompatibility": false, + "isDnD": false, "parent": { "name": "Scripts", "path": "folders/Scripts.yy", diff --git a/scripts/stanncam/stanncam.gml b/scripts/stanncam/stanncam.gml new file mode 100644 index 0000000..06d0eb3 --- /dev/null +++ b/scripts/stanncam/stanncam.gml @@ -0,0 +1,406 @@ +/// @function stanncam() +/// @param x pos +/// @param y pos +/// @param width +/// @param height +/// @param surface_extra_on_ use surface_extra in regular draw events +/// @param smooth_draw_ use fractional camera position when drawing +/// @description creates a new stanncam +function stanncam(x_ = 0,y_ = 0,width_ = global.game_w,height_ = global.game_h, surface_extra_on_ = false, smooth_draw_ = true) constructor{ + #region init + //whenever a new cam is created number_of_cams gets incremented + cam_id = __obj_stanncam_manager.number_of_cams; + + //checks if there's already 8 cameras + if(cam_id == 8){ + show_error("There can maximum be 8 cameras",true); + } + + view_camera[cam_id] = camera_create(); + + __obj_stanncam_manager.number_of_cams++; + + array_set(global.stanncams,cam_id,self); + #endregion + + #region variables + x = x_; + y = y_; + + width = width_; + height = height_; + + surface_extra_on = surface_extra_on_; + + spd = 10; //how fast the camera follows an object + spd_threshold = 50; //the minimum distance the camera is away, for the speed to be in full effect + room_constrain = false; //if camera should be constrained to the room size + + //the camera bounding box, for the followed object to leave before the camera starts moving + bounds_w = 20; + bounds_h = 20; + + //wether to use the fractional camera position when drawing the camera contents. Else it will be snapped to nearest integer + smooth_draw = smooth_draw_; + __x_frac = 0; + __y_frac = 0; + + + surface = -1; + + surface_extra = -1; + + follow = -1; + + __destroyed = false; + + #region animation variables + + //moving + __xStart = x; + __yStart = y; + __xTo = x; + __yTo = y; + __duration = 0; + __t = 0; + + //zoom + __zoom_amount = 1; + __zoom_x = 0; + __zoom_y = 0; + __zooming = false; + __t_zoom = 0; + __zoomStart = 0; + __zoomTo = 0; + __zoom_duration = 0; + + //screen shake + __shake_length = 0; + __shake_magnitude = 0; + __shake_time = 0; + __shake_x = 0; + __shake_y = 0; + + __moving = false; + + __check_surface(); + __check_viewports(); + __update_resolution(); + + #endregion + + #endregion + + #region Step + //gets called every step + static __step = function(){ + if (instance_exists(follow)){ + + //update destination + __xTo = follow.x; + __yTo = follow.y; + + var dist_w = max(bounds_w,abs(__xTo - x)) - bounds_w; + var dist_h = max(bounds_h,abs(__yTo - y)) - bounds_h; + + //update camera position + if (abs(__xTo - x) > bounds_w){ + var _spd = (dist_w/spd_threshold)*spd; + if (x < __xTo) x+=_spd; + else if (x > __xTo) x-=_spd; + } + + if (abs(y - __yTo) > bounds_h){ + var _spd = (dist_h/spd_threshold)*spd; + if (y < __yTo) y+=_spd; + else if (y > __yTo) y-=_spd; + } + + } else if(__moving){ + //gradually moves camera into position based on duration + x = ease_in_out(__t,__xStart,__xTo-__xStart,__duration); + y = ease_in_out(__t,__yStart,__yTo-__yStart,__duration); + + __t++; + if(x == __xTo && y == __yTo) __moving = false; + } + + #region screen-shake + var stanncam_shake_x = shake(__shake_time++,__shake_magnitude,__shake_length); + var stanncam_shake_y = shake(__shake_time++,__shake_magnitude,__shake_length); + __shake_x = stanncam_shake_x; + __shake_y = stanncam_shake_y; + #endregion + + #region constrains camera to room bounds + if(room_constrain){ + x = clamp(x,(width/2),room_width -(width/2)); + y = clamp(y,(height/2),room_height-(height/2)); + } + #endregion + + #region zooming + if(__zooming){ + //gradually zooms camera + __zoom_amount = ease_in_out(__t_zoom,__zoomStart,__zoomTo-__zoomStart,__zoom_duration); + __t_zoom++; + if(__zoom_amount == __zoomTo) __zooming = false; + camera_set_view_size(view_camera[cam_id],width*__zoom_amount,height*__zoom_amount); + __zoom_x = ((width *__zoom_amount) - width)/2; + __zoom_y = ((height*__zoom_amount) - height)/2; + } + #endregion + + //update camera view + var new_x = x - ((width / 2) + __shake_x + __zoom_x); + var new_y = y - ((height / 2) + __shake_y + __zoom_y); + + //seperates position into whole and fractional parts + if(smooth_draw == true){ + __x_frac = frac(new_x); + __y_frac = frac(new_y); + } else { + __x_frac = 0; + __y_frac = 0; + } + + new_x = floor(new_x); + new_y = floor(new_y); + + camera_set_view_pos(view_camera[cam_id], new_x, new_y); + } + #endregion + + #region Drawing functions + + static draw = function(x_,y_,scale_x_ = 1, scale_y_ = 1){ + __check_surface(); + var x_scale = __obj_stanncam_manager.display_res_w / global.game_w + var y_scale = __obj_stanncam_manager.display_res_h / global.game_h + x_ *= x_scale; + y_ *= y_scale; + + x_ += fullscreen_keep_aspect_ratio_compensate(); + + var w_ = surface_get_width(surface); + var h_ = surface_get_height(surface); + + draw_surface_part_ext(surface,__x_frac,__y_frac,w_,h_,x_,y_,__display_scale_x*scale_x_,__display_scale_y*scale_y_,-1,1); + } + #endregion + + #region Dynamic functions + + /// @description returns a clone of the camera + static clone = function(){ + var clone = new stanncam(x,y,width,height); + clone.spd = spd; + clone.spd_threshold = spd_threshold; + clone.room_constrain = room_constrain; + clone.bounds_w = bounds_w; + clone.bounds_h = bounds_h; + clone.follow = follow; + + return clone; + } + + /// @description sets the camera size + /// @param width + /// @param height + static set_size = function(_width,_height){ + width = _width; + height = _height; + surface_resize(surface,width,height); + __update_resolution(); + camera_set_view_size(view_camera[cam_id],width*__zoom_amount,height*__zoom_amount); + } + + /// @function shake_screen(magnitude, duration); + /// @description makes the camera shake + /// @param magnitude + /// @param duration in frames + static shake_screen = function(magnitude, duration) { + __shake_magnitude =+ magnitude; + __shake_length =+ duration; + __shake_time = 0; + } + + /// @function move(_x,_y,duration) + /// @description moves the camera to x y + /// @param _x + /// @param _y + /// @param _duration + static move = function(_x, _y, _duration = 0){ + if(_duration == 0){ + x = _x; + y = _y; + + var new_x = x - ((width / 2) + __shake_x + __zoom_x); + var new_y = y - ((height / 2) + __shake_y + __zoom_y); + + camera_set_view_pos(view_camera[cam_id], new_x, new_y); + }else{ + __moving = true; + __t = 0; + __xStart = x; + __yStart = y; + + __xTo = _x; + __yTo = _y; + __duration = _duration; + } + } + + /// @function zoom(_zoom,zoom_duration) + /// @description zooms the camera + /// @param _zoom + /// @param duration + static zoom = function(_zoom, _duration){ + if(_duration == 0){ + __zoom_amount = _zoom; + camera_set_view_size(view_camera[cam_id],width*_zoom,height*_zoom); + __zoom_x = ((width *__zoom_amount) - width)/2; + __zoom_y = ((height*__zoom_amount) - height)/2; + + } else { + __zooming = true; + __t_zoom = 0; + __zoomStart = __zoom_amount; + } + __zoomTo = _zoom; + __zoom_duration = _duration; + } + + /// @function set_speed(spd,threshold) + /// @description changes the speed of the camera + /// @param spd how fast the camera can move + /// @param threshold minimum distance for the speed to have full effect + static set_speed = function(_spd,threshold){ + spd = _spd; + spd_threshold = threshold; + } + + /// @function get_x() + /// @description get camera corner x position. if need the middle of the camera use x + static get_x = function(){ + return camera_get_view_x(view_camera[cam_id]); + } + + /// @function get_y() + /// @description get camera corner y position. if need the middle of the camera use y + static get_y = function(){ + return camera_get_view_y(view_camera[cam_id]); + } + + /// @description gets the mouse x position within room relative to the camera + static get_mouse_x = function(){ + return (((display_mouse_get_x() - window_get_x() - fullscreen_keep_aspect_ratio_compensate()) / (__display_scale_x * width)) * width) + get_x(); + } + + /// @description gets the mouse y position within room relative to the camera + static get_mouse_y = function(){ + return (((display_mouse_get_y() - window_get_y()) / (__display_scale_y * height)) * height) + get_y(); + } + + /// @func room_to_gui_x(x_) + /// @description returns the room x position as the position on the gui relative to camera + /// @param x_ + static room_to_gui_x = function(x_){ + return (x_-get_x()-__x_frac)*stanncam_get_gui_scale_x()/__zoom_amount; + } + + /// @func room_to_gui_y(y_) + /// @description returns the room y position as the position on the gui relative to camera + /// @param y_ + static room_to_gui_y = function(y_){ + return (y_-get_y()-__y_frac)*stanncam_get_gui_scale_y()/__zoom_amount; + } + + /// @func room_to_display_x(x_) + /// @description returns the room x position as the position on the display relative to camera + /// @param x_ + //function room_to_display_x(x_){ + // return (x_-get_x())*stanncam_get_res_scale_x()/__zoom_amount; + //} + + /// @func room_to_display_y(y_) + /// @description returns the room y position as the position on the display relative to camera + /// @param y_ + //function room_to_display_y(y_){ + // return (y_-get_y())*stanncam_get_res_scale_y()/__zoom_amount; + //} + + /// @function out_of_bounds() + /// @param x_ position + /// @param y_ position + /// @param margin the margin for the camera bounds + /// @description returns if the object is outside cam bounds + function out_of_bounds(x_,y_,margin = 0){ + + var col = ( //uses bounding box to see if it's within the camera view + x_ < get_x() + margin || + y_ < get_y() + margin || + x_ > (get_x() + (width * __zoom_amount)) - margin || + y_ > (get_y() + (height * __zoom_amount)) - margin + ) + + if(col)return true + else return false; + } + + /// @function destroy() + static destroy = function(){ + follow = -1; + array_set(global.stanncams,cam_id,-1); + __obj_stanncam_manager.number_of_cams--; + if(surface_exists(surface)) surface_free(surface); + if(surface_exists(surface)) surface_free(surface); + __destroyed = true; + } + + /// @function is_destroyed() + static is_destroyed = function(){ + return __destroyed; + } + #endregion + + #region Internal functions + + //enables viewports and sets viewports size + static __check_viewports = function(){ + view_visible[cam_id] = true; + set_size(width,height); + } + + //checks if surface_extra exists and else creates it and attaches it + static __check_surface = function(){ + if (!surface_exists(surface)){ + surface = surface_create(width,height); + } + + if (surface_extra_on && !surface_exists(surface_extra)){ + surface_extra = surface_create(width,height); + } + } + + //updates cameras drawing resolution + static __update_resolution = function(){ + __display_scale_x = __obj_stanncam_manager.display_res_w / global.game_w; + __display_scale_y = __obj_stanncam_manager.display_res_h / global.game_h; + + view_set_camera(cam_id, view_camera[cam_id]); + } + + //clears the surface + static __predraw = function(){ + __check_surface(); + if(surface_extra_on){ + surface_copy(surface_extra,0,0,surface); + } + surface_set_target(surface); + draw_clear_alpha(c_black,0); + surface_reset_target(); + view_set_surface_id(cam_id,surface); + } + #endregion +} \ No newline at end of file diff --git a/scripts/stanncam_functions/stanncam_functions.yy b/scripts/stanncam/stanncam.yy similarity index 85% rename from scripts/stanncam_functions/stanncam_functions.yy rename to scripts/stanncam/stanncam.yy index 4b21e58..508a2bc 100644 --- a/scripts/stanncam_functions/stanncam_functions.yy +++ b/scripts/stanncam/stanncam.yy @@ -1,9 +1,9 @@ { "resourceType": "GMScript", "resourceVersion": "1.0", - "name": "stanncam_functions", - "isDnD": false, + "name": "stanncam", "isCompatibility": false, + "isDnD": false, "parent": { "name": "Scripts", "path": "folders/Scripts.yy", diff --git a/scripts/stanncam_functions/stanncam_functions.gml b/scripts/stanncam_functions/stanncam_functions.gml deleted file mode 100644 index 9adeefa..0000000 --- a/scripts/stanncam_functions/stanncam_functions.gml +++ /dev/null @@ -1,176 +0,0 @@ -//spawns the camera into the first room, you can remove this line if you don't want that -gml_pragma("global", "stanncam_init()"); - -/// @description spawns stanncam into the first room -function stanncam_init(){ - room_instance_add(room_first,0,0,obj_stanncam); -} - -/// @function stanncam_toggle_fullscreen -/// @description toggle fullscreen on off -function stanncam_toggle_fullscreen(){ - window_set_fullscreen(!window_get_fullscreen()); - stanncam_update_resolution(); -} - -/// @function stanncam_update_resolution(); -/// @description updates the camera resolution, change view_w view_h and upscale to see changes -function stanncam_update_resolution(){ - camera_set_view_size(cam,global.view_w*obj_stanncam.zoom,global.view_h*obj_stanncam.zoom); - window_set_size(global.view_w*global.upscale, global.view_h*global.upscale); - - display_set_gui_size(global.gui_w,global.gui_h); - - surface_resize(application_surface, global.view_w,global.view_h); - display_reset(0, false); - - view_wport[0] = global.view_w; - view_hport[0] = global.view_h; - - with(obj_stanncam){ - //var ratio = display_width / display_height; - - if(window_get_fullscreen()) { - display_width = display_get_width(); - display_height = display_get_height(); - } else { - display_width = global.view_w * global.upscale; - display_height = global.view_h* global.upscale; - } - } -} - -/// @function stanncam_shake(magnitude, duration); -/// @description makes the screen shake -/// @param magnitude -/// @param duration in frames -function stanncam_shake(magnitude, duration) { - obj_stanncam.shake_magnitude =+ magnitude; - obj_stanncam.shake_length =+ duration; - obj_stanncam.shake_time = 0; -} - -/// @function stanncam_move(_x,_y,duration) -/// @description moves the camera to x y -/// @param _x -/// @param _y -/// @param _duration -function stanncam_move(_x, _y, duration){ - if(duration == 0){ - obj_stanncam.x = _x; - obj_stanncam.y = _y; - }else{ - with (obj_stanncam){ - moving = true; - t = 0; - xStart = x; - yStart = y; - } - obj_stanncam.xTo = _x; - obj_stanncam.yTo = _y; - obj_stanncam.duration = duration; - } -} - -/// @function stanncam_zoom(_zoom,zoom_duration) -/// @description zooms the camera -/// @param _zoom -/// @param duration -function stanncam_zoom(_zoom, duration){ - if(duration == 0){ - obj_stanncam.zoom = _zoom; - camera_set_view_size(cam,global.view_w*_zoom,global.view_h*_zoom); - - } else with (obj_stanncam){ - zooming = true; - t_zoom = 0; - zoomStart = zoom; - } - obj_stanncam.zoomTo = _zoom; - obj_stanncam.zoom_duration = duration; -} - -/// @function stanncam_speed(spd,threshold) -/// @description changes the speed of the camera -/// @param spd how fast the camera can move -/// @param threshold minimum distance for the speed to have full effect -function stanncam_speed(spd,threshold){ - obj_stanncam.spd = spd; - obj_stanncam.spd_threshold = threshold; -} - -/// @function stanncam_x() -/// @description get camera x position. if need the middle of the screen use obj_stanncam.x -function stanncam_x(){ - return camera_get_view_x(cam); -} - -/// @function stanncam_y() -/// @description get camera y position. if need the middle of the screen use obj_stanncam.y -function stanncam_y(){ - return camera_get_view_y(cam); -} - -/// @function stanncam_out_of_bounds() -/// @param x_ position the object is temporarily moved to -/// @param y_ position the object is temporarily moved to -/// @param margin the margin for the camera bounds -/// @param ignore_zoom check bounds depending on zoom level -/// @description returns if the object is outside cam bounds -function stanncam_out_of_bounds(x_,y_,margin = 0, ignore_zoom = false){ - var x_delta = x; - var y_delta = y; - - x = x_; - y = y_; - - if(!ignore_zoom){ - - } - - var col = ( //uses bounding box to see if it's within the camera view - bbox_left < stanncam_x() + margin || - bbox_top < stanncam_y() + margin || - bbox_right > (stanncam_x() + (global.view_w * obj_stanncam.zoom)) - margin || - bbox_bottom > (stanncam_y() + (global.view_h * obj_stanncam.zoom)) - margin - ) - - x = x_delta; - y = y_delta; - - if(col)return true - else return false; -} - -/// @func stanncam_point_in_rectangle(pos_x,pos_y,x1,y1,x2,y2) -/// @description checks if point is within rectangle relative to camera, default is full view -/// @param pos_x -/// @param pos_y -/// @param x1 -/// @param y1 -/// @param x2 -/// @param y2 -function stanncam_point_in_rectangle(pos_x,pos_y,x1=0,y1=0,x2=global.view_w,y2=global.view_h) { - var stanncam_x = stanncam_x(); - var stanncam_y = stanncam_y(); - return point_in_rectangle(pos_x,pos_y,stanncam_x+x1,stanncam_y+y1,stanncam_x+x2,stanncam_y+y2); -} - -/// @func stanncam_room_to_gui_x(x_) -/// @description returns the room x position as the position on the gui -/// @param x_ -function stanncam_room_to_gui_x(x_){ - x_ = x_ - stanncam_x(); - x_ = x_*(1+((global.gui_w-global.view_w)/global.view_w)); - - return x_/obj_stanncam.zoom; -} - -/// @func stanncam_room_to_gui_y(y_) -/// @description returns the room y position as the position on the gui -/// @param y_ -function stanncam_room_to_gui_y(y_){ - y_ = y_ - stanncam_y(); - y_ = y_*(1+((global.gui_h-global.view_h)/global.view_h)); - return y_/obj_stanncam.zoom; -} diff --git a/scripts/stanncam_manager/stanncam_manager.gml b/scripts/stanncam_manager/stanncam_manager.gml new file mode 100644 index 0000000..607ffce --- /dev/null +++ b/scripts/stanncam_manager/stanncam_manager.gml @@ -0,0 +1,123 @@ +/// @function stanncam_init(game_w,game_h,resolution_w,resolution_h,gui_w,gui_h) +/// @description set game dimensions, display resolution, and gui dimensions, it's the same as game scale by default +function stanncam_init(game_w,game_h,resolution_w=game_w,resolution_h=game_h,gui_w=game_w,gui_h=game_h){ + instance_create_layer(0,0,"instances",__obj_stanncam_manager); + global.stanncams = array_create(8,-1); + global.game_w = game_w; + global.game_h = game_h; + global.gui_w = gui_w; + global.gui_h = gui_h; + global.res_w = resolution_w; + global.res_h = resolution_h; + + for (var i = 0; i < array_length(view_camera); ++i) { + camera_destroy(view_camera[i]); + } + + application_surface_draw_enable(false); + __stanncam_update_resolution(); +} + +/// @function stanncam_set_resolution(resolution_w,resolution_h); +/// @description updates the camera resolution, change view_w view_h and upscale to see changes +function stanncam_set_resolution(resolution_w,resolution_h){ + global.res_w = resolution_w; + global.res_h = resolution_h; + __stanncam_update_resolution(); +} + +/// @function stanncam_toggle_fullscreen() +/// @description toggle fullscreen on off +function stanncam_toggle_fullscreen(){ + window_set_fullscreen(!window_get_fullscreen()); + __stanncam_update_resolution(); +} + +/// @function stanncam_toggle_keep_aspect_ratio() +/// @description toggle display keep_aspect_ratio +function stanncam_toggle_keep_aspect_ratio(){ + __obj_stanncam_manager.keep_aspect_ratio = !__obj_stanncam_manager.keep_aspect_ratio; + __stanncam_update_resolution(); +} + +/// @function stanncam_get_keep_aspect_ratio() +/// @description get wheter the display is keep_aspect_ratio +function stanncam_get_keep_aspect_ratio(){ + return __obj_stanncam_manager.keep_aspect_ratio; +} + +//if fullscreen keep_aspect_ratio is on it offsets the x value so the render is in the middle +function fullscreen_keep_aspect_ratio_compensate(){ + if(stanncam_get_keep_aspect_ratio() && window_get_fullscreen()){ + return (display_get_width() - __obj_stanncam_manager.display_res_w)/2; + } else return 0; +} + +/// @function stanncam_set_gui_resolution(gui_w,gui_h) +/// @description set the gui resolution +function stanncam_set_gui_resolution(gui_w,gui_h){ + global.gui_w = gui_w; + global.gui_h = gui_h; + __stanncam_update_resolution(); +} + +/// @function stanncam_get_gui_scale_x() +/// @description gets how much bigger gui is from game +function stanncam_get_gui_scale_x(){ + return global.gui_w / global.game_w; +} + +/// @function stanncam_get_gui_scale_y() +/// @description gets how much bigger gui is from game +function stanncam_get_gui_scale_y(){ + return global.gui_h / global.game_h; +} + +/// @function stanncam_get_res_scale_x() +/// @description gets how much bigger res is from game +function stanncam_get_res_scale_x(){ + return __obj_stanncam_manager.display_res_w / global.game_w; +} + +/// @function stanncam_get_res_scale_y() +/// @description gets how much bigger res is from game +function stanncam_get_res_scale_y(){ + return __obj_stanncam_manager.display_res_h / global.game_h; +} + +/// @function __stanncam_update_resolution(); +/// @description updates the camera resolution +function __stanncam_update_resolution(){ + if(window_get_fullscreen()) { + if(__obj_stanncam_manager.keep_aspect_ratio){ + var ratio = global.game_w / global.game_h; + __obj_stanncam_manager.display_res_w = display_get_height() * ratio; + __obj_stanncam_manager.display_res_h = display_get_height(); + } else { + __obj_stanncam_manager.display_res_w = display_get_width(); + __obj_stanncam_manager.display_res_h = display_get_height(); + } + } else { + if(__obj_stanncam_manager.keep_aspect_ratio){ + var ratio = global.game_w / global.game_h; + __obj_stanncam_manager.display_res_w = global.res_h * ratio; + __obj_stanncam_manager.display_res_h = global.res_h; + } else { + __obj_stanncam_manager.display_res_w = global.res_w; + __obj_stanncam_manager.display_res_h = global.res_h; + } + + window_set_size(__obj_stanncam_manager.display_res_w, __obj_stanncam_manager.display_res_h); + } + + var gui_x_scale = __obj_stanncam_manager.display_res_w / global.gui_w; + var gui_y_scale = __obj_stanncam_manager.display_res_h / global.gui_h; + + display_set_gui_maximize(gui_x_scale,gui_y_scale,fullscreen_keep_aspect_ratio_compensate()); + //surface_resize(application_surface, display_get_gui_width(), display_get_gui_height()) + + for (var i = 0; i < array_length(global.stanncams); ++i) { + if (global.stanncams[i] == -1) continue; + global.stanncams[i].__update_resolution(); + } +} \ No newline at end of file diff --git a/scripts/stanncam_manager/stanncam_manager.yy b/scripts/stanncam_manager/stanncam_manager.yy new file mode 100644 index 0000000..c6603dc --- /dev/null +++ b/scripts/stanncam_manager/stanncam_manager.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "stanncam_manager", + "isCompatibility": false, + "isDnD": false, + "parent": { + "name": "Scripts", + "path": "folders/Scripts.yy", + }, +} \ No newline at end of file diff --git a/sprites/spr_arrow/spr_arrow.yy b/sprites/spr_arrow/spr_arrow.yy index 0afead2..f57478f 100644 --- a/sprites/spr_arrow/spr_arrow.yy +++ b/sprites/spr_arrow/spr_arrow.yy @@ -2,76 +2,76 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_arrow", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 1, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 45, "bbox_left": 0, "bbox_right": 69, "bbox_top": 0, - "bbox_bottom": 45, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 70, - "height": 46, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 51, - "gridY": 51, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e",}, ], + "gridX": 51, + "gridY": 51, + "height": 46, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4a98bca5-875b-452d-9fec-1b80c036d5f2","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"79bf20b2-e262-4265-8a1a-d57f21af8b6a","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 1, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_arrow", - "timeUnits": 1, + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 2.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 1.0, "playbackSpeedType": 1, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9fcbf0d7-aff9-4f58-a7b8-6d3e8488396c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"02009123-e026-494d-9c2c-e3d3248d6208","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow/spr_arrow.yy",},},},"Disabled":false,"id":"9fcbf0d7-aff9-4f58-a7b8-6d3e8488396c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow/spr_arrow.yy",},},},"Disabled":false,"id":"02009123-e026-494d-9c2c-e3d3248d6208","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 35, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"4a98bca5-875b-452d-9fec-1b80c036d5f2","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"79bf20b2-e262-4265-8a1a-d57f21af8b6a","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"Layer 1",}, - ], - "nineSlice": null, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 70, } \ No newline at end of file diff --git a/sprites/spr_arrow_small/spr_arrow_small.yy b/sprites/spr_arrow_small/spr_arrow_small.yy index e061aa4..52f9f59 100644 --- a/sprites/spr_arrow_small/spr_arrow_small.yy +++ b/sprites/spr_arrow_small/spr_arrow_small.yy @@ -2,75 +2,75 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_arrow_small", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 1, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 6, "bbox_left": 0, "bbox_right": 9, "bbox_top": 1, - "bbox_bottom": 6, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 10, - "height": 7, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 51, - "gridY": 51, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e",}, ], + "gridX": 51, + "gridY": 51, + "height": 7, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3210fd01-7382-4aa7-b86e-b2f4f7df87bd","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 1, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_arrow_small", - "timeUnits": 1, + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 2.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 1.0, "playbackSpeedType": 1, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"66b03764-d23e-4c1d-a2d2-f4be575eacc0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"5a961afb-4f00-43e9-a866-e8054f5bea6b","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cfa456cb-3dc7-444f-adfe-20f18d1fc6d3","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},},},"Disabled":false,"id":"66b03764-d23e-4c1d-a2d2-f4be575eacc0","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a365953c-c44b-4b88-90e8-ef1d5b51a19e","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},},},"Disabled":false,"id":"5a961afb-4f00-43e9-a866-e8054f5bea6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 5, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"3210fd01-7382-4aa7-b86e-b2f4f7df87bd","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 10, } \ No newline at end of file diff --git a/sprites/spr_ball/spr_ball.yy b/sprites/spr_ball/spr_ball.yy index a167614..a86121c 100644 --- a/sprites/spr_ball/spr_ball.yy +++ b/sprites/spr_ball/spr_ball.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_ball", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 4, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 63, "bbox_left": 0, "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 63, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 64, - "height": 64, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"89a15171-096d-4273-b5e1-bed216c67447",}, ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a85f0884-bccb-4d64-91e7-91e920726f39","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_ball", - "timeUnits": 1, + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 1.0, "playbackSpeedType": 1, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"08c475be-3a5e-499d-a363-9bc528f6eda7","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"89a15171-096d-4273-b5e1-bed216c67447","path":"sprites/spr_ball/spr_ball.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"89a15171-096d-4273-b5e1-bed216c67447","path":"sprites/spr_ball/spr_ball.yy",},},},"Disabled":false,"id":"08c475be-3a5e-499d-a363-9bc528f6eda7","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 32, "yorigin": 32, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a85f0884-bccb-4d64-91e7-91e920726f39","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 64, } \ No newline at end of file diff --git a/sprites/spr_bg/spr_bg.yy b/sprites/spr_bg/spr_bg.yy index fb3c226..8122adc 100644 --- a/sprites/spr_bg/spr_bg.yy +++ b/sprites/spr_bg/spr_bg.yy @@ -2,74 +2,74 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_bg", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 0, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 31, "bbox_left": 0, "bbox_right": 31, "bbox_top": 0, - "bbox_bottom": 31, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, ], + "gridX": 0, + "gridY": 0, + "height": 32, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","blendMode":0,"displayName":"Layer 1","isLocked":false,"opacity":80.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_bg", - "timeUnits": 1, + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 1.0, "playbackSpeedType": 1, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"c6af7e4d-0598-4b4b-b35b-f9024321a62a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_bg/spr_bg.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_bg/spr_bg.yy",},},},"Disabled":false,"id":"c6af7e4d-0598-4b4b-b35b-f9024321a62a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 0, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"d797d937-1b8b-4f7e-aa6e-b01b3d661531","visible":true,"isLocked":false,"blendMode":0,"opacity":80.0,"displayName":"Layer 1",}, - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 32, } \ No newline at end of file diff --git a/sprites/spr_player2_idle/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09.png b/sprites/spr_player2_idle/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09.png new file mode 100644 index 0000000..3138a8e Binary files /dev/null and b/sprites/spr_player2_idle/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09.png differ diff --git a/sprites/spr_player2_idle/layers/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png b/sprites/spr_player2_idle/layers/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png new file mode 100644 index 0000000..3138a8e Binary files /dev/null and b/sprites/spr_player2_idle/layers/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png differ diff --git a/sprites/spr_player2_idle/spr_player2_idle.yy b/sprites/spr_player2_idle/spr_player2_idle.yy new file mode 100644 index 0000000..cd82b22 --- /dev/null +++ b/sprites/spr_player2_idle/spr_player2_idle.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_player2_idle", + "bbox_bottom": 10, + "bbox_left": 3, + "bbox_right": 8, + "bbox_top": 1, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, + ], + "gridX": 0, + "gridY": 0, + "height": 11, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_player2_idle", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 0.2, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_idle/spr_player2_idle.yy",},},},"Disabled":false,"id":"f4086892-5bd8-4310-a65a-ca7ad42739c2","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 6, + "yorigin": 11, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 12, +} \ No newline at end of file diff --git a/sprites/spr_player2_moving/9685cde2-1c2c-40d5-85bb-bb36c1f0d672.png b/sprites/spr_player2_moving/9685cde2-1c2c-40d5-85bb-bb36c1f0d672.png new file mode 100644 index 0000000..2c17e8f Binary files /dev/null and b/sprites/spr_player2_moving/9685cde2-1c2c-40d5-85bb-bb36c1f0d672.png differ diff --git a/sprites/spr_player2_moving/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09.png b/sprites/spr_player2_moving/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09.png new file mode 100644 index 0000000..47977ce Binary files /dev/null and b/sprites/spr_player2_moving/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09.png differ diff --git a/sprites/spr_player2_moving/layers/9685cde2-1c2c-40d5-85bb-bb36c1f0d672/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png b/sprites/spr_player2_moving/layers/9685cde2-1c2c-40d5-85bb-bb36c1f0d672/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png new file mode 100644 index 0000000..2c17e8f Binary files /dev/null and b/sprites/spr_player2_moving/layers/9685cde2-1c2c-40d5-85bb-bb36c1f0d672/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png differ diff --git a/sprites/spr_player2_moving/layers/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png b/sprites/spr_player2_moving/layers/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png new file mode 100644 index 0000000..47977ce Binary files /dev/null and b/sprites/spr_player2_moving/layers/d6d0b87b-5a28-4c24-ad6e-27cd148e7b09/cee7bc7a-8d99-4793-a7d2-7c83a4178460.png differ diff --git a/sprites/spr_player2_moving/spr_player2_moving.yy b/sprites/spr_player2_moving/spr_player2_moving.yy new file mode 100644 index 0000000..78e64cf --- /dev/null +++ b/sprites/spr_player2_moving/spr_player2_moving.yy @@ -0,0 +1,76 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_player2_moving", + "bbox_bottom": 10, + "bbox_left": 1, + "bbox_right": 10, + "bbox_top": 1, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672",}, + ], + "gridX": 0, + "gridY": 0, + "height": 11, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_player2_moving", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 2.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 0.1, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},},},"Disabled":false,"id":"df5daded-5d7c-47cc-9099-87a5c13bffae","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},},},"Disabled":false,"id":"9807de71-eb91-48eb-ae37-abde603ed83a","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 6, + "yorigin": 11, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 12, +} \ No newline at end of file diff --git a/sprites/spr_player_idle/spr_player_idle.yy b/sprites/spr_player_idle/spr_player_idle.yy index 2072265..a0833e8 100644 --- a/sprites/spr_player_idle/spr_player_idle.yy +++ b/sprites/spr_player_idle/spr_player_idle.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_player_idle", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 7, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 10, "bbox_left": 3, "bbox_right": 8, "bbox_top": 1, - "bbox_bottom": 10, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 12, - "height": 11, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, ], + "gridX": 0, + "gridY": 0, + "height": 11, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_player_idle", - "timeUnits": 1, + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 0.2, "playbackSpeedType": 1, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a1a3f3b3-0702-4892-adaf-39099977cbc1","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_idle/spr_player_idle.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_idle/spr_player_idle.yy",},},},"Disabled":false,"id":"a1a3f3b3-0702-4892-adaf-39099977cbc1","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 6, "yorigin": 11, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 12, } \ No newline at end of file diff --git a/sprites/spr_player_moving/spr_player_moving.yy b/sprites/spr_player_moving/spr_player_moving.yy index c8babce..4f083ed 100644 --- a/sprites/spr_player_moving/spr_player_moving.yy +++ b/sprites/spr_player_moving/spr_player_moving.yy @@ -2,75 +2,75 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_player_moving", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 7, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 10, "bbox_left": 1, "bbox_right": 10, "bbox_top": 1, - "bbox_bottom": 10, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 12, - "height": 11, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672",}, ], + "gridX": 0, + "gridY": 0, + "height": 11, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 7, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_player_moving", - "timeUnits": 1, + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 2.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 0.1, "playbackSpeedType": 1, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"eac30cb0-0d0f-4d52-b911-fcb0e9caf624","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_moving/spr_player_moving.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"088325c1-7772-4ba3-ac9e-62e51881a76c","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player_moving/spr_player_moving.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"d6d0b87b-5a28-4c24-ad6e-27cd148e7b09","path":"sprites/spr_player_moving/spr_player_moving.yy",},},},"Disabled":false,"id":"eac30cb0-0d0f-4d52-b911-fcb0e9caf624","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"9685cde2-1c2c-40d5-85bb-bb36c1f0d672","path":"sprites/spr_player_moving/spr_player_moving.yy",},},},"Disabled":false,"id":"088325c1-7772-4ba3-ac9e-62e51881a76c","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 6, "yorigin": 11, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"cee7bc7a-8d99-4793-a7d2-7c83a4178460","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 12, } \ No newline at end of file diff --git a/sprites/spr_tile_bg/spr_tile_bg.yy b/sprites/spr_tile_bg/spr_tile_bg.yy index e4d9b2b..869e92c 100644 --- a/sprites/spr_tile_bg/spr_tile_bg.yy +++ b/sprites/spr_tile_bg/spr_tile_bg.yy @@ -2,73 +2,73 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_tile_bg", - "bboxMode": 0, - "collisionKind": 1, - "type": 0, - "origin": 0, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, + "bbox_bottom": 31, "bbox_left": 32, "bbox_right": 63, "bbox_top": 0, - "bbox_bottom": 31, - "HTile": false, - "VTile": false, - "For3D": false, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, "DynamicTexturePage": false, - "width": 64, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, + "edgeFiltering": false, + "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3",}, ], + "gridX": 0, + "gridY": 0, + "height": 32, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, "sequence": { "resourceType": "GMSequence", "resourceVersion": "1.4", "name": "spr_tile_bg", - "timeUnits": 1, + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 1.0, "playbackSpeedType": 1, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, "tracks": [ - {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"309dd744-34d6-46cb-b4bd-9c86c59311e5","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b5e8d5bb-c127-4d8b-8514-dca5179f5af3","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},},},"Disabled":false,"id":"309dd744-34d6-46cb-b4bd-9c86c59311e5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, + "volume": 1.0, "xorigin": 0, "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, }, - "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bed84a38-1422-4fe6-8871-3c553508ef23","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, - ], - "nineSlice": null, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", }, + "type": 0, + "VTile": false, + "width": 64, } \ No newline at end of file diff --git a/sprites/spr_tv/ca68646b-1689-4d76-b7ab-b0c225cc8d31.png b/sprites/spr_tv/ca68646b-1689-4d76-b7ab-b0c225cc8d31.png new file mode 100644 index 0000000..c3634bb Binary files /dev/null and b/sprites/spr_tv/ca68646b-1689-4d76-b7ab-b0c225cc8d31.png differ diff --git a/sprites/spr_tv/layers/ca68646b-1689-4d76-b7ab-b0c225cc8d31/9bc939da-2fec-4e13-aa9c-105eb44921f3.png b/sprites/spr_tv/layers/ca68646b-1689-4d76-b7ab-b0c225cc8d31/9bc939da-2fec-4e13-aa9c-105eb44921f3.png new file mode 100644 index 0000000..c3634bb Binary files /dev/null and b/sprites/spr_tv/layers/ca68646b-1689-4d76-b7ab-b0c225cc8d31/9bc939da-2fec-4e13-aa9c-105eb44921f3.png differ diff --git a/sprites/spr_tv/spr_tv.yy b/sprites/spr_tv/spr_tv.yy new file mode 100644 index 0000000..dc74bf9 --- /dev/null +++ b/sprites/spr_tv/spr_tv.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_tv", + "bbox_bottom": 63, + "bbox_left": 0, + "bbox_right": 63, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"9bc939da-2fec-4e13-aa9c-105eb44921f3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_tv", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 1.0, + "playbackSpeedType": 1, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ca68646b-1689-4d76-b7ab-b0c225cc8d31","path":"sprites/spr_tv/spr_tv.yy",},},},"Disabled":false,"id":"d337b439-7ffc-4d02-973f-5a39b2dc1705","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file diff --git a/stanncam.resource_order b/stanncam.resource_order new file mode 100644 index 0000000..94ff5fa --- /dev/null +++ b/stanncam.resource_order @@ -0,0 +1,32 @@ +{ + "FolderOrderSettings": [ + {"name":"demonstration","order":11,"path":"folders/demonstration.yy",}, + {"name":"Objects","order":9,"path":"folders/Objects.yy",}, + {"name":"Scripts","order":5,"path":"folders/Scripts.yy",}, + ], + "ResourceOrderSettings": [ + {"name":"stanncam","order":6,"path":"scripts/stanncam/stanncam.yy",}, + {"name":"demo_obj_player2","order":15,"path":"objects/demo_obj_player2/demo_obj_player2.yy",}, + {"name":"demo_obj_camera","order":20,"path":"objects/demo_obj_camera/demo_obj_camera.yy",}, + {"name":"ease_in_out","order":4,"path":"scripts/ease_in_out/ease_in_out.yy",}, + {"name":"spr_tv","order":19,"path":"sprites/spr_tv/spr_tv.yy",}, + {"name":"spr_player2_idle","order":17,"path":"sprites/spr_player2_idle/spr_player2_idle.yy",}, + {"name":"draw_text_outline","order":5,"path":"scripts/draw_text_outline/draw_text_outline.yy",}, + {"name":"spr_bg","order":9,"path":"sprites/spr_bg/spr_bg.yy",}, + {"name":"spr_arrow_small","order":7,"path":"sprites/spr_arrow_small/spr_arrow_small.yy",}, + {"name":"TileSet1","order":13,"path":"tilesets/TileSet1/TileSet1.yy",}, + {"name":"demo_f_pixel","order":1,"path":"fonts/demo_f_pixel/demo_f_pixel.yy",}, + {"name":"spr_player2_moving","order":16,"path":"sprites/spr_player2_moving/spr_player2_moving.yy",}, + {"name":"stanncam_manager","order":5,"path":"scripts/stanncam_manager/stanncam_manager.yy",}, + {"name":"spr_ball","order":8,"path":"sprites/spr_ball/spr_ball.yy",}, + {"name":"spr_player_moving","order":11,"path":"sprites/spr_player_moving/spr_player_moving.yy",}, + {"name":"demo_obj_player","order":2,"path":"objects/demo_obj_player/demo_obj_player.yy",}, + {"name":"shake","order":3,"path":"scripts/shake/shake.yy",}, + {"name":"spr_player_idle","order":10,"path":"sprites/spr_player_idle/spr_player_idle.yy",}, + {"name":"spr_arrow","order":6,"path":"sprites/spr_arrow/spr_arrow.yy",}, + {"name":"demo_obj_tv","order":18,"path":"objects/demo_obj_tv/demo_obj_tv.yy",}, + {"name":"demo_obj_ball","order":3,"path":"objects/demo_obj_ball/demo_obj_ball.yy",}, + {"name":"spr_tile_bg","order":12,"path":"sprites/spr_tile_bg/spr_tile_bg.yy",}, + {"name":"Room1","order":4,"path":"rooms/Room1/Room1.yy",}, + ], +} \ No newline at end of file diff --git a/stanncam.yyp b/stanncam.yyp index 7bbfae0..9d9d446 100644 --- a/stanncam.yyp +++ b/stanncam.yyp @@ -2,59 +2,55 @@ "resourceType": "GMProject", "resourceVersion": "1.6", "name": "stanncam", + "AudioGroups": [ + {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, + ], + "configs": { + "children": [], + "name": "Default", + }, + "defaultScriptType": 1, + "Folders": [ + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"demonstration","folderPath":"folders/demonstration.yy","order":11,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Objects","folderPath":"folders/Objects.yy","order":9,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Scripts","folderPath":"folders/Scripts.yy","order":5,}, + ], + "IncludedFiles": [], + "isEcma": false, + "MetaData": { + "IDEVersion": "2023.1.1.62", + }, "resources": [ + {"id":{"name":"stanncam","path":"scripts/stanncam/stanncam.yy",},"order":6,}, + {"id":{"name":"demo_obj_player2","path":"objects/demo_obj_player2/demo_obj_player2.yy",},"order":15,}, + {"id":{"name":"demo_obj_camera","path":"objects/demo_obj_camera/demo_obj_camera.yy",},"order":20,}, {"id":{"name":"ease_in_out","path":"scripts/ease_in_out/ease_in_out.yy",},"order":4,}, + {"id":{"name":"spr_tv","path":"sprites/spr_tv/spr_tv.yy",},"order":19,}, + {"id":{"name":"spr_player2_idle","path":"sprites/spr_player2_idle/spr_player2_idle.yy",},"order":17,}, {"id":{"name":"draw_text_outline","path":"scripts/draw_text_outline/draw_text_outline.yy",},"order":5,}, {"id":{"name":"spr_bg","path":"sprites/spr_bg/spr_bg.yy",},"order":9,}, {"id":{"name":"spr_arrow_small","path":"sprites/spr_arrow_small/spr_arrow_small.yy",},"order":7,}, - {"id":{"name":"stanncam_functions","path":"scripts/stanncam_functions/stanncam_functions.yy",},"order":2,}, {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":13,}, {"id":{"name":"demo_f_pixel","path":"fonts/demo_f_pixel/demo_f_pixel.yy",},"order":1,}, + {"id":{"name":"spr_player2_moving","path":"sprites/spr_player2_moving/spr_player2_moving.yy",},"order":16,}, + {"id":{"name":"stanncam_manager","path":"scripts/stanncam_manager/stanncam_manager.yy",},"order":5,}, {"id":{"name":"spr_ball","path":"sprites/spr_ball/spr_ball.yy",},"order":8,}, {"id":{"name":"spr_player_moving","path":"sprites/spr_player_moving/spr_player_moving.yy",},"order":11,}, {"id":{"name":"demo_obj_player","path":"objects/demo_obj_player/demo_obj_player.yy",},"order":2,}, {"id":{"name":"shake","path":"scripts/shake/shake.yy",},"order":3,}, - {"id":{"name":"obj_stanncam","path":"objects/obj_stanncam/obj_stanncam.yy",},"order":2,}, {"id":{"name":"demo_f_hires","path":"fonts/demo_f_hires/demo_f_hires.yy",},"order":0,}, {"id":{"name":"spr_player_idle","path":"sprites/spr_player_idle/spr_player_idle.yy",},"order":10,}, {"id":{"name":"spr_arrow","path":"sprites/spr_arrow/spr_arrow.yy",},"order":6,}, - {"id":{"name":"obj_ball","path":"objects/obj_ball/obj_ball.yy",},"order":3,}, + {"id":{"name":"demo_obj_tv","path":"objects/demo_obj_tv/demo_obj_tv.yy",},"order":18,}, + {"id":{"name":"demo_obj_ball","path":"objects/demo_obj_ball/demo_obj_ball.yy",},"order":3,}, + {"id":{"name":"__obj_stanncam_manager","path":"objects/__obj_stanncam_manager/__obj_stanncam_manager.yy",},"order":0,}, {"id":{"name":"spr_tile_bg","path":"sprites/spr_tile_bg/spr_tile_bg.yy",},"order":12,}, {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":4,}, ], - "Options": [ - {"name":"Android","path":"options/android/options_android.yy",}, - {"name":"HTML5","path":"options/html5/options_html5.yy",}, - {"name":"iOS","path":"options/ios/options_ios.yy",}, - {"name":"Linux","path":"options/linux/options_linux.yy",}, - {"name":"macOS","path":"options/mac/options_mac.yy",}, - {"name":"tvOS","path":"options/tvos/options_tvos.yy",}, - {"name":"Windows","path":"options/windows/options_windows.yy",}, - {"name":"operagx","path":"options/operagx/options_operagx.yy",}, - {"name":"Main","path":"options/main/options_main.yy",}, - ], - "defaultScriptType": 1, - "isEcma": false, - "configs": { - "name": "Default", - "children": [], - }, "RoomOrderNodes": [ {"roomId":{"name":"Room1","path":"rooms/Room1/Room1.yy",},}, ], - "Folders": [ - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"demonstration","folderPath":"folders/demonstration.yy","order":11,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Objects","folderPath":"folders/Objects.yy","order":9,}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Scripts","folderPath":"folders/Scripts.yy","order":5,}, - ], - "AudioGroups": [ - {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, - ], "TextureGroups": [ - {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","isScaled":true,"compressFormat":"bz2","loadType":"default","directory":"","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,}, + {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"targets":-1,}, ], - "IncludedFiles": [], - "MetaData": { - "IDEVersion": "2022.11.1.56", - }, } \ No newline at end of file diff --git a/tilesets/TileSet1/TileSet1.yy b/tilesets/TileSet1/TileSet1.yy index 52b87ba..ae224c9 100644 --- a/tilesets/TileSet1/TileSet1.yy +++ b/tilesets/TileSet1/TileSet1.yy @@ -2,28 +2,29 @@ "resourceType": "GMTileSet", "resourceVersion": "1.0", "name": "TileSet1", + "autoTileSets": [], + "macroPageTiles": { + "SerialiseHeight": 0, + "SerialiseWidth": 0, + "TileSerialiseData": [], + }, + "out_columns": 1, + "out_tilehborder": 2, + "out_tilevborder": 2, + "parent": { + "name": "demonstration", + "path": "folders/demonstration.yy", + }, "spriteId": { "name": "spr_tile_bg", "path": "sprites/spr_tile_bg/spr_tile_bg.yy", }, - "tileWidth": 32, - "tileHeight": 32, - "tilexoff": 0, - "tileyoff": 0, - "tilehsep": 0, - "tilevsep": 0, "spriteNoExport": true, "textureGroupId": { "name": "Default", "path": "texturegroups/Default", }, - "out_tilehborder": 2, - "out_tilevborder": 2, - "out_columns": 1, "tile_count": 2, - "autoTileSets": [], - "tileAnimationFrames": [], - "tileAnimationSpeed": 15.0, "tileAnimation": { "FrameData": [ 0, @@ -31,13 +32,12 @@ ], "SerialiseFrameCount": 1, }, - "macroPageTiles": { - "SerialiseWidth": 0, - "SerialiseHeight": 0, - "TileSerialiseData": [], - }, - "parent": { - "name": "demonstration", - "path": "folders/demonstration.yy", - }, + "tileAnimationFrames": [], + "tileAnimationSpeed": 15.0, + "tileHeight": 32, + "tilehsep": 0, + "tilevsep": 0, + "tileWidth": 32, + "tilexoff": 0, + "tileyoff": 0, } \ No newline at end of file