diff options
| author | Amlal <amlalelmahrouss@icloud.com> | 2024-07-28 16:11:46 +0000 |
|---|---|---|
| committer | Amlal <amlalelmahrouss@icloud.com> | 2024-07-28 16:11:46 +0000 |
| commit | c4023005e029ae092dad2689564c490580dd5c28 (patch) | |
| tree | 3080ba07a6b552bf3d7591574cf69b2a3c8fd0fd /Kernel/Modules/CoreCG | |
| parent | 8c8822fff78f9ff9cd640271da9b3634c4c2f97f (diff) | |
| parent | 4db57a2d646b1538783a0675b38bada7a0f903ae (diff) | |
Merged in MHR-36 (pull request #17)
MHR-36
Diffstat (limited to 'Kernel/Modules/CoreCG')
| -rw-r--r-- | Kernel/Modules/CoreCG/Accessibility.hxx | 7 | ||||
| -rw-r--r-- | Kernel/Modules/CoreCG/CoreCG.hxx | 89 | ||||
| -rw-r--r-- | Kernel/Modules/CoreCG/CoreIMG.hxx | 13 | ||||
| -rw-r--r-- | Kernel/Modules/CoreCG/Lerp.hxx | 2 |
4 files changed, 62 insertions, 49 deletions
diff --git a/Kernel/Modules/CoreCG/Accessibility.hxx b/Kernel/Modules/CoreCG/Accessibility.hxx index 7878de4f..849adece 100644 --- a/Kernel/Modules/CoreCG/Accessibility.hxx +++ b/Kernel/Modules/CoreCG/Accessibility.hxx @@ -1,10 +1,11 @@ /* ------------------------------------------- - Copyright Zeta Electronics Corporation + Copyright ZKA Technologies ------------------------------------------- */ -#pragma once +#ifndef __CORECG_ACCESS_HXX__ +#define __CORECG_ACCESS_HXX__ #include <NewKit/NewKit.hpp> #include <KernelKit/HError.hpp> @@ -44,3 +45,5 @@ namespace Kernel } }; } // namespace Kernel + +#endif // !__CORECG_ACCESS_HXX__ diff --git a/Kernel/Modules/CoreCG/CoreCG.hxx b/Kernel/Modules/CoreCG/CoreCG.hxx index 013cb08a..4894d150 100644 --- a/Kernel/Modules/CoreCG/CoreCG.hxx +++ b/Kernel/Modules/CoreCG/CoreCG.hxx @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright Zeta Electronics Corporation + Copyright ZKA Technologies ------------------------------------------- */ @@ -8,75 +8,72 @@ #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) \ - __GXCursor = 0; \ - \ +#define CGDrawBitMapInRegionA(ImgPtr, _Height, _Width, BaseX, BaseY) \ + __GXCursor = 0; \ + \ for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ - { \ + { \ for (Kernel::SizeT u = BaseY; u < (_Width + BaseY); ++u) \ - { \ + { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) |= ImgPtr[__GXCursor]; \ - \ - ++__GXCursor; \ - } \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) |= (ImgPtr)[__GXCursor]; \ + \ + ++__GXCursor; \ + } \ } /// @brief Draws a resource. -#define GXDrawImg(ImgPtr, _Height, _Width, BaseX, BaseY) \ - __GXCursor = 0; \ - \ +#define CGDrawBitMapInRegion(ImgPtr, _Height, _Width, BaseX, BaseY) \ + __GXCursor = 0; \ + \ for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ - { \ + { \ for (Kernel::SizeT u = BaseY; u < (_Width + BaseY); ++u) \ - { \ + { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) = ImgPtr[__GXCursor]; \ - \ - ++__GXCursor; \ - } \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) = (ImgPtr)[__GXCursor]; \ + \ + ++__GXCursor; \ + } \ } /// @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) \ - { \ + { \ for (Kernel::SizeT u = BaseY; u < _Width + BaseY; ++u) \ - { \ + { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) = gxClearClr; \ - } \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 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) \ - { \ + { \ for (Kernel::SizeT u = BaseY; u < (_Height + BaseY); ++u) \ - { \ + { \ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) = _Clr; \ - } \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) = _Clr; \ + } \ } - - - diff --git a/Kernel/Modules/CoreCG/CoreIMG.hxx b/Kernel/Modules/CoreCG/CoreIMG.hxx new file mode 100644 index 00000000..f51c1255 --- /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; + +} // namespace Kernel + +#endif // ifndef __CORECG_IMG_HXX__ diff --git a/Kernel/Modules/CoreCG/Lerp.hxx b/Kernel/Modules/CoreCG/Lerp.hxx index b62a8266..932f70c5 100644 --- a/Kernel/Modules/CoreCG/Lerp.hxx +++ b/Kernel/Modules/CoreCG/Lerp.hxx @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright Zeta Electronics Corporation + Copyright ZKA Technologies ------------------------------------------- */ |