paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-28 01:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Use FPColor instead of Color in TOpenGLDrawer.

Browse Source 
git-svn-id: trunk@29947 -
This commit is contained in:
ask 2011-03-21 03:27:16 +00:00
parent 4b1973d625
commit 5bbc04b0df
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
components/tachart/tadraweropengl.pas
View File

@ -20,7 +20,7 @@ unit TADrawerOpenGL;
interface
uses
Classes, SysUtils, FPCanvas, OpenGLContext, GL, GLu, Glut,
Classes, SysUtils, FPCanvas, FPImage, OpenGLContext, GL, GLu, Glut,
TADrawUtils;
type
@ -29,9 +29,9 @@ type
TOpenGLDrawer = class(TFPCanvasDrawer, IChartDrawer, ISimpleTextOut)
strict private
FBrushColor: TChartColor;
FBrushColor: TFPColor;
FContext: TOpenGLControl;
FPenColor: TChartColor;
FPenColor: TFPColor;
FPenWidth: Integer;
FPos: TPoint;
procedure SetBrush(ABrush: TFPCustomBrush);
@ -78,13 +78,10 @@ implementation
uses
Graphics, TAChartUtils;
procedure ChartGLColor(AColor: TChartColor);
var
r, g, b: Byte;
procedure ChartGLColor(AColor: TFPColor);
begin
RedGreenBlue(ColorToRGB(AColor), r, g, b);
// For some reason, glColor3b/glColor3ub did not work for me.
glColor3f(r / High(r), g / High(b), b / High(b));
with AColor do
glColor4us(red, green, blue, alpha);
end;
{ TOpenGLDrawer }
@ -127,7 +124,7 @@ end;
function TOpenGLDrawer.GetBrushColor: TChartColor;
begin
Result := FBrushColor;
Result := FPColorToTColor(FBrushColor);
end;
function TOpenGLDrawer.GetFontAngle: Double;
@ -201,7 +198,7 @@ end;
procedure TOpenGLDrawer.PrepareSimplePen(AColor: TChartColor);
begin
FPenWidth := 1;
FPenColor := AColor;
FPenColor := TColorToFPColor(ColorToRGB(AColor));
end;
procedure TOpenGLDrawer.RadialPie(
@ -233,13 +230,12 @@ end;
procedure TOpenGLDrawer.SetBrush(ABrush: TFPCustomBrush);
begin
if ABrush is TBrush then
SetBrushColor((ABrush as TBrush).Color);
SetBrushColor((ABrush as TBrush).Color);
end;
procedure TOpenGLDrawer.SetBrushColor(AColor: TChartColor);
begin
FBrushColor := AColor;
FBrushColor := TColorToFPColor(ColorToRGB(AColor));
end;
procedure TOpenGLDrawer.SetBrushParams(
@ -257,14 +253,13 @@ end;
procedure TOpenGLDrawer.SetPen(APen: TFPCustomPen);
begin
FPenWidth := APen.Width;
if APen is TPen then
FPenColor := (APen as TPen).Color;
FPenColor := APen.FPColor;
end;
procedure TOpenGLDrawer.SetPenParams(AStyle: TFPPenStyle; AColor: TChartColor);
begin
Unused(AStyle);
FPenColor := AColor;
FPenColor := TColorToFPColor(ColorToRGB(AColor));
end;
function TOpenGLDrawer.SimpleTextExtent(const AText: String): TPoint;