IM HIM

- renamed some conditional flags to be more specific and (as always) more consistent
- reformatted some files
- added a data util class for manipulating, well, DATA, in specifically variables
- added way more mechanics for the text box class (you can now type in it!)
- added a (currently very broken) cursor for the text box class
- the web version of the game now also has *a* filter rather than looking bland all the time
- some other bullshit i cant remember at the top of my head right now because its 5:30 in the morning

Author: stringfromjava

.vscode/settings.json

@@ -12,9 +12,10 @@
   },
   "haxe.enableExtendedIndentation": true,
   "cSpell.words": [
-    "GRAVEACCENT",
+    "openeditors",
     "Haxe",
     "IBEAM",
+    "GRAVEACCENT",
     "NUMPADEIGHT",
     "NUMPADFIVE",
     "NUMPADFOUR",
@@ -29,7 +30,6 @@
     "NUMPADTHREE",
     "NUMPADTWO",
     "NUMPADZERO",
-    "NUMPADSLASH",
-    "openeditors"
+    "NUMPADSLASH"
   ]
 }

assets/shaders/grayscale.frag

@@ -6,15 +6,17 @@ uniform float _amount;
 // Converts the input image to grayscale, with `_amount` representing the proportion of the conversion.
 
 // See https://drafts.fxtf.org/filter-effects/#grayscaleEquivalent
