huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Compare commits

base: huskee:1f6998e7239c58ddb5b1da974600253ca483d2ef
Branches Tags
huskee:master
huskee:l10n_master
huskee:gh-pages
huskee:1.0
huskee:release
huskee:0.x
huskee:0.8
huskee:v1.0.5
huskee:v1.0.4
huskee:v1.0.3
huskee:v1.0.2
huskee:v1.0.1
huskee:v1.0
huskee:v0.11.4
huskee:v0.11.3
huskee:v0.11.2
huskee:v0.11.1
huskee:v0.11
huskee:v0.10.3
huskee:v0.10.2
huskee:v0.10.1
huskee:v0.10
huskee:v0.9.2
huskee:v0.9.1
huskee:v0.9
huskee:v0.8.3
huskee:v0.8.2
huskee:v0.8.1
huskee:v0.8
huskee:v0.7
huskee:v0.6.2
huskee:v0.6.1
huskee:v0.6
huskee:v0.5
huskee:v0.4
huskee:v0.3
huskee:v0.2
..
compare: huskee:bbc93e3f82fe935c76e4ca86597751348eea6e5a
Branches Tags
huskee:l10n_master
huskee:gh-pages
huskee:master
huskee:1.0
huskee:release
huskee:0.x
huskee:0.8
huskee:v1.0.5
huskee:v1.0.4
huskee:v1.0.3
huskee:v1.0.2
huskee:v1.0.1
huskee:v1.0
huskee:v0.11.4
huskee:v0.11.3
huskee:v0.11.2
huskee:v0.11.1
huskee:v0.11
huskee:v0.10.3
huskee:v0.10.2
huskee:v0.10.1
huskee:v0.10
huskee:v0.9.2
huskee:v0.9.1
huskee:v0.9
huskee:v0.8.3
huskee:v0.8.2
huskee:v0.8.1
huskee:v0.8
huskee:v0.7
huskee:v0.6.2
huskee:v0.6.1
huskee:v0.6
huskee:v0.5
huskee:v0.4
huskee:v0.3
huskee:v0.2

No commits in common. "1f6998e7239c58ddb5b1da974600253ca483d2ef" and "bbc93e3f82fe935c76e4ca86597751348eea6e5a" have entirely different histories.
1f6998e723 ... bbc93e3f82

5 changed files with 128 additions and 191 deletions
Show stats Expand all files Collapse all files

266
src/Classes/ObjParse.gd
View file

