PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into precipitation

Browse Source
This commit is contained in:
MihailRis
2025-03-09 23:13:04 +03:00
parent 70b3a4d91e 5956f18b65
commit bf5a5b243f
26 changed files with 577 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/core/Atlas.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ std::unique_ptr<Atlas> AtlasBuilder::build(uint extrusion, bool prepare, uint ma
uint y = rect.y;
uint w = rect.width;
uint h = rect.height;
canvas->blit(entry.image.get(), rect.x, rect.y);
canvas->blit(*entry.image, rect.x, rect.y);
for (uint j = 0; j < extrusion; j++) {
canvas->extrude(x - j, y - j, w + j*2, h + j*2);
}
src/graphics/core/ImageData.cpp
+112 -14
View File
@@ -3,6 +3,7 @@
#include <assert.h>
#include <stdexcept>
#include <cstring>
#include <cmath>
#include <algorithm>
ImageData::ImageData(ImageFormat format, uint width, uint height)
@@ -80,23 +81,116 @@ void ImageData::flipY() {
}
}
void ImageData::blit(const ImageData* image, int x, int y) {
if (format == image->format) {
void ImageData::blit(const ImageData& image, int x, int y) {
if (format == image.format) {
blitMatchingFormat(image, x, y);
return;
}
if (format == ImageFormat::rgba8888 &&
image->format == ImageFormat::rgb888) {
image.format == ImageFormat::rgb888) {
blitRGB_on_RGBA(image, x, y);
return;
}
throw std::runtime_error("mismatching format");
}
void ImageData::blitRGB_on_RGBA(const ImageData* image, int x, int y) {
ubyte* source = image->getData();
uint srcwidth = image->getWidth();
uint srcheight = image->getHeight();
static bool clip_line(int& x1, int& y1, int& x2, int& y2, int width, int height) {
const int left = 0;
const int right = width;
const int bottom = 0;
const int top = height;
int dx = x2 - x1;
int dy = y2 - y1;
float t0 = 0.0f;
float t1 = 1.0f;
auto clip = [](int p, int q, float& t0, float& t1) {
if (p == 0) {
return q >= 0;
}
float t = static_cast<float>(q) / p;
if (p < 0) {
if (t > t1) return false;
if (t > t0) t0 = t;
} else {
if (t < t0) return false;
if (t < t1) t1 = t;
}
return true;
};
if (!clip(-dx, x1 - left, t0, t1)) return false;
if (!clip( dx, right - x1, t0, t1)) return false;
if (!clip(-dy, y1 - bottom, t0, t1)) return false;
if (!clip( dy, top - y1, t0, t1)) return false;
if (t1 < 1.0f) {
x2 = x1 + static_cast<int>(std::round(t1 * dx));
y2 = y1 + static_cast<int>(std::round(t1 * dy));
}
if (t0 > 0.0f) {
x1 = x1 + static_cast<int>(std::round(t0 * dx));
y1 = y1 + static_cast<int>(std::round(t0 * dy));
}
return true;
}
template<uint channels>
static void draw_line(ImageData& image, int x1, int y1, int x2, int y2, const glm::ivec4& color) {
ubyte* data = image.getData();
uint width = image.getWidth();
uint height = image.getHeight();
if ((x1 < 0 || x1 >= width || x2 < 0 || x2 >= width ||
y1 < 0 || y1 >= height || y2 < 0 || y2 >= height) &&
!clip_line(x1, y1, x2, y2, width, height)) {
return;
}
int dx = std::abs(x2 - x1);
int dy = -std::abs(y2 - y1);
int sx = x1 < x2 ? 1 : -1;
int sy = y1 < y2 ? 1 : -1;
int err = dx + dy;
while (true) {
size_t pos = (y1 * width + x1) * channels;
for (int i = 0; i < channels; i++) {
data[pos + i] = color[i];
}
if (x1 == x2 && y1 == y2) break;
int e2 = 2 * err;
if (e2 >= dy) {
err += dy;
x1 += sx;
}
if (e2 <= dx) {
err += dx;
y1 += sy;
}
}
}
void ImageData::drawLine(int x1, int y1, int x2, int y2, const glm::ivec4& color) {
switch (format) {
case ImageFormat::rgb888:
draw_line<3>(*this, x1, y1, x2, y2, color);
break;
case ImageFormat::rgba8888:
draw_line<4>(*this, x1, y1, x2, y2, color);
break;
default:
break;
}
}
void ImageData::blitRGB_on_RGBA(const ImageData& image, int x, int y) {
ubyte* source = image.getData();
uint srcwidth = image.getWidth();
uint srcheight = image.getHeight();
for (uint srcy = std::max(0, -y);
srcy < std::min(srcheight, height - y);
@@ -116,7 +210,7 @@ void ImageData::blitRGB_on_RGBA(const ImageData* image, int x, int y) {
}
}
void ImageData::blitMatchingFormat(const ImageData* image, int x, int y) {
void ImageData::blitMatchingFormat(const ImageData& image, int x, int y) {
uint comps;
switch (format) {
case ImageFormat::rgb888: comps = 3; break;
@@ -124,20 +218,24 @@ void ImageData::blitMatchingFormat(const ImageData* image, int x, int y) {
default:
throw std::runtime_error("only unsigned byte formats supported");
}
ubyte* source = image->getData();
uint srcwidth = image->getWidth();
uint srcheight = image->getHeight();
ubyte* source = image.getData();
const uint width = this->width;
const uint height = this->height;
const uint src_width = image.getWidth();
const uint src_height = image.getHeight();
ubyte* data = this->data.get();
for (uint srcy = std::max(0, -y);
srcy < std::min(srcheight, height - y);
srcy < std::min(src_height, height - y);
srcy++) {
for (uint srcx = std::max(0, -x);
srcx < std::min(srcwidth, width - x);
srcx < std::min(src_width, width - x);
srcx++) {
uint dstx = srcx + x;
uint dsty = srcy + y;
uint dstidx = (dsty * width + dstx) * comps;
uint srcidx = (srcy * srcwidth + srcx) * comps;
uint srcidx = (srcy * src_width + srcx) * comps;
for (uint c = 0; c < comps; c++) {
data[dstidx + c] = source[srcidx + c];
}
src/graphics/core/ImageData.hpp
+11 -3
View File
@@ -2,6 +2,7 @@
#include "typedefs.hpp"
#include <glm/vec4.hpp>
#include <memory>
enum class ImageFormat {
@@ -14,6 +15,9 @@ class ImageData {
uint width;
uint height;
std::unique_ptr<ubyte[]> data;
void blitRGB_on_RGBA(const ImageData& image, int x, int y);
void blitMatchingFormat(const ImageData& image, int x, int y);
public:
ImageData(ImageFormat format, uint width, uint height);
ImageData(ImageFormat format, uint width, uint height, std::unique_ptr<ubyte[]> data);
@@ -23,9 +27,8 @@ public:
void flipX();
void flipY();
void blitRGB_on_RGBA(const ImageData* image, int x, int y);
void blitMatchingFormat(const ImageData* image, int x, int y);
void blit(const ImageData* image, int x, int y);
void drawLine(int x1, int y1, int x2, int y2, const glm::ivec4& color);
void blit(const ImageData& image, int x, int y);
void extrude(int x, int y, int w, int h);
void fixAlphaColor();
@@ -44,6 +47,11 @@ public:
uint getHeight() const {
return height;
}
size_t getDataSize() const {
size_t channels = 3 + (format == ImageFormat::rgba8888);
return width * height * channels;
}
};
std::unique_ptr<ImageData> add_atlas_margins(ImageData* image, int grid_size);
src/graphics/ui/elements/Canvas.cpp
+1 -1
View File
@@ -16,5 +16,5 @@ void gui::Canvas::draw(const DrawContext& pctx, const Assets& assets) {
auto batch = pctx.getBatch2D();
batch->texture(mTexture.get());
batch->rect(pos.x, pos.y, size.x, size.y, 0, 0, 0, {}, false, true, col);
batch->rect(pos.x, pos.y, size.x, size.y, 0, 0, 0, {}, false, false, col);
}
src/graphics/ui/elements/Canvas.hpp
+1 -1
View File
@@ -26,4 +26,4 @@ namespace gui {
std::shared_ptr<::Texture> mTexture;
std::shared_ptr<ImageData> mData;
};
}
}