Skip to content

Commit

Permalink
More functionlist section cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@ollydev
ollydev committed Aug 7, 2023
1 parent 1e232d5 commit c61b522
Show file tree
Hide file tree
Showing 15 changed files with 280 additions and 339 deletions.
2 changes: 1 addition & 1 deletion DocGen/doccomments.simba
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ begin
for I := 0 to High(Map) do
NewContents := Map[I].DocComment + LINE_SEP*2 + NewContents;

ClearScriptOutput();
ClearSimbaOutput();
WriteLn(NewContents);
SetClipBoard(NewContents);
end.
2 changes: 1 addition & 1 deletion DocGen/docgen.simba
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ var
Str: String;
I: Integer;
begin
ClearScriptOutput();
ClearSimbaOutput();

DirCreate(OUTPUT_DIR);
DirDelete(OUTPUT_DIR, True);
Expand Down
2 changes: 1 addition & 1 deletion Source/Simba.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@
<IsPartOfProject Value="True"/>
</Unit36>
<Unit37>
<Filename Value="script/imports/simba/simba.import_other.pas"/>
<Filename Value="script/imports/simba/simba.import_misc.pas"/>
<IsPartOfProject Value="True"/>
</Unit37>
<Unit38>
Expand Down
2 changes: 1 addition & 1 deletion Source/forms/simba.functionlistform.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ procedure TSimbaFunctionListForm.AddSimbaNodes;
end;

for Decl in Parser.Items.ToArray do
if (Decl.Name <> '') and (not Decl.isOverrideMethod) then
if (Decl.Name <> '') and (not Decl.isOverrideMethod) and (Decl.Name[1] <> '_') then
AddSimbaDecl(ParentNode, Decl);

ParentNode.CustomSort(@CompareDecl);
Expand Down
193 changes: 184 additions & 9 deletions Source/script/imports/simba/simba.import_colormath.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ procedure ImportColorMath(Compiler: TSimbaScript_Compiler);
addGlobalType('array [0..2] of Single', 'TChannelMultipliers');

addGlobalType('record B,G,R,A: Byte; end;', 'TColorBGRA');
addGlobalType('record R,G,B: Byte; end;', 'TColorRGB');
addGlobalType('record R,G,B: Byte; end;', 'TColorRGB');
addGlobalType('record X,Y,Z: Single; end;', 'TColorXYZ');
addGlobalType('record L,A,B: Single; end;', 'TColorLAB');
addGlobalType('record L,C,H: Single; end;', 'TColorLCH');
Expand All @@ -210,6 +210,36 @@ procedure ImportColorMath(Compiler: TSimbaScript_Compiler);

addGlobalType('^TColorBGRA', 'PColorBGRA');

addGlobalFunc('function TColor.ToBGRA: TColorBGRA', @_LapeTColorToBGRA);
addGlobalFunc('function TColor.ToRGB: TColorRGB', @_LapeTColorToRGB);
addGlobalFunc('function TColor.ToXYZ: TColorXYZ', @_LapeTColorToXYZ);
addGlobalFunc('function TColor.ToLAB: TColorLAB', @_LapeTColorToLAB);
addGlobalFunc('function TColor.ToLCH: TColorLCH', @_LapeTColorToLCH);
addGlobalFunc('function TColor.ToHSV: TColorHSV', @_LapeTColorToHSV);
addGlobalFunc('function TColor.ToHSL: TColorHSL', @_LapeTColorToHSL);

addGlobalFunc(
'function TColor.R: Byte;', [
'type TRGB = packed record B,G,R,A: Byte; end;',
'begin',
' Result := TRGB(Self).R;',
'end;'
]);
addGlobalFunc(
'function TColor.G: Byte;', [
'type TRGB = packed record B,G,R,A: Byte; end;',
'begin',
' Result := TRGB(Self).G;',
'end;'
]);
addGlobalFunc(
'function TColor.B: Byte;', [
'type TRGB = packed record B,G,R,A: Byte; end;',
'begin',
' Result := TRGB(Self).B;',
'end;'
]);

addGlobalFunc('function TColorRGB.ToBGRA: TColorBGRA', @_LapeColorRGBToBGRA);
addGlobalFunc('function TColorRGB.ToXYZ: TColorXYZ', @_LapeColorRGBToXYZ);
addGlobalFunc('function TColorRGB.ToLAB: TColorLAB', @_LapeColorRGBToLAB);
Expand All @@ -233,14 +263,6 @@ procedure ImportColorMath(Compiler: TSimbaScript_Compiler);
addGlobalFunc('function TColorLCH.ToRGB: TColorRGB', @_LapeColorLCHToRGB);
addGlobalFunc('function TColorLCH.ToColor: TColor', @_LapeColorLCHToColor);