@ -1,111 +1,105 @@
class_name ObjParse class_name ObjParse
extends Object
const DEBUG: bool = false ## Obj parser made by Ezcha, updated by Deakcor
## Created on 7/11/2018
## https://ezcha.net
## https://github.com/Ezcha/gd-obj
## MIT License
## https://github.com/Ezcha/gd-obj/blob/master/LICENSE
## Returns an array of materials from a MTL file
# gd-obj const DEBUG := false
#
# Created on 7/11/2018 # Public methods
#
# Originally made by Ezcha
# Contributors: deakcor, kb173, jeffgamedev
#
# https://ezcha.net
# https://github.com/Ezcha/gd-obj
#
# MIT License
# https://github.com/Ezcha/gd-obj/blob/master/LICENSE
# Create mesh from obj and mtl paths ## Create mesh from obj and mtl paths
static func load_obj(obj_path: String, mtl_path: String = "") -> Mesh: static func load_obj(obj_path: String, mtl_path: String = "") -> Mesh:
var obj_str: String = _read_file_str(obj_path)
if mtl_path == "": if mtl_path == "":
var mtl_filename: String = _get_mtl_filename(obj_str) mtl_path = search_mtl_path(obj_path)
mtl_path = "%s/%s" % [obj_path.get_base_dir(), mtl_filename] var obj := get_data(obj_path)
var mats: Dictionary = {} var mats := {}
if mtl_path != "": if mtl_path != "":
mats = _create_mtl(_read_file_str(mtl_path), _get_mtl_tex(mtl_path)) mats = _create_mtl(get_data(mtl_path), get_mtl_tex(mtl_path))
if obj_str.is_empty(): return _create_obj(obj, mats) if obj and mats else null
return null
return _create_obj(obj_str, mats)
# Create mesh from obj, materials. Materials should be { "matname": data } ## Create mesh from obj, materials. Materials should be {"matname":data}
static func load_obj_from_buffer(obj_data: String, materials: Dictionary) -> Mesh: static func load_obj_from_buffer(obj_data: String, materials: Dictionary) -> Mesh:
return _create_obj(obj_data, materials) return _create_obj(obj_data, materials)
# Create materials ## Create materials
static func load_mtl_from_buffer(mtl_data: String, textures: Dictionary) -> Dictionary: static func load_mtl_from_buffer(mtl_data: String, textures: Dictionary) -> Dictionary:
return _create_mtl(mtl_data, textures) return _create_mtl(mtl_data, textures)
# Get data from file path ## Get data from file path
static func _read_file_str(path: String) -> String: static func get_data(path: String) -> String:
if path == "": if path != "":
return "" var file := FileAccess.open(path, FileAccess.READ)
var file: FileAccess = FileAccess.open(path, FileAccess.READ) if FileAccess.get_open_error() == OK:
if file == null: var res := file.get_as_text()
return "" file.close()
return file.get_as_text() return res
return ""
# Internal functions ## Get textures from mtl path (return {"tex_path":data})
static func get_mtl_tex(mtl_path: String) -> Dictionary:
var file_paths := get_mtl_tex_paths(mtl_path)
# Get textures from mtl path (returns { "tex_path": data }) var textures := {}
static func _get_mtl_tex(mtl_path: String) -> Dictionary:
var file_paths: Array[String] = _get_mtl_tex_paths(mtl_path)
var textures: Dictionary = {}
for k in file_paths: for k in file_paths:
textures[k] = _get_image(mtl_path, k).save_png_to_buffer() textures[k] = _get_image(mtl_path, k).save_png_to_buffer()
return textures return textures
# Get textures paths from mtl path ## Get textures paths from mtl path
static func _get_mtl_tex_paths(mtl_path: String) -> Array[String]: static func get_mtl_tex_paths(mtl_path: String) -> Array:
var file: FileAccess = FileAccess.open(mtl_path, FileAccess.READ) var file := FileAccess.open(mtl_path, FileAccess.READ)
if file == null: var paths := []
return [] if FileAccess.get_open_error() == OK:
var lines := file.get_as_text().split("\n", false)
var paths: Array[String] = [] file.close()
var lines: PackedStringArray = file.get_as_text().split("\n", false) for line in lines:
for line in lines: var parts := line.split(" ", false, 1)
var parts: PackedStringArray = line.split(" ", false, 1) if parts[0] in ["map_Kd", "map_Ks", "map_Ka"]:
if ["map_Kd", "map_Ks", "map_Ka"].has(parts[0]): if !parts[1] in paths:
if !paths.has(parts[1]): paths.push_back(parts[1])
paths.push_back(parts[1])
return paths return paths
static func _get_mtl_filename(obj: String) -> String: ## Try to find mtl path from obj path
var lines: PackedStringArray = obj.split("\n") static func search_mtl_path(obj_path: String) -> String:
for line in lines: var mtl_path := obj_path.get_base_dir().path_join(
var split: PackedStringArray = line.split(" ", false) obj_path.get_file().rsplit(".", false, 1)[0] + ".mtl"
if split.size() < 2: )
continue if !FileAccess.file_exists(mtl_path):
if split[0] != "mtllib": mtl_path = obj_path.get_base_dir().path_join(obj_path.get_file() + ".mtl")
continue if !FileAccess.file_exists(mtl_path):
return split[1].strip_edges() return ""
return "" return mtl_path
# Private methods
static func _create_mtl(obj: String, textures: Dictionary) -> Dictionary: static func _create_mtl(obj: String, textures: Dictionary) -> Dictionary:
var mats: Dictionary = {} var mats := {}
var current_mat: StandardMaterial3D = null var current_mat: StandardMaterial3D = null
var lines: PackedStringArray = obj.split("\n", false) var lines := obj.split("\n", false)
for line in lines: for line in lines:
var parts: PackedStringArray = line.split(" ", false) var parts := line.split(" ", false)
match parts[0]: match parts[0]:
"#": "#":
# Comment # Comment
#print("Comment: "+line)
pass pass
"newmtl": "newmtl":
# Create a new material # Create a new material
if DEBUG: if DEBUG:
prints("Adding new material", parts[1]) print("Adding new material " + parts[1])
current_mat = StandardMaterial3D.new() current_mat = StandardMaterial3D.new()
mats[parts[1]] = current_mat mats[parts[1]] = current_mat
"Ka": "Ka":
@ -114,134 +108,117 @@ static func _create_mtl(obj: String, textures: Dictionary) -> Dictionary:
pass pass
"Kd": "Kd":
# Diffuse color # Diffuse color
current_mat.albedo_color = Color( current_mat.albedo_color = Color(float(parts[1]), float(parts[2]), float(parts[3]))
parts[1].to_float(), parts[2].to_float(), parts[3].to_float()
)
if DEBUG: if DEBUG:
prints("Setting material color", str(current_mat.albedo_color)) print("Setting material color " + str(current_mat.albedo_color))
_: _:
if parts[0] in ["map_Kd", "map_Ks", "map_Ka"]: if parts[0] in ["map_Kd", "map_Ks", "map_Ka"]:
var path: String = line.split(" ", false, 1)[1] var path := line.split(" ", false, 1)[1]
if textures.has(path): if textures.has(path):
current_mat.albedo_texture = _create_texture(textures[path]) current_mat.albedo_texture = _create_texture(textures[path])
return mats return mats
static func _parse_mtl_file(path) -> Dictionary:
return _create_mtl(_read_file_str(path), _get_mtl_tex(path))
static func _get_image(mtl_filepath: String, tex_filename: String) -> Image: static func _get_image(mtl_filepath: String, tex_filename: String) -> Image:
if DEBUG: if DEBUG:
prints("Debug: Mapping texture file", tex_filename) print(" Debug: Mapping texture file " + tex_filename)
var tex_filepath: String = tex_filename var texfilepath := tex_filename
if tex_filename.is_relative_path(): if tex_filename.is_relative_path():
tex_filepath = "%s/%s" % [mtl_filepath.get_base_dir(), tex_filename] texfilepath = mtl_filepath.get_base_dir().path_join(tex_filename)
var file_type: String = tex_filepath.get_extension() var filetype := texfilepath.get_extension()
if DEBUG: if DEBUG:
prints("Debug: texture file path:", tex_filepath, "of type", file_type) print(" Debug: texture file path: " + texfilepath + " of type " + filetype)
var img: Image = Image.new() var img := Image.new()
img.load(tex_filepath) img.load(texfilepath)
return img return img
static func _create_texture(data: PackedByteArray) -> ImageTexture: static func _create_texture(data: PackedByteArray) -> ImageTexture:
var img: Image = Image.new() var img := Image.new()
img.load_png_from_buffer(data) img.load_png_from_buffer(data)
return ImageTexture.create_from_image(img) return ImageTexture.create_from_image(img)
static func _get_texture(mtl_filepath, tex_filename) -> ImageTexture:
var tex = ImageTexture.create_from_image(_get_image(mtl_filepath, tex_filename))
if DEBUG:
prints("Debug: texture is", str(tex))
return tex
static func _create_obj(obj: String, mats: Dictionary) -> Mesh: static func _create_obj(obj: String, mats: Dictionary) -> Mesh:
# Setup # Setup
var mesh: ArrayMesh = ArrayMesh.new() var mesh := ArrayMesh.new()
var vertices: PackedVector3Array = PackedVector3Array() var vertices := PackedVector3Array()
var normals: PackedVector3Array = PackedVector3Array() var normals := PackedVector3Array()
var uvs: PackedVector2Array = PackedVector2Array() var uvs := PackedVector2Array()
var faces: Dictionary = {} var faces := {}
var mat_name: String = "default" var mat_name := "default"
var count_mtl: int = 0 var count_mtl := 0
# Parse # Parse
var lines: PackedStringArray = obj.split("\n", false) var lines := obj.split("\n", false)
for line in lines: for line in lines:
var parts: PackedStringArray = line.split(" ", false) var parts := line.split(" ", false)
match parts[0]: match parts[0]:
"#": "#":
# Comment # Comment
#print("Comment: "+line)
pass pass
"v": "v":
# Vertice # Vertex
var n_v: Vector3 = Vector3( var n_v := Vector3(float(parts[1]), float(parts[2]), float(parts[3]))
parts[1].to_float(), parts[2].to_float(), parts[3].to_float()
)
vertices.append(n_v) vertices.append(n_v)
"vn": "vn":
# Normal # Normal
var n_vn: Vector3 = Vector3( var n_vn := Vector3(float(parts[1]), float(parts[2]), float(parts[3]))
parts[1].to_float(), parts[2].to_float(), parts[3].to_float()
)
normals.append(n_vn) normals.append(n_vn)
"vt": "vt":
# UV # UV
var n_uv: Vector2 = Vector2(parts[1].to_float(), 1 - parts[2].to_float()) var n_uv := Vector2(float(parts[1]), 1 - float(parts[2]))
uvs.append(n_uv) uvs.append(n_uv)
"usemtl": "usemtl":
# Material group # Material group
count_mtl += 1 count_mtl += 1
mat_name = parts[1].strip_edges() mat_name = parts[1]
if !faces.has(mat_name): if not faces.has(mat_name):
var mats_keys: Array = mats.keys() var mats_keys := mats.keys()
if !mats.has(mat_name): if !mats.has(mat_name):
if mats_keys.size() > count_mtl: if mats_keys.size() > count_mtl:
mat_name = mats_keys[count_mtl] mat_name = mats_keys[count_mtl]
faces[mat_name] = [] faces[mat_name] = []
"f": "f":
if !faces.has(mat_name): if not faces.has(mat_name):
var mats_keys: Array = mats.keys() var mats_keys := mats.keys()
if mats_keys.size() > count_mtl: if mats_keys.size() > count_mtl:
mat_name = mats_keys[count_mtl] mat_name = mats_keys[count_mtl]
faces[mat_name] = [] faces[mat_name] = []
# Face # Face
if parts.size() == 4: if parts.size() == 4:
# Tri # Tri
var face: Dictionary = {"v": [], "vt": [], "vn": []} var face := {"v": [], "vt": [], "vn": []}
for map in parts: for map in parts:
var vertices_index: PackedStringArray = map.split("/") var vertices_index := map.split("/")
if vertices_index[0] != "f": if str(vertices_index[0]) != "f":
face["v"].append(vertices_index[0].to_int() - 1) face["v"].append(int(vertices_index[0]) - 1)
if vertices_index.size() > 1: face["vt"].append(int(vertices_index[1]) - 1)
face["vt"].append(vertices_index[1].to_int() - 1) if vertices_index.size() > 2:
if vertices_index.size() > 2: face["vn"].append(int(vertices_index[2]) - 1)
face["vn"].append(vertices_index[2].to_int() - 1)
if faces.has(mat_name): if faces.has(mat_name):
faces[mat_name].append(face) faces[mat_name].append(face)
elif parts.size() > 4: elif parts.size() > 4:
# Triangulate # Triangulate
var points: Array[Array] = [] var points: Array[PackedInt64Array] = []
for map in parts: for map in parts:
var vertices_index: PackedStringArray = map.split("/") var vertices_index = map.split("/")
if vertices_index[0] != "f": if str(vertices_index[0]) != "f":
var point: Array[int] = [] var point: PackedInt64Array = []
point.append(vertices_index[0].to_int() - 1) point.append(int(vertices_index[0]) - 1)
point.append(vertices_index[1].to_int() - 1) point.append(int(vertices_index[1]) - 1)
if vertices_index.size() > 2: if vertices_index.size() > 2:
point.append(vertices_index[2].to_int() - 1) point.append(int(vertices_index[2]) - 1)
points.append(point) points.append(point)
for i in points.size(): for i in points.size():
if i != 0: if i != 0:
var face = {"v": [], "vt": [], "vn": []} var face = {"v": [], "vt": [], "vn": []}
var point0: Array[int] = points[0] var point0 := points[0]
var point1: Array[int] = points[i] var point1 := points[i]
var point2: Array[int] = points[i - 1] var point2 := points[i - 1]
face["v"].append(point0[0]) face["v"].append(point0[0])
face["v"].append(point2[0]) face["v"].append(point2[0])
face["v"].append(point1[0]) face["v"].append(point1[0])
@ -259,16 +236,18 @@ static func _create_obj(obj: String, mats: Dictionary) -> Mesh:
# Make tri # Make tri
for matgroup in faces.keys(): for matgroup in faces.keys():
if DEBUG: if DEBUG:
prints( print(
"Creating surface for matgroup", (
matgroup, "Creating surface for matgroup "
"with", + matgroup
str(faces[matgroup].size()), + " with "
"faces" + str(faces[matgroup].size())
+ " faces"
)
) )
# Mesh Assembler # Mesh Assembler
var st: SurfaceTool = SurfaceTool.new() var st := SurfaceTool.new()
st.begin(Mesh.PRIMITIVE_TRIANGLES) st.begin(Mesh.PRIMITIVE_TRIANGLES)
if !mats.has(matgroup): if !mats.has(matgroup):
mats[matgroup] = StandardMaterial3D.new() mats[matgroup] = StandardMaterial3D.new()
@ -276,38 +255,37 @@ static func _create_obj(obj: String, mats: Dictionary) -> Mesh:
for face in faces[matgroup]: for face in faces[matgroup]:
if face["v"].size() == 3: if face["v"].size() == 3:
# Vertices # Vertices
var fan_v: PackedVector3Array = PackedVector3Array() var fan_v := PackedVector3Array()
fan_v.append(vertices[face["v"][0]]) fan_v.append(vertices[face["v"][0]])
fan_v.append(vertices[face["v"][2]]) fan_v.append(vertices[face["v"][2]])
fan_v.append(vertices[face["v"][1]]) fan_v.append(vertices[face["v"][1]])
# Normals # Normals
var fan_vn: PackedVector3Array = PackedVector3Array() var fan_vn := PackedVector3Array()
if face["vn"].size() > 0: if face["vn"].size() > 0:
fan_vn.append(normals[face["vn"][0]]) fan_vn.append(normals[face["vn"][0]])
fan_vn.append(normals[face["vn"][2]]) fan_vn.append(normals[face["vn"][2]])
fan_vn.append(normals[face["vn"][1]]) fan_vn.append(normals[face["vn"][1]])
# Textures # Textures
var fan_vt: PackedVector2Array = PackedVector2Array() var fan_vt := PackedVector2Array()
if face["vt"].size() > 0: if face["vt"].size() > 0:
for k in [0, 2, 1]: for k in [0, 2, 1]:
var f = face["vt"][k] var f = face["vt"][k]
if f > -1: if f > -1:
var uv = uvs[f] var uv = uvs[f]
fan_vt.append(uv) fan_vt.append(uv)
st.add_triangle_fan( st.add_triangle_fan(
fan_v, fan_vt, PackedColorArray(), PackedVector2Array(), fan_vn, [] fan_v, fan_vt, PackedColorArray(), PackedVector2Array(), fan_vn, []
) )
mesh = st.commit(mesh) mesh = st.commit(mesh)
for k in mesh.get_surface_count(): for k in mesh.get_surface_count():
var mat: Material = mesh.surface_get_material(k) var mat := mesh.surface_get_material(k)
mat_name = "" mat_name = ""
for m in mats: for m in mats:
if mats[m] == mat: if mats[m] == mat:
mat_name = m mat_name = m
mesh.surface_set_name(k, mat_name) mesh.surface_set_name(k, mat_name)
# Finish # Finish
return mesh return mesh

