Dev

Project.xml

@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin': CorruptCore Engine" file="CorruptCore" packageName="com.justin.corruptcore" package="com.justin.corruptcore" main="Main" version="0.2.0" company="JustX" />
+	<app title="Friday Night Funkin': CorruptCore Engine" file="CorruptCore" packageName="com.justin.corruptcore" package="com.justin.corruptcore" main="Main" version="0.3.0" company="JustX" />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
@@ -21,10 +21,10 @@
 	<!-- ____________________________ Window Settings ___________________________ -->
 
 	<!--These window settings apply to all targets-->
-	<window width="1280" height="720" background="#000000" hardware="true" vsync="false" allow-high-dpi="true"/>
+	<window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false" allow-high-dpi="true"/>
 
 	<!--HTML5-specific-->
-	<window if="html5" resizable="true" />
+	<window if="html5" resizable="true" vsync="true" />
 
 	<!--Desktop-specific-->
 	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false"/>
@@ -33,7 +33,7 @@
 	<window if="mobile" orientation="landscape" fullscreen="true" width="1280" height="720" resizable="false" allow-shaders="true" require-shaders="true"/>
 
 	<!--Switch-specific-->
-	<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
+	<window if="switch" orientation="landscape" fullscreen="true" width="1280" height="720" resizable="true" />
 
 	<!-- _____________________________ Path Settings ____________________________ -->
 
@@ -56,12 +56,12 @@
 	<define name="MODS_ALLOWED" if="desktop" />
 	<define name="LUA_ALLOWED" if="cpp" />
 	<define name="HSCRIPT_ALLOWED" />
-	<!--<define name="MODCHART_ALLOWED" />--> <!-- disabled for now-->
-	<define name="DISCORD_ALLOWED" if="desktop" unless="hl"/>
-	<define name="ACHIEVEMENTS_ALLOWED" />
-	<define name="VIDEOS_ALLOWED" if="desktop || mobile" unless="hl"/>
+	<define name="MODCHART_ALLOWED" />
+	<define name="DISCORD_ALLOWED" if="desktop cpp" />
+	<!--<define name="ACHIEVEMENTS_ALLOWED" />--> <!-- Not neccesary -->
+	<define name="VIDEOS_ALLOWED" if="cpp" />
 	<define name="TITLE_SCREEN_EASTER_EGG" if="officialBuild" /> <!-- DELETE THE if="officialBuild" for enabling this on an unofficial build -->
-	<define name="CRASH_HANDLER" unless="debug" />
+	<define name="CRASH_HANDLER" />
 
 	<section if="HSCRIPT_ALLOWED">
 		<define name="SCRIPTABLE_STATES" /> <!-- Adds haxe scripting support to the menus (need to enable HSCRIPT_ALLOWED)! -->
@@ -73,6 +73,7 @@
 
 	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
 	<assets path="assets/preload" rename="assets" exclude="*.mp3"  unless="web"/>
+
 	<section if="TITLE_SCREEN_EASTER_EGG">
 		<assets path="assets/secrets" rename="assets" exclude="*.ogg" if="web"/>
 		<assets path="assets/secrets" rename="assets" exclude="*.mp3"  unless="web"/>
@@ -102,12 +103,14 @@
 	<assets path="assets/shared"        library="shared"        exclude="*.ogg" if="web"/>
 	<assets path="assets/shared"        library="shared"        exclude="*.mp3" unless="web"/>
 
-	<assets path="assets/week6_sfx" rename="assets" exclude="*.ogg" if="web"/>
-	<assets path="assets/week6_sfx" rename="assets" exclude="*.mp3" unless="web"/>
-
 	<section if="MODS_ALLOWED">
 		<assets path='contents_file' rename='contents' embed='false'/>
 	</section>
+
+	<section if="INCLUDE_BASE_GAME">
+		<assets path="base_game" rename="contents/base_game" exclude="*.ogg" if="web"/>
+		<assets path="base_game" rename="contents/base_game" exclude="*.mp3" unless="web"/>
+	</section>
 	<!-- <template path='mods' /> -->
 
 	<assets path="psych-ui" library="psych-ui" rename="assets/psych-ui" embed="true" />
@@ -124,7 +127,7 @@
 	<assets path="assets/embed/sounds" rename="assets/sounds" embed='true'/>
 	<!-- _______________________________ Libraries ______________________________ -->
 
-	<haxelib name="flixel" version="6.1.0"/>
+	<haxelib name="flixel" version="6.1.1"/>
 	<haxedev set='webgl'/>
 
 	<!--<haxelib name="flixel-ui" /> fuck this shit ass creation-->
