Merge branch 'main' into dev

This commit is contained in:
MihailRis 2026-11-01 02:03:50 +03:00
commit 5011a654be
7 changed files with 69 additions and 26 deletions

View file

@ -116,6 +116,9 @@ local function complete_app_lib(app)
end
function app.config_packs(packs_list)
if tick_required and not internals.is_post_runnable_context() then
__app_tick()
end
-- Check if packs are valid and add dependencies to the configuration
packs_list = pack.assemble(packs_list)

View file

@ -78,6 +78,8 @@ std::shared_ptr<UINode> create_debug_panel(
static int drawCallsMax = drawCalls;
static std::wstring drawCallsAvgString = L"";
static std::wstring drawCallsMinMaxString = L"";
static int verticesCount = 0;
static std::wstring verticesCountString = L"";
static size_t lastTotalDownload = 0;
static size_t lastTotalUpload = 0;
@ -151,6 +153,19 @@ std::shared_ptr<UINode> create_debug_panel(
panel->add(create_label(gui, []() {
return drawCallsMinMaxString;
}));
panel->add(create_label(gui, []() {
static int frame = 0;
verticesCount = std::max<int>(verticesCount, MeshStats::vertices);
if (frame % 4 == 0) {
verticesCountString =
L"vertices: " + std::to_wstring(verticesCount) + L" (" +
util::str2wstr_utf8(util::format_count(verticesCount)) + L")";
}
frame++;
MeshStats::vertices = 0;
verticesCount = 0;
return verticesCountString;
}));
panel->add(create_label(gui, []() {
return L"speakers: " + std::to_wstring(audio::count_speakers()) +
L" streams: " + std::to_wstring(audio::count_streams());

View file

@ -1,4 +1,5 @@
#include "graphics/core/Mesh.hpp"
int MeshStats::meshesCount = 0;
int MeshStats::drawCalls = 0;
int MeshStats::drawCalls = 0;
int MeshStats::vertices = 0;

View file

@ -9,6 +9,7 @@
struct MeshStats {
static int meshesCount;
static int drawCalls;
static int vertices;
};
struct IndexBufferData {

View file

@ -118,17 +118,20 @@ void Mesh<VertexStructure>::draw(unsigned int primitive, int iboIndex) const {
if (!ibos.empty()) {
if (iboIndex < ibos.size()) {
size_t indexCount = ibos.at(iboIndex).indexCount;
glBindVertexArray(vao);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibos[iboIndex].ibo);
glDrawElements(
primitive, ibos.at(iboIndex).indexCount, GL_UNSIGNED_INT, nullptr
primitive, indexCount, GL_UNSIGNED_INT, nullptr
);
glBindVertexArray(0);
MeshStats::vertices += indexCount;
}
} else if (vertexCount > 0) {
glBindVertexArray(vao);
glDrawArrays(primitive, 0, vertexCount);
glBindVertexArray(0);
MeshStats::vertices += vertexCount;
}
}

View file

@ -1,11 +1,11 @@
#include "stringutil.hpp"
#include <algorithm>
#include <charconv>
#include <cctype>
#include <cmath>
#include <iomanip>
#include <locale>
#include "stringutil.hpp"
#include <algorithm>
#include <charconv>
#include <cctype>
#include <cmath>
#include <iomanip>
#include <locale>
#include <sstream>
#include <stdexcept>
@ -511,22 +511,22 @@ int util::replaceAll(
return replace_all(str, from, to);
}
double util::parse_double(const std::string& str) {
const char* begin = str.data();
const char* end = begin + str.size();
while (begin != end && std::isspace(static_cast<unsigned char>(*begin))) {
begin++;
}
if (begin != end && *begin == '+') {
begin++;
}
double d = 0.0;
const auto result = std::from_chars(begin, end, d);
if (result.ec != std::errc()) {
throw std::runtime_error("invalid number format");
}
return d;
}
double util::parse_double(const std::string& str) {
const char* begin = str.data();
const char* end = begin + str.size();
while (begin != end && std::isspace(static_cast<unsigned char>(*begin))) {
begin++;
}
if (begin != end && *begin == '+') {
begin++;
}
double d = 0.0;
const auto result = std::from_chars(begin, end, d);
if (result.ec != std::errc()) {
throw std::runtime_error("invalid number format");
}
return d;
}
double util::parse_double(const std::string& str, size_t offset, size_t len) {
return parse_double(str.substr(offset, len));
@ -667,6 +667,25 @@ std::string util::format_data_size(size_t size) {
postfixes[group];
}
std::string util::format_count(size_t count) {
if (count < 1000) {
return std::to_string(count);
}
const std::string postfixes[] {
"", " K", " M", " B"
};
int group = 0;
size_t remainder = 0;
while (count >= 1000) {
group++;
remainder = count % 1000;
count /= 1000;
}
return std::to_string(count) + "." +
std::to_string(static_cast<int>(round(remainder / 1000.0f))) +
postfixes[group];
}
std::pair<std::string, std::string> util::split_at(
std::string_view view, char c
) {

View file

@ -118,6 +118,7 @@ namespace util {
std::vector<std::wstring> split(const std::wstring& str, char delimiter);
std::string format_data_size(size_t size);
std::string format_count(size_t size);
std::pair<std::string, std::string> split_at(std::string_view view, char c);