mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2025-01-27 21:38:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

0.10.3d

Browse source
This commit is contained in:
Tanasart 2022-12-23 12:58:31 +07:00
parent abaf0d3fa2
commit 1f821fbab5
12 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datafiles/Getting started/2 animation.pxc
View file

File diff suppressed because one or more lines are too long

2
datafiles/Getting started/5 Particle and effectors.pxc
View file

File diff suppressed because one or more lines are too long

4
objects/o_main/Create_0.gml
View file

@ -110,10 +110,6 @@
#region version #region version
version_check = -1; version_check = -1;
version_latest = 0; version_latest = 0;
if(os_is_network_connected()) {
var version = "https://gist.githubusercontent.com/Ttanasart-pt/d9eefbda84a78863c122b8b155bc0cda/raw/version.txt";
version_check = http_get(version);
}
#endregion #endregion
#region parameter #region parameter

8
objects/o_main/Other_2.gml
View file

@ -2,6 +2,13 @@
#region directory #region directory
globalvar DIRECTORY; globalvar DIRECTORY;
DIRECTORY = "C:\\Users\\" + environment_get_variable("USERNAME") + "\\AppData\\Local\\Pixels_Composer\\"; DIRECTORY = "C:\\Users\\" + environment_get_variable("USERNAME") + "\\AppData\\Local\\Pixels_Composer\\";
if(!directory_exists(DIRECTORY))
directory_create(DIRECTORY);
DIRECTORY += "demo\\"
if(!directory_exists(DIRECTORY))
directory_create(DIRECTORY);
log_clear(); log_clear();
log_newline(); log_newline();
log_message("SESSION", "Begin"); log_message("SESSION", "Begin");
@ -29,5 +36,6 @@
#region pref #region pref
PREF_LOAD(); PREF_LOAD();
loadFonts();
setPanel(); setPanel();
#endregion #endregion

7
objects/o_main/Other_62.gml
View file

@ -1,7 +0,0 @@
/// @description init
if (ds_map_find_value(async_load, "id") == version_check) {
if (ds_map_find_value(async_load, "status") == 0) {
var v = ds_map_find_value(async_load, "result");
version_latest = toNumber(v);
}
}

1
objects/o_main/o_main.yy
View file

