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

Merge branch 'dev' into generated-pcm-stream

Browse Source
This commit is contained in:
MihailRis
2025-11-06 12:18:47 +03:00
parent 41e2b015d7 31d2dde534
commit 219d5aab31
19 changed files with 226 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/scripting/lua/libs/libassets.cpp
+41
View File
@@ -7,7 +7,9 @@
#include "engine/Engine.hpp"
#include "graphics/commons/Model.hpp"
#include "graphics/core/Texture.hpp"
#include "graphics/core/Atlas.hpp"
#include "util/Buffer.hpp"
#include "../usertypes/lua_type_canvas.hpp"
using namespace scripting;
@@ -64,8 +66,47 @@ static int l_parse_model(lua::State* L) {
return 0;
}
static int l_to_canvas(lua::State* L) {
auto& assets = *engine->getAssets();
auto alias = lua::require_lstring(L, 1);
size_t sep = alias.rfind(':');
if (sep == std::string::npos) {
auto texture = assets.getShared<Texture>(std::string(alias));
if (texture != nullptr) {
auto image = texture->readData();
return lua::newuserdata<lua::LuaCanvas>(
L, texture, std::move(image)
);
}
return 0;
}
auto atlasName = alias.substr(0, sep);
if (auto atlas = assets.get<Atlas>(std::string(atlasName))) {
auto textureName = std::string(alias.substr(sep + 1));
auto image = atlas->shareImageData();
auto texture = atlas->shareTexture();
if (auto region = atlas->getIf(textureName)) {
UVRegion uvRegion = *region;
int atlasWidth = static_cast<int>(image->getWidth());
int atlasHeight = static_cast<int>(image->getHeight());
int x = static_cast<int>(uvRegion.u1 * atlasWidth);
int y = static_cast<int>(uvRegion.v1 * atlasHeight);
int w = static_cast<int>(uvRegion.getWidth() * atlasWidth);
int h = static_cast<int>(uvRegion.getHeight() * atlasHeight);
return lua::newuserdata<lua::LuaCanvas>(
L, std::move(texture), image->cropped(x, y, w, h), uvRegion
);
}
}
return 0;
}
const luaL_Reg assetslib[] = {
{"load_texture", lua::wrap<l_load_texture>},
{"parse_model", lua::wrap<l_parse_model>},
{"to_canvas", lua::wrap<l_to_canvas>},
{nullptr, nullptr}
};
src/logic/scripting/lua/libs/libgui.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ DocumentNode get_document_node(lua::State* L, int idx) {
static int l_menu_back(lua::State* L) {
auto node = get_document_node(L);
if (auto menu = dynamic_cast<Menu*>(node.node.get())) {
menu->back();
return lua::pushboolean(L, menu->back());
}
return 0;
}
src/logic/scripting/lua/usertypes/lua_type_canvas.cpp
+57 -14
View File
@@ -11,14 +11,59 @@
using namespace lua;
LuaCanvas::LuaCanvas(
std::shared_ptr<Texture> inTexture, std::shared_ptr<ImageData> inData
std::shared_ptr<Texture> texture,
std::shared_ptr<ImageData> data,
UVRegion region
)
: mTexture(std::move(inTexture)), mData(std::move(inData)) {
: texture(std::move(texture)),
data(std::move(data)),
region(std::move(region)) {
}
void LuaCanvas::update(int extrusion) {
if (!hasTexture()) {
return;
}
if (region.isFull()) {
texture->reload(*data);
} else {
uint texWidth = texture->getWidth();
uint texHeight = texture->getHeight();
uint imgWidth = data->getWidth();
uint imgHeight = data->getHeight();
uint x = static_cast<uint>(region.u1 * texWidth);
uint y = static_cast<uint>(region.v1 * texHeight);
uint w = static_cast<uint>((region.u2 - region.u1) * texWidth);
uint h = static_cast<uint>((region.v2 - region.v1) * texHeight);
w = std::min<uint>(w, imgWidth);
h = std::min<uint>(h, imgHeight);
if (extrusion > 0) {
auto extruded = std::make_unique<ImageData>(
data->getFormat(),
w + extrusion * 2,
h + extrusion * 2
);
extruded->blit(*data, extrusion, extrusion);
extruded->extrude(0, 0, w + extrusion * 2, h + extrusion * 2);
texture->reloadPartial(
*extruded,
x - extrusion,
y - extrusion,
w + extrusion * 2,
h + extrusion * 2
);
} else {
texture->reloadPartial(*data, x, y, w, h);
}
}
}
void LuaCanvas::createTexture() {
mTexture = Texture::from(mData.get());
mTexture->setMipMapping(false, true);
texture = Texture::from(data.get());
texture->setMipMapping(false, true);
}
union RGBA {
@@ -42,7 +87,7 @@ static RGBA* get_at(const ImageData& data, uint x, uint y) {
static RGBA* get_at(State* L, uint x, uint y) {
if (auto canvas = touserdata<LuaCanvas>(L, 1)) {
return get_at(canvas->data(), x, y);
return get_at(canvas->getData(), x, y);
}
return nullptr;
}
@@ -98,7 +143,7 @@ static LuaCanvas& require_canvas(State* L, int idx) {
static int l_clear(State* L) {
auto& canvas = require_canvas(L, 1);
auto& image = canvas.data();
auto& image = canvas.getData();
ubyte* data = image.getData();
RGBA rgba {};
if (gettop(L) == 1) {
@@ -123,7 +168,7 @@ static int l_line(State* L) {
RGBA rgba = get_rgba(L, 6);
if (auto canvas = touserdata<LuaCanvas>(L, 1)) {
auto& image = canvas->data();
auto& image = canvas->getData();
image.drawLine(
x1, y1, x2, y2, glm::ivec4 {rgba.r, rgba.g, rgba.b, rgba.a}
);
@@ -136,13 +181,13 @@ static int l_blit(State* L) {
auto& src = require_canvas(L, 2);
int dst_x = tointeger(L, 3);
int dst_y = tointeger(L, 4);
dst.data().blit(src.data(), dst_x, dst_y);
dst.getData().blit(src.getData(), dst_x, dst_y);
return 0;
}
static int l_set_data(State* L) {
auto& canvas = require_canvas(L, 1);
auto& image = canvas.data();
auto& image = canvas.getData();
auto data = image.getData();
if (lua::isstring(L, 2)) {
@@ -167,9 +212,7 @@ static int l_set_data(State* L) {
static int l_update(State* L) {
if (auto canvas = touserdata<LuaCanvas>(L, 1)) {
if (canvas->hasTexture()) {
canvas->texture().reload(canvas->data());
}
canvas->update();
}
return 0;
}
@@ -203,7 +246,7 @@ static int l_meta_index(State* L) {
if (texture == nullptr) {
return 0;
}
auto& data = texture->data();
auto& data = texture->getData();
if (isnumber(L, 2)) {
if (auto pixel = get_at(data, static_cast<uint>(tointeger(L, 2)))) {
return pushinteger(L, pixel->rgba);
@@ -232,7 +275,7 @@ static int l_meta_newindex(State* L) {
if (texture == nullptr) {
return 0;
}
auto& data = texture->data();
auto& data = texture->getData();
if (isnumber(L, 2) && isnumber(L, 3)) {
if (auto pixel = get_at(data, static_cast<uint>(tointeger(L, 2)))) {
pixel->rgba = static_cast<uint>(tointeger(L, 3));
src/logic/scripting/lua/usertypes/lua_type_canvas.hpp
+16 -10
View File
@@ -1,6 +1,8 @@
#pragma once
#include "../lua_commons.hpp"
#include "maths/UVRegion.hpp"
#include "constants.hpp"
class Texture;
class ImageData;
@@ -9,8 +11,9 @@ namespace lua {
class LuaCanvas : public Userdata {
public:
explicit LuaCanvas(
std::shared_ptr<Texture> inTexture,
std::shared_ptr<ImageData> inData
std::shared_ptr<Texture> texture,
std::shared_ptr<ImageData> data,
UVRegion region = UVRegion(0, 0, 1, 1)
);
~LuaCanvas() override = default;
@@ -18,29 +21,32 @@ namespace lua {
return TYPENAME;
}
[[nodiscard]] auto& texture() const {
return *mTexture;
[[nodiscard]] auto& getTexture() const {
return *texture;
}
[[nodiscard]] auto& data() const {
return *mData;
[[nodiscard]] auto& getData() const {
return *data;
}
[[nodiscard]] bool hasTexture() const {
return mTexture != nullptr;
return texture != nullptr;
}
auto shareTexture() const {
return mTexture;
return texture;
}
void update(int extrusion = ATLAS_EXTRUSION);
void createTexture();
static int createMetatable(lua::State*);
inline static std::string TYPENAME = "Canvas";
private:
std::shared_ptr<Texture> mTexture; // nullable
std::shared_ptr<ImageData> mData;
std::shared_ptr<Texture> texture; // nullable
std::shared_ptr<ImageData> data;
UVRegion region;
};
static_assert(!std::is_abstract<LuaCanvas>());
}