feat: grid guides

addons/ffmpeg/LICENSE-ffmpeg.txt.uid

@@ -0,0 +1 @@
+uid://b3ustrqft4n31

addons/ffmpeg/ffmpeg.gdextension

@@ -9,6 +9,9 @@ windows.release.x86_64 = "res://addons/ffmpeg/win64/libgdffmpeg.windows.template
 linux.debug.x86_64 = "res://addons/ffmpeg/linux64/libgdffmpeg.linux.template_debug.x86_64.so"
 linux.release.x86_64 = "res://addons/ffmpeg/linux64/libgdffmpeg.linux.template_release.x86_64.so"
 
+macos.debug = "res://addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework"
+macos.release = "res://addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework"
+
 [dependencies]
 
 windows.x86_64 = 
@@ -25,4 +28,14 @@ linux.x86_64 =
     "res://addons/ffmpeg/linux64/libavformat.so.60": "",
     "res://addons/ffmpeg/linux64/libavutil.so.58": "",
     "res://addons/ffmpeg/linux64/libswresample.so.4": "",
-    "res://addons/ffmpeg/linux64/libswscale.so.7": ""}
+    "res://addons/ffmpeg/linux64/libswscale.so.7": ""}
+
+macos =
+    {
+        "res://addons/ffmpeg/macos/libavcodec.dylib": "",
+        "res://addons/ffmpeg/macos/libavfilter.dylib": "",
+        "res://addons/ffmpeg/macos/libavformat.dylib": "",
+        "res://addons/ffmpeg/macos/libavutil.dylib": "",
+        "res://addons/ffmpeg/macos/libswresample.dylib": "",
+        "res://addons/ffmpeg/macos/libswscale.dylib": ""
+    }

addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/Resources/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>libgdffmpeg_advanced.macos.template_release</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.godotengine.ffmpeg</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>FFmpeg for Godot</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+</dict>
+</plist>

project.godot

@@ -85,7 +85,6 @@ common/physics_ticks_per_second=120
 
 [rendering]
 
+textures/vram_compression/import_etc2_astc=true
 textures/lossless_compression/force_png=true
-anti_aliasing/quality/msaa_2d=1
 environment/defaults/default_clear_color=Color(0.0885599, 0.08855992, 0.08855987, 1)
-anti_aliasing/quality/screen_space_aa=1

scenes/game.tscn

@@ -21,6 +21,7 @@
 [ext_resource type="FontFile" uid="uid://cmjos3o0k2f6t" path="res://fonts/Comfortaa-Medium.ttf" id="11_o37lt"]
 [ext_resource type="Texture2D" uid="uid://80bitp5weqrb" path="res://user/skins/default/game/panel_left_background.png" id="11_sdncv"]
 [ext_resource type="FontFile" uid="uid://b6hgjef6s6oly" path="res://fonts/Comfortaa-Bold.ttf" id="12_axsek"]
+[ext_resource type="Texture2D" uid="uid://cxl0501pqg6dk" path="res://user/skins/default/game/grid_guides.png" id="12_pr1ej"]
 [ext_resource type="Texture2D" uid="uid://diba7c3s8as4s" path="res://user/skins/default/game/panel_right_background.png" id="12_whe6p"]
 [ext_resource type="Texture2D" uid="uid://dw2gxd3m24h4m" path="res://user/skins/default/game/hits.png" id="13_6rhgc"]
 [ext_resource type="Script" uid="uid://c3gf0hgrqqqx5" path="res://scripts/game/ui/PanelRight.cs" id="13_sww3w"]
@@ -83,6 +84,17 @@ transform_format = 1
 use_colors = true
 mesh = SubResource("QuadMesh_5p2n8")
 
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_05nbr"]
+resource_name = "Material"
+transparency = 1
+shading_mode = 0
+albedo_texture = ExtResource("12_pr1ej")
+texture_repeat = false
+
+[sub_resource type="QuadMesh" id="QuadMesh_0sl42"]
+material = SubResource("StandardMaterial3D_05nbr")
+size = Vector2(4, 4)
+
 [sub_resource type="ViewportTexture" id="ViewportTexture_pl11u"]
 viewport_path = NodePath("Runner/HUD/Health/HealthViewport")
 
@@ -306,6 +318,12 @@ skeleton = NodePath("../../../..")
 material_override = SubResource("StandardMaterial3D_ssr8x")
 multimesh = SubResource("MultiMesh_e28va")
 
+[node name="GridGuides" type="MeshInstance3D" parent="Runner/HUD/Grid" unique_id=2145859938]
+transform = Transform3D(1.01, 0, 0, 0, 1.01, 0, 0, 0, 1.01, 0, 0, -0.2)
+visible = false
+mesh = SubResource("QuadMesh_0sl42")
+skeleton = NodePath("../../../..")
+
 [node name="Health" type="MeshInstance3D" parent="Runner/HUD" unique_id=449857227]
 transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, -6.3, -10)
 cast_shadow = 0

