tobid7/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# Update

Browse Source 
- Added GetTime funcs to utils
- Added Time() to App class to gather the apps run time in seconds
- Updated almost every part of the sourcecode to the D7 Style guide
This commit is contained in:
tobid7
2025-11-26 13:46:46 +01:00
parent 830524c9eb
commit 2a2a670e1a
32 changed files with 913 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
source/image.cpp
View File

@@ -5,64 +5,63 @@
// #define STB_IMAGE_IMPLEMENTATION
#include <stb_image.h>
namespace amy {
void image::load(cstr& path) {
namespace Amy {
void Image::Load(ksr path) {
int c = 0;
uc* buf = stbi_load(path.c_str(), &m_w, &m_h, &c, 4);
uc* buf = stbi_load(path.c_str(), &pW, &pH, &c, 4);
if (c == 3) {
// Releoading the Image with tree channels requestet
// Still need to find a better way for this :(
stbi_image_free(buf);
buf = stbi_load(path.c_str(), &m_w, &m_h, &c, 3);
m_buffer.assign(buf, buf + (m_w * m_h * 3));
m_fmt = RGB;
buf = stbi_load(path.c_str(), &pW, &pH, &c, 3);
pBuffer.assign(buf, buf + (pW * pH * 3));
pFmt = RGB;
stbi_image_free(buf);
} else if (c == 4) {
m_buffer.assign(buf, buf + (m_w * m_h * 4));
m_fmt = RGBA;
pBuffer.assign(buf, buf + (pW * pH * 4));
pFmt = RGBA;
stbi_image_free(buf);
} else {
throw std::runtime_error(path + " is using an unsupported image format!");
}
}
void image::load(const std::vector<uc>& data) {
void Image::Load(const std::vector<uc>& data) {
int c = 0;
uc* buf = stbi_load_from_memory(data.data(), data.size(), &m_w, &m_h, &c, 4);
uc* buf = stbi_load_from_memory(data.data(), data.size(), &pW, &pH, &c, 4);
if (c == 3) {
// Releoading the Image with tree channels requestet
// Still need to find a better way for this :(
stbi_image_free(buf);
buf = stbi_load_from_memory(data.data(), data.size(), &m_w, &m_h, &c, 3);
m_buffer.assign(buf, buf + (m_w * m_h * 3));
m_fmt = RGB;
buf = stbi_load_from_memory(data.data(), data.size(), &pW, &pH, &c, 3);
pBuffer.assign(buf, buf + (pW * pH * 3));
pFmt = RGB;
stbi_image_free(buf);
} else if (m_fmt == 4) {
m_buffer.assign(buf, buf + (m_w * m_h * 4));
m_fmt = RGBA;
} else if (pFmt == 4) {
pBuffer.assign(buf, buf + (pW * pH * 4));
pFmt = RGBA;
stbi_image_free(buf);
} else {
throw std::runtime_error("image mem using an unsupported image format!");
}
}
void image::copy(const std::vector<uc>& pixels, int w, int h,
const format& fmt) {
int f = getBppOfFmt(fmt);
void Image::Copy(kvr<uc> pixels, int w, int h, const Format& fmt) {
int f = GetBppOfFmt(fmt);
if (pixels.size() != static_cast<size_t>(w * h * f)) {
throw std::runtime_error("Connot copy image due to size error!");
}
m_fmt = fmt;
m_w = w;
m_h = h;
m_buffer.clear();
m_buffer.resize(w * h * f);
for (size_t i = 0; i < m_buffer.size(); i++) {
m_buffer[i] = pixels[i];
pFmt = fmt;
pW = w;
pH = h;
pBuffer.clear();
pBuffer.resize(w * h * f);
for (size_t i = 0; i < pBuffer.size(); i++) {
pBuffer[i] = pixels[i];
}
}
int image::getBppOfFmt(const image::format& fmt) {
int Image::GetBppOfFmt(const Image::Format& fmt) {
switch (fmt) {
case RGBA:
case ABGR:
@@ -83,28 +82,28 @@ int image::getBppOfFmt(const image::format& fmt) {
}
}
void image::convert(image& img, const format& dst) {
if (img.m_fmt == dst) {
void Image::Convert(Image& img, const Format& dst) {
if (img.pFmt == dst) {
return;
} else if (img.m_fmt == RGB && dst == BGR) {
utils::image::reverseBuf(img.m_buffer, img.m_w, img.m_h, 3);
img.m_fmt = BGR;
} else if (img.m_fmt == RGB && dst == RGBA) {
utils::image::addAlphaChannel(img.m_buffer, img.m_w, img.m_h);
img.m_fmt = RGBA;
} else if (img.m_fmt == RGBA && dst == RGB) {
utils::image::removeAlphaChannel(img.m_buffer, img.m_w, img.m_h);
img.m_fmt = RGB;
} else if (img.m_fmt == RGBA && dst == ABGR) {
utils::image::reverseBuf(img.m_buffer, img.m_w, img.m_h, 4);
img.m_fmt = ABGR;
} else if (img.m_fmt == RGB && dst == ABGR) {
convert(img, RGBA);
convert(img, ABGR);
} else if (img.m_fmt == RGBA && dst == RGB565) {
convert(img, RGB);
convert(img, RGB565);
} else if (img.m_fmt == RGB && dst == RGB565) {
} else if (img.pFmt == RGB && dst == BGR) {
Utils::Image::ReverseBuf(img.pBuffer, img.pW, img.pH, 3);
img.pFmt = BGR;
} else if (img.pFmt == RGB && dst == RGBA) {
Utils::Image::AddAlphaChannel(img.pBuffer, img.pW, img.pH);
img.pFmt = RGBA;
} else if (img.pFmt == RGBA && dst == RGB) {
Utils::Image::RemoveAlphaChannel(img.pBuffer, img.pW, img.pH);
img.pFmt = RGB;
} else if (img.pFmt == RGBA && dst == ABGR) {
Utils::Image::ReverseBuf(img.pBuffer, img.pW, img.pH, 4);
img.pFmt = ABGR;
} else if (img.pFmt == RGB && dst == ABGR) {
Convert(img, RGBA);
Convert(img, ABGR);
} else if (img.pFmt == RGBA && dst == RGB565) {
Convert(img, RGB);
Convert(img, RGB565);
} else if (img.pFmt == RGB && dst == RGB565) {
// Inlined make pixel 565 func
auto f = [](uc r, uc g, uc b) -> unsigned short {
unsigned short _r = (r >> 3);
@@ -112,35 +111,35 @@ void image::convert(image& img, const format& dst) {
unsigned short _b = (b >> 3);
return (_r << 11) | (_g << 5) | _b;
};
std::vector<uc> cpy = img.m_buffer;
img.m_buffer.resize(img.m_w * img.m_h * 2);
for (int y = 0; y < img.m_w; y++) {
for (int x = 0; x < img.m_h; x++) {
int src = (y * img.m_w + x) * 3;
int dst = (y * img.m_w + x) * 2;
std::vector<uc> cpy = img.pBuffer;
img.pBuffer.resize(img.pW * img.pH * 2);
for (int y = 0; y < img.pW; y++) {
for (int x = 0; x < img.pH; x++) {
int src = (y * img.pW + x) * 3;
int dst = (y * img.pW + x) * 2;
unsigned short new_px = f(cpy[src + 0], cpy[src + 1], cpy[src + 2]);
img.m_buffer[dst + 0] = new_px >> 8;
img.m_buffer[dst + 1] = new_px & 0xff;
img.pBuffer[dst + 0] = new_px >> 8;
img.pBuffer[dst + 1] = new_px & 0xff;
}
}
img.m_fmt = RGB565;
img.pFmt = RGB565;
}
}
void image::retile(image& img, std::function<ui(int x, int y, int w)> src,
void Image::Retile(Image& img, std::function<ui(int x, int y, int w)> src,
std::function<ui(int x, int y, int w)> dst) {
std::vector<uc> cpy = img.m_buffer;
std::vector<uc> cpy = img.pBuffer;
/** could use fmt here but for 565 that woulnt work as it is not supported by
* file loading where fmt is used */
int bpp = img.bpp();
for (int y = 0; y < img.m_h; y++) {
for (int x = 0; x < img.m_w; x++) {
int src_idx = src(x, y, img.m_w);
int dst_idx = dst(x, y, img.m_w);
int bpp = img.Bpp();
for (int y = 0; y < img.pH; y++) {
for (int x = 0; x < img.pW; x++) {
int src_idx = src(x, y, img.pW);
int dst_idx = dst(x, y, img.pW);
for (int i = 0; i < bpp; i++) {
img.m_buffer[dst_idx + i] = cpy[src_idx + i];
img.pBuffer[dst_idx + i] = cpy[src_idx + i];
}
}
}
}
} // namespace amy
} // namespace Amy