@@ -134,7 +137,8 @@
 	<haxelib name="tjson" />
 
 	<!--In case you want to use the ui package-->
-	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
+	<haxelib name="hxluajit" if="LUA_ALLOWED"/>
+	<haxelib name="hxluajit-wrapper" if="LUA_ALLOWED"/>
 	<haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>
 	<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
 	<haxelib name="faxe" if="switch"/>
@@ -145,16 +149,18 @@
 	<haxedef name="hscriptPos" />
 
 	<haxelib name="flixel-animate"/>
-	<haxelib name="flxsoundfilters" unless="flash || html5 || hl"/>
+	<haxelib name="flixel-waveform"/>
+	<haxelib name="flxsoundfilters" if="cpp"/>
 	<haxelib name="flxgif"/>
 	<haxelib name="hxcpp"/>
 
+	<haxelib name="away3d" />
+
 	<section if="cpp">
 		<haxelib name="sl-windows-api" if="windows" />
+		<haxelib name="hxopus" />
 	</section>
 
-	<haxelib name="funkin-modchart" if="MODCHART_ALLOWED"/>
-
 	<!-- Disable Discord IO Thread -->
 	<haxedef name="DISCORD_DISABLE_IO_THREAD" if="hxdiscord_rpc" />
 	<haxedef name="NO_PRECOMPILED_HEADERS" if="linux" />
@@ -179,16 +185,11 @@
 		<haxedef name="HXVLC_OPENAL" />
 	</section>
 
-	<section if="funkin-modchart">
-		<haxedef name="FM_ENGINE" value="PSYCH"/>
-		<haxedef name="FM_ENGINE_VERSION" value="0.6"/>
-
-		<haxeflag name="--macro" value="modchart.backend.macros.Macro.includeFiles()"/>
-	</section>
-
 	<!-- Basically Allows Videos To Render In Higher Quality On Higher Resoluttions -->
 	<haxedef name="openfl_dpi_aware" unless="web" />
 
+	<haxedef name='lime_disable_assets_version'/>
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 
@@ -234,6 +235,9 @@
 
 	<haxeflag name="--macro" value="game.backend.utils.MacroUtil.addScriptResources()" />
 
+	<!-- Disable Dead Code Elimination, because it breaks some stuff for scripting -->
+	<haxeflag name="-dce" value="no" if="HSCRIPT_ALLOWED || LUA_ALLOWED"/>
+
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
@@ -245,10 +249,10 @@
 
 	<!--Code Cleanup and Full Compile of Classes-->
 	<haxeflag name="--macro" value="allowPackage('flash')" />
-	<haxeflag name="--macro" value="include('hxvlc')" />
+	<haxeflag name="--macro" value="include('hxvlc')" if="VIDEOS_ALLOWED"/>
 
 	<!--Analyzer Optimization-->
-	<haxedef name="analyzer-optimize" />
+	<haxedef name="analyzer-optimize" unless="HSCRIPT_ALLOWED || LUA_ALLOWED"/>
 
 	<haxedef name='no-deprecation-warnings' />
 

art/unused stuff/FunkinText.hx