@ -28,7 +28,6 @@
{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,},
{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":2,"collisionObjectId":null,},
{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":2,"eventType":7,"collisionObjectId":null,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":2,"eventType":7,"collisionObjectId":null,},
{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":62,"eventType":7,"collisionObjectId":null,},
{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":1,"eventType":2,"collisionObjectId":null,},
{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":75,"eventType":8,"collisionObjectId":null,},
{"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":4,"eventType":7,"collisionObjectId":null,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":4,"eventType":7,"collisionObjectId":null,},

6
options/windows/options_windows.yy
View file

@ -2,9 +2,9 @@
"resourceType": "GMWindowsOptions", "resourceType": "GMWindowsOptions",
"resourceVersion": "1.1", "resourceVersion": "1.1",
"name": "Windows", "name": "Windows",
"option_windows_display_name": "Pixel Composer 0.10.1", "option_windows_display_name": "Pixel Composer 0.10.3",
"option_windows_executable_name": "${project_name} 0.10.1.exe", "option_windows_executable_name": "${project_name} 0.10.3.exe",
"option_windows_version": "0.10.1.0", "option_windows_version": "0.10.3.0",
"option_windows_company_info": "MakhamDev", "option_windows_company_info": "MakhamDev",
"option_windows_product_info": "Pixel Composer", "option_windows_product_info": "Pixel Composer",
"option_windows_copyright_info": "", "option_windows_copyright_info": "",

20
scripts/font_loader/font_loader.gml
View file

@ -2,6 +2,12 @@ globalvar FONT_LOADED, f_h3, f_h5, f_p0, f_p0b, f_p1, f_p2, f_p3;
FONT_LOADED = false; FONT_LOADED = false;
function fontTryLoad(path, size, def) {
if(!file_exists(path)) return def;
return font_add(path, size, false, false, 32, 127);
}
function loadFonts() { function loadFonts() {
if(FONT_LOADED) { if(FONT_LOADED) {
font_delete(f_h3); font_delete(f_h3);
@ -16,15 +22,15 @@ function loadFonts() {
} }
var font = "NotoSans"; var font = "NotoSans";
f_h3 = font_add("data/fonts/" + font + "-Bold.ttf", 20 * UI_SCALE, false, false, 32, 127); f_h3 = fontTryLoad("data/fonts/" + font + "-Bold.ttf", 20 * UI_SCALE, _f_h3 );
f_h5 = font_add("data/fonts/" + font + "-Bold.ttf", 16 * UI_SCALE, false, false, 32, 127); f_h5 = fontTryLoad("data/fonts/" + font + "-Bold.ttf", 16 * UI_SCALE, _f_h5 );
f_p0 = font_add("data/fonts/" + font + "-Medium.ttf", 12 * UI_SCALE, false, false, 32, 127); f_p0 = fontTryLoad("data/fonts/" + font + "-Medium.ttf", 12 * UI_SCALE, _f_p0 );
f_p0b = font_add("data/fonts/" + font + "-Bold.ttf", 12 * UI_SCALE, false, false, 32, 127); f_p0b = fontTryLoad("data/fonts/" + font + "-Bold.ttf", 12 * UI_SCALE, _f_p0b );
f_p1 = font_add("data/fonts/" + font + "-SemiBold.ttf", 11 * UI_SCALE, false, false, 32, 127); f_p1 = fontTryLoad("data/fonts/" + font + "-SemiBold.ttf", 11 * UI_SCALE, _f_p1 );
f_p2 = font_add("data/fonts/" + font + "-SemiBold.ttf", 10 * UI_SCALE, false, false, 32, 127); f_p2 = fontTryLoad("data/fonts/" + font + "-SemiBold.ttf", 10 * UI_SCALE, _f_p2 );
f_p3 = font_add("data/fonts/" + font + "-SemiBold.ttf", 9 * UI_SCALE, false, false, 32, 127); f_p3 = fontTryLoad("data/fonts/" + font + "-SemiBold.ttf", 9 * UI_SCALE, _f_p3 );
FONT_LOADED = true; FONT_LOADED = true;
} }

4
scripts/globals/globals.gml
View file

@ -17,9 +17,9 @@
DEBUG = false; DEBUG = false;
globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING; globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING;
VERSION = 102; VERSION = 103;
SAVEFILE_VERSION = 90; SAVEFILE_VERSION = 90;
VERSION_STRING = "0.10.2 DEMO"; VERSION_STRING = "0.10.3 DEMO";
globalvar NODES, ANIMATOR, NODE_MAP, APPEND_MAP, HOTKEYS, HOTKEY_CONTEXT; globalvar NODES, ANIMATOR, NODE_MAP, APPEND_MAP, HOTKEYS, HOTKEY_CONTEXT;

12
scripts/load_function/load_function.gml
View file

@ -2,11 +2,7 @@ function LOAD() {
var path = get_open_filename("*.pxc;*.json", ""); var path = get_open_filename("*.pxc;*.json", "");
if(path == "") return; if(path == "") return;
if(filename_ext(path) != ".json" && filename_ext(path) != ".pxc") return; if(filename_ext(path) != ".json" && filename_ext(path) != ".pxc") return;
nodeCleanUp();
setPanel();
room_restart();
gc_collect(); gc_collect();
LOAD_PATH(path); LOAD_PATH(path);
@ -26,6 +22,11 @@ function LOAD_PATH(path, readonly = false) {
return false; return false;
} }
nodeCleanUp();
clearPanel();
setPanel();
room_restart();
var temp_path = DIRECTORY + "\_temp"; var temp_path = DIRECTORY + "\_temp";
if(file_exists(temp_path)) file_delete(temp_path); if(file_exists(temp_path)) file_delete(temp_path);
file_copy(path, temp_path); file_copy(path, temp_path);
@ -138,7 +139,6 @@ function LOAD_PATH(path, readonly = false) {
LOADING = false; LOADING = false;
MODIFIED = false; MODIFIED = false;
PANEL_GRAPH.fullView();
PANEL_ANIMATION.updatePropertyList(); PANEL_ANIMATION.updatePropertyList();
log_message("FILE", "load " + path, s_noti_icon_file_load); log_message("FILE", "load " + path, s_noti_icon_file_load);

2
scripts/panel_inspector/panel_inspector.gml
View file

@ -103,7 +103,7 @@ function Panel_Inspector() : PanelContent() constructor {
} }
jun = inspecting.inputs[| inspecting.input_display_list[i]]; jun = inspecting.inputs[| inspecting.input_display_list[i]];
} }
if(!jun.show_in_inspector || jun.type == VALUE_TYPE.object) continue; if(!jun.show_in_inspector || jun.type == VALUE_TYPE.object) continue;
var lb_h = line_height(f_p0) + ui(8); var lb_h = line_height(f_p0) + ui(8);

2
scripts/preferences/preferences.gml
View file

@ -245,8 +245,6 @@
window_set_size(ww, hh); window_set_size(ww, hh);
window_set_position(display_get_width() / 2 - ww / 2, display_get_height() / 2 - hh / 2); window_set_position(display_get_width() / 2 - ww / 2, display_get_height() / 2 - hh / 2);
loadFonts();
} }
function find_hotkey(_context, _name) { function find_hotkey(_context, _name) {