refactor project
This commit is contained in:
@ -1,21 +1,20 @@
|
||||
#include "../VTImage.hpp"
|
||||
#include "VxMath.hpp"
|
||||
#include "stb_image.h"
|
||||
#include "stb_image_resize.h"
|
||||
|
||||
namespace LibCmo::VxMath {
|
||||
|
||||
#pragma region Structure copying
|
||||
|
||||
void VxFillStructure(CK2::CKDWORD Count, void* Dst, CK2::CKDWORD Stride, CK2::CKDWORD SizeSrc, const void* Src) {
|
||||
void VxFillStructure(CKDWORD Count, void* Dst, CKDWORD Stride, CKDWORD SizeSrc, const void* Src) {
|
||||
VxCopyStructure(Count, Dst, Stride, SizeSrc, Src, SizeSrc);
|
||||
}
|
||||
|
||||
void VxCopyStructure(CK2::CKDWORD Count, void* Dst, CK2::CKDWORD OutStride, CK2::CKDWORD SizeSrc, const void* Src, CK2::CKDWORD InStride) {
|
||||
void VxCopyStructure(CKDWORD Count, void* Dst, CKDWORD OutStride, CKDWORD SizeSrc, const void* Src, CKDWORD InStride) {
|
||||
if (Dst == nullptr || Src == nullptr) return;
|
||||
|
||||
char* cdst = reinterpret_cast<char*>(Dst);
|
||||
const char* csrc = reinterpret_cast<const char*>(Src);
|
||||
for (CK2::CKDWORD i = 0; i < Count; ++i) {
|
||||
for (CKDWORD i = 0; i < Count; ++i) {
|
||||
std::memcpy(cdst, csrc, SizeSrc);
|
||||
cdst += OutStride;
|
||||
csrc += InStride;
|
||||
@ -57,9 +56,9 @@ namespace LibCmo::VxMath {
|
||||
}
|
||||
|
||||
// copy and swap data by line
|
||||
CK2::CKDWORD height = dst->GetHeight(),
|
||||
CKDWORD height = dst->GetHeight(),
|
||||
rowsize = VxImageDescEx::PixelSize * dst->GetWidth();
|
||||
for (CK2::CKDWORD row = 0; row < height; ++row) {
|
||||
for (CKDWORD row = 0; row < height; ++row) {
|
||||
std::memcpy(
|
||||
dst->GetMutableImage() + (row * rowsize),
|
||||
origin->GetImage() + ((height - row - 1) * rowsize),
|
||||
@ -68,10 +67,10 @@ namespace LibCmo::VxMath {
|
||||
}
|
||||
}
|
||||
|
||||
CK2::CKDWORD VxGetBitCount(CK2::CKDWORD dwMask) {
|
||||
CKDWORD VxGetBitCount(CKDWORD dwMask) {
|
||||
if (dwMask == 0u) return 0;
|
||||
dwMask >>= VxGetBitShift(dwMask);
|
||||
CK2::CKDWORD count = 0;
|
||||
CKDWORD count = 0;
|
||||
while ((dwMask & 1u) == 0u) {
|
||||
dwMask >>= 1u;
|
||||
++count;
|
||||
@ -79,9 +78,9 @@ namespace LibCmo::VxMath {
|
||||
return count;
|
||||
}
|
||||
|
||||
CK2::CKDWORD VxGetBitShift(CK2::CKDWORD dwMask) {
|
||||
CKDWORD VxGetBitShift(CKDWORD dwMask) {
|
||||
if (dwMask == 0u) return 0;
|
||||
CK2::CKDWORD count = 0;
|
||||
CKDWORD count = 0;
|
||||
while ((dwMask & 1u) != 0u) {
|
||||
dwMask >>= 1u;
|
||||
++count;
|
||||
@ -89,7 +88,7 @@ namespace LibCmo::VxMath {
|
||||
return count;
|
||||
}
|
||||
|
||||
//CK2::CKDWORD VxScaleFactor(CK2::CKDWORD val, CK2::CKDWORD srcBitCount, CK2::CKDWORD dstBitCount) {
|
||||
//CKDWORD VxScaleFactor(CKDWORD val, CKDWORD srcBitCount, CKDWORD dstBitCount) {
|
||||
// if (srcBitCount == dstBitCount) return val;
|
||||
// if (srcBitCount > dstBitCount) {
|
||||
// return val >> (srcBitCount - dstBitCount);
|
||||
@ -98,52 +97,29 @@ namespace LibCmo::VxMath {
|
||||
// }
|
||||
//}
|
||||
|
||||
void VxDoAlphaBlit(VxImageDescEx* dst_desc, CK2::CKBYTE AlphaValue) {
|
||||
void VxDoAlphaBlit(VxImageDescEx* dst_desc, CKBYTE AlphaValue) {
|
||||
if (dst_desc == nullptr) return;
|
||||
|
||||
CK2::CKDWORD* pixels = dst_desc->GetMutablePixels();
|
||||
CK2::CKDWORD pixelcount = dst_desc->GetPixelCount();
|
||||
CKDWORD* pixels = dst_desc->GetMutablePixels();
|
||||
CKDWORD pixelcount = dst_desc->GetPixelCount();
|
||||
|
||||
for (CK2::CKDWORD i = 0; i < pixelcount; ++i) {
|
||||
*pixels = (*pixels) & 0x00FFFFFF | (static_cast<CK2::CKDWORD>(AlphaValue) << 24);
|
||||
for (CKDWORD i = 0; i < pixelcount; ++i) {
|
||||
*pixels = (*pixels) & 0x00FFFFFF | (static_cast<CKDWORD>(AlphaValue) << 24);
|
||||
++pixels;
|
||||
}
|
||||
|
||||
//CK2::CKDWORD* pixels = dst_desc->GetPixels();
|
||||
//CK2::CKDWORD pixelcount = dst_desc->GetPixelCount(),
|
||||
// alphashift = VxGetBitShift(dst_desc->m_AlphaMask),
|
||||
// alphacount = VxGetBitCount(dst_desc->m_AlphaMask);
|
||||
|
||||
//CK2::CKDWORD av = VxScaleFactor(AlphaValue, static_cast<CK2::CKDWORD>(sizeof(CK2::CKBYTE) * 8), alphacount) << alphashift;
|
||||
|
||||
//for (CK2::CKDWORD i = 0; i < pixelcount; ++i) {
|
||||
// *pixels = (*pixels) & (~dst_desc->m_AlphaMask) | av;
|
||||
// ++pixels;
|
||||
//}
|
||||
}
|
||||
|
||||
void VxDoAlphaBlit(VxImageDescEx* dst_desc, CK2::CKBYTE* AlphaValues) {
|
||||
void VxDoAlphaBlit(VxImageDescEx* dst_desc, CKBYTE* AlphaValues) {
|
||||
if (dst_desc == nullptr) return;
|
||||
|
||||
CK2::CKDWORD* pixels = dst_desc->GetMutablePixels();
|
||||
CK2::CKDWORD pixelcount = dst_desc->GetPixelCount();
|
||||
CKDWORD* pixels = dst_desc->GetMutablePixels();
|
||||
CKDWORD pixelcount = dst_desc->GetPixelCount();
|
||||
|
||||
for (CK2::CKDWORD i = 0; i < pixelcount; ++i) {
|
||||
*pixels = (*pixels) & 0x00FFFFFF | (static_cast<CK2::CKDWORD>(*AlphaValues) << 24);
|
||||
for (CKDWORD i = 0; i < pixelcount; ++i) {
|
||||
*pixels = (*pixels) & 0x00FFFFFF | (static_cast<CKDWORD>(*AlphaValues) << 24);
|
||||
++pixels;
|
||||
++AlphaValues;
|
||||
}
|
||||
|
||||
//CK2::CKDWORD* pixels = dst_desc->GetPixels();
|
||||
//CK2::CKDWORD pixelcount = dst_desc->GetPixelCount(),
|
||||
// alphashift = VxGetBitShift(dst_desc->m_AlphaMask),
|
||||
// alphacount = VxGetBitCount(dst_desc->m_AlphaMask);
|
||||
|
||||
//for (CK2::CKDWORD i = 0; i < pixelcount; ++i) {
|
||||
// *pixels = (*pixels) & (~dst_desc->m_AlphaMask) | (VxScaleFactor(*AlphaValues, static_cast<CK2::CKDWORD>(sizeof(CK2::CKBYTE) * 8), alphacount) << alphashift);
|
||||
// ++pixels;
|
||||
// ++AlphaValues;
|
||||
//}
|
||||
}
|
||||
|
||||
#pragma endregion
|
||||
|
Reference in New Issue
Block a user