2
src/Tools/3DTools/3DShapeEdit.gd
View file

@ -367,7 +367,7 @@ func _set_node_values(to_edit: Object, properties: Dictionary) -> void:
if property_path.ends_with("v2"): if property_path.ends_with("v2"):
property_path = property_path.replace("v2", "") property_path = property_path.replace("v2", "")
var value = to_edit.get_indexed(property_path) var value = to_edit.get_indexed(property_path)
if not is_instance_valid(value): if value == null:
continue continue
if "scale" in prop: if "scale" in prop:
value *= 100 value *= 100

3
src/Tools/3DTools/3DShapeEdit.tscn
View file

@ -2,7 +2,7 @@
[ext_resource type="PackedScene" uid="uid://ctfgfelg0sho8" path="res://src/Tools/BaseTool.tscn" id="1"] [ext_resource type="PackedScene" uid="uid://ctfgfelg0sho8" path="res://src/Tools/BaseTool.tscn" id="1"]
[ext_resource type="Script" path="res://src/Tools/3DTools/3DShapeEdit.gd" id="2"] [ext_resource type="Script" path="res://src/Tools/3DTools/3DShapeEdit.gd" id="2"]
[ext_resource type="PackedScene" uid="uid://bbnqcxa20a5a5" path="res://src/UI/Nodes/Sliders/ValueSliderV2.tscn" id="3"] [ext_resource type="PackedScene" path="res://src/UI/Nodes/Sliders/ValueSliderV2.tscn" id="3"]
[ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/Sliders/ValueSlider.tscn" id="4"] [ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/Sliders/ValueSlider.tscn" id="4"]
[ext_resource type="Script" path="res://src/UI/Nodes/Sliders/ValueSlider.gd" id="5"] [ext_resource type="Script" path="res://src/UI/Nodes/Sliders/ValueSlider.gd" id="5"]
[ext_resource type="Script" path="res://src/UI/Nodes/CollapsibleContainer.gd" id="6"] [ext_resource type="Script" path="res://src/UI/Nodes/CollapsibleContainer.gd" id="6"]
@ -521,6 +521,7 @@ unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
selected = 0
[node name="MeshPixelSizeLabel" type="Label" parent="ObjectOptions/MeshOptions/GridContainer" index="24"] [node name="MeshPixelSizeLabel" type="Label" parent="ObjectOptions/MeshOptions/GridContainer" index="24"]
layout_mode = 2 layout_mode = 2