scenes/main_menu.tscn

@@ -1617,8 +1617,9 @@ anchor_left = 0.5
 anchor_right = 0.75
 anchor_bottom = 1.0
 offset_left = 150.0
-offset_top = 200.0
-offset_bottom = -200.0
+offset_top = 160.0
+offset_right = 230.0
+offset_bottom = -160.0
 grow_vertical = 2
 mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxEmpty_qw82i")
@@ -1725,10 +1726,35 @@ fit_content = true
 horizontal_alignment = 1
 
 [node name="noobour" type="RichTextLabel" parent="Menus/Extras/Credits/ScrollContainer/VBoxContainer" unique_id=1684835200]
+modulate = Color(0.05882353, 0.5058824, 0.7176471, 1)
 layout_mode = 2
 bbcode_enabled = true
 text = "[font_size=20]noobour
-[color=0f81b7][font_size=16]Contributor"
+[color=ffffffbb][font_size=16]Contributor"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="jonyro" type="RichTextLabel" parent="Menus/Extras/Credits/ScrollContainer/VBoxContainer" unique_id=478363351]
+modulate = Color(0.9607843, 0.60784316, 0.6784314, 1)
+layout_mode = 2
+bbcode_enabled = true
+text = "[font_size=20][u]jonyro / jrolly
+[color=ffffffbb][font_size=16]\"Redshift\" (Menu theme) artist"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="Button" type="Button" parent="Menus/Extras/Credits/ScrollContainer/VBoxContainer/jonyro" unique_id=1840543780]
+show_behind_parent = true
+clip_contents = true
+layout_mode = 0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = 33.0
+offset_bottom = 12.0
+mouse_filter = 1
+flat = true
+script = ExtResource("44_ybca7")
+Link = "https://soundcloud.com/jonyro"
 
 [node name="Outline" type="Panel" parent="Menus/Extras/Credits" unique_id=239136532]
 material = SubResource("ShaderMaterial_yxnar")
@@ -2107,6 +2133,7 @@ mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_sgh51")
 
 [node name="Transition" type="ColorRect" parent="." unique_id=86050768]
+visible = false
 self_modulate = Color(1, 1, 1, 0)
 z_index = 2
 anchors_preset = 15

scripts/database/settings/SettingsProfile.cs

@@ -109,9 +109,9 @@ public partial class SettingsProfile
     public SettingsItem<string> MenuSpace { get; private set; }
 
     /// <summary>
-    /// Overrides the skin's background space for the game
-    /// </summary>
-    [Order]
+	/// Overrides the skin's background space for the game
+	/// </summary>
+	[Order]
     public SettingsItem<string> GameSpace { get; private set; }
 
     /// <summary>
@@ -139,9 +139,9 @@ public partial class SettingsProfile
     public SettingsItem<double> NoteOpacityExponent { get; private set; }
 
     /// <summary>
-    /// Overrides the skin's note mesh
-    /// </summary>
-    [Order]
+	/// Overrides the skin's note mesh
+	/// </summary>
+	[Order]
     public SettingsItem<string> NoteMesh { get; private set; }
 
     /// <summary>
@@ -150,6 +150,7 @@ public partial class SettingsProfile
     [Order]
     public SettingsItem<double> NoteSize { get; private set; }
 
+
     /// <summary>
     /// Adjusts the cursor scale
     /// </summary>
@@ -204,6 +205,12 @@ public partial class SettingsProfile
     [Order]
     public SettingsItem<double> VideoRenderScale { get; private set; }
 
+    /// <summary>
+    /// Toggles Grid Guides
+    /// </summary>
+    [Order]
+    public SettingsItem<bool> GridGuides { get; private set; }
+
     /// <summary>
     /// Toggles a minimal HUD
     /// </summary>
@@ -362,9 +369,9 @@ public partial class SettingsProfile
 
     [Order]
     /// <summary>
-    /// Restarts settings to the game's defaults
-    /// </summary>
-    public SettingsItem<Variant> ResetToDefaults { get; private set; }
+	/// Restarts settings to the game's defaults
+	/// </summary>
+	public SettingsItem<Variant> ResetToDefaults { get; private set; }
 
     #endregion
 
@@ -669,6 +676,14 @@ public SettingsProfile()
             }
         };
 
