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

update ContentGfxCache

Browse Source
This commit is contained in:
MihailRis
2025-07-24 22:51:53 +03:00
parent 4a6ccf4847
commit 799d712447
5 changed files with 69 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/ContentGfxCache.cpp
+24 -16
View File
@@ -9,9 +9,11 @@
#include "graphics/core/Atlas.hpp"
#include "maths/UVRegion.hpp"
#include "voxels/Block.hpp"
#include "debug/Logger.hpp"
#include "core_defs.hpp"
#include "settings.hpp"
static debug::Logger logger("content-gfx-cache");
ContentGfxCache::ContentGfxCache(
const Content& content,
@@ -22,27 +24,29 @@ ContentGfxCache::ContentGfxCache(
refresh();
}
static void refresh_variant(
const Assets& assets,
void ContentGfxCache::refreshVariant(
const Block& def,
const Variant& variant,
uint8_t variantIndex,
std::unique_ptr<UVRegion[]>& sideregions,
const Atlas& atlas,
const GraphicsSettings& settings,
std::unordered_map<blockid_t, model::Model>& models
const Atlas& atlas
) {
bool denseRender = settings.denseRender.get();
for (uint side = 0; side < 6; side++) {
std::string tex = variant.textureFaces[side];
if (variant.culling == CullingMode::OPTIONAL &&
!settings.denseRender.get() && atlas.has(tex + "_opaque")) {
tex = tex + "_opaque";
std::string texOpaque = tex + "_opaque";
if (!atlas.has(tex)) {
tex = TEXTURE_NOTFOUND;
}
if (atlas.has(tex)) {
sideregions[(def.rt.id * 6 + side) * MAX_VARIANTS + variantIndex] = atlas.get(tex);
} else if (atlas.has(TEXTURE_NOTFOUND)) {
sideregions[(def.rt.id * 6 + side) * MAX_VARIANTS + variantIndex] = atlas.get(TEXTURE_NOTFOUND);
if (!atlas.has(texOpaque)) {
texOpaque = tex;
} else if (variant.culling == CullingMode::OPTIONAL && !denseRender) {
tex = texOpaque;
}
size_t index = getRegionIndex(def.rt.id, variantIndex, side, false);
sideregions[index] = atlas.get(tex);
sideregions[index + 1] = atlas.get(texOpaque);
}
if (variant.model.type == BlockModelType::CUSTOM) {
auto model = assets.require<model::Model>(variant.model.name);
@@ -63,11 +67,11 @@ static void refresh_variant(
}
void ContentGfxCache::refresh(const Block& def, const Atlas& atlas) {
refresh_variant(assets, def, def.defaults, 0, sideregions, atlas, settings, models);
refreshVariant(def, def.defaults, 0, atlas);
if (def.variants) {
const auto& variants = def.variants->variants;
for (int i = 1; i < variants.size() - 1; i++) {
refresh_variant(assets, def, variants[i], i, sideregions, atlas, settings, models);
refreshVariant(def, variants[i], i, atlas);
}
def.variants->variants.at(0) = def.defaults;
}
@@ -75,7 +79,11 @@ void ContentGfxCache::refresh(const Block& def, const Atlas& atlas) {
void ContentGfxCache::refresh() {
auto indices = content.getIndices();
sideregions = std::make_unique<UVRegion[]>(indices->blocks.count() * 6 * MAX_VARIANTS);
size_t size = indices->blocks.count() * GFXC_SIDES * GFXC_MAX_VARIANTS * 2;
logger.info() << "uv cache size is " << (sizeof(UVRegion) * size) << " B";
sideregions = std::make_unique<UVRegion[]>(size);
const auto& atlas = assets.require<Atlas>("blocks");
const auto& blocks = indices->blocks.getIterable();