36
src/UI/Nodes/GradientEdit.gd
View file

@ -19,14 +19,9 @@ var active_cursor: GradientCursor: ## Showing a color picker popup to change a
i.queue_redraw() i.queue_redraw()
var texture := GradientTexture2D.new() var texture := GradientTexture2D.new()
var gradient := Gradient.new() var gradient := Gradient.new()
var presets: Array[Gradient] = []
@onready var x_offset: float = size.x - GradientCursor.WIDTH @onready var x_offset: float = size.x - GradientCursor.WIDTH
@onready var offset_value_slider := %OffsetValueSlider as ValueSlider @onready var offset_value_slider := %OffsetValueSlider as ValueSlider
@onready var interpolation_option_button: OptionButton = %InterpolationOptionButton
@onready var color_space_option_button: OptionButton = %ColorSpaceOptionButton
@onready var tools_menu_button: MenuButton = %ToolsMenuButton
@onready var presets_menu_button: MenuButton = %PresetsMenuButton
@onready var texture_rect := $TextureRect as TextureRect @onready var texture_rect := $TextureRect as TextureRect
@onready var color_picker := $Popup.get_node("ColorPicker") as ColorPicker @onready var color_picker := $Popup.get_node("ColorPicker") as ColorPicker
@onready var divide_dialog := $DivideConfirmationDialog as ConfirmationDialog @onready var divide_dialog := $DivideConfirmationDialog as ConfirmationDialog
@ -136,23 +131,14 @@ class GradientCursor:
func _init() -> void: func _init() -> void:
texture.gradient = gradient texture.gradient = gradient
presets.append(Gradient.new()) # Left to right
presets.append(Gradient.new()) # Left to transparent
presets.append(Gradient.new()) # Black to white
func _ready() -> void: func _ready() -> void:
texture_rect.texture = texture texture_rect.texture = texture
_create_cursors() _create_cursors()
interpolation_option_button.select(gradient.interpolation_mode) %InterpolationOptionButton.select(gradient.interpolation_mode)
color_space_option_button.select(gradient.interpolation_color_space) %ColorSpaceOptionButton.select(gradient.interpolation_color_space)
tools_menu_button.get_popup().index_pressed.connect(_on_tools_menu_button_index_pressed) %ToolsMenuButton.get_popup().index_pressed.connect(_on_tools_menu_button_index_pressed)
presets_menu_button.get_popup().index_pressed.connect(_on_presets_menu_button_index_pressed)
for preset in presets:
var grad_texture := GradientTexture2D.new()
grad_texture.height = 32
grad_texture.gradient = preset
presets_menu_button.get_popup().add_icon_item(grad_texture, "")
func _create_cursors() -> void: func _create_cursors() -> void:
@ -270,22 +256,6 @@ func _on_tools_menu_button_index_pressed(index: int) -> void:
divide_dialog.popup_centered() divide_dialog.popup_centered()
func _on_presets_menu_button_about_to_popup() -> void:
# Update left to right and left to transparent gradients
presets[0].set_color(0, Tools.get_assigned_color(MOUSE_BUTTON_LEFT))
presets[0].set_color(1, Tools.get_assigned_color(MOUSE_BUTTON_RIGHT))
presets[1].set_color(0, Tools.get_assigned_color(MOUSE_BUTTON_LEFT))
presets[1].set_color(1, Color(0, 0, 0, 0))
func _on_presets_menu_button_index_pressed(index: int) -> void:
var item_icon := presets_menu_button.get_popup().get_item_icon(index) as GradientTexture2D
gradient = item_icon.gradient.duplicate()
texture.gradient = gradient
_create_cursors()
updated.emit(gradient, continuous_change)
func _on_DivideConfirmationDialog_confirmed() -> void: func _on_DivideConfirmationDialog_confirmed() -> void:
var add_point_to_end := add_point_end_check_box.button_pressed var add_point_to_end := add_point_end_check_box.button_pressed
var parts := number_of_parts_spin_box.value var parts := number_of_parts_spin_box.value

