Skip to content

Updated Linux support. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RedErr404 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated Linux support. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a148a10
Updated Linux support.
Jan 5, 2024
9008614
Various fixes in examples.
Jan 6, 2024
81686d2
Added loading of raster fonts.
Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
101 changes: 45 additions & 56 deletions Examples/Simple/Agg2DDemo.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,19 @@ uses
{$ENDIF}
SysUtils,

AggPlatformSupport, // please add the path to this file manually
AggFileUtils, // please add the path to this file manually
{$IFDEF AGG_WINDOWS}
AggPlatformSupport in '..\..\Source\Platform\win\AggPlatformSupport.pas',
AggFileUtils in '..\..\Source\Platform\win\AggFileUtils.pas',
{$ENDIF}
{$IFDEF AGG_LINUX}
AggPlatformSupport in '..\..\Source\Platform\linux\AggPlatformSupport.pas',
AggFileUtils in '..\..\Source\Platform\linux\AggFileUtils.pas',
{$ENDIF}
{$IFDEF AGG_MACOSX}
AggPlatformSupport in '..\..\Source\Platform\mac\AggPlatformSupport.pas',
AggFileUtils in '..\..\Source\Platform\mac\AggFileUtils.pas',
{$ENDIF}


AggBasics in '..\..\Source\AggBasics.pas',
AggTransAffine in '..\..\Source\AggTransAffine.pas',
Expand All @@ -21,7 +32,7 @@ uses

{-$DEFINE ViewportOptionAnisotropic}
{-$DEFINE FontCacheRaster}
{$DEFINE More}
{-$DEFINE More}
{$DEFINE UseTextHints}
{-$DEFINE BlackBackground}
{-$DEFINE UseClipBox}
Expand Down Expand Up @@ -57,28 +68,21 @@ type
FGmText: AnsiString;
public
constructor Create(PixelFormat: TPixelFormat; FlipY: Boolean);
destructor Destroy; override;

procedure OnDraw; override;

procedure OnKey(X, Y: Integer; Key: Cardinal; Flags: TMouseKeyboardFlags);
override;
destructor Destroy(); override;
procedure OnDraw(); override;
procedure OnKey(X, Y: Integer; Key: Cardinal; Flags: TMouseKeyboardFlags); override;
end;


{ TAggApplication }

constructor TAggApplication.Create(PixelFormat: TPixelFormat; FlipY: Boolean);
begin
inherited Create(PixelFormat, FlipY);

FGraphics := TAgg2D.Create;
FTimer := TAgg2D.Create;

FAngle := 0;
FGamma := 1.4;
FImage := 6;

Str(FGamma: 0: 2, FGmText);
FGmText := 'Gamma: ' + FGmText;
end;
Expand All @@ -87,33 +91,24 @@ destructor TAggApplication.Destroy;
begin
FGraphics.Free;
FTimer.Free;

Finalize(FGmText);

inherited;
end;

procedure TAggApplication.OnDraw;
var
Bounds: TRectDouble;

Clr, C1, C2, C3: TAggColorRgba8;

Img: TAgg2DImage;

Parl: TAggParallelogram;
Poly: array [0..11] of Double;

Tm : Double;
Fps: Integer;

Timer, Rate: AnsiString;
begin
StartTimer;

FGraphics.Attach(RenderingBufferWindow.Buffer,
RenderingBufferWindow.Width, RenderingBufferWindow.Height,
RenderingBufferWindow.Stride);
FGraphics.Attach(RenderingBufferWindow.Buffer, RenderingBufferWindow.Width, RenderingBufferWindow.Height, RenderingBufferWindow.Stride);

{$IFDEF BlackBackground}
FGraphics.ClearAll(0, 0, 0);
Expand All @@ -128,8 +123,7 @@ begin
FGraphics.FlipText := not CFlipY;

{$IFDEF UseClipBox}
FGraphics.ClipBox(50, 50, RenderingBufferWindow.Width - 50,
RenderingBufferWindow.Height - 50);
FGraphics.ClipBox(50, 50, RenderingBufferWindow.Width - 50, RenderingBufferWindow.Height - 50);
{$ENDIF}