addGlobalFunc('function TColor.ToBGRA: TColorBGRA', @_LapeTColorToBGRA);
addGlobalFunc('function TColor.ToRGB: TColorRGB', @_LapeTColorToRGB);
addGlobalFunc('function TColor.ToXYZ: TColorXYZ', @_LapeTColorToXYZ);
addGlobalFunc('function TColor.ToLAB: TColorLAB', @_LapeTColorToLAB);
addGlobalFunc('function TColor.ToLCH: TColorLCH', @_LapeTColorToLCH);
addGlobalFunc('function TColor.ToHSV: TColorHSV', @_LapeTColorToHSV);
addGlobalFunc('function TColor.ToHSL: TColorHSL', @_LapeTColorToHSL);

addGlobalFunc('function ColorIntensity(Color: TColor): Byte', @_LapeColorIntensity);
addGlobalFunc('function ColorToGray(Color: TColor): Byte', @_LapeColorToGray);
addGlobalFunc('function ColorToRGB(Color: TColor): TColorRGB', @_LapeColorToRGB);
Expand Down Expand Up @@ -291,6 +313,159 @@ procedure ImportColorMath(Compiler: TSimbaScript_Compiler);
addGlobalFunc('function SimilarColors(Color1, Color2: TColor; Tolerance: Single): Boolean; overload', @_LapeSimilarColors1);
addGlobalFunc('function SimilarColors(Color1, Color2: TColor; Tolerance: Single; ColorSpace: EColorSpace; Multipliers: TChannelMultipliers): Boolean; overload;', @_LapeSimilarColors2);