+        GridGuides = new(true)
+        {
+            Id = "GridGuides",
+            Title = "Grid Guides",
+            Description = "Enables grid guides",
+            Section = SettingsSection.Visual,
+        };
+
         CursorScale = new(1)
         {
             Id = "CursorScale",

scripts/game/ui/Grid.cs

@@ -6,6 +6,7 @@ public partial class Grid : MeshInstance3D, IUIComponent
     [Export] public Runner Runner { get; set; }
     public MeshInstance3D Cursor { get; set; }
     public MultiMeshInstance3D CursorTrail { get; set; }
+    public MeshInstance3D GridGuides { get; set; }
 
     private static readonly PackedScene hit_feedback = GD.Load<PackedScene>("res://prefabs/hit_popup.tscn");
     private static readonly PackedScene miss_feedback = GD.Load<PackedScene>("res://prefabs/miss_icon.tscn");
@@ -20,6 +21,11 @@ public override void _ExitTree()
 
     public void Init()
     {
+        GridGuides ??= GetNode<MeshInstance3D>("GridGuides");
+
+        GridGuides.Visible = Runner.Attempt.Settings.GridGuides;
+        (GridGuides.GetActiveMaterial(0) as StandardMaterial3D).AlbedoTexture = SkinManager.Instance.Skin.GridGuidesImage;
+
         Cursor ??= GetNode<MeshInstance3D>("Cursor");
         (Cursor.Mesh as QuadMesh).Size = new Vector2((float)(Constants.CURSOR_SIZE * Runner.Attempt.Settings.CursorScale), (float)(Constants.CURSOR_SIZE * Runner.Attempt.Settings.CursorScale));
 
@@ -103,4 +109,3 @@ private void updateGridPosition(Vector2 position)
 
     }
 }
-

scripts/skinning/SkinManager.cs

@@ -59,6 +59,7 @@ public static void Load()
 
         skin.CursorImage = loadTexture("game/cursor.png");
         skin.GridImage = loadTexture("game/grid.png");
+        skin.GridGuidesImage = loadTexture("game/grid_guides.png");
         skin.PanelLeftBackgroundImage = loadTexture("game/panel_left_background.png");
         skin.PanelRightBackgroundImage = loadTexture("game/panel_right_background.png");
         skin.HealthImage = loadTexture("game/health.png");

scripts/skinning/SkinProfile.cs

@@ -1,4 +1,4 @@
-using Godot;
+using Godot;
 
 [GlobalClass]
 public partial class SkinProfile : RefCounted
@@ -9,6 +9,8 @@ public partial class SkinProfile : RefCounted
 
     public ImageTexture GridImage { get; set; } = new();
 
+    public ImageTexture GridGuidesImage { get; set; } = new();
+
     public ImageTexture PanelLeftBackgroundImage { get; set; } = new();
 
     public ImageTexture PanelRightBackgroundImage { get; set; } = new();

scripts/spaces/TriTunnel.cs

@@ -8,7 +8,7 @@ public partial class TriTunnel : BaseSpace
     private MeshInstance3D tunnel;
     private StandardMaterial3D tunnelTexture;
     private Vector3 tunnelPosReset;
-    private Color tunnelColorReset = new(255, 255, 255);
+    private Color tunnelColor;
     private const float tunnel_loop_end = 148f;
 
     public override void _Ready()
@@ -19,6 +19,7 @@ public override void _Ready()
         tunnel = GetNode<MeshInstance3D>("Tunnel");
         tunnelPosReset = tunnel.Position;
         tunnelTexture = tunnel.MaterialOverride as StandardMaterial3D;
+        tunnelColor = tunnelTexture.AlbedoColor;
     }
 
     public override void _Process(double delta)
@@ -36,6 +37,6 @@ public override void _Process(double delta)
         }
 
         // Hit VFX
-        tunnelTexture.AlbedoColor = settings.SpaceHitEffects ? NoteHitColor : tunnelColorReset;
+        tunnelTexture.AlbedoColor = settings.SpaceHitEffects ? NoteHitColor : tunnelColor;
     }
 }

textures/RhythiaSquircle.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://baivqqkfll133"
 path.s3tc="res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.s3tc.ctex"
+path.etc2="res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://textures/RhythiaSquircle.png"
-dest_files=["res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.s3tc.ctex"]
+dest_files=["res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.s3tc.ctex", "res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.etc2.ctex"]
 
 [params]
 

textures/empty.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://c4u5y3e8yamuk"
 path.s3tc="res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.s3tc.ctex"
+path.etc2="res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://textures/empty.png"
-dest_files=["res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.s3tc.ctex"]
+dest_files=["res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.s3tc.ctex", "res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.etc2.ctex"]
 
 [params]
 

textures/galaxy_rainbow.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://d4n3duxjt288o"
 path.s3tc="res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.s3tc.ctex"
+path.etc2="res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://textures/galaxy_rainbow.png"
-dest_files=["res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.s3tc.ctex"]
+dest_files=["res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.s3tc.ctex", "res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.etc2.ctex"]
 
 [params]
 

textures/galaxy_skybox.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://drj0rof0q81b5"
 path.s3tc="res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.s3tc.ctex"
+path.etc2="res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://textures/galaxy_skybox.png"
-dest_files=["res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.s3tc.ctex"]
+dest_files=["res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.s3tc.ctex", "res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.etc2.ctex"]
 
 [params]