// Transformations - Rotate around (300, 300) to 5 degree
Expand All @@ -155,8 +149,7 @@ begin
FGraphics.Font(PAnsiChar(GFontTimes), 14, False, False);
FGraphics.SetFillColor(0, 0, 0);
FGraphics.NoLine;
FGraphics.Text(100, 20, PAnsiChar('Regular Raster Text -- Fast, but can''t '
+ 'be rotated'));{ }
FGraphics.Text(100, 20, PAnsiChar('Regular Raster Text -- Fast, but can''t ' + 'be rotated'));{ }
{$ENDIF}

// Outlined Text
Expand Down Expand Up @@ -374,8 +367,7 @@ begin

2 : // Transform the rectangular part of the image to the destination
// rectangle
FGraphics.TransformImage(Img, 60, 60, Img.Width - 60, Img.Height - 60,
450, 200, 595, 350);
FGraphics.TransformImage(Img, 60, 60, Img.Width - 60, Img.Height - 60, 450, 200, 595, 350);

3 : // Transform the whole image to the destination parallelogram
begin
Expand All @@ -399,8 +391,7 @@ begin
Parl[4] := 575;
Parl[5] := 350;

FGraphics.TransformImage(Img, 60, 60, Img.Width - 60, Img.Height - 60,
@Parl[0]);
FGraphics.TransformImage(Img, 60, 60, Img.Width - 60, Img.Height - 60, @Parl[0]);
end;


Expand All @@ -421,8 +412,7 @@ begin
FGraphics.MoveTo(450, 200);
FGraphics.CubicCurveTo(595, 220, 575, 350, 595, 350);
FGraphics.LineTo(470, 340);
FGraphics.TransformImagePath(Img, 60, 60, Img.Width - 60,
Img.Height - 60, 450, 200, 595, 350);
FGraphics.TransformImagePath(Img, 60, 60, Img.Width - 60, Img.Height - 60, 450, 200, 595, 350);
end;


Expand Down Expand Up @@ -460,8 +450,7 @@ begin
Parl[4] := 575;
Parl[5] := 350;

FGraphics.TransformImagePath(Img, 60, 60, Img.Width - 60,
Img.Height - 60, @Parl[0]);
FGraphics.TransformImagePath(Img, 60, 60, Img.Width - 60, Img.Height - 60, @Parl[0]);
end;
end;

Expand Down Expand Up @@ -550,8 +539,7 @@ begin
// ----------
Tm := GetElapsedTime;

FTimer.Attach(RenderingBufferWindow.Buffer, RenderingBufferWindow.Width,
RenderingBufferWindow.Height, RenderingBufferWindow.Stride);
FTimer.Attach(RenderingBufferWindow.Buffer, RenderingBufferWindow.Width, RenderingBufferWindow.Height, RenderingBufferWindow.Stride);

FTimer.AntiAliasGamma := 1.4;

Expand All @@ -574,8 +562,7 @@ begin
FTimer.Text(350, 8, Timer);
end;