addGlobalType([
'record',
' const ALICEBLUE = TColor($FFF8F0);',
' const ANTIQUEWHITE = TColor($D7EBFA);',
' const AQUA = TColor($FFFF00);',
' const AQUAMARINE = TColor($D4FF7F);',
' const AZURE = TColor($FFFFF0);',
' const BEIGE = TColor($DCF5F5);',
' const BISQUE = TColor($C4E4FF);',
' const BLACK = TColor($000000);',
' const BLANCHEDALMOND = TColor($CDEBFF);',
' const BLUE = TColor($FF0000);',
' const BLUEVIOLET = TColor($E22B8A);',
' const BROWN = TColor($2A2AA5);',
' const BURLYWOOD = TColor($87B8DE);',
' const CADET_BLUE = TColor($A09E5F);',
' const CHARTREUSE = TColor($00FF7F);',
' const CHOCOLATE = TColor($1E69D2);',
' const CORAL = TColor($507FFF);',
' const CORNFLOWER_BLUE = TColor($ED9564);',
' const CORNSILK = TColor($DCF8FF);',
' const CRIMSON = TColor($3C14DC);',
' const CYAN = TColor($FFFF00);',
' const DARK_BLUE = TColor($8B0000);',
' const DARK_CYAN = TColor($8B8B00);',
' const DARK_GOLDENROD = TColor($0B86B8);',
' const DARK_GRAY = TColor($A9A9A9);',
' const DARK_GREEN = TColor($006400);',
' const DARK_GREY = TColor($A9A9A9);',
' const DARK_KHAKI = TColor($6BB7BD);',
' const DARK_MAGENTA = TColor($8B008B);',
' const DARK_OLIVEGREEN = TColor($2F6B55);',
' const DARK_ORANGE = TColor($008CFF);',
' const DARK_ORCHID = TColor($CC3299);',
' const DARK_RED = TColor($00008B);',
' const DARK_SALMON = TColor($7A96E9);',
' const DARK_SEAGREEN = TColor($8FBC8F);',
' const DARK_SLATEBLUE = TColor($8B3D48);',
' const DARK_SLATEGRAY = TColor($4F4F2F);',
' const DARK_SLATEGREY = TColor($4F4F2F);',
' const DARK_TURQUOISE = TColor($D1CE00);',
' const DARK_VIOLET = TColor($D30094);',
' const DEEPPINK = TColor($9314FF);',
' const DEEPSKYBLUE = TColor($FFBF00);',
' const DIMGRAY = TColor($696969);',
' const DIMGREY = TColor($696969);',
' const DODGERBLUE = TColor($FF901E);',
' const FIREBRICK = TColor($2222B2);',
' const FLORALWHITE = TColor($F0FAFF);',
' const FORESTGREEN = TColor($228B22);',
' const FUCHSIA = TColor($FF00FF);',
' const GAINSBORO = TColor($DCDCDC);',
' const GHOSTWHITE = TColor($FFF8F8);',
' const GOLD = TColor($00D7FF);',
' const GOLDENROD = TColor($20A5DA);',
' const GRAY = TColor($808080);',
' const GREEN = TColor($008000);',
' const GREENYELLOW = TColor($2FFFAD);',
' const GREY = TColor($808080);',
' const HONEYDEW = TColor($F0FFF0);',
' const HOTPINK = TColor($B469FF);',
' const INDIANRED = TColor($5C5CCD);',
' const INDIGO = TColor($82004B);',
' const IVORY = TColor($F0FFFF);',
' const KHAKI = TColor($8CE6F0);',
' const LAVENDER = TColor($FAE6E6);',
' const LAVENDERBLUSH = TColor($F5F0FF);',
' const LAWNGREEN = TColor($00FC7C);',
' const LEMONCHIFFON = TColor($CDFAFF);',
' const LIGHT_BLUE = TColor($E6D8AD);',
' const LIGHT_CORAL = TColor($8080F0);',
' const LIGHT_CYAN = TColor($FFFFE0);',
' const LIGHT_GOLDENRODYELLOW = TColor($D2FAFA);',
' const LIGHT_GRAY = TColor($D3D3D3);',
' const LIGHT_GREEN = TColor($90EE90);',
' const LIGHT_GREY = TColor($D3D3D3);',
' const LIGHT_PINK = TColor($C1B6FF);',
' const LIGHT_SALMON = TColor($7AA0FF);',
' const LIGHT_SEAGREEN = TColor($AAB220);',
' const LIGHT_SKYBLUE = TColor($FACE87);',
' const LIGHT_SLATEGRAY = TColor($998877);',
' const LIGHT_SLATEGREY = TColor($998877);',
' const LIGHT_STEELBLUE = TColor($DEC4B0);',
' const LIGHT_YELLOW = TColor($E0FFFF);',
' const LIME = TColor($00FF00);',
' const LIMEGREEN = TColor($32CD32);',
' const LINEN = TColor($E6F0FA);',
' const MAGENTA = TColor($FF00FF);',
' const MAROON = TColor($000080);',
' const MEDIUM_AQUAMARINE = TColor($AACD66);',
' const MEDIUM_BLUE = TColor($CD0000);',
' const MEDIUM_ORCHID = TColor($D355BA);',
' const MEDIUM_PURPLE = TColor($DB7093);',
' const MEDIUM_SEAGREEN = TColor($71B33C);',
' const MEDIUM_SLATEBLUE = TColor($EE687B);',
' const MEDIUM_SPRINGGREEN = TColor($9AFA00);',
' const MEDIUM_TURQUOISE = TColor($CCD148);',
' const MEDIUM_VIOLETRED = TColor($8515C7);',
' const MIDNIGHTBLUE = TColor($701919);',
' const MINTCREAM = TColor($FAFFF5);',
' const MISTYROSE = TColor($E1E4FF);',
' const MOCCASIN = TColor($B5E4FF);',
' const NAVAJOWHITE = TColor($ADDEFF);',
' const NAVY = TColor($800000);',
' const OLDLACE = TColor($E6F5FD);',
' const OLIVE = TColor($008080);',
' const OLIVEDRAB = TColor($238E6B);',
' const ORANGE = TColor($00A5FF);',
' const ORANGERED = TColor($0045FF);',
' const ORCHID = TColor($D670DA);',
' const PALE_GOLDENROD = TColor($AAE8EE);',
' const PALE_GREEN = TColor($98FB98);',
' const PALE_TURQUOISE = TColor($EEEEAF);',
' const PALE_VIOLETRED = TColor($9370DB);',
' const PAPAYAWHIP = TColor($D5EFFF);',
' const PEACHPUFF = TColor($B9DAFF);',
' const PERU = TColor($3F85CD);',
' const PINK = TColor($CBC0FF);',
' const PLUM = TColor($DDA0DD);',
' const POWDERBLUE = TColor($E6E0B0);',
' const PURPLE = TColor($800080);',
' const REBECCAPURPLE = TColor($993366);',
' const RED = TColor($0000FF);',
' const ROSYBROWN = TColor($8F8FBC);',
' const ROYALBLUE = TColor($E16941);',
' const SADDLEBROWN = TColor($13458B);',
' const SALMON = TColor($7280FA);',
' const SANDYBROWN = TColor($60A4F4);',
' const SEAGREEN = TColor($578B2E);',
' const SEASHELL = TColor($EEF5FF);',
' const SIENNA = TColor($2D52A0);',
' const SILVER = TColor($C0C0C0);',
' const SKYBLUE = TColor($EBCE87);',
' const SLATEBLUE = TColor($CD5A6A);',
' const SLATEGRAY = TColor($908070);',
' const SLATEGREY = TColor($908070);',
' const SNOW = TColor($FAFAFF);',
' const SPRINGGREEN = TColor($7FFF00);',
' const STEELBLUE = TColor($B48246);',
' const TAN = TColor($8CB4D2);',
' const TEAL = TColor($808000);',
' const THISTLE = TColor($D8BFD8);',
' const TOMATO = TColor($4763FF);',
' const TURQUOISE = TColor($D0E040);',
' const VIOLET = TColor($EE82EE);',
' const WHEAT = TColor($B3DEF5);',
' const WHITE = TColor($FFFFFF);',
' const WHITESMOKE = TColor($F5F5F5);',
' const YELLOW = TColor($00FFFF);',
' const YELLOWGREEN = TColor($32CD9A);',
'end;'
], 'Colors');

ImportingSection := '';
end;
end;
Expand Down
Loading

0 comments on commit c61b522

Please sign in to comment.