gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gf-tankmen optimisation

Browse Source
This commit is contained in:
Yoshman29
2023-02-01 22:48:36 +01:00
parent bcb3b1271a
commit 25f49c9dab
12 changed files with 29699 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/characters/gf-tankmen.xml
+4 -4
View File
@@ -1,6 +1,6 @@
<!DOCTYPE codename-engine-character>
<character isPlayer="false" flipX="false" isGF="true">
<anim name="danceLeft" anim="GF Dancing at Gunpoint" fps="24" loop="false" x="0" y="-9" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
<anim name="danceRight" anim="GF Dancing at Gunpoint" fps="24" loop="false" x="0" y="-9" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
<anim name="sad" anim="GF Crying at Gunpoint" fps="24" loop="true" x="-2" y="-21" indices="0,1,2,3,4,5,6,7,8,9,10,11,12"/>
<character isPlayer="false" flipX="false" isGF="true" x="175" y="325">
<anim name="danceLeft" anim="GF Dancing at Gunpoint" fps="24" loop="false" x="0" y="0" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
<anim name="danceRight" anim="GF Dancing at Gunpoint" fps="24" loop="false" x="0" y="0" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
<anim name="sad" anim="GF Crying at Gunpoint" fps="24" loop="true" x="0" y="0" indices="0,1,2,3,4,5,6,7,8,9,10,11,12"/>
</character>
assets/data/characters/pico-speakers.xml
+3 -3
View File
@@ -4,13 +4,13 @@
<anim name="shoot1" anim="Pico shoot 1" fps="24" loop="false" indices="0,1,2,3" />
<anim name="idle1" anim="Pico shoot 1" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
<anim name="shoot2" anim="Pico shoot 2" fps="24" loop="false" indices="0,1,2,3" x="-1" y="-128" />
<anim name="shoot2" anim="Pico shoot 2" fps="24" loop="false" indices="0,1,2,3" />
<anim name="idle2" anim="Pico shoot 2" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" x="-1" y="-128" />
<!-- Right Animations-->
<anim name="shoot3" anim="Pico shoot 3" fps="24" loop="false" indices="0,1,2,3" x="412" y="-64" />
<anim name="shoot3" anim="Pico shoot 3" fps="24" loop="false" indices="0,1,2,3" />
<anim name="idle3" anim="Pico shoot 3" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" x="412" y="-64" />
<anim name="shoot4" anim="Pico shoot 4" fps="24" loop="false" indices="0,1,2,3" x="439" y="-19" />
<anim name="shoot4" anim="Pico shoot 4" fps="24" loop="false" indices="0,1,2,3" />
<anim name="idle4" anim="Pico shoot 4" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" x="439" y="-19" />
</character>
assets/images/characters/gf-tankmen.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 MiB

