Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
This commit is contained in:
MtH
commit
a656214453
|
|
@ -126,6 +126,12 @@
|
|||
<haxelib name="faxe" if='switch'/>
|
||||
<haxelib name="polymod"/>
|
||||
<haxelib name="hxcpp-debug-server" if="desktop debug"/>
|
||||
|
||||
<haxelib name="flixel-animate" />
|
||||
<haxelib name="spinehaxe" />
|
||||
<!-- https://github.com/ninjamuffin99/Flixel-Animate-Atlas-Player -->
|
||||
|
||||
|
||||
<!--<haxelib name="discord_rpc" if="cpp"/> --> <!-- foesn't work with neko -->
|
||||
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,65 @@
|
|||
{"ATLAS": {"SPRITES":[
|
||||
{"SPRITE" : {"name": "0000","x":1147,"y":0,"w":387,"h":220,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0001","x":397,"y":592,"w":194,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0002","x":235,"y":689,"w":88,"h":148,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0003","x":209,"y":512,"w":184,"h":173,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0004","x":623,"y":546,"w":184,"h":173,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0005","x":1593,"y":659,"w":113,"h":152,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0006","x":1910,"y":624,"w":114,"h":152,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0007","x":453,"y":718,"w":40,"h":100,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0008","x":1196,"y":696,"w":121,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0009","x":1321,"y":696,"w":122,"h":44,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0010","x":327,"y":718,"w":122,"h":42,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0011","x":1593,"y":622,"w":97,"h":33,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0012","x":811,"y":720,"w":97,"h":32,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0013","x":811,"y":720,"w":97,"h":32,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0014","x":1484,"y":515,"w":97,"h":34,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0015","x":1447,"y":696,"w":122,"h":44,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0016","x":2009,"y":366,"w":32,"h":19,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0017","x":1068,"y":567,"w":261,"h":125,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0018","x":1068,"y":696,"w":124,"h":68,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0019","x":1333,"y":567,"w":256,"h":125,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0020","x":0,"y":678,"w":107,"h":154,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0021","x":978,"y":569,"w":86,"h":145,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0022","x":284,"y":363,"w":116,"h":135,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0023","x":2030,"y":0,"w":1,"h":4,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0024","x":833,"y":0,"w":310,"h":377,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0025","x":111,"y":689,"w":120,"h":119,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0026","x":423,"y":362,"w":196,"h":226,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0027","x":1910,"y":490,"w":138,"h":130,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0028","x":865,"y":381,"w":199,"h":184,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0029","x":623,"y":381,"w":238,"h":161,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0030","x":0,"y":363,"w":280,"h":145,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0031","x":1790,"y":0,"w":236,"h":241,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0032","x":811,"y":569,"w":163,"h":147,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0033","x":1538,"y":0,"w":248,"h":267,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0034","x":1068,"y":393,"w":204,"h":170,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0035","x":1276,"y":393,"w":204,"h":170,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0036","x":1704,"y":490,"w":202,"h":165,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0037","x":0,"y":512,"w":205,"h":162,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0038","x":1487,"y":224,"w":40,"h":34,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0039","x":497,"y":718,"w":51,"h":62,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0040","x":1704,"y":271,"w":65,"h":79,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0041","x":1704,"y":354,"w":53,"h":78,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0042","x":552,"y":718,"w":47,"h":64,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0043","x":2009,"y":245,"w":30,"h":42,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0044","x":2009,"y":291,"w":23,"h":36,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0045","x":2009,"y":331,"w":20,"h":31,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0046","x":1761,"y":354,"w":17,"h":22,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0047","x":1710,"y":659,"w":187,"h":90,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0048","x":0,"y":0,"w":419,"h":359,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0049","x":423,"y":0,"w":406,"h":358,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0050","x":1147,"y":224,"w":336,"h":165,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0051","x":1593,"y":515,"w":90,"h":103,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0052","x":1790,"y":245,"w":215,"h":241,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0053","x":1487,"y":271,"w":213,"h":240,"rotated": false}}
|
||||
]},
|
||||
"meta": {
|
||||
"app": "Adobe Animate",
|
||||
"version": "21.0.0.35450",
|
||||
"image": "spritemap1.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {"w":2048,"h":837},
|
||||
"resolution": "1"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 313 KiB |
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,117 @@
|
|||
{"ATLAS": {"SPRITES":[
|
||||
{"SPRITE" : {"name": "0000","x":2853,"y":971,"w":327,"h":397,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0001","x":2449,"y":896,"w":110,"h":159,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0002","x":3120,"y":1633,"w":197,"h":185,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0003","x":3973,"y":1406,"w":92,"h":155,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0004","x":236,"y":1647,"w":274,"h":132,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0005","x":1811,"y":1826,"w":133,"h":74,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0006","x":3278,"y":540,"w":121,"h":162,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0007","x":359,"y":649,"w":518,"h":294,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0008","x":1959,"y":0,"w":775,"h":483,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0009","x":1014,"y":0,"w":941,"h":607,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0010","x":0,"y":0,"w":1010,"h":645,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0011","x":4067,"y":0,"w":20,"h":142,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0012","x":4043,"y":438,"w":40,"h":83,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0013","x":1880,"y":811,"w":64,"h":57,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0014","x":2589,"y":487,"w":91,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0015","x":1404,"y":1155,"w":88,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0016","x":3441,"y":1501,"w":109,"h":93,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0017","x":3408,"y":0,"w":655,"h":434,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0018","x":1959,"y":487,"w":626,"h":405,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0019","x":3408,"y":438,"w":631,"h":438,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0020","x":1174,"y":1213,"w":393,"h":287,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0021","x":2853,"y":540,"w":421,"h":427,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0022","x":2738,"y":0,"w":666,"h":536,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0023","x":544,"y":1484,"w":224,"h":221,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0024","x":1333,"y":1742,"w":186,"h":175,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0025","x":1496,"y":1155,"w":56,"h":52,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0026","x":3181,"y":1822,"w":126,"h":104,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0027","x":3953,"y":1565,"w":135,"h":104,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0028","x":0,"y":1444,"w":232,"h":236,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0029","x":3573,"y":1226,"w":139,"h":109,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0030","x":1527,"y":1629,"w":235,"h":158,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0031","x":1155,"y":1504,"w":198,"h":233,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0032","x":881,"y":801,"w":118,"h":117,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0033","x":1571,"y":1404,"w":262,"h":221,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0034","x":3673,"y":1744,"w":222,"h":145,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0035","x":985,"y":1484,"w":166,"h":292,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0036","x":3673,"y":1598,"w":276,"h":142,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0037","x":2818,"y":1747,"w":203,"h":138,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0038","x":236,"y":1473,"w":304,"h":170,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0039","x":4091,"y":0,"w":1,"h":4,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0040","x":2449,"y":1059,"w":135,"h":127,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0041","x":1968,"y":1639,"w":194,"h":180,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0042","x":3899,"y":1744,"w":160,"h":144,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0043","x":715,"y":947,"w":237,"h":255,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0044","x":2387,"y":1512,"w":378,"h":121,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0045","x":3076,"y":1501,"w":361,"h":128,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0046","x":715,"y":1213,"w":455,"h":267,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0047","x":0,"y":1114,"w":272,"h":326,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0048","x":3720,"y":880,"w":249,"h":557,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0049","x":2589,"y":540,"w":260,"h":701,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0050","x":1014,"y":611,"w":291,"h":598,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0051","x":1309,"y":611,"w":315,"h":540,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0052","x":0,"y":649,"w":355,"h":461,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0053","x":359,"y":947,"w":352,"h":373,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0054","x":2769,"y":1633,"w":347,"h":110,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0055","x":2045,"y":1252,"w":379,"h":216,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0056","x":2837,"y":1372,"w":235,"h":257,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0057","x":3573,"y":1339,"w":140,"h":92,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0058","x":0,"y":1859,"w":119,"h":79,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0059","x":1571,"y":1253,"w":434,"h":147,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0060","x":276,"y":1324,"w":433,"h":145,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0061","x":3278,"y":880,"w":438,"h":342,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0062","x":3184,"y":1226,"w":385,"h":271,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0063","x":3573,"y":1441,"w":373,"h":153,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0064","x":933,"y":1780,"w":202,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0065","x":209,"y":1783,"w":202,"h":122,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0066","x":2374,"y":1809,"w":150,"h":91,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0067","x":2607,"y":1637,"w":151,"h":95,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0068","x":1968,"y":1823,"w":140,"h":90,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0069","x":3461,"y":1794,"w":149,"h":92,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0070","x":1663,"y":1826,"w":144,"h":87,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0071","x":3025,"y":1822,"w":152,"h":87,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0072","x":2449,"y":1245,"w":384,"h":263,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0073","x":1628,"y":611,"w":248,"h":277,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0074","x":1628,"y":896,"w":413,"h":353,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0075","x":2045,"y":896,"w":400,"h":352,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0076","x":1837,"y":1472,"w":330,"h":163,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0077","x":3076,"y":1372,"w":90,"h":103,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0078","x":2171,"y":1472,"w":212,"h":238,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0079","x":772,"y":1484,"w":209,"h":236,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0080","x":415,"y":1783,"w":86,"h":84,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0081","x":881,"y":649,"w":126,"h":148,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0082","x":2387,"y":1637,"w":216,"h":168,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0083","x":1155,"y":1741,"w":174,"h":192,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0084","x":3321,"y":1633,"w":106,"h":75,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0085","x":3953,"y":1673,"w":129,"h":63,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0086","x":1837,"y":1404,"w":158,"h":60,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0087","x":3278,"y":706,"w":123,"h":148,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0088","x":3973,"y":880,"w":123,"h":148,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0089","x":2607,"y":1747,"w":207,"h":142,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0090","x":1309,"y":1155,"w":91,"h":53,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0091","x":1880,"y":611,"w":65,"h":96,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0092","x":1880,"y":711,"w":65,"h":96,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0093","x":1523,"y":1791,"w":136,"h":102,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0094","x":3321,"y":1794,"w":136,"h":102,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0095","x":3441,"y":1598,"w":228,"h":192,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0096","x":1357,"y":1504,"w":166,"h":234,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0097","x":0,"y":1684,"w":205,"h":171,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0098","x":514,"y":1709,"w":205,"h":171,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0099","x":2166,"y":1714,"w":204,"h":166,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0100","x":723,"y":1724,"w":206,"h":164,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0101","x":276,"y":1114,"w":79,"h":185,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0102","x":3184,"y":971,"w":83,"h":200,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0103","x":3973,"y":1222,"w":86,"h":180,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0104","x":3973,"y":1032,"w":89,"h":186,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0105","x":1766,"y":1639,"w":198,"h":183,"rotated": false}}
|
||||
]},
|
||||
"meta": {
|
||||
"app": "Adobe Animate",
|
||||
"version": "21.0.0.35450",
|
||||
"image": "spritemap1.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {"w":4096,"h":1938},
|
||||
"resolution": "1"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 942 KiB |
|
|
@ -63,63 +63,4 @@ class CoolUtil
|
|||
{
|
||||
return FlxMath.lerp(a, b, camLerpShit(ratio));
|
||||
}
|
||||
|
||||
public static function fromAnimate(Source:FlxGraphicAsset, Description:String):FlxAtlasFrames
|
||||
{
|
||||
var graphic:FlxGraphic = FlxG.bitmap.add(Source);
|
||||
if (graphic == null)
|
||||
return null;
|
||||
|
||||
var frames:FlxAtlasFrames = FlxAtlasFrames.findFrame(graphic);
|
||||
if (frames != null)
|
||||
return frames;
|
||||
|
||||
if (graphic == null || Description == null)
|
||||
return null;
|
||||
|
||||
frames = new FlxAtlasFrames(graphic);
|
||||
|
||||
var data:AnimateObject;
|
||||
|
||||
var json:String = Description;
|
||||
|
||||
trace(json);
|
||||
|
||||
if (Assets.exists(json))
|
||||
json = Assets.getText(json);
|
||||
|
||||
data = cast Json.parse(json).ATLAS;
|
||||
|
||||
for (sprite in data.SPRITES)
|
||||
{
|
||||
// probably nicer way to do this? Oh well
|
||||
var swagSprite:AnimateSprite = sprite.SPRITE;
|
||||
|
||||
var rect = FlxRect.get(swagSprite.x, swagSprite.y, swagSprite.w, swagSprite.h);
|
||||
|
||||
var size = new Rectangle(0, 0, rect.width, rect.height);
|
||||
|
||||
var offset = FlxPoint.get(-size.left, -size.top);
|
||||
var sourceSize = FlxPoint.get(size.width, size.height);
|
||||
|
||||
frames.addAtlasFrame(rect, sourceSize, offset, swagSprite.name);
|
||||
}
|
||||
|
||||
return frames;
|
||||
}
|
||||
}
|
||||
|
||||
typedef AnimateObject =
|
||||
{
|
||||
SPRITES:Array<Dynamic>
|
||||
}
|
||||
|
||||
typedef AnimateSprite =
|
||||
{
|
||||
var name:String;
|
||||
var x:Int;
|
||||
var y:Int;
|
||||
var w:Int;
|
||||
var h:Int;
|
||||
var rotated:Bool;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,8 @@
|
|||
package;
|
||||
|
||||
import animate.FlxAnimate;
|
||||
import animateAtlasPlayer.assets.AssetManager;
|
||||
import animateAtlasPlayer.core.Animation;
|
||||
import flixel.FlxG;
|
||||
import flixel.FlxSprite;
|
||||
import flixel.FlxState;
|
||||
|
|
@ -8,6 +11,7 @@ import flixel.group.FlxGroup.FlxTypedGroup;
|
|||
import flixel.math.FlxPoint;
|
||||
import flixel.text.FlxText;
|
||||
import flixel.util.FlxColor;
|
||||
import openfl.display.BitmapData;
|
||||
|
||||
class CutsceneAnimTestState extends FlxState
|
||||
{
|
||||
|
|
@ -38,17 +42,8 @@ class CutsceneAnimTestState extends FlxState
|
|||
debugTxt.color = FlxColor.BLUE;
|
||||
add(debugTxt);
|
||||
|
||||
for (i in 0...animShit.length)
|
||||
{
|
||||
var dummyLoader:FlxSprite = new FlxSprite();
|
||||
dummyLoader.loadGraphic(Paths.image('cutsceneStuff/gfHoldup-' + i));
|
||||
add(dummyLoader);
|
||||
dummyLoader.alpha = 0.01;
|
||||
dummyLoader.y = FlxG.height - 20;
|
||||
}
|
||||
|
||||
cutsceneGroup = new CutsceneCharacter(0, 0, 'gfHoldup');
|
||||
add(cutsceneGroup);
|
||||
var animated:FlxAnimate = new FlxAnimate(10, 10);
|
||||
add(animated);
|
||||
|
||||
// createCutscene(0);
|
||||
// createCutscene(1);
|
||||
|
|
@ -59,36 +54,37 @@ class CutsceneAnimTestState extends FlxState
|
|||
|
||||
override function update(elapsed:Float)
|
||||
{
|
||||
if (FlxG.keys.pressed.SHIFT)
|
||||
{
|
||||
if (FlxG.keys.justPressed.UP)
|
||||
curSelected -= 1;
|
||||
if (FlxG.keys.justPressed.DOWN)
|
||||
curSelected += 1;
|
||||
/* if (FlxG.keys.pressed.SHIFT)
|
||||
{
|
||||
if (FlxG.keys.justPressed.UP)
|
||||
curSelected -= 1;
|
||||
if (FlxG.keys.justPressed.DOWN)
|
||||
curSelected += 1;
|
||||
|
||||
if (curSelected < 0)
|
||||
curSelected = cutsceneGroup.members.length - 1;
|
||||
if (curSelected >= cutsceneGroup.members.length)
|
||||
curSelected = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
var valueMulti:Float = 1;
|
||||
if (curSelected < 0)
|
||||
curSelected = cutsceneGroup.members.length - 1;
|
||||
if (curSelected >= cutsceneGroup.members.length)
|
||||
curSelected = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
var valueMulti:Float = 1;
|
||||
|
||||
if (FlxG.keys.pressed.SPACE)
|
||||
valueMulti = 10;
|
||||
if (FlxG.keys.pressed.SPACE)
|
||||
valueMulti = 10;
|
||||
|
||||
if (FlxG.keys.justPressed.UP)
|
||||
cutsceneGroup.members[curSelected].y -= valueMulti;
|
||||
if (FlxG.keys.justPressed.DOWN)
|
||||
cutsceneGroup.members[curSelected].y += valueMulti;
|
||||
if (FlxG.keys.justPressed.LEFT)
|
||||
cutsceneGroup.members[curSelected].x -= valueMulti;
|
||||
if (FlxG.keys.justPressed.RIGHT)
|
||||
cutsceneGroup.members[curSelected].x += valueMulti;
|
||||
}
|
||||
if (FlxG.keys.justPressed.UP)
|
||||
cutsceneGroup.members[curSelected].y -= valueMulti;
|
||||
if (FlxG.keys.justPressed.DOWN)
|
||||
cutsceneGroup.members[curSelected].y += valueMulti;
|
||||
if (FlxG.keys.justPressed.LEFT)
|
||||
cutsceneGroup.members[curSelected].x -= valueMulti;
|
||||
if (FlxG.keys.justPressed.RIGHT)
|
||||
cutsceneGroup.members[curSelected].x += valueMulti;
|
||||
}
|
||||
|
||||
debugTxt.text = curSelected + " : " + cutsceneGroup.members[curSelected].getPosition();
|
||||
debugTxt.text = curSelected + " : " + cutsceneGroup.members[curSelected].getPosition();
|
||||
*/
|
||||
|
||||
super.update(elapsed);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package;
|
|||
import Section.SwagSection;
|
||||
import Song.SwagSong;
|
||||
import WiggleEffect.WiggleEffectType;
|
||||
import animateAtlasPlayer.assets.AssetManager;
|
||||
import animateAtlasPlayer.core.Animation;
|
||||
import flixel.FlxBasic;
|
||||
import flixel.FlxCamera;
|
||||
import flixel.FlxG;
|
||||
|
|
@ -37,6 +39,7 @@ import flixel.util.FlxTimer;
|
|||
import haxe.Json;
|
||||
import lime.utils.Assets;
|
||||
import openfl.Lib;
|
||||
import openfl.display.BitmapData;
|
||||
import openfl.display.BlendMode;
|
||||
import openfl.display.StageQuality;
|
||||
import openfl.filters.ShaderFilter;
|
||||
|
|
@ -1062,16 +1065,18 @@ class PlayState extends MusicBeatState
|
|||
var dummyLoaderShit:FlxGroup = new FlxGroup();
|
||||
|
||||
add(dummyLoaderShit);
|
||||
/*
|
||||
for (i in 0...7)
|
||||
{
|
||||
var dummyLoader:FlxSprite = new FlxSprite();
|
||||
dummyLoader.loadGraphic(Paths.image('cutsceneStuff/gfHoldup-' + i));
|
||||
dummyLoaderShit.add(dummyLoader);
|
||||
dummyLoader.alpha = 0.01;
|
||||
dummyLoader.y = FlxG.height - 20;
|
||||
// dummyLoader.drawFrame(true);
|
||||
}
|
||||
|
||||
for (i in 0...7)
|
||||
{
|
||||
var dummyLoader:FlxSprite = new FlxSprite();
|
||||
dummyLoader.loadGraphic(Paths.image('cutsceneStuff/gfHoldup-' + i));
|
||||
dummyLoaderShit.add(dummyLoader);
|
||||
dummyLoader.alpha = 0.01;
|
||||
dummyLoader.y = FlxG.height - 20;
|
||||
// dummyLoader.drawFrame(true);
|
||||
}
|
||||
*/
|
||||
|
||||
dad.visible = false;
|
||||
|
||||
|
|
@ -1111,6 +1116,21 @@ class PlayState extends MusicBeatState
|
|||
var fakeBF:Character = new Character(boyfriend.x, boyfriend.y, 'bf', true);
|
||||
bfTankCutsceneLayer.add(fakeBF);
|
||||
|
||||
// var atlasCutscene:Animation
|
||||
// var animAssets:AssetManager = new AssetManager();
|
||||
|
||||
// var url = 'images/gfDemon';
|
||||
|
||||
// // animAssets.enqueueSingle(Paths.file(url + "/spritemap1.png"));
|
||||
// // animAssets.enqueueSingle(Paths.file(url + "/spritemap1.json"));
|
||||
// // animAssets.enqueueSingle(Paths.file(url + "/Animation.json"));
|
||||
|
||||
// animAssets.loadQueue(function(asssss:AssetManager)
|
||||
// {
|
||||
// var daAnim:Animation = asssss.createAnimation('GF Turnin Demon W Effect');
|
||||
// FlxG.addChildBelowMouse(daAnim);
|
||||
// });
|
||||
|
||||
var bfCatchGf:FlxSprite = new FlxSprite(boyfriend.x - 10, boyfriend.y - 90);
|
||||
bfCatchGf.frames = Paths.getSparrowAtlas('cutsceneStuff/bfCatchesGF');
|
||||
bfCatchGf.animation.addByPrefix('catch', 'BF catches GF', 24, false);
|
||||
|
|
|
|||
|
|
@ -376,6 +376,11 @@ class TitleState extends MusicBeatState
|
|||
}
|
||||
#end
|
||||
|
||||
if (FlxG.keys.justPressed.FIVE)
|
||||
{
|
||||
FlxG.switchState(new CutsceneAnimTestState());
|
||||
}
|
||||
|
||||
var gamepad:FlxGamepad = FlxG.gamepads.lastActive;
|
||||
|
||||
if (gamepad != null)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,144 @@
|
|||
package animate;
|
||||
|
||||
import animateAtlasPlayer.assets.AssetManager;
|
||||
import animateAtlasPlayer.core.Animation;
|
||||
import flixel.FlxG;
|
||||
import flixel.FlxSprite;
|
||||
import flixel.graphics.FlxGraphic;
|
||||
import flixel.graphics.frames.FlxAtlasFrames;
|
||||
import flixel.math.FlxPoint;
|
||||
import flixel.math.FlxRect;
|
||||
import flixel.system.FlxAssets.FlxGraphicAsset;
|
||||
import haxe.Json;
|
||||
import openfl.Assets;
|
||||
import openfl.display.Bitmap;
|
||||
import openfl.display.BitmapData;
|
||||
import openfl.geom.Point;
|
||||
import openfl.geom.Rectangle;
|
||||
|
||||
class FlxAnimate extends FlxSprite
|
||||
{
|
||||
var myAnim:Animation;
|
||||
var animBitmap:BitmapData;
|
||||
|
||||
var loadedQueue:Bool = false;
|
||||
|
||||
var swagFrames:Array<BitmapData> = [];
|
||||
|
||||
public function new(x:Float, y:Float)
|
||||
{
|
||||
super(x, y);
|
||||
|
||||
// get fromAnimate()
|
||||
// get every symbol / piece needed
|
||||
// animate them?
|
||||
|
||||
var swagAssets:AssetManager = new AssetManager();
|
||||
swagAssets.enqueueSingle(Paths.file('images/picoShoot/spritemap1.png'));
|
||||
swagAssets.enqueueSingle(Paths.file('images/picoShoot/spritemap1.json'));
|
||||
swagAssets.enqueueSingle(Paths.file('images/picoShoot/Animation.json'));
|
||||
|
||||
swagAssets.loadQueue(function(assetMgr:AssetManager)
|
||||
{
|
||||
myAnim = assetMgr.createAnimation("Pico Saves them sequence");
|
||||
myAnim.cacheAsBitmap = true;
|
||||
myAnim.opaqueBackground = null;
|
||||
// myAnim.root.x += 200;
|
||||
// myAnim.root.y += 200;
|
||||
// myAnim.x += 200;
|
||||
// myAnim.y += 200;
|
||||
|
||||
var daAnim:BitmapData = new BitmapData(200, 200, true, 0x00000000);
|
||||
daAnim.draw(myAnim);
|
||||
animBitmap = new BitmapData(200, 200, true, 0x00000000);
|
||||
animBitmap.draw(myAnim);
|
||||
|
||||
loadGraphic(animBitmap);
|
||||
// framePixels = animBitmap;
|
||||
|
||||
loadedQueue = true;
|
||||
});
|
||||
}
|
||||
|
||||
var pointZero:Point = new Point();
|
||||
|
||||
private var lastFrame:Int = 0;
|
||||
|
||||
override function draw()
|
||||
{
|
||||
super.draw();
|
||||
|
||||
if (loadedQueue)
|
||||
{
|
||||
if (lastFrame != myAnim.currentFrame)
|
||||
{
|
||||
lastFrame = myAnim.currentFrame;
|
||||
// loadGraphic(animBitmap);
|
||||
|
||||
animBitmap.draw(myAnim);
|
||||
}
|
||||
|
||||
// animBitmap.draw(myAnim);
|
||||
}
|
||||
}
|
||||
|
||||
// This stuff is u
|
||||
public static function fromAnimate(Source:FlxGraphicAsset, Description:String):FlxAtlasFrames
|
||||
{
|
||||
var graphic:FlxGraphic = FlxG.bitmap.add(Source);
|
||||
if (graphic == null)
|
||||
return null;
|
||||
|
||||
var frames:FlxAtlasFrames = FlxAtlasFrames.findFrame(graphic);
|
||||
if (frames != null)
|
||||
return frames;
|
||||
|
||||
if (graphic == null || Description == null)
|
||||
return null;
|
||||
|
||||
frames = new FlxAtlasFrames(graphic);
|
||||
|
||||
var data:AnimateObject;
|
||||
|
||||
var json:String = Description;
|
||||
|
||||
trace(json);
|
||||
|
||||
if (Assets.exists(json))
|
||||
json = Assets.getText(json);
|
||||
|
||||
data = cast Json.parse(json).ATLAS;
|
||||
|
||||
for (sprite in data.SPRITES)
|
||||
{
|
||||
// probably nicer way to do this? Oh well
|
||||
var swagSprite:AnimateSprite = sprite.SPRITE;
|
||||
|
||||
var rect = FlxRect.get(swagSprite.x, swagSprite.y, swagSprite.w, swagSprite.h);
|
||||
|
||||
var size = new Rectangle(0, 0, rect.width, rect.height);
|
||||
|
||||
var offset = FlxPoint.get(-size.left, -size.top);
|
||||
var sourceSize = FlxPoint.get(size.width, size.height);
|
||||
|
||||
frames.addAtlasFrame(rect, sourceSize, offset, swagSprite.name);
|
||||
}
|
||||
|
||||
return frames;
|
||||
}
|
||||
}
|
||||
|
||||
typedef AnimateObject =
|
||||
{
|
||||
SPRITES:Array<Dynamic>
|
||||
}
|
||||
|
||||
typedef AnimateSprite =
|
||||
{
|
||||
var name:String;
|
||||
var x:Int;
|
||||
var y:Int;
|
||||
var w:Int;
|
||||
var h:Int;
|
||||
var rotated:Bool;
|
||||
}
|
||||
Loading…
Reference in New Issue