procedure TAggApplication.OnKey(X, Y: Integer; Key: Cardinal;
Flags: TMouseKeyboardFlags);
procedure TAggApplication.OnKey(X, Y: Integer; Key: Cardinal; Flags: TMouseKeyboardFlags);
begin
if Key = Cardinal(kcF1) then
DisplayMessage('"Quick and dirty prototype" of 2D drawing API for AGG.'#13#13
Expand All @@ -595,7 +582,7 @@ begin
if FAngle < 0 then
FAngle := 360 - CAngleStep;

ForceRedraw;
ForceRedraw();
end;

if Key = Cardinal(kcUp) then
Expand All @@ -605,7 +592,7 @@ begin
if FAngle > 360 then
FAngle := CAngleStep;

ForceRedraw;
ForceRedraw();
end;

if Key = Cardinal(kcRight) then
Expand All @@ -615,7 +602,7 @@ begin
if FImage > 8 then
FImage := 1;

ForceRedraw;
ForceRedraw();
end;

if Key = Cardinal(kcLeft) then
Expand All @@ -625,7 +612,7 @@ begin
if FImage < 1 then
FImage := 8;

ForceRedraw;
ForceRedraw();
end;

if Key = Cardinal(kcPadPlus) then
Expand All @@ -635,7 +622,7 @@ begin
Str(FGamma: 0: 2, FGmText);
FGmText := 'Gamma: ' + FGmText;

ForceRedraw;
ForceRedraw();
end;

if Key = Cardinal(kcPadMinus) then
Expand All @@ -645,13 +632,14 @@ begin
Str(FGamma: 0: 2, FGmText);
FGmText := 'Gamma: ' + FGmText;

ForceRedraw;
ForceRedraw();
end;
end;

var
ImageName, P, N, X: ShortString;
Text: AnsiString;
App: TAggApplication;

begin
if Agg2DUsesFreeType then
Expand All @@ -661,9 +649,9 @@ begin
GFontVerdana := 'verdana.ttf';
end;

with TAggApplication.Create(pfBgra32, CFlipY) do
App := TAggApplication.Create(pfBgra32, CFlipY);
try
Caption := 'Agg2DDemo (F1-Help)';
App.Caption := 'Agg2DDemo (F1-Help)';

ImageName := 'spheres2';

Expand All @@ -676,19 +664,20 @@ begin
end;
{$ENDIF}

if not LoadImage(0, ImageName) then
if not App.LoadImage(0, ImageName) then
begin
Text := 'File not found: ' + ImageName + ImageExtension;
Text := 'File not found: ' + ImageName + App.ImageExtension;
if ImageName = 'spheres2' then
Text := Text + #13#13 + 'Download http://www.antigrain.com/'
+ ImageName + ImageExtension + #13 + 'or copy it from another ' +
'directory if available.';

DisplayMessage(Text);
+ ImageName + App.ImageExtension + #13 + 'or copy it from another ' +
'directory if available.';
App.DisplayMessage(PChar(Text));
end
else if Init(600, 600, [wfResize]) then
Run;
else if App.Init(600, 600, [wfResize]) then
begin
App.Run;
end;
finally
Free;
App.Free;
end;
end.
29 changes: 11 additions & 18 deletions Examples/Simple/Agg2DDemo.lpi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,34 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="12"/>
<PathDelim Value="\"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>
<MainUnitHasTitleStatement Value="False"/>
<MainUnitHasScaledStatement Value="False"/>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="Agg2DDemo"/>
<UseAppBundle Value="False"/>
<ResourceType Value="res"/>
</General>
<i18n>
<EnableI18N LFM="False"/>
</i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
</PublishOptions>
<RunParams>
<local>
<FormatVersion Value="1"/>
</local>
<FormatVersion Value="2"/>
<Modes Count="1">
<Mode0 Name="default"/>
</Modes>
</RunParams>
<Units Count="1">
<Unit0>
Expand Down Expand Up @@ -61,12 +58,14 @@
</Parsing>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<Optimizations>
<OptimizationLevel Value="0"/>
</Optimizations>
</CodeGeneration>
<Linking>
<Debugging>
<GenerateDebugInfo Value="False"/>
<UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
Expand All @@ -75,12 +74,6 @@
</Win32>
</Options>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
<Debugging>
<Exceptions Count="3">
Expand Down
15 changes: 13 additions & 2 deletions Examples/Simple/AlphaGradient.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,18 @@ uses
{$ENDIF}
Math,

AggPlatformSupport, // please add the path to this file manually
{$IFDEF AGG_WINDOWS}
AggPlatformSupport in '..\..\Source\Platform\win\AggPlatformSupport.pas',
AggFileUtils in '..\..\Source\Platform\win\AggFileUtils.pas',
{$ENDIF}
{$IFDEF AGG_LINUX}
AggPlatformSupport in '..\..\Source\Platform\linux\AggPlatformSupport.pas',
AggFileUtils in '..\..\Source\Platform\linux\AggFileUtils.pas',
{$ENDIF}
{$IFDEF AGG_MACOSX}
AggPlatformSupport in '..\..\Source\Platform\mac\AggPlatformSupport.pas',
AggFileUtils in '..\..\Source\Platform\mac\AggFileUtils.pas',
{$ENDIF}

AggBasics,

Expand All @@ -26,7 +37,7 @@ uses
AggRendererScanLine in '..\..\Source\AggRendererScanLine.pas',
AggRasterizerScanLineAA in '..\..\Source\AggRasterizerScanLineAA.pas',
AggScanLine in '..\..\Source\AggScanLine.pas',
AggScanlineUnpacked in '..\..\Source\AggScanlineUnpacked.pas',
AggScanLineUnpacked in '..\..\Source\AggScanLineUnpacked.pas',
AggRenderScanLines in '..\..\Source\AggRenderScanLines.pas',

AggArray in '..\..\Source\AggArray.pas',
Expand Down
Loading