assets/images/characters/gf-tankmen.xml
-70
View File
@@ -1,70 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="gfTankmen.png">
<!-- Created with Adobe Animate version 21.0.0.35450 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="GF Crying at Gunpoint 0000" x="1824" y="1926" width="911" height="625" frameX="0" frameY="-5" frameWidth="911" frameHeight="630"/>
<SubTexture name="GF Crying at Gunpoint 0001" x="1824" y="1926" width="911" height="625" frameX="0" frameY="-5" frameWidth="911" frameHeight="630"/>
<SubTexture name="GF Crying at Gunpoint 0002" x="0" y="1925" width="911" height="629" frameX="0" frameY="-1" frameWidth="911" frameHeight="630"/>
<SubTexture name="GF Crying at Gunpoint 0003" x="0" y="1925" width="911" height="629" frameX="0" frameY="-1" frameWidth="911" frameHeight="630"/>
<SubTexture name="GF Crying at Gunpoint 0004" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0005" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0006" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0007" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0008" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0009" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0010" x="4569" y="1922" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0011" x="4569" y="1922" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0012" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0013" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0014" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0015" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0016" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0017" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0018" x="4569" y="1922" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0019" x="4569" y="1922" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0020" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0021" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0022" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0023" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0024" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0025" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0026" x="4569" y="1922" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0027" x="4569" y="1922" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0028" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0029" x="4569" y="1288" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0030" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0031" x="0" y="1291" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0032" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0033" x="915" y="1292" width="911" height="630"/>
<SubTexture name="GF Crying at Gunpoint 0034" x="4569" y="1922" width="911" height="630"/>
<SubTexture name="GF Dancing at Gunpoint0000" x="6399" y="1287" width="907" height="634" frameX="-2" frameY="-14" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0001" x="2737" y="1288" width="907" height="634" frameX="-2" frameY="-14" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0002" x="6399" y="1925" width="905" height="632" frameX="-3" frameY="-16" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0003" x="915" y="1926" width="905" height="632" frameX="-3" frameY="-16" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0004" x="3660" y="647" width="911" height="635" frameX="0" frameY="-13" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0005" x="0" y="652" width="911" height="635" frameX="0" frameY="-13" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0006" x="5490" y="646" width="911" height="637" frameX="0" frameY="-11" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0007" x="0" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0008" x="0" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0009" x="0" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0010" x="915" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0011" x="915" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0012" x="915" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0013" x="1830" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0014" x="1830" y="0" width="911" height="648"/>
<SubTexture name="GF Dancing at Gunpoint0015" x="915" y="652" width="907" height="636" frameX="-2" frameY="-12" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0016" x="1826" y="652" width="907" height="636" frameX="-2" frameY="-12" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0017" x="3660" y="1286" width="905" height="636" frameX="-3" frameY="-12" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0018" x="5490" y="1287" width="905" height="636" frameX="-3" frameY="-12" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0019" x="6405" y="646" width="911" height="637" frameX="0" frameY="-11" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0020" x="2745" y="647" width="911" height="637" frameX="0" frameY="-11" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0021" x="4575" y="646" width="911" height="638" frameX="0" frameY="-10" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0022" x="2745" y="0" width="911" height="643" frameX="0" frameY="-5" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0023" x="2745" y="0" width="911" height="643" frameX="0" frameY="-5" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0024" x="3660" y="0" width="911" height="643" frameX="0" frameY="-5" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0025" x="4575" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0026" x="4575" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0027" x="5490" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0028" x="6405" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
<SubTexture name="GF Dancing at Gunpoint0029" x="6405" y="0" width="911" height="642" frameX="0" frameY="-6" frameWidth="911" frameHeight="648"/>
</TextureAtlas>
assets/images/characters/gf-tankmen/Animation.json
+29580
View File
File diff suppressed because it is too large Load Diff
assets/images/characters/gf-tankmen/spritemap1.json
+43
View File
@@ -0,0 +1,43 @@
{"ATLAS": {"SPRITES":[
{"SPRITE" : {"name": "0000","x":205,"y":352,"w":183,"h":115,"rotated": false}},
{"SPRITE" : {"name": "0001","x":1608,"y":394,"w":84,"h":140,"rotated": false}},
{"SPRITE" : {"name": "0002","x":1903,"y":162,"w":111,"h":149,"rotated": false}},
{"SPRITE" : {"name": "0003","x":824,"y":365,"w":251,"h":121,"rotated": false}},
{"SPRITE" : {"name": "0004","x":1899,"y":458,"w":120,"h":65,"rotated": false}},
{"SPRITE" : {"name": "0005","x":1903,"y":311,"w":102,"h":147,"rotated": false}},
{"SPRITE" : {"name": "0006","x":1434,"y":417,"w":76,"h":117,"rotated": false}},
{"SPRITE" : {"name": "0007","x":2005,"y":311,"w":35,"h":53,"rotated": false}},
{"SPRITE" : {"name": "0008","x":2005,"y":364,"w":36,"h":46,"rotated": false}},
{"SPRITE" : {"name": "0009","x":254,"y":467,"w":47,"h":51,"rotated": false}},
{"SPRITE" : {"name": "0010","x":2014,"y":162,"w":33,"h":47,"rotated": false}},
{"SPRITE" : {"name": "0011","x":205,"y":467,"w":49,"h":88,"rotated": false}},
{"SPRITE" : {"name": "0012","x":1523,"y":394,"w":85,"h":143,"rotated": false}},
{"SPRITE" : {"name": "0013","x":2021,"y":0,"w":1,"h":4,"rotated": false}},
{"SPRITE" : {"name": "0014","x":809,"y":0,"w":300,"h":365,"rotated": false}},
{"SPRITE" : {"name": "0015","x":1109,"y":0,"w":355,"h":212,"rotated": false}},
{"SPRITE" : {"name": "0016","x":1317,"y":245,"w":206,"h":172,"rotated": false}},
{"SPRITE" : {"name": "0017","x":411,"y":350,"w":206,"h":172,"rotated": false}},
{"SPRITE" : {"name": "0018","x":0,"y":352,"w":205,"h":167,"rotated": false}},
{"SPRITE" : {"name": "0019","x":617,"y":365,"w":207,"h":164,"rotated": false}},
{"SPRITE" : {"name": "0020","x":0,"y":0,"w":411,"h":352,"rotated": false}},
{"SPRITE" : {"name": "0021","x":411,"y":0,"w":398,"h":350,"rotated": false}},
{"SPRITE" : {"name": "0022","x":1692,"y":0,"w":329,"h":162,"rotated": false}},
{"SPRITE" : {"name": "0023","x":1809,"y":398,"w":90,"h":103,"rotated": false}},
{"SPRITE" : {"name": "0024","x":1692,"y":162,"w":211,"h":236,"rotated": false}},
{"SPRITE" : {"name": "0025","x":1109,"y":212,"w":208,"h":235,"rotated": false}},
{"SPRITE" : {"name": "0026","x":1523,"y":245,"w":165,"h":149,"rotated": false}},
{"SPRITE" : {"name": "0027","x":1464,"y":0,"w":228,"h":245,"rotated": false}},
{"SPRITE" : {"name": "0028","x":1692,"y":398,"w":117,"h":83,"rotated": false}},
{"SPRITE" : {"name": "0029","x":1317,"y":417,"w":117,"h":83,"rotated": false}},
{"SPRITE" : {"name": "0030","x":1192,"y":447,"w":103,"h":83,"rotated": false}},
{"SPRITE" : {"name": "0031","x":1075,"y":447,"w":117,"h":83,"rotated": false}}
]},
"meta": {
"app": "Adobe Animate",
"version": "21.0.1.37179",
"image": "spritemap1.png",
"format": "RGBA8888",
"size": {"w":2047,"h":555},
"resolution": "1"
}
}
assets/images/characters/gf-tankmen/spritemap1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 180 KiB

