diff --git a/src/sys/graphics/objgfx30.cpp b/src/sys/graphics/objgfx30.cpp index 0721036..6e88e18 100755 --- a/src/sys/graphics/objgfx30.cpp +++ b/src/sys/graphics/objgfx30.cpp @@ -28,6 +28,7 @@ RedFieldPosition = 0; GreenFieldPosition = 0; BlueFieldPosition = 0; + AntiAlias = TRUE; return; } // TGfx0::TGfx0() @@ -67,6 +68,9 @@ RedShifter = SrcObject.RedShifter; GreenShifter = SrcObject.GreenShifter; BlueShifter = SrcObject.BlueShifter; + + AntiAlias = SrcObject.AntiAlias; + return TRUE; } // TGfx0::alias @@ -390,6 +394,8 @@ SrcObject.getPixFmt(pixfmt); create(SrcObject.MaxX+1,SrcObject.MaxY+1,pixfmt); if (pal!=NULL) memcpy(pal, SrcObject.pal, sizeof(TRGB)*256); + TransparentColor = SrcObject.TransparentColor; + AntiAlias = SrcObject.AntiAlias; copy(SrcObject); } // TGfx0::clone @@ -1319,7 +1325,7 @@ } // TGfx0::setRGBPalette void -TGfx0::rectangle(Int32 x1, Int32 y1, Int32 x2, Int32 y2, UInt32 colour) { +TGfx0::rect(Int32 x1, Int32 y1, Int32 x2, Int32 y2, UInt32 colour) { hLine(x1,x2,y1,colour); // Horizline has built in clipping vLine(x2,y1,y2,colour); // vertline has built in clipping too vLine(x1,y1,y2,colour); diff --git a/src/sys/graphics/objgfx30.h b/src/sys/graphics/objgfx30.h index 9ddf7dc..1e40dc8 100755 --- a/src/sys/graphics/objgfx30.h +++ b/src/sys/graphics/objgfx30.h @@ -130,25 +130,26 @@ class TGfx0 { protected: - TGfx0* Owner; - void* Buffer; - UInt32* LineOfs; - TRGB* pal; - UInt32 xRes, yRes; - UInt32 MaxX, MaxY; - UInt32 bSize; // buffer size (in bytes) - UInt32 lSize; // LineOfs size (in bytes) - UInt32 TransparentColor; + TGfx0* Owner; + void* Buffer; + UInt32* LineOfs; + TRGB* pal; + UInt32 xRes, yRes; + UInt32 MaxX, MaxY; + UInt32 bSize; // buffer size (in bytes) + UInt32 lSize; // LineOfs size (in bytes) + UInt32 TransparentColor; og_DataState DataState; - UInt8 BPP; // bits per pixel - UInt8 RedFieldPosition; - UInt8 GreenFieldPosition; - UInt8 BlueFieldPosition; - UInt8 RedShifter; - UInt8 GreenShifter; - UInt8 BlueShifter; - bool clipLine(Int32&, Int32&, Int32&, Int32&); - void rawLine(UInt32, UInt32, UInt32, UInt32, UInt32); + UInt8 BPP; // bits per pixel + UInt8 RedFieldPosition; + UInt8 GreenFieldPosition; + UInt8 BlueFieldPosition; + UInt8 RedShifter; + UInt8 GreenShifter; + UInt8 BlueShifter; + bool AntiAlias; + bool clipLine(Int32&, Int32&, Int32&, Int32&); + void rawLine(UInt32, UInt32, UInt32, UInt32, UInt32); public: TGfx0(void); bool alias(TGfx0&, UInt32, UInt32, UInt32, UInt32); @@ -181,7 +182,7 @@ void line(Int32, Int32, Int32, Int32, UInt32); // loadPal void putPixel(UInt32, UInt32, UInt32); - void rectangle(Int32, Int32, Int32, Int32, UInt32); + void rect(Int32, Int32, Int32, Int32, UInt32); UInt32 RGB(UInt8, UInt8, UInt8); // savePal void setRGBPalette(UInt8, UInt8, UInt8, UInt8);