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

Cleanup + Fixes + Mac/Linux cne.sh

Browse Source
This commit is contained in:
NeeEoo
2023-12-29 16:01:33 +01:00
parent a4771d9340
commit df6988dd3a
5 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cne.sh
Executable
+1
View File
@@ -0,0 +1 @@
haxe -cp commandline -D analyzer-optimize --run Main $@
source/funkin/backend/FunkinSprite.hx
+3 -3
View File
@@ -301,14 +301,14 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
public inline function getAnimOffset(name:String)
{
if (animOffsets[name] != null)
if (animOffsets.exists(name))
return animOffsets[name];
return FlxPoint.weak(0, 0);
}
public inline function hasAnimation(AnimName:String):Bool @:privateAccess
return animateAtlas != null ? (animateAtlas.anim.animsMap.exists(AnimName)
|| animateAtlas.anim.symbolDictionary.exists(AnimName)) : animation.getByName(AnimName) != null;
|| animateAtlas.anim.symbolDictionary.exists(AnimName)) : animation.exists(AnimName);
public inline function getAnimName()
{
@@ -333,7 +333,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
}
public inline function getNameList():Array<String> {
if (animateAtlas != null)
if (animateAtlas != null)
return [for (name in @:privateAccess animateAtlas.anim.animsMap.keys()) name];
else
return animation.getNameList();
source/funkin/backend/utils/CoolUtil.hx
+23 -22
View File
@@ -50,7 +50,7 @@ class CoolUtil
* Deletes a folder recursively
* @param delete Path to the folder.
*/
public static function deleteFolder(delete:String) {
@:noUsing public static function deleteFolder(delete:String) {
#if sys
if (!sys.FileSystem.exists(delete)) return;
var files:Array<String> = sys.FileSystem.readDirectory(delete);
@@ -156,7 +156,7 @@ class CoolUtil
* @param ratio Ratio
* @return Float Final value
*/
public static inline function fpsLerp(v1:Float, v2:Float, ratio:Float):Float {
@:noUsing public static inline function fpsLerp(v1:Float, v2:Float, ratio:Float):Float {
return FlxMath.lerp(v1, v2, getFPSRatio(ratio));
}
/**
@@ -166,7 +166,7 @@ class CoolUtil
* @param ratio Ratio
* @param fpsSensitive Whenever the ratio should be fps sensitive (adapted when game is running at 120 instead of 60)
*/
public static inline function lerpColor(color1:FlxColor, color2:FlxColor, ratio:Float, fpsSensitive:Bool = false) {
@:noUsing public static inline function lerpColor(color1:FlxColor, color2:FlxColor, ratio:Float, fpsSensitive:Bool = false) {
if (!fpsSensitive)
ratio = getFPSRatio(ratio);
return FlxColor.interpolate(color1, color2, ratio);
@@ -177,7 +177,7 @@ class CoolUtil
* @param ratio Ratio
* @return FPS-Modified Ratio
*/
public static inline function getFPSRatio(ratio:Float):Float {
@:noUsing public static inline function getFPSRatio(ratio:Float):Float {
return FlxMath.bound(ratio * 60 * FlxG.elapsed, 0, 1);
}
/**
@@ -205,10 +205,10 @@ class CoolUtil
for(k=>e in array) {
if (e is Int || e is Float) {
switch(k) {
case 0: r = Std.int(e);
case 1: g = Std.int(e);
case 2: b = Std.int(e);
case 3: a = Std.int(e);
case 0: r = Std.int(e);
case 1: g = Std.int(e);
case 2: b = Std.int(e);
case 3: a = Std.int(e);
}
}
}
@@ -221,7 +221,7 @@ class CoolUtil
* Plays the main menu theme.
* @param fadeIn
*/
public static function playMenuSong(fadeIn:Bool = false) {
@:noUsing public static function playMenuSong(fadeIn:Bool = false) {
if (FlxG.sound.music == null || !FlxG.sound.music.playing)
{
playMusic(Paths.music('freakyMenu'), true, fadeIn ? 0 : 1, true, 102);
@@ -236,7 +236,7 @@ class CoolUtil
* @param name Character name
* @param spriteName (Optional) sprite name.
*/
public static function preloadCharacter(name:String, ?spriteName:String) {
@:noUsing public static function preloadCharacter(name:String, ?spriteName:String) {
if (name == null) return;
if (spriteName == null)
spriteName = name;
@@ -253,7 +253,7 @@ class CoolUtil
* @param Looped Whenever the music loops (true)
* @param Group A group that this music belongs to (default)
*/
public static function playMusic(path:String, Persist:Bool = false, Volume:Int = 1, Looped:Bool = true, DefaultBPM:Int = 102, ?Group:FlxSoundGroup) {
@:noUsing public static function playMusic(path:String, Persist:Bool = false, Volume:Int = 1, Looped:Bool = true, DefaultBPM:Int = 102, ?Group:FlxSoundGroup) {
Conductor.reset();
FlxG.sound.playMusic(path, Volume, Looped, Group);
if (FlxG.sound.music != null) {
@@ -264,20 +264,21 @@ class CoolUtil
if (Assets.exists(infoPath)) {
var musicInfo = IniUtil.parseAsset(infoPath, [
"BPM" => null,
"TimeSignature" => "2/2"
"TimeSignature" => "4/4"
]);
var timeSignParsed:Array<Null<Float>> = musicInfo["TimeSignature"] == null ? [] : [for(s in musicInfo["TimeSignature"].split("/")) Std.parseFloat(s)];
var beatsPerMeasure:Float = 4;
var stepsPerBeat:Float = 4;
// Check later, i dont think timeSignParsed can contain null, only nan
if (timeSignParsed.length == 2 && !timeSignParsed.contains(null)) {
beatsPerMeasure = timeSignParsed[0] == null || timeSignParsed[0] <= 0 ? 4 : cast timeSignParsed[0];
stepsPerBeat = timeSignParsed[1] == null || timeSignParsed[1] <= 0 ? 4 : cast timeSignParsed[1];
}
var parsedBPM:Null<Float> = Std.parseFloat(musicInfo["BPM"]);
Conductor.changeBPM(parsedBPM == null ? DefaultBPM : parsedBPM, beatsPerMeasure, stepsPerBeat);
var bpm:Null<Float> = Std.parseFloat(musicInfo["BPM"]).getDefault(DefaultBPM);
Conductor.changeBPM(bpm, beatsPerMeasure, stepsPerBeat);
} else
Conductor.changeBPM(DefaultBPM);
}
@@ -287,7 +288,7 @@ class CoolUtil
* @param menuSFX Menu SFX to play
* @param volume At which volume it should play
*/
public static inline function playMenuSFX(menuSFX:CoolSfx = SCROLL, volume:Float = 1) {
@:noUsing public static inline function playMenuSFX(menuSFX:CoolSfx = SCROLL, volume:Float = 1) {
FlxG.sound.play(Paths.sound(switch(menuSFX) {
case CONFIRM: 'menu/confirm';
case CANCEL: 'menu/cancel';
@@ -309,7 +310,7 @@ class CoolUtil
* @param path
* @return Array<String>
*/
public static function coolTextFile(path:String):Array<String>
@:noUsing public static function coolTextFile(path:String):Array<String>
{
var trim:String;
return [for(line in Assets.getText(path).split("\n")) if ((trim = line.trim()) != "" && !trim.startsWith("#")) trim];
@@ -321,7 +322,7 @@ class CoolUtil
* @param min Minimal value (0)
* @return Array<Int> Final array
*/
public static inline function numberArray(max:Int, ?min:Int = 0):Array<Int>
@:noUsing public static inline function numberArray(max:Int, ?min:Int = 0):Array<Int>
{
return [for (i in min...max) i];
}
@@ -331,7 +332,7 @@ class CoolUtil
* @param anim1 First animation
* @param anim2 Second animation
*/
public static function switchAnimFrames(anim1:FlxAnimation, anim2:FlxAnimation) {
@:noUsing public static function switchAnimFrames(anim1:FlxAnimation, anim2:FlxAnimation) {
if (anim1 == null || anim2 == null) return;
var old = anim1.frames;
anim1.frames = anim2.frames;
@@ -491,7 +492,7 @@ class CoolUtil
/**
* Gets the macro class created by hscript-improved for an abstract / enum
*/
public static inline function getMacroAbstractClass(className:String) {
@:noUsing public static inline function getMacroAbstractClass(className:String) {
return Type.resolveClass('${className}_HSC');
}
@@ -537,7 +538,7 @@ class CoolUtil
* Opens an URL in the browser.
* @param url
*/
public static inline function openURL(url:String) {
@:noUsing public static inline function openURL(url:String) {
#if linux
Sys.command('/usr/bin/xdg-open', [url, "&"]);
#else
@@ -567,7 +568,7 @@ class CoolUtil
* @param p2
* @return return p1 < p2 ? p2 : p1
*/
public static inline function maxInt(p1:Int, p2:Int)
@:noUsing public static inline function maxInt(p1:Int, p2:Int)
return p1 < p2 ? p2 : p1;
/**
@@ -581,7 +582,7 @@ class CoolUtil
return r;
}
public static inline function quantize(Value:Float, Quant:Float) {
@:noUsing public static inline function quantize(Value:Float, Quant:Float) {
return Math.fround(Value * Quant) / Quant;
}
source/funkin/menus/PauseSubState.hx
+3 -2
View File
@@ -42,7 +42,7 @@ class PauseSubState extends MusicBeatSubstate
{
super.create();
if (menuItems.contains("Exit to charter") && !PlayState.chartingMode)
if (menuItems.contains("Exit to charter") && !PlayState.chartingMode)
menuItems.remove("Exit to charter");
add(parentDisabler = new FunkinParentDisabler());
@@ -64,9 +64,10 @@ class PauseSubState extends MusicBeatSubstate
if (__cancelDefault = event.cancelled) return;
var bg:FlxSprite = new FlxSprite().makeSolid(FlxG.width, FlxG.height, FlxColor.BLACK);
var bg:FlxSprite = new FlxSprite().makeSolid(FlxG.width + 100, FlxG.height + 100, FlxColor.BLACK);
bg.updateHitbox();
bg.alpha = 0;
bg.screenCenter();
bg.scrollFactor.set();
add(bg);
source/funkin/menus/ui/Alphabet.hx
+8 -9
View File
@@ -28,8 +28,6 @@ class Alphabet extends FlxSpriteGroup
var _finalText:String = "";
var _curText:String = "";
public var widthOfWords:Float = FlxG.width;
var yMulti:Float = 1;
// custom shit
@@ -156,7 +154,7 @@ class Alphabet extends FlxSpriteGroup
splitWords = _finalText.split("");
}
public var personTalking:String = 'gf';
//public var personTalking:String = 'gf';
public function startTypedText():Void
{
@@ -202,9 +200,7 @@ class Alphabet extends FlxSpriteGroup
_finalText = text;
for(e in members)
e.destroy();
@:privateAccess
group.members = [];
_sprites = cast group.members;
members.clear();
lastSprite = null;
addText();
}
@@ -243,9 +239,11 @@ class AlphaCharacter extends FlxSprite
public function createBold(letter:String)
{
letter = letter.toUpperCase();
if (boldAnims[letter] == null) {
if(!boldAnims.exists(letter))
letter = letter.toUpperCase();
if (!boldAnims.exists(letter)) {
visible = false;
active = false;
scale.set();
width = 40;
return;
@@ -258,8 +256,9 @@ class AlphaCharacter extends FlxSprite
public function createLetter(letter:String):Void
{
if (letterAnims[letter] == null) {
if (!letterAnims.exists(letter)) {
visible = false;
active = false;
scale.set();
width = 40;
return;