@@ -0,0 +1,192 @@
+package game.objects;
+
+import flixel.text.FlxText;
+import flixel.FlxCamera;
+import flixel.math.FlxPoint;
+import flixel.util.FlxColor;
+
+/**
+ * Enhanced FlxText with fixes for character clipping and rendering issues
+ */
+class FunkinText extends FlxText
+{
+    /**
+     * Enable pixel-perfect alignment to prevent sub-pixel positioning artifacts
+     */
+    public var pixelPerfect:Bool = true;
+
+    /**
+     * Additional font metrics correction for fonts with unusual character bounds
+     */
+    public var fontMetricsCorrection:Float = 0;
+
+    /**
+     * Horizontal gutter to prevent character clipping on sides
+     */
+    static inline var HORIZONTAL_GUTTER:Int = 4;
+
+    /**
+     * Vertical gutter to prevent character clipping on top/bottom
+     */
+    static inline var VERTICAL_GUTTER:Int = 8;
+
+    /**
+     * Creates a new FunkinText object with enhanced rendering
+     *
+     * @param   X              The x position of the text
+     * @param   Y              The y position of the text
+     * @param   FieldWidth     The width of the text object
+     * @param   Text           The actual text to display initially
+     * @param   Size           The font size for this text object
+     * @param   EmbeddedFont   Whether this text field uses embedded fonts
+     */
+    public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 8, EmbeddedFont:Bool = true)
+    {
+        super(X, Y, FieldWidth, Text, Size, EmbeddedFont);
+
+        // Apply additional horizontal padding by default
+        if (FieldWidth > 0)
+        {
+            this.fieldWidth = FieldWidth + HORIZONTAL_GUTTER;
+        }
+    }
+
+    /**
+     * Regenerate the text graphic with applied fixes
+     */
+    override function regenGraphic():Void
+    {
+        // Apply font metrics correction before regeneration
+        if (fontMetricsCorrection != 0 && _autoHeight && textField != null)
+        {
+            textField.height = textField.textHeight + fontMetricsCorrection;
+        }
+
+        super.regenGraphic();
+    }
+
+    /**
+     * Override drawSimple to apply pixel-perfect positioning
+     */
+    override function drawSimple(camera:FlxCamera):Void
+    {
+        getScreenPosition(_point, camera).subtract(offset).subtract(_graphicOffset);
+
+        if (pixelPerfect && isPixelPerfectRender(camera))
+        {
+            _point.x = Math.floor(_point.x);
+            _point.y = Math.floor(_point.y);
+        }
+
+        _point.copyTo(_flashPoint);
+        camera.copyPixels(_frame, framePixels, _flashRect, _flashPoint, colorTransform, blend, antialiasing);
+    }
+
+    /**
+     * Override drawComplex to apply pixel-perfect positioning
+     */
+    override function drawComplex(camera:FlxCamera):Void
+    {
+        _frame.prepareMatrix(_matrix, ANGLE_0, checkFlipX(), checkFlipY());
+        _matrix.translate(-origin.x, -origin.y);
+        _matrix.scale(scale.x, scale.y);
+
+        if (bakedRotationAngle <= 0)
+        {
+            updateTrig();
+
+            if (angle != 0)
+                _matrix.rotateWithTrig(_cosAngle, _sinAngle);
+        }
+
+        getScreenPosition(_point, camera).subtract(offset).subtract(_graphicOffset);
+        _point.add(origin.x, origin.y);
+        _matrix.translate(_point.x, _point.y);
+
+        if (pixelPerfect && isPixelPerfectRender(camera))
+        {
+            _matrix.tx = Math.floor(_matrix.tx);
+            _matrix.ty = Math.floor(_matrix.ty);
+        }
+
+        camera.drawPixels(_frame, framePixels, _matrix, colorTransform, blend, antialiasing, shader);
+    }
+
+    /**
+     * Apply preset configurations for different font types
+     *
+     * @param   preset   The font preset to apply
+     * @return  This FunkinText instance (for chaining)
+     */
+    public function setFontPreset(preset:FontPreset):FunkinText
+    {
+        switch(preset)
+        {
+            case PIXEL:
+                // Optimal for pixel fonts - disable antialiasing, enable pixel perfection
+                pixelPerfect = true;
+                fontMetricsCorrection = 2;
+
+            case SMOOTH:
+                // Optimal for smooth vector fonts - enable antialiasing, disable pixel perfection
+                pixelPerfect = false;
+                fontMetricsCorrection = 0;
+
+            case CLEAR:
+                // Balanced preset - enable both antialiasing and pixel perfection
+                pixelPerfect = true;
+                fontMetricsCorrection = 1;
+        }
+        _regen = true;
+        return this;
+    }
+
+    /**
+     * Set custom gutters for precise control over text padding
+     *
+     * @param   horizontal   Horizontal gutter size
+     * @param   vertical     Vertical gutter size
+     * @return  This FunkinText instance (for chaining)
+     */
+    public function setCustomGutters(horizontal:Int, vertical:Int):FunkinText
+    {
+        // Note: This would require overriding more internal methods to take effect
+        // For now, it serves as a reminder for future enhancements
+        return this;
+    }
+
+    /**
+     * Enable or disable pixel-perfect rendering
+     *
+     * @param   value   Whether to enable pixel-perfect rendering
+     * @return  This FunkinText instance (for chaining)
+     */
+    public function setPixelPerfect(value:Bool):FunkinText
+    {
+        pixelPerfect = value;
+        return this;
+    }
+
+    /**
+     * Set font metrics correction value
+     *
+     * @param   correction   Additional height correction for problematic fonts
+     * @return  This FunkinText instance (for chaining)
+     */
+    public function setFontMetricsCorrection(correction:Float):FunkinText
+    {
+        fontMetricsCorrection = correction;
+        _regen = true;
+        return this;
+    }
+}
+
+/**
+ * Font presets for different rendering requirements
+ */
+enum FontPreset
+{
+    PIXEL;    // For pixel fonts - crisp rendering without antialiasing
+    SMOOTH;   // For smooth vector fonts - best quality with antialiasing  
+    CLEAR;    // Balanced preset - good for most use cases
+}