assets/images/desktop/ui/taskbar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 151 B

assets/songs/stress/scripts/chart.hx
+1 -1
View File
@@ -3,7 +3,7 @@ import openfl.utils.Assets;
function onNoteCreation(event) {
if (event.noteType != null || event.note.noteTypeID > 0) {
// event.note.visible = false;
event.note.playerID = 2;
event.note.strumLineID = 2;
}
}
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
2207
2212
source/funkin/desktop/DesktopScreen.hx
+55
View File
@@ -0,0 +1,55 @@
package funkin.desktop;
import flixel.util.FlxDestroyUtil.IFlxDestroyable;
import flixel.FlxCamera;
import openfl.events.Event;
import flixel.FlxG;
import lime.app.Application;
import lime.ui.Window;
class DesktopScreen implements IFlxDestroyable {
public var cameras:Array<FlxCamera> = [];
public var window:Window;
public function new() {
window = Application.current.createWindow({
x: 0,
y: 0,
width: FlxG.width,
height: FlxG.height
});
@:privateAccess
Application.current.__addWindow(window);
window.stage.addEventListener(Event.ENTER_FRAME, onFrameEnter);
FlxG.signals.preDraw.add(__onPreDraw);
FlxG.signals.postDraw.add(__onPostDraw);
window.onClose.add(destroy);
}
public function addCamera(cam:FlxCamera) {
cameras.push(cam);
window.stage.addChild(cam.flashSprite);
}
private inline function __onPreDraw() {}
private inline function __onPostDraw() {}
private function onFrameEnter(event:Event) {
try {
@:privateAccess
for(c in cameras)
c.render();
} catch(e) {
trace(e.toString());
}
}
public function destroy() {
for(c in cameras)
c.destroy();
window.close();
}
}
source/funkin/menus/MainMenuState.hx
+12 -1
View File
@@ -103,9 +103,20 @@ class MainMenuState extends MusicBeatState
if (!selectedSomethin)
{
if (canAccessDebugMenus)
if (canAccessDebugMenus) {
if (FlxG.keys.justPressed.SEVEN)
FlxG.switchState(new funkin.desktop.DesktopMain());
if (FlxG.keys.justPressed.EIGHT) {
var scr = new funkin.desktop.DesktopScreen();
var camList = [for(c in FlxG.cameras.list) c];
for(c in camList) {
FlxG.cameras.remove(c, false);
scr.addCamera(c);
}
cameras = camList;
}
}
if (controls.UP_P)
changeItem(-1);