From f8cfbf91c96fd425cf04bd598f78f77cb5e3595c Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Mon, 27 Jan 2025 22:57:01 +0100 Subject: [PATCH 1/2] Fixed out-of-date shaderlib autocomplete --- src/Editor.gd | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Editor.gd b/src/Editor.gd index 4fb716c..61f0435 100644 --- a/src/Editor.gd +++ b/src/Editor.gd @@ -128,21 +128,15 @@ const gdshader_preprocessor = [ "if", "elif", "ifdef", "ifndef", "else", "endif" ] # shaderlib -var shaderlib_regex = { - "colorspaces": RegEx.create_from_string(r'\s*\#include\s+\"res\:\/\/shaderlib\/colorspaces\.gdshaderinc\"'), - "transform": RegEx.create_from_string(r'\s*\#include\s+\"res\:\/\/shaderlib\/transform\.gdshaderinc\"'), - "transparency": RegEx.create_from_string(r'\s*\#include\s+\"res\:\/\/shaderlib\/transparency\.gdshaderinc\"'), - "effects": RegEx.create_from_string(r'\s*\#include\s+\"res\:\/\/shaderlib\/effects\.gdshaderinc\"'), - "denoise": RegEx.create_from_string(r'\s*\#include\s+\"res\:\/\/shaderlib\/denoise\.gdshaderinc\"'), - "blur": RegEx.create_from_string(r'\s*\#include\s+\"res\:\/\/shaderlib\/blur\.gdshaderinc\"'), -} +var shaderlib_regex = {} # auto-generated const shaderlib_functions = { - "colorspaces": ["rgb2hsv", "hsv2rgb", "oklab2rgb", "rgb2oklab", "oklab2oklch", "oklch2oklab"], - "transform": ["place_texture"], - "transparency": ["alpha_blend"], - "effects": ["pixelate"], - "denoise": ["smart_denoise"], "blur": ["gaussian_blur"], + "common": ["alpha_blend", "cbrt"], + "denoise": ["smart_denoise"], + "hsv": ["rgb2hsv", "hsv2rgb",], + "oklab": ["oklab2rgb", "rgb2oklab", "oklab2oklch", "oklch2oklab"], + "pixelate": ["pixelate"], + "place_texture": ["place_texture"], } # # configure Highlighter @@ -211,6 +205,11 @@ func _on_code_edit_code_completion_requested(): # # # # # # # # # # # # func _ready(): + # generate regexes + for k in shaderlib_functions: + shaderlib_regex[k] = RegEx.create_from_string( + r'\s*\#include\s+\"res\:\/\/shaderlib\/' + k + r'\.gdshaderinc\"') + # code_editor.code_completion_enabled = true code_editor.syntax_highlighter = ShaderSyntaxHighlighter.new() self.update_code_edit() From a444cea11a96b70a6c3a1ecf474f441c5fe116d8 Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Mon, 27 Jan 2025 22:58:18 +0100 Subject: [PATCH 2/2] Bump version to v8.1 --- project.godot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.godot b/project.godot index d882762..d51c3fe 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Fragmented" -config/version="v8.0" +config/version="v8.1" run/main_scene="res://scenes/main.tscn" config/features=PackedStringArray("4.3", "Mobile") run/low_processor_mode=true