mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-25 06:26:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Inline

Browse source
This commit is contained in:
Tanasart 2023-04-16 16:24:17 +02:00
parent d250b7b49f
commit 965453bcc6
6 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PixelComposer.resource_order
View file

@ -83,6 +83,7 @@
{"name":"strandSim","order":20,"path":"folders/nodes/data/strandSim.yy",},
{"name":"transform","order":8,"path":"folders/nodes/data/transform.yy",},
{"name":"value","order":3,"path":"folders/nodes/data/value.yy",},
{"name":"atlas","order":9,"path":"folders/nodes/data/value/atlas.yy",},
{"name":"mesh","order":7,"path":"folders/nodes/data/value/mesh.yy",},
{"name":"struct","order":6,"path":"folders/nodes/data/value/struct.yy",},
{"name":"trigger","order":8,"path":"folders/nodes/data/value/trigger.yy",},
@ -101,6 +102,7 @@
{"name":"transform","order":145,"path":"folders/nodes/icons/transform.yy",},
{"name":"value","order":144,"path":"folders/nodes/icons/value.yy",},
{"name":"array","order":44,"path":"folders/nodes/icons/value/array.yy",},
{"name":"atlas","order":52,"path":"folders/nodes/icons/value/atlas.yy",},
{"name":"bool","order":45,"path":"folders/nodes/icons/value/bool.yy",},
{"name":"color","order":46,"path":"folders/nodes/icons/value/color.yy",},
{"name":"mesh","order":51,"path":"folders/nodes/icons/value/mesh.yy",},
@ -132,6 +134,7 @@
{"name":"generator","order":19,"path":"folders/shader/generator.yy",},
{"name":"mask","order":45,"path":"folders/shader/mask.yy",},
{"name":"misc","order":50,"path":"folders/shader/misc.yy",},
{"name":"morph","order":54,"path":"folders/shader/morph.yy",},
{"name":"shape seperator","order":35,"path":"folders/shader/shape seperator.yy",},
{"name":"sprites","order":20,"path":"folders/shader/sprites.yy",},
{"name":"surface replace","order":53,"path":"folders/shader/surface replace.yy",},
@ -140,9 +143,6 @@
{"name":"sprites","order":12,"path":"folders/sprites.yy",},
{"name":"gameframe","order":2,"path":"folders/sprites/gameframe.yy",},
{"name":"widgets","order":5,"path":"folders/widgets.yy",},
{"name":"morph","order":54,"path":"folders/shader/morph.yy",},
{"name":"atlas","order":9,"path":"folders/nodes/data/value/atlas.yy",},
{"name":"atlas","order":52,"path":"folders/nodes/icons/value/atlas.yy",},
],
"ResourceOrderSettings": [
{"name":"s_node_corner","order":16,"path":"sprites/s_node_corner/s_node_corner.yy",},

6
PixelComposer.yyp
View file

@ -110,6 +110,7 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"transform","folderPath":"folders/nodes/data/transform.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"value","folderPath":"folders/nodes/data/value.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"array","folderPath":"folders/nodes/data/value/array.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"atlas","folderPath":"folders/nodes/data/value/atlas.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"bool","folderPath":"folders/nodes/data/value/bool.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"color","folderPath":"folders/nodes/data/value/color.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"mesh","folderPath":"folders/nodes/data/value/mesh.yy",},
@ -133,6 +134,7 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"transform","folderPath":"folders/nodes/icons/transform.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"value","folderPath":"folders/nodes/icons/value.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"array","folderPath":"folders/nodes/icons/value/array.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"atlas","folderPath":"folders/nodes/icons/value/atlas.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"bool","folderPath":"folders/nodes/icons/value/bool.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"color","folderPath":"folders/nodes/icons/value/color.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"mesh","folderPath":"folders/nodes/icons/value/mesh.yy",},
@ -165,6 +167,7 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"generator","folderPath":"folders/shader/generator.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"mask","folderPath":"folders/shader/mask.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"misc","folderPath":"folders/shader/misc.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"morph","folderPath":"folders/shader/morph.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"shape seperator","folderPath":"folders/shader/shape seperator.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"sprites","folderPath":"folders/shader/sprites.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"surface replace","folderPath":"folders/shader/surface replace.yy",},
@ -176,9 +179,6 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"Steamworks","folderPath":"folders/Steamworks.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"UGC","folderPath":"folders/Steamworks/UGC.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"widgets","folderPath":"folders/widgets.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"morph","folderPath":"folders/shader/morph.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"atlas","folderPath":"folders/nodes/data/value/atlas.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"atlas","folderPath":"folders/nodes/icons/value/atlas.yy",},
],
"IncludedFiles": [
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ApolloHelp.html","CopyToMask":-1,"filePath":"datafiles",},

2
scripts/array_functions/array_functions.gml
View file

@ -21,8 +21,8 @@ enum ARRAY_OVERFLOW {
loop
}
gml_pragma("forceinline");
function array_safe_get(arr, index, def = 0, overflow = ARRAY_OVERFLOW._default) {
gml_pragma("forceinline");
if(!is_array(arr)) return def;
if(overflow == ARRAY_OVERFLOW.loop) {

4
scripts/draw_UI_scale/draw_UI_scale.gml
View file

@ -23,6 +23,8 @@ function line_width(txt, font = noone, offset = 0) {
#region global
#macro TEXTBOX_HEIGHT line_height(f_p0, 12)
function ui(val) {
gml_pragma("forceinline");
function ui(val) { return val * UI_SCALE; }
return val * UI_SCALE;
}
#endregion

2
scripts/string_decimal/string_decimal.gml
View file

@ -9,8 +9,8 @@ function string_decimal(str) {
return (neg? "-" : "") + (dec? string_digits(pre) + "." + string_digits(pos) : string_digits(str));
}
gml_pragma("forceinline");
function toNumber(str) {
gml_pragma("forceinline");
if(is_real(str)) return str;
var expo = 0;

6
scripts/surface_functions/surface_functions.gml
View file

@ -88,8 +88,9 @@ function surface_save_safe(surface, path) {
}
//check
gml_pragma("forceinline");
function is_surface(s) {
gml_pragma("forceinline");
if(is_undefined(s)) return false;
if(is_array(s)) return false;
if(!is_real(s)) return false;
@ -102,8 +103,9 @@ function is_surface(s) {
return true;
}
gml_pragma("forceinline");
function surface_verify(surf, w, h, format = surface_rgba8unorm) {
gml_pragma("forceinline");
if(!is_surface(surf))
return surface_create_valid(w, h, format);
return surface_size_to(surf, w, h, format);