Skip to content

Commit

Permalink
Fleshes out constants script
Browse files Browse the repository at this point in the history
  • Loading branch information
@JujuAdams
JujuAdams committed Jul 23, 2024
1 parent 19a9f7c commit a2d9e5a
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 62 deletions.
20 changes: 10 additions & 10 deletions scribble.resource_order
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"FolderOrderSettings":[
{"name":"Mallangche","order":1,"path":"folders/Fonts/Mallangche.yy",},
{"name":"(System - don't call these functions)","order":2,"path":"folders/Scribble/(System - don't call these functions).yy",},
{"name":"(System - don't call these functions)","order":3,"path":"folders/Scribble/(System - don't call these functions).yy",},
{"name":"Classes","order":2,"path":"folders/Scribble/(System - don't call these functions)/Classes.yy",},
{"name":"Deprecated","order":3,"path":"folders/Scribble/(System - don't call these functions)/Deprecated.yy",},
{"name":"Generator","order":4,"path":"folders/Scribble/(System - don't call these functions)/Generator.yy",},
{"name":"Global Static Getters","order":5,"path":"folders/Scribble/(System - don't call these functions)/Global Static Getters.yy",},
{"name":"Shaders","order":6,"path":"folders/Scribble/(System - don't call these functions)/Shaders.yy",},
{"name":"Animation","order":3,"path":"folders/Scribble/Animation.yy",},
{"name":"Colours","order":4,"path":"folders/Scribble/Colours.yy",},
{"name":"Configuration - Please edit these!","order":5,"path":"folders/Scribble/Configuration - Please edit these!.yy",},
{"name":"External Assets","order":6,"path":"folders/Scribble/External Assets.yy",},
{"name":"Fonts","order":7,"path":"folders/Scribble/Fonts.yy",},
{"name":"Miscellaneous","order":8,"path":"folders/Scribble/Miscellaneous.yy",},
{"name":"Quick Functions","order":9,"path":"folders/Scribble/Quick Functions.yy",},
{"name":"Superfonts","order":10,"path":"folders/Scribble/Superfonts.yy",},
{"name":"Animation","order":4,"path":"folders/Scribble/Animation.yy",},
{"name":"Colours","order":5,"path":"folders/Scribble/Colours.yy",},
{"name":"Configuration - Please edit these!","order":6,"path":"folders/Scribble/Configuration - Please edit these!.yy",},
{"name":"External Assets","order":7,"path":"folders/Scribble/External Assets.yy",},
{"name":"Fonts","order":8,"path":"folders/Scribble/Fonts.yy",},
{"name":"Miscellaneous","order":9,"path":"folders/Scribble/Miscellaneous.yy",},
{"name":"Quick Functions","order":10,"path":"folders/Scribble/Quick Functions.yy",},
{"name":"Superfonts","order":11,"path":"folders/Scribble/Superfonts.yy",},
{"name":"Animation","order":1,"path":"folders/Test Cases/Animation.yy",},
{"name":"Basic","order":2,"path":"folders/Test Cases/Basic.yy",},
{"name":"Caching, Stress Testing","order":3,"path":"folders/Test Cases/Caching, Stress Testing.yy",},
Expand Down Expand Up @@ -227,7 +227,7 @@
{"name":"__scribble_class_typist","order":4,"path":"scripts/__scribble_class_typist/__scribble_class_typist.yy",},
{"name":"__scribble_config_behaviours","order":1,"path":"scripts/__scribble_config_behaviours/__scribble_config_behaviours.yy",},
{"name":"__scribble_config_colours","order":2,"path":"scripts/__scribble_config_colours/__scribble_config_colours.yy",},
{"name":"__scribble_constants","order":3,"path":"scripts/__scribble_constants/__scribble_constants.yy",},
{"name":"__scribble_constants","order":2,"path":"scripts/__scribble_constants/__scribble_constants.yy",},
{"name":"__scribble_effects_maps_initialize","order":8,"path":"scripts/__scribble_effects_maps_initialize/__scribble_effects_maps_initialize.yy",},
{"name":"__scribble_font_add_all_from_project","order":10,"path":"scripts/__scribble_font_add_all_from_project/__scribble_font_add_all_from_project.yy",},
{"name":"__scribble_font_add_from_project","order":11,"path":"scripts/__scribble_font_add_from_project/__scribble_font_add_from_project.yy",},
Expand Down
62 changes: 61 additions & 1 deletion scripts/__scribble_constants/__scribble_constants.gml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,63 @@
// Feather disable all

#macro SCRIBBLE_NO_PREPROCESS (function(_string) { return _string; })
////////////////////////////////////////////////////////////////////////////
// //
// You're welcome to use any of the following macros in your game but ... //
// //
// DO NOT EDIT THIS SCRIPT //
// Bad things might happen. //
// //
// Customisation options can be found in the Configuration scripts. //
// //
////////////////////////////////////////////////////////////////////////////

#macro SCRIBBLE_NO_PREPROCESS (function(_string) { return _string; })

enum SCRIBBLE_GLYPH
{
CHARACTER, // 0

UNICODE, // 1
BIDI, // 2
//
X_OFFSET, // 3
Y_OFFSET, // 4
WIDTH, // 5
HEIGHT, // 6
FONT_HEIGHT, // 7
SEPARATION, // 8
LEFT_OFFSET, // 9
FONT_SCALE, //10
//
TEXTURE, //11
U0, //12
U1, //13
V0, //14
V1, //15
//
SDF_PXRANGE, //16
SDF_THICKNESS_OFFSET, //17
BILINEAR, //18

__SIZE //19
}

enum SCRIBBLE_EASE
{
NONE, // 0
LINEAR, // 1
QUAD, // 2
CUBIC, // 3
QUART, // 4
QUINT, // 5
SINE, // 6
EXPO, // 7
CIRC, // 8
BACK, // 9
ELASTIC, //10
BOUNCE, //11
CUSTOM_1, //12
CUSTOM_2, //13
CUSTOM_3, //14
__SIZE //15
}
4 changes: 2 additions & 2 deletions scripts/__scribble_constants/__scribble_constants.yy
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 0 additions & 49 deletions scripts/__scribble_system/__scribble_system.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,55 +439,6 @@ function __scribble_matrix_inverse(_matrix)

#region Enums

enum SCRIBBLE_GLYPH
{
CHARACTER, // 0

UNICODE, // 1 \
BIDI, // 2 |
// |
X_OFFSET, // 3 |
Y_OFFSET, // 4 |
WIDTH, // 5 |
HEIGHT, // 6 |
FONT_HEIGHT, // 7 |
SEPARATION, // 8 |
LEFT_OFFSET, // 9 | This group of enums must not change order or be split
FONT_SCALE, //10 |
// |
TEXTURE, //11 |
U0, //12 | Be careful of ordering!
U1, //13 | scribble_font_bake_shader() relies on this
V0, //14 |
V1, //15 |
// |
SDF_PXRANGE, //16 |
SDF_THICKNESS_OFFSET, //17 |
BILINEAR, //18 /

__SIZE //19
}

enum SCRIBBLE_EASE
{
NONE, // 0
LINEAR, // 1
QUAD, // 2
CUBIC, // 3
QUART, // 4
QUINT, // 5
SINE, // 6
EXPO, // 7
CIRC, // 8
BACK, // 9
ELASTIC, //10
BOUNCE, //11
CUSTOM_1, //12
CUSTOM_2, //13
CUSTOM_3, //14
__SIZE //15
}

enum __SCRIBBLE_GLYPH_LAYOUT
{
__UNICODE, // 0
Expand Down

0 comments on commit a2d9e5a

Please sign in to comment.