-vec4 to_grayscale(vec4 input_rgba) {
+vec4 to_grayscale(vec4 input_rgba)
+{
     float red = (0.2126 + 0.7874 * (1.0 - _amount)) * input_rgba.r + (0.7152 - 0.7152  * (1.0 - _amount)) * input_rgba.g + (0.0722 - 0.0722 * (1.0 - _amount)) * input_rgba.b;
     float green = (0.2126 - 0.2126 * (1.0 - _amount)) * input_rgba.r + (0.7152 + 0.2848  * (1.0 - _amount)) * input_rgba.g + (0.0722 - 0.0722 * (1.0 - _amount)) * input_rgba.b;
     float blue = (0.2126 - 0.2126 * (1.0 - _amount)) * input_rgba.r + (0.7152 - 0.7152  * (1.0 - _amount)) * input_rgba.g + (0.0722 + 0.9278 * (1.0 - _amount)) * input_rgba.b;
 
     return vec4(red, green, blue, input_rgba.a);
 }
 
-void main() {
+void main()
+{
 	// Get the texture to apply to.
 	vec4 color = flixel_texture2D(bitmap, openfl_TextureCoordv);
 

assets/shaders/hueshift.frag

@@ -1,7 +1,8 @@
 #pragma header
 uniform float hue;
 
-vec3 rgb2hsv(vec3 c) {
+vec3 rgb2hsv(vec3 c)
+{
     vec4 K = vec4(0., -1./3., 2./3., -1.);
     vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
     vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
@@ -11,12 +12,14 @@ vec3 rgb2hsv(vec3 c) {
     return vec3(abs(q.z + (q.w - q.y) / (6. * d + e)), d / (q.x + e), q.x);
 }
 
-vec3 hsv2rgb(vec3 c) {
+vec3 hsv2rgb(vec3 c)
+{
     vec3 rgb = clamp(abs(mod(c.x * 6. + vec3(0., 4., 2.), 6.) - 3.) - 1., 0., 1.);
     return c.z * mix(vec3(1.), rgb, c.y);
 }
 
-void main() {
+void main()
+{
     vec4 color = flixel_texture2D(bitmap, openfl_TextureCoordv);
     vec3 hsv = rgb2hsv(color.rgb);
     hsv.x = mod(hsv.x + hue, 1.0);

assets/shaders/scanline.frag

@@ -4,7 +4,11 @@ const float scale = 1.0;
 void main()
 {
     if (mod(floor(openfl_TextureCoordv.y * openfl_TextureSize.y / scale), 2.0) == 0.0)
+    {
         gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);
+    }
     else
+    {
         gl_FragColor = texture2D(bitmap, openfl_TextureCoordv);
+    }
 }

assets/shaders/vcrborder.frag

@@ -1,6 +1,7 @@
 #pragma header
 
-vec2 curve(vec2 uv) {
+vec2 curve(vec2 uv)
+{
     uv = (uv - 0.5) * 2.0;
     uv *= 1.1;	
     uv.x *= 1.0 + pow((abs(uv.y) / 5.0), 2.0); // Increased horizontal distortion

assets/shaders/vcrmario85.frag

@@ -7,15 +7,18 @@ uniform float time;
 // Noise generation functions borrowed from: 
 // https://github.com/ashima/webgl-noise/blob/master/src/noise2D.glsl
 
-vec3 mod289(vec3 x) {
+vec3 mod289(vec3 x)
+{
 	return x - floor(x * (1.0 / 289.0)) * 289.0;
 }
 
-vec2 mod289(vec2 x) {
+vec2 mod289(vec2 x)
+{
 	return x - floor(x * (1.0 / 289.0)) * 289.0;
 }
 
-vec3 permute(vec3 x) {
+vec3 permute(vec3 x)
+{
 	return mod289(((x*34.0)+1.0)*x);
 }
 
@@ -68,7 +71,8 @@ float snoise(vec2 v)
 	return 130.0 * dot(m, g);
 }
 
-void main() {
+void main()
+{
 	float fuzzOffset = snoise(vec2(time*15.0,openfl_TextureCoordv.y*80.0))*0.0005;
 	float largeFuzzOffset = snoise(vec2(time*1.0,openfl_TextureCoordv.y*25.0))*0.001;
 	float xOffset = (fuzzOffset + largeFuzzOffset);

project.hxp

@@ -92,26 +92,26 @@ class Project extends HXProject
 
 	//
 	// FEATURE FLAGS
-	// Inverse feature flags are automatically populated.
-	//
+	// (Inverse feature flags are automatically populated)
+	// ===========================================================================
 
 	/**
 	 * Allows the game to be displayed in the user's Discord "Activity" box 
 	 * (it can still be disabled by the user in-game if the option is off).
 	 */
-	static final DISCORD_ALLOWED:FeatureFlag = 'DISCORD_ALLOWED';
+	static final DISCORD_RPC_ALLOWED:FeatureFlag = 'DISCORD_RPC_ALLOWED';
 
 	/**
-	 * Enables the game to use filters, giving it a more unsettling and unnerving vibe.
+	 * Enables the game to use advanced shaders, giving it a more unsettling and unnerving vibe.
 	 * Sort of like the analog horror videos you see on YouTube.
 	 */
-	static final SHADERS_ALLOWED:FeatureFlag = 'SHADERS_ALLOWED';
+	static final ADVANCED_SHADERS_ALLOWED:FeatureFlag = 'ADVANCED_SHADERS_ALLOWED';
 
 	/**
 	 * Allows the developer(s) to use built-in editors, 
 	 * such as creating animations for entities.
 	 */
-	static final EDITORS_ALLOWED:FeatureFlag = 'EDITORS_ALLOWED';
+	static final DEBUG_EDITORS_ALLOWED:FeatureFlag = 'DEBUG_EDITORS_ALLOWED';
 
 	/**
 	 * Permits the game to use a built-in logging system, which writes all 
@@ -134,9 +134,9 @@ class Project extends HXProject
 		configureApp();
 
 		displayTarget();
+		configureOutputDir();
 		configureFeatureFlags();
 		configureCompileDefines();
-		configureOutputDir();
 		configureHaxelibs();
 		configureAssets();
 		configureIcons(); // TODO: Implement code when icons are made!
@@ -155,6 +155,7 @@ class Project extends HXProject
 		info('Git Commit:     ' + getGitCommit());
 		info('Git Modified?   ' + getGitModified());
 		info('Display?        ' + isDisplay());
+		info('-------------------------------------------------------------');
 	}
 
 	/**
@@ -356,15 +357,15 @@ class Project extends HXProject
 	{
 		// Enable Discord rich presence
 		// (works only for Windows)
-		DISCORD_ALLOWED.apply(this, isWindows());
+		DISCORD_RPC_ALLOWED.apply(this, isWindows());
 
 		// Enable dope ass screen filters
 		// (if the platform is on desktop)
-		SHADERS_ALLOWED.apply(this, isDesktop());
+		ADVANCED_SHADERS_ALLOWED.apply(this, isDesktop());
 
 		// Enable the editors if the game is in debug mode,
 		// otherwise, disable them of course
-		EDITORS_ALLOWED.apply(this, isDesktop() && isDebug());
+		DEBUG_EDITORS_ALLOWED.apply(this, isDesktop() && isDebug());
 
 		// Enables dope ass logging
 		// (only works on desktop)
@@ -373,6 +374,8 @@ class Project extends HXProject
 		// Allows the game to programmatically change sounds
 		// (only works on desktop)
 		SOUND_FILTERS_ALLOWED.apply(this, isDesktop());
+
+		info('-------------------------------------------------------------');
 	}
 
 	/**
@@ -417,6 +420,7 @@ class Project extends HXProject
 		buildDir += '/';
 		info('Output Directory: $buildDir');
 		app.path = buildDir;
+		info('-------------------------------------------------------------');
 	}
 
 	function configureHaxelibs()
@@ -450,7 +454,7 @@ class Project extends HXProject
 		}
 
 		// Discord rich presence
-		if (DISCORD_ALLOWED.isEnabled(this))
+		if (DISCORD_RPC_ALLOWED.isEnabled(this))
 		{
 			addHaxelib('hxdiscord_rpc');
 		}
@@ -475,10 +479,7 @@ class Project extends HXProject
 		addAssetPath('assets/shared/images', 'assets/shared/images', 'default', ['*.png'], []);
 
 		// Add shader frag assets
-		if (isDesktop())
-		{
-			addAssetPath('assets/shaders', 'assets/shaders', 'default', ['*.frag'], []);
-		}
+		addAssetPath('assets/shaders', 'assets/shaders', 'default', ['*.frag'], []);
 
 		// Add shared music and sound assets for web (.mp3)
 		if (isWeb())

source/InitState.hx

@@ -1,5 +1,7 @@
 package;
 
+import starcore.backend.util.SaveUtil;
+import openfl.events.KeyboardEvent;
 import flixel.FlxG;
 import flixel.FlxState;
 import flixel.math.FlxMath;
@@ -15,10 +17,8 @@ import starcore.backend.util.FlixelUtil;
 import starcore.backend.util.LoggerUtil;
 import starcore.backend.util.PathUtil;
 import starcore.menus.MainMenuState;
-#if DISCORD_ALLOWED
 import starcore.backend.api.DiscordClient;
-#end
-#if SHADERS_ALLOWED
+#if ADVANCED_SHADERS_ALLOWED
 import starcore.shaders.*;
 #end
 #if web
@@ -57,9 +57,7 @@ class InitState extends FlxState
 		registerEntities();
 
 		// Start up Discord rich presence
-		#if DISCORD_ALLOWED
 		DiscordClient.initialize();
-		#end
 
 		// Switch to the main menu state after everything has loaded
 		FlxG.switchState(() -> new MainMenuState());
@@ -101,7 +99,7 @@ class InitState extends FlxState
 		#end
 
 		// Assign the shaders AFTER all assets have been loaded!
-		#if SHADERS_ALLOWED
+		#if ADVANCED_SHADERS_ALLOWED
 		CacheUtil.vcrBorderFilter = new VCRBorderShader();
 		CacheUtil.vcrMario85Filter = new VCRMario85Shader();
 		#end
@@ -113,7 +111,7 @@ class InitState extends FlxState
 		LoggerUtil.log('Adding background processes');
 		// Update the shaders that need to
 		// constantly be reset
-		#if SHADERS_ALLOWED
+		#if ADVANCED_SHADERS_ALLOWED
 		FlxG.signals.postUpdate.add(() ->
 		{
 			CacheUtil.vcrMario85Filter.update(FlxG.elapsed);
@@ -163,6 +161,16 @@ class InitState extends FlxState
 		});
 		#end
 
+		#if (web && debug)
+		FlxG.stage.addEventListener(KeyboardEvent.KEY_DOWN, (_) ->
+		{
+			if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.BACKSPACE)
+			{
+				SaveUtil.deleteAll();
+			}
+		});
+		#end
+
 		// Do shit like saving the user's data when the game closes
 		Application.current.window.onClose.add(() ->
 		{

source/starcore/backend/api/DiscordClient.hx

@@ -1,18 +1,18 @@
 package starcore.backend.api;
 
 import starcore.backend.data.Constants;
-#if DISCORD_ALLOWED
 import starcore.backend.util.LoggerUtil;
 import starcore.backend.data.ClientPrefs;
+#if DISCORD_RPC_ALLOWED
 import cpp.RawConstPointer;
 import hxdiscord_rpc.Discord;
 import hxdiscord_rpc.Types.DiscordRichPresence;
-import lime.app.Application;
 import sys.thread.Thread;
+#end
+import lime.app.Application;
 
 /**
- * Class that handles Discord rich presence for the client's
- * "Activity" box.
+ * Class that handles Discord rich presence for the client's "Activity" box.
  */
 final class DiscordClient
 {
@@ -25,6 +25,7 @@ final class DiscordClient
 	 */
 	public static function initialize():Void
 	{
+		#if DISCORD_RPC_ALLOWED
 		if (ClientPrefs.getOption('discordRPC'))
 		{
 			// Log info
@@ -55,15 +56,17 @@ final class DiscordClient
 		{
 			shutdown();
 		});
+		#end
 	}
 
 	/**
 	 * Shutdowns Discord rich presence.
 	 */
 	public static function shutdown():Void
 	{
+		#if DISCORD_RPC_ALLOWED
 		LoggerUtil.log('Shutting down Discord rich presence');
 		Discord.Shutdown();
+		#end
 	}
 }
-#end

source/starcore/backend/data/ClientPrefs.hx

@@ -15,7 +15,7 @@ import haxe.Exception;
 enum ShaderModeType
 {
 	DEFAULT; // All shaders applied
-	FAST; // Only the VCRMario85 shader enabled
+	FAST; // Only the VCRMario85 and Scanline shaders enabled
 	MINIMAL; // Only scanline shader enabled
 	NONE; // No shaders at all
 }