mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2025-02-03 00:35:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

- [Preview Panel] Fix view range not apply to sdf shape.

Browse source
This commit is contained in:
Tanasart 2024-07-05 07:57:06 +07:00
parent 25b1a9954b
commit 63efb6be3c
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
objects/o_dialog_add_node/Create_0.gml
View file

@ -787,7 +787,7 @@ event_inherited();
if(match == -9999) continue; if(match == -9999) continue;
ds_priority_add(pr_list, [_node, param], match); ds_priority_add(pr_list, [ _node, param ], match);
search_map[? _node] = 1; search_map[? _node] = 1;
} }
} }

4
scripts/node_registry/node_registry.gml
View file

@ -695,9 +695,9 @@ function __initNodes() {
addNodeObject(d3d, "Point Affector", s_node_3d_point_affector, "Node_3D_Point_Affector", [1, Node_3D_Point_Affector],, "Generate array of 3D points interpolating between two values based on the distance.").setVersion(11570); addNodeObject(d3d, "Point Affector", s_node_3d_point_affector, "Node_3D_Point_Affector", [1, Node_3D_Point_Affector],, "Generate array of 3D points interpolating between two values based on the distance.").setVersion(11570);
ds_list_add(d3d, "Ray Marching"); ds_list_add(d3d, "Ray Marching");
addNodeObject(d3d, "RM Primitive", s_node_rm_primitive, "Node_RM_Primitive", [1, Node_RM_Primitive], ["ray marching"]).setVersion(11720); addNodeObject(d3d, "RM Primitive", s_node_rm_primitive, "Node_RM_Primitive", [1, Node_RM_Primitive], ["ray marching", "rm object"]).setVersion(11720);
addNodeObject(d3d, "RM Terrain", s_node_rm_terrain, "Node_RM_Terrain", [1, Node_RM_Terrain], ["ray marching"]).setVersion(11720); addNodeObject(d3d, "RM Terrain", s_node_rm_terrain, "Node_RM_Terrain", [1, Node_RM_Terrain], ["ray marching"]).setVersion(11720);
addNodeObject(d3d, "RM Combine", s_node_rm_combine, "Node_RM_Combine", [1, Node_RM_Combine], ["ray marching"]).setVersion(11740); addNodeObject(d3d, "RM Combine", s_node_rm_combine, "Node_RM_Combine", [1, Node_RM_Combine], ["ray marching", "rm boolean"]).setVersion(11740);
addNodeObject(d3d, "RM Render", s_node_rm_render, "Node_RM_Render", [1, Node_RM_Render], ["ray marching"]).setVersion(11740); addNodeObject(d3d, "RM Render", s_node_rm_render, "Node_RM_Render", [1, Node_RM_Render], ["ray marching"]).setVersion(11740);
#endregion #endregion

2
scripts/node_registry/node_registry.yy
View file

@ -1,5 +1,5 @@
{ {
"$GMScript":"v1", "$GMScript":"",
"%Name":"node_registry", "%Name":"node_registry",
"isCompatibility":false, "isCompatibility":false,
"isDnD":false, "isDnD":false,

1
scripts/panel_preview/panel_preview.gml
View file

@ -1211,6 +1211,7 @@ function Panel_Preview() : PanelContent() constructor {
shader_set_f("gridStep", _step); shader_set_f("gridStep", _step);
shader_set_f("gridScale", zm / 2); shader_set_f("gridScale", zm / 2);
shader_set_f("axisBlend", 1.); shader_set_f("axisBlend", 1.);
shader_set_f("viewRange", [ d3_view_camera.view_near, d3_view_camera.view_far ]);
draw_sprite_stretched(s_fx_pixel, 0, 0, 0, w, h); draw_sprite_stretched(s_fx_pixel, 0, 0, 0, w, h);
shader_reset(); shader_reset();

2
scripts/panel_preview/panel_preview.yy
View file

@ -1,5 +1,5 @@
{ {
"$GMScript":"v1", "$GMScript":"",
"%Name":"panel_preview", "%Name":"panel_preview",
"isCompatibility":false, "isCompatibility":false,
"isDnD":false, "isDnD":false,

14
scripts/string_functions/string_functions.gml
View file

@ -7,21 +7,23 @@ function string_to_array(str) { #region
} #endregion } #endregion
function string_partial_match(str, key) { #region function string_partial_match(str, key) { #region
var amo = string_length(str); var amo = string_length(str);
var run = 1; var run = 1;
var consec = 0; var consec = 0;
var conMax = 0; var conMax = 0;
var misMatch = 0; var misMatch = 0;
var kchr = string_char_at(key, run); var kchr = string_char_at(key, run);
var ch;
for( var i = 1; i <= amo; i++ ) { for( var i = 1; i <= amo; i++ ) {
var ch = string_char_at(str, i); ch = string_char_at(str, i);
if(ch == kchr) { if(ch == kchr) {
consec++; consec++;
conMax = max(conMax, consec); conMax = max(conMax, consec);
run++; run++;
if(run > string_length(key)) return conMax - (misMatch + (amo - i)); if(run > string_length(key)) return conMax - (misMatch + (amo - i));
kchr = string_char_at(key, run); kchr = string_char_at(key, run);
} else { } else {
consec = 0; consec = 0;
misMatch += amo - i; misMatch += amo - i;