ChaoticByte/Fragmented
1
1
Fork 0
Code Issues 2 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #51 from ChaoticByte/release/v8.1

Browse source 
Release/v8.1
This commit is contained in:
Julian Müller 2025-01-27 22:59:37 +01:00 • committed by GitHub
commit d512005b86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project.godot
View file

@ -11,7 +11,7 @@ config_version=5
[application] [application]
config/name="Fragmented" config/name="Fragmented"
config/version="v8.0" config/version="v8.1"
run/main_scene="res://scenes/main.tscn" run/main_scene="res://scenes/main.tscn"
config/features=PackedStringArray("4.3", "Mobile") config/features=PackedStringArray("4.3", "Mobile")
run/low_processor_mode=true run/low_processor_mode=true

25
src/Editor.gd
View file

@ -128,21 +128,15 @@ const gdshader_preprocessor = [
"if", "elif", "ifdef", "ifndef", "else", "endif" "if", "elif", "ifdef", "ifndef", "else", "endif"
] ]
# shaderlib # shaderlib
var shaderlib_regex = { var shaderlib_regex = {} # auto-generated
"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\"'),
}
const shaderlib_functions = { const shaderlib_functions = {
"colorspaces": ["rgb2hsv", "hsv2rgb", "oklab2rgb", "rgb2oklab", "oklab2oklch", "oklch2oklab"],
"transform": ["place_texture"],
"transparency": ["alpha_blend"],
"effects": ["pixelate"],
"denoise": ["smart_denoise"],
"blur": ["gaussian_blur"], "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 # configure Highlighter
@ -211,6 +205,11 @@ func _on_code_edit_code_completion_requested():
# # # # # # # # # # # # # # # # # # # # # # # #
func _ready(): 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.code_completion_enabled = true
code_editor.syntax_highlighter = ShaderSyntaxHighlighter.new() code_editor.syntax_highlighter = ShaderSyntaxHighlighter.new()
self.update_code_edit() self.update_code_edit()