mirror of
https://github.com/Ttanasart-pt/Pixel-Composer.git
synced 2024-12-24 22:16:17 +01:00
Mac please work with me man.
This commit is contained in:
Tanasart
parent
8c0ce7dcf6
commit
ed2d11da6e
18 changed files with 236 additions and 2825 deletions
|
|
@ -3,9 +3,9 @@
|
|||
{"name":"_crash_handler","order":19,"path":"folders/_crash_handler.yy",},
|
||||
{"name":"sprites","order":3,"path":"folders/_crash_handler/sprites.yy",},
|
||||
{"name":"_extensions","order":16,"path":"folders/_extensions.yy",},
|
||||
{"name":"BBMOD","order":8,"path":"folders/_extensions/BBMOD.yy",},
|
||||
{"name":"BBMOD","order":6,"path":"folders/_extensions/BBMOD.yy",},
|
||||
{"name":"Math","order":1,"path":"folders/_extensions/BBMOD/Math.yy",},
|
||||
{"name":"FireBase","order":12,"path":"folders/_extensions/FireBase.yy",},
|
||||
{"name":"FireBase","order":10,"path":"folders/_extensions/FireBase.yy",},
|
||||
{"name":"Extensions","order":1,"path":"folders/_extensions/FireBase/Firebase Firestore/Extensions.yy",},
|
||||
{"name":"Firebase REST API Library (Don't Touch)","order":1,"path":"folders/_extensions/FireBase/Firebase Firestore/Extensions/Firebase REST API Library (Don't Touch).yy",},
|
||||
{"name":"Firebase Firestore","order":1,"path":"folders/_extensions/FireBase/Firebase Firestore/Extensions/Firebase REST API Library (Don't Touch)/Firebase Firestore.yy",},
|
||||
|
|
@ -18,9 +18,9 @@
|
|||
{"name":"CRUD","order":1,"path":"folders/_extensions/FireBase/Firebase Firestore/Testing/CRUD.yy",},
|
||||
{"name":"Query","order":2,"path":"folders/_extensions/FireBase/Firebase Firestore/Testing/Query.yy",},
|
||||
{"name":"Firebase Utils","order":1,"path":"folders/_extensions/FireBase/Firebase Utils.yy",},
|
||||
{"name":"GMD3D11","order":11,"path":"folders/_extensions/GMD3D11.yy",},
|
||||
{"name":"MAC","order":6,"path":"folders/_extensions/MAC.yy",},
|
||||
{"name":"patreon","order":13,"path":"folders/_extensions/patreon.yy",},
|
||||
{"name":"GMD3D11","order":9,"path":"folders/_extensions/GMD3D11.yy",},
|
||||
{"name":"MAC","order":4,"path":"folders/_extensions/MAC.yy",},
|
||||
{"name":"patreon","order":11,"path":"folders/_extensions/patreon.yy",},
|
||||
{"name":"addons","order":10,"path":"folders/addons.yy",},
|
||||
{"name":"custom","order":4,"path":"folders/addons/custom.yy",},
|
||||
{"name":"key displayer","order":2,"path":"folders/addons/key displayer.yy",},
|
||||
|
|
@ -324,7 +324,7 @@
|
|||
{"name":"node_switch","order":5,"path":"scripts/node_switch/node_switch.yy",},
|
||||
{"name":"sh_corner","order":20,"path":"shaders/sh_corner/sh_corner.yy",},
|
||||
{"name":"node_array","order":5,"path":"scripts/node_array/node_array.yy",},
|
||||
{"name":"discordBridge","order":10,"path":"extensions/discordBridge/discordBridge.yy",},
|
||||
{"name":"discordBridge","order":8,"path":"extensions/discordBridge/discordBridge.yy",},
|
||||
{"name":"pack_corner","order":3,"path":"scripts/pack_corner/pack_corner.yy",},
|
||||
{"name":"s_node_websocket","order":18,"path":"sprites/s_node_websocket/s_node_websocket.yy",},
|
||||
{"name":"sh_colorize","order":9,"path":"shaders/sh_colorize/sh_colorize.yy",},
|
||||
|
|
@ -374,7 +374,6 @@
|
|||
{"name":"fd_rectangle_set_velocity_time_step","order":17,"path":"scripts/fd_rectangle_set_velocity_time_step/fd_rectangle_set_velocity_time_step.yy",},
|
||||
{"name":"fd_rectangle_set_collision_mask_sprite","order":1,"path":"scripts/fd_rectangle_set_collision_mask_sprite/fd_rectangle_set_collision_mask_sprite.yy",},
|
||||
{"name":"sh_flip","order":7,"path":"shaders/sh_flip/sh_flip.yy",},
|
||||
{"name":"libdlgmodule","order":2,"path":"extensions/libdlgmodule/libdlgmodule.yy",},
|
||||
{"name":"s_node_alpha_grey","order":4,"path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},
|
||||
{"name":"fd_rectangle_set_pressure_iteration_type","order":10,"path":"scripts/fd_rectangle_set_pressure_iteration_type/fd_rectangle_set_pressure_iteration_type.yy",},
|
||||
{"name":"s_node_sort_array","order":29,"path":"sprites/s_node_sort_array/s_node_sort_array.yy",},
|
||||
|
|
@ -664,7 +663,7 @@
|
|||
{"name":"node_array_get","order":7,"path":"scripts/node_array_get/node_array_get.yy",},
|
||||
{"name":"node_widget_test","order":16,"path":"scripts/node_widget_test/node_widget_test.yy",},
|
||||
{"name":"node_pb_fx_highlight","order":1,"path":"scripts/node_pb_fx_highlight/node_pb_fx_highlight.yy",},
|
||||
{"name":"Apollo","order":5,"path":"extensions/Apollo/Apollo.yy",},
|
||||
{"name":"Apollo","order":3,"path":"extensions/Apollo/Apollo.yy",},
|
||||
{"name":"panel_graph_grid_settings","order":7,"path":"scripts/panel_graph_grid_settings/panel_graph_grid_settings.yy",},
|
||||
{"name":"sh_twirl","order":3,"path":"shaders/sh_twirl/sh_twirl.yy",},
|
||||
{"name":"s_node_shape","order":14,"path":"sprites/s_node_shape/s_node_shape.yy",},
|
||||
|
|
@ -759,7 +758,7 @@
|
|||
{"name":"node_pin","order":2,"path":"scripts/node_pin/node_pin.yy",},
|
||||
{"name":"_node_fluid_nodes","order":7,"path":"scripts/_node_fluid_nodes/_node_fluid_nodes.yy",},
|
||||
{"name":"sh_skew","order":6,"path":"shaders/sh_skew/sh_skew.yy",},
|
||||
{"name":"libxprocess","order":4,"path":"extensions/libxprocess/libxprocess.yy",},
|
||||
{"name":"libxprocess","order":2,"path":"extensions/libxprocess/libxprocess.yy",},
|
||||
{"name":"fd_rectangle_get_pressure_height","order":16,"path":"scripts/fd_rectangle_get_pressure_height/fd_rectangle_get_pressure_height.yy",},
|
||||
{"name":"hyperbolic_function","order":16,"path":"scripts/hyperbolic_function/hyperbolic_function.yy",},
|
||||
{"name":"node_tile","order":4,"path":"scripts/node_tile/node_tile.yy",},
|
||||
|
|
@ -957,7 +956,7 @@
|
|||
{"name":"sh_color_replace","order":8,"path":"shaders/sh_color_replace/sh_color_replace.yy",},
|
||||
{"name":"s_node_3d_meterial","order":12,"path":"sprites/s_node_3d_meterial/s_node_3d_meterial.yy",},
|
||||
{"name":"__surface","order":8,"path":"scripts/__surface/__surface.yy",},
|
||||
{"name":"clipboard","order":9,"path":"extensions/clipboard/clipboard.yy",},
|
||||
{"name":"clipboard","order":7,"path":"extensions/clipboard/clipboard.yy",},
|
||||
{"name":"__node_3d_light","order":1,"path":"scripts/__node_3d_light/__node_3d_light.yy",},
|
||||
{"name":"d3d_icosphere","order":4,"path":"scripts/d3d_icosphere/d3d_icosphere.yy",},
|
||||
{"name":"s_node_edge_detect","order":22,"path":"sprites/s_node_edge_detect/s_node_edge_detect.yy",},
|
||||
|
|
@ -1224,7 +1223,7 @@
|
|||
{"name":"s_gizmo","order":4,"path":"sprites/s_gizmo/s_gizmo.yy",},
|
||||
{"name":"node_pb_draw_line","order":9,"path":"scripts/node_pb_draw_line/node_pb_draw_line.yy",},
|
||||
{"name":"s_node_3d_plane","order":6,"path":"sprites/s_node_3d_plane/s_node_3d_plane.yy",},
|
||||
{"name":"Regex","order":7,"path":"extensions/Regex/Regex.yy",},
|
||||
{"name":"Regex","order":5,"path":"extensions/Regex/Regex.yy",},
|
||||
{"name":"s_node_path_shift","order":4,"path":"sprites/s_node_path_shift/s_node_path_shift.yy",},
|
||||
{"name":"sh_slice_spritesheet_empty_scan","order":10,"path":"shaders/sh_slice_spritesheet_empty_scan/sh_slice_spritesheet_empty_scan.yy",},
|
||||
{"name":"s_node_grid_tri","order":6,"path":"sprites/s_node_grid_tri/s_node_grid_tri.yy",},
|
||||
|
|
@ -1381,6 +1380,7 @@
|
|||
{"name":"sh_colours_replace","order":54,"path":"shaders/sh_colours_replace/sh_colours_replace.yy",},
|
||||
{"name":"sh_channel_R2G","order":11,"path":"shaders/sh_channel_R2G/sh_channel_R2G.yy",},
|
||||
{"name":"node_wrap_mesh","order":6,"path":"scripts/node_wrap_mesh/node_wrap_mesh.yy",},
|
||||
{"name":"libdlgmodule","order":12,"path":"extensions/libdlgmodule/libdlgmodule.yy",},
|
||||
{"name":"sh_alpha_hash","order":2,"path":"shaders/sh_alpha_hash/sh_alpha_hash.yy",},
|
||||
{"name":"vct_slider","order":1,"path":"scripts/vct_slider/vct_slider.yy",},
|
||||
{"name":"panel_node_align","order":3,"path":"scripts/panel_node_align/panel_node_align.yy",},
|
||||
|
|
@ -1464,7 +1464,6 @@
|
|||
{"name":"BBMOD_Matrix","order":2,"path":"scripts/BBMOD_Matrix/BBMOD_Matrix.yy",},
|
||||
{"name":"pack_shelf","order":1,"path":"scripts/pack_shelf/pack_shelf.yy",},
|
||||
{"name":"s_node_path_trim","order":6,"path":"sprites/s_node_path_trim/s_node_path_trim.yy",},
|
||||
{"name":"libfilesystem","order":3,"path":"extensions/libfilesystem/libfilesystem.yy",},
|
||||
{"name":"node_channels_hsv","order":1,"path":"scripts/node_channels_hsv/node_channels_hsv.yy",},
|
||||
{"name":"sh_stripe","order":10,"path":"shaders/sh_stripe/sh_stripe.yy",},
|
||||
{"name":"s_node_shard","order":33,"path":"sprites/s_node_shard/s_node_shard.yy",},
|
||||
|
|
@ -1618,6 +1617,7 @@
|
|||
{"name":"s_node_bokeh","order":51,"path":"sprites/s_node_bokeh/s_node_bokeh.yy",},
|
||||
{"name":"s_node_3d_sphere_uv","order":16,"path":"sprites/s_node_3d_sphere_uv/s_node_3d_sphere_uv.yy",},
|
||||
{"name":"s_biterator_toggler","order":13,"path":"sprites/s_biterator_toggler/s_biterator_toggler.yy",},
|
||||
{"name":"libfilesystem","order":13,"path":"extensions/libfilesystem/libfilesystem.yy",},
|
||||
{"name":"s_node_smokeSim_render","order":9,"path":"sprites/s_node_smokeSim_render/s_node_smokeSim_render.yy",},
|
||||
{"name":"sh_vertex_depth_pass","order":2,"path":"shaders/sh_vertex_depth_pass/sh_vertex_depth_pass.yy",},
|
||||
{"name":"sh_curve","order":3,"path":"shaders/sh_curve/sh_curve.yy",},
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
],"name":"Steam",},
|
||||
{"children":[
|
||||
{"children":[],"name":"ItchDemo",},
|
||||
{"children":[],"name":"MacAlpha",},
|
||||
],"name":"Itch",},
|
||||
{"children":[],"name":"GX",},
|
||||
],
|
||||
|
|
@ -574,7 +573,6 @@
|
|||
{"id":{"name":"fd_rectangle_set_collision_mask_sprite","path":"scripts/fd_rectangle_set_collision_mask_sprite/fd_rectangle_set_collision_mask_sprite.yy",},},
|
||||
{"id":{"name":"node_iterate_each","path":"scripts/node_iterate_each/node_iterate_each.yy",},},
|
||||
{"id":{"name":"sh_flip","path":"shaders/sh_flip/sh_flip.yy",},},
|
||||
{"id":{"name":"libdlgmodule","path":"extensions/libdlgmodule/libdlgmodule.yy",},},
|
||||
{"id":{"name":"s_node_alpha_grey","path":"sprites/s_node_alpha_grey/s_node_alpha_grey.yy",},},
|
||||
{"id":{"name":"node_blend","path":"scripts/node_blend/node_blend.yy",},},
|
||||
{"id":{"name":"fd_rectangle_set_pressure_iteration_type","path":"scripts/fd_rectangle_set_pressure_iteration_type/fd_rectangle_set_pressure_iteration_type.yy",},},
|
||||
|
|
@ -1723,6 +1721,7 @@
|
|||
{"id":{"name":"sh_channel_R2G","path":"shaders/sh_channel_R2G/sh_channel_R2G.yy",},},
|
||||
{"id":{"name":"node_wrap_mesh","path":"scripts/node_wrap_mesh/node_wrap_mesh.yy",},},
|
||||
{"id":{"name":"node_surface_to_buffer","path":"scripts/node_surface_to_buffer/node_surface_to_buffer.yy",},},
|
||||
{"id":{"name":"libdlgmodule","path":"extensions/libdlgmodule/libdlgmodule.yy",},},
|
||||
{"id":{"name":"node_curve","path":"scripts/node_curve/node_curve.yy",},},
|
||||
{"id":{"name":"sh_alpha_hash","path":"shaders/sh_alpha_hash/sh_alpha_hash.yy",},},
|
||||
{"id":{"name":"vct_slider","path":"scripts/vct_slider/vct_slider.yy",},},
|
||||
|
|
@ -1822,7 +1821,6 @@
|
|||
{"id":{"name":"pack_shelf","path":"scripts/pack_shelf/pack_shelf.yy",},},
|
||||
{"id":{"name":"s_node_path_trim","path":"sprites/s_node_path_trim/s_node_path_trim.yy",},},
|
||||
{"id":{"name":"sh_d3d_ssao","path":"shaders/sh_d3d_ssao/sh_d3d_ssao.yy",},},
|
||||
{"id":{"name":"libfilesystem","path":"extensions/libfilesystem/libfilesystem.yy",},},
|
||||
{"id":{"name":"node_channels_hsv","path":"scripts/node_channels_hsv/node_channels_hsv.yy",},},
|
||||
{"id":{"name":"sh_stripe","path":"shaders/sh_stripe/sh_stripe.yy",},},
|
||||
{"id":{"name":"s_node_shard","path":"sprites/s_node_shard/s_node_shard.yy",},},
|
||||
|
|
@ -2000,6 +1998,7 @@
|
|||
{"id":{"name":"s_node_bokeh","path":"sprites/s_node_bokeh/s_node_bokeh.yy",},},
|
||||
{"id":{"name":"s_node_3d_sphere_uv","path":"sprites/s_node_3d_sphere_uv/s_node_3d_sphere_uv.yy",},},
|
||||
{"id":{"name":"s_biterator_toggler","path":"sprites/s_biterator_toggler/s_biterator_toggler.yy",},},
|
||||
{"id":{"name":"libfilesystem","path":"extensions/libfilesystem/libfilesystem.yy",},},
|
||||
{"id":{"name":"s_node_smokeSim_render","path":"sprites/s_node_smokeSim_render/s_node_smokeSim_render.yy",},},
|
||||
{"id":{"name":"sh_vertex_depth_pass","path":"shaders/sh_vertex_depth_pass/sh_vertex_depth_pass.yy",},},
|
||||
{"id":{"name":"sh_curve","path":"shaders/sh_curve/sh_curve.yy",},},
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 58 KiB |
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
|
|
@ -125,7 +125,7 @@ draw_sprite_ext(s_noti_icon_error, 0, 18, 18, 0.5, 0.5, 0, c_white, 1);
|
|||
|
||||
if(point_in_rectangle(mouse_mx, mouse_my, bx0, by0, bx0 + bw, by0 + bh)) {
|
||||
if(mouse_check_button_pressed(mb_left)) {
|
||||
EnvironmentUnsetVariable("process_id");
|
||||
environment_set_variable("process_id", string(0));
|
||||
|
||||
var path = executable_get_pathname();
|
||||
shell_execute_async(path, "--crashed");
|
||||
|
|
|
|||
|
|
@ -47,11 +47,9 @@ if !ready exit;
|
|||
__initPalette();
|
||||
bx -= ui(32);
|
||||
|
||||
if(buttonInstant(THEME.button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, __txtx("color_selector_open_palette", "Open palette folder"), THEME.folder) == 2) {
|
||||
var _realpath = environment_get_variable("LOCALAPPDATA") + "/Pixels_Composer/Palettes";
|
||||
var _windir = environment_get_variable("WINDIR") + "/explorer.exe";
|
||||
shell_execute_async(_windir, _realpath);
|
||||
}
|
||||
if(buttonInstant(THEME.button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, __txtx("color_selector_open_palette", "Open palette folder"), THEME.folder) == 2)
|
||||
shellOpenExplorer($"{DIRECTORY}Palettes");
|
||||
|
||||
bx -= ui(32);
|
||||
|
||||
if(buttonInstant(THEME.button_hide, bx, by, ui(28), ui(28), mouse_ui, sFOCUS, sHOVER, __txt("Show on Selector"), THEME.display_palette, NODE_COLOR_SHOW_PALETTE, c_white) == 2)
|
||||
|
|
|
|||
|
|
@ -115,7 +115,6 @@
|
|||
shell_execute_async("assoc", cmd);
|
||||
|
||||
directory_set_current_working(DIRECTORY);
|
||||
//print($"Setup time: {(current_time - t)/1000}s");
|
||||
#endregion
|
||||
|
||||
#region parameter
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
/// @description
|
||||
#region process management
|
||||
global.PROC_ID = bool(EnvironmentGetVariableExists("process_id"))? int64(EnvironmentGetVariable("process_id")) : 0;
|
||||
EnvironmentSetVariable("process_id", string(global.PROC_ID + 1));
|
||||
global.PROC_ID = int64(environment_get_variable_exists("process_id")? environment_get_variable("process_id") : 0);
|
||||
environment_set_variable("process_id", string(global.PROC_ID + 1));
|
||||
|
||||
if (global.PROC_ID == 0)
|
||||
instance_create(0, 0, o_main);
|
||||
else if (global.PROC_ID == 1)
|
||||
instance_create(0, 0, o_crash_handler);
|
||||
if (global.PROC_ID == 0) instance_create(0, 0, o_main);
|
||||
else if (global.PROC_ID == 1) instance_create(0, 0, o_crash_handler);
|
||||
#endregion
|
||||
|
|
@ -73,6 +73,8 @@ function exception_print(e) {
|
|||
}
|
||||
|
||||
function setException() {
|
||||
if(OS == os_macosx) return;
|
||||
|
||||
exception_unhandled_handler(function(ex) {
|
||||
var path = string(DIRECTORY) + "prev_crash.pxc";
|
||||
if(!SAVING && !TESTING) SAVE_AT(PROJECT, path);
|
||||
|
|
@ -98,9 +100,7 @@ function setException() {
|
|||
}
|
||||
//setException();
|
||||
|
||||
function resetException() {
|
||||
exception_unhandled_handler(undefined);
|
||||
}
|
||||
function resetException() { exception_unhandled_handler(undefined); }
|
||||
|
||||
function printCallStack(maxDepth = 32) {
|
||||
var stack = debug_get_callstack(maxDepth);
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ function filepath_resolve(path) {
|
|||
}
|
||||
|
||||
function get_open_filenames_compat(ext, sel) {
|
||||
INLINE
|
||||
if(OS == os_windows) return get_open_filenames(ext, sel);
|
||||
return get_open_filename(ext, sel);
|
||||
}
|
||||
|
|
@ -25,10 +25,10 @@
|
|||
globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION;
|
||||
|
||||
LATEST_VERSION = 11500;
|
||||
VERSION = 11604;
|
||||
VERSION = 11603;
|
||||
SAVE_VERSION = 11600.1;
|
||||
VERSION_STRING = "1.16.0.4";
|
||||
BUILD_NUMBER = 11604;
|
||||
VERSION_STRING = "1.16.0.3";
|
||||
BUILD_NUMBER = 11603;
|
||||
|
||||
globalvar APPEND_MAP;
|
||||
APPEND_MAP = ds_map_create();
|
||||
|
|
@ -96,10 +96,6 @@
|
|||
#macro DEMO false
|
||||
#macro ItchDemo:DEMO true
|
||||
#macro SteamDemo:DEMO true
|
||||
#macro MacAlpha:DEMO true
|
||||
|
||||
#macro ALPHA false
|
||||
#macro MacAlpha:ALPHA true
|
||||
|
||||
#region color
|
||||
#macro c_ui_blue_dkblack $251919
|
||||
|
|
|
|||
|
|
@ -663,8 +663,7 @@ function Panel_Menu() : PanelContent() constructor {
|
|||
txt += PROJECT.path == ""? __txt("Untitled") : filename_name(PROJECT.path);
|
||||
if(PROJECT.modified) txt += "*";
|
||||
txt += " - Pixel Composer";
|
||||
if(ALPHA) txt += " ALPHA";
|
||||
else if(DEMO) txt += " DEMO";
|
||||
if(DEMO) txt += " DEMO";
|
||||
|
||||
var tx0, tx1, tcx;
|
||||
var ty0, ty1;
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ function SAVE(project = PROJECT) { #region
|
|||
function SAVE_AS(project = PROJECT) { #region
|
||||
if(DEMO) return false;
|
||||
|
||||
var path = get_save_filename("Pixel Composer project (.pxc)|*.pxc", "");
|
||||
var path = get_save_filename("Pixel Composer project (.pxc)|*.pxc", "");
|
||||
key_release();
|
||||
if(path == "") return false;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ THEME_DEF = true;
|
|||
function __initTheme() { #region
|
||||
var root = DIRECTORY + "Themes";
|
||||
|
||||
show_message(root);
|
||||
show_message(directory_exists(root));
|
||||
|
||||
directory_verify(root);
|
||||
if(check_version($"{root}/version")) {
|
||||
log_message("THEME", $"unzipping default theme to {root}.");
|
||||
|
|
|
|||
Loading…
Reference in a new issue