12
src/UI/Nodes/GradientEdit.tscn
View file

@ -15,7 +15,6 @@ layout_mode = 2
[node name="OffsetValueSlider" type="TextureProgressBar" parent="InterpolationContainer"] [node name="OffsetValueSlider" type="TextureProgressBar" parent="InterpolationContainer"]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(64, 0)
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
focus_mode = 2 focus_mode = 2
@ -39,7 +38,6 @@ size_flags_horizontal = 3
tooltip_text = "Interpolation" tooltip_text = "Interpolation"
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
selected = 0 selected = 0
fit_to_longest_item = false
item_count = 3 item_count = 3
popup/item_0/text = "Linear" popup/item_0/text = "Linear"
popup/item_1/text = "Constant" popup/item_1/text = "Constant"
@ -54,7 +52,6 @@ size_flags_horizontal = 3
tooltip_text = "Color space" tooltip_text = "Color space"
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
selected = 0 selected = 0
fit_to_longest_item = false
item_count = 3 item_count = 3
popup/item_0/text = "sRGB" popup/item_0/text = "sRGB"
popup/item_1/text = "Linear sRGB" popup/item_1/text = "Linear sRGB"
@ -77,14 +74,6 @@ popup/item_1/id = 1
popup/item_2/text = "Divide into equal parts" popup/item_2/text = "Divide into equal parts"
popup/item_2/id = 2 popup/item_2/id = 2
[node name="PresetsMenuButton" type="MenuButton" parent="InterpolationContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
mouse_default_cursor_shape = 2
text = "Presets"
flat = false
[node name="TextureRect" type="TextureRect" parent="."] [node name="TextureRect" type="TextureRect" parent="."]
custom_minimum_size = Vector2(0, 30) custom_minimum_size = Vector2(0, 30)
layout_mode = 2 layout_mode = 2
@ -140,6 +129,5 @@ text = "Add point at the end"
[connection signal="value_changed" from="InterpolationContainer/OffsetValueSlider" to="." method="_on_offset_value_slider_value_changed"] [connection signal="value_changed" from="InterpolationContainer/OffsetValueSlider" to="." method="_on_offset_value_slider_value_changed"]
[connection signal="item_selected" from="InterpolationContainer/InterpolationOptionButton" to="." method="_on_InterpolationOptionButton_item_selected"] [connection signal="item_selected" from="InterpolationContainer/InterpolationOptionButton" to="." method="_on_InterpolationOptionButton_item_selected"]
[connection signal="item_selected" from="InterpolationContainer/ColorSpaceOptionButton" to="." method="_on_color_space_option_button_item_selected"] [connection signal="item_selected" from="InterpolationContainer/ColorSpaceOptionButton" to="." method="_on_color_space_option_button_item_selected"]
[connection signal="about_to_popup" from="InterpolationContainer/PresetsMenuButton" to="." method="_on_presets_menu_button_about_to_popup"]
[connection signal="color_changed" from="Popup/ColorPicker" to="." method="_on_ColorPicker_color_changed"] [connection signal="color_changed" from="Popup/ColorPicker" to="." method="_on_ColorPicker_color_changed"]
[connection signal="confirmed" from="DivideConfirmationDialog" to="." method="_on_DivideConfirmationDialog_confirmed"] [connection signal="confirmed" from="DivideConfirmationDialog" to="." method="_on_DivideConfirmationDialog_confirmed"]