diff options
Diffstat (limited to 'Kernel/Modules')
| -rw-r--r-- | Kernel/Modules/CoreCG/CoreCG.hxx | 18 | ||||
| -rw-r--r-- | Kernel/Modules/CoreCG/CoreIMG.hxx | 13 |
2 files changed, 22 insertions, 9 deletions
diff --git a/Kernel/Modules/CoreCG/CoreCG.hxx b/Kernel/Modules/CoreCG/CoreCG.hxx index a0f1ede1..b77a2f28 100644 --- a/Kernel/Modules/CoreCG/CoreCG.hxx +++ b/Kernel/Modules/CoreCG/CoreCG.hxx @@ -8,16 +8,16 @@ #include <NewKit/Defines.hpp> -#define GXInit() Kernel::SizeT __GXCursor = 0 +#define CGInit() Kernel::SizeT __GXCursor = 0 -#define GXRgba(R, G, B) (UInt32)(R | G | B) +#define CGColor(R, G, B) RGB(R, G, B) -#define gxClearClr RGB(9d, 9d, 9d) +#define cCGClearClr CGColor(0x0, 0x0, 0x0) -#define GXFini() __GXCursor = 0 +#define CGFini() __GXCursor = 0 /// @brief Performs OR drawing on the framebuffer. -#define GXDrawAlphaImg(ImgPtr, _Height, _Width, BaseX, BaseY) \ +#define CGDrawBitMapInRegionA(ImgPtr, _Height, _Width, BaseX, BaseY) \ __GXCursor = 0; \ \ for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ @@ -34,7 +34,7 @@ } /// @brief Draws a resource. -#define GXDrawImg(ImgPtr, _Height, _Width, BaseX, BaseY) \ +#define CGDrawBitMapInRegion(ImgPtr, _Height, _Width, BaseX, BaseY) \ __GXCursor = 0; \ \ for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ @@ -51,7 +51,7 @@ } /// @brief Cleans a resource. -#define GXClear(_Height, _Width, BaseX, BaseY) \ +#define CGClearRegion(_Height, _Width, BaseX, BaseY) \ \ for (Kernel::SizeT i = BaseX; i < _Height + BaseX; ++i) \ { \ @@ -60,12 +60,12 @@ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ - 4 * u))) = gxClearClr; \ + 4 * u))) = cCGClearClr; \ } \ } /// @brief Draws inside a zone. -#define GXDraw(_Clr, _Height, _Width, BaseX, BaseY) \ +#define CGDrawInRegion(_Clr, _Height, _Width, BaseX, BaseY) \ \ for (Kernel::SizeT i = BaseX; i < (_Width + BaseX); ++i) \ { \ diff --git a/Kernel/Modules/CoreCG/CoreIMG.hxx b/Kernel/Modules/CoreCG/CoreIMG.hxx new file mode 100644 index 00000000..8fb4629d --- /dev/null +++ b/Kernel/Modules/CoreCG/CoreIMG.hxx @@ -0,0 +1,13 @@ +#ifndef __CORECG_IMG_HXX__ +#define __CORECG_IMG_HXX__ + +#include <NewKit/Defines.hpp> + +namespace Kernel +{ + struct IMGContainerHeader; + struct IMGMetadataHeader; + +} + +#endif // ifndef __CORECG_IMG_HXX__ |