mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 05:09:20 +02:00
* refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize<Type_>() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117)
262 lines
7.0 KiB
C++
262 lines
7.0 KiB
C++
#include "stdafx.h"
|
|
#include "scripting/pythonscreenviewer.h"
|
|
#include "application/application.h"
|
|
#include "gl/shader.h"
|
|
#include "gl/vao.h"
|
|
#include "utilities/Logs.h"
|
|
|
|
void texture_window_resize(GLFWwindow *win, int w, int h)
|
|
{
|
|
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
|
|
texwindow->notify_window_size(win, w, h);
|
|
}
|
|
|
|
void texture_window_fb_resize(GLFWwindow *win, int w, int h)
|
|
{
|
|
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
|
|
texwindow->notify_window_fb_size(win, w, h);
|
|
}
|
|
|
|
void texture_window_mouse_button(GLFWwindow *win, int button, int action, int /*mods*/)
|
|
{
|
|
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
|
|
texwindow->notify_click(win, button, action);
|
|
}
|
|
|
|
void texture_window_cursor_pos(GLFWwindow *win, double x, double y)
|
|
{
|
|
auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win);
|
|
texwindow->notify_cursor_pos(win, x, y);
|
|
}
|
|
|
|
python_screen_viewer::python_screen_viewer(std::shared_ptr<python_rt> rt, std::shared_ptr<std::vector<glm::vec2>> touchlist, std::string const &surfacename)
|
|
: m_rt(rt), m_touchlist(touchlist)
|
|
{
|
|
|
|
for (const auto &viewport : Global.python_viewports) {
|
|
if (viewport.surface == surfacename) {
|
|
auto conf = std::make_unique<window_state>();
|
|
conf->window_size = viewport.size;
|
|
conf->offset = viewport.offset;
|
|
conf->scale = viewport.scale;
|
|
|
|
GLFWmonitor *monitor = Application.find_monitor(viewport.monitor);
|
|
if (!monitor && viewport.monitor != "window")
|
|
continue;
|
|
|
|
conf->window = Application.window(-1, true, conf->window_size.x, conf->window_size.y,
|
|
monitor, false, Global.python_sharectx);
|
|
|
|
{
|
|
int w;
|
|
int h;
|
|
glfwGetWindowSize(conf->window, &w, &h);
|
|
conf->window_size = glm::ivec2(w, h);
|
|
glfwGetFramebufferSize(conf->window, &w, &h);
|
|
conf->fb_size = glm::ivec2(w, h);
|
|
}
|
|
|
|
glfwSetWindowUserPointer(conf->window, this);
|
|
glfwSetWindowSizeCallback(conf->window, texture_window_resize);
|
|
glfwSetFramebufferSizeCallback(conf->window, texture_window_fb_resize);
|
|
glfwSetMouseButtonCallback(conf->window, texture_window_mouse_button);
|
|
glfwSetCursorPosCallback(conf->window, texture_window_cursor_pos);
|
|
|
|
m_windows.push_back(std::move(conf));
|
|
}
|
|
}
|
|
|
|
if (!m_windows.empty())
|
|
m_renderthread = std::make_unique<std::thread>(&python_screen_viewer::threadfunc, this);
|
|
}
|
|
|
|
python_screen_viewer::~python_screen_viewer()
|
|
{
|
|
m_exit = true;
|
|
if (m_renderthread)
|
|
m_renderthread->join();
|
|
}
|
|
|
|
void python_screen_viewer::threadfunc()
|
|
{
|
|
for (auto const &window : m_windows) {
|
|
glfwMakeContextCurrent(window->window);
|
|
|
|
glfwSwapInterval(Global.python_vsync ? 1 : 0);
|
|
GLuint v;
|
|
glGenVertexArrays(1, &v);
|
|
glBindVertexArray(v);
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
if (Global.python_sharectx) {
|
|
glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(m_rt->shared_tex->get_id()));
|
|
}
|
|
else {
|
|
GLuint tex;
|
|
glGenTextures(1, &tex);
|
|
glBindTexture(GL_TEXTURE_2D, tex);
|
|
}
|
|
|
|
if (!Global.gfx_usegles && !Global.gfx_shadergamma)
|
|
glEnable(GL_FRAMEBUFFER_SRGB);
|
|
|
|
gl::program::unbind();
|
|
gl::buffer::unbind();
|
|
|
|
window->ubo = std::make_unique<gl::ubo>(sizeof(gl::scene_ubs), 0, GL_STREAM_DRAW);
|
|
|
|
gl::shader vert("texturewindow.vert");
|
|
gl::shader frag("texturewindow.frag");
|
|
window->shader = std::make_unique<gl::program>(std::vector<std::reference_wrapper<const gl::shader>>({vert, frag}));
|
|
}
|
|
|
|
while (!m_exit)
|
|
{
|
|
auto start_time = std::chrono::high_resolution_clock::now();
|
|
|
|
for (auto const &window : m_windows) {
|
|
|
|
unsigned char *image = nullptr;
|
|
int format;
|
|
int components;
|
|
int width;
|
|
int height;
|
|
|
|
if (!Global.python_sharectx) {
|
|
std::scoped_lock guard(m_rt->mutex);
|
|
|
|
if (window->timestamp == m_rt->timestamp)
|
|
continue;
|
|
|
|
window->timestamp = m_rt->timestamp;
|
|
|
|
if (m_rt->image.empty())
|
|
continue;
|
|
|
|
format = m_rt->format;
|
|
components = m_rt->components;
|
|
width = m_rt->width;
|
|
height = m_rt->height;
|
|
|
|
size_t size = width * height * (components == GL_RGB ? 3 : 4);
|
|
|
|
image = new unsigned char[size];
|
|
memcpy(image, m_rt->image.data(), size);
|
|
}
|
|
|
|
glfwMakeContextCurrent(window->window);
|
|
gl::program::unbind();
|
|
gl::buffer::unbind();
|
|
|
|
window->shader->bind();
|
|
window->ubo->bind_uniform();
|
|
|
|
m_ubs.projection = glm::mat4(glm::mat3(glm::translate(glm::scale(glm::mat3(), 1.0f / window->scale), window->offset)));
|
|
window->ubo->update(m_ubs);
|
|
|
|
if (image) {
|
|
glTexImage2D(
|
|
GL_TEXTURE_2D, 0,
|
|
format,
|
|
width, height, 0,
|
|
components, GL_UNSIGNED_BYTE, image);
|
|
|
|
delete[] image;
|
|
|
|
if (Global.python_mipmaps) {
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
|
|
glGenerateMipmap(GL_TEXTURE_2D);
|
|
}
|
|
else {
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
}
|
|
}
|
|
|
|
glViewport(0, 0, window->fb_size.x, window->fb_size.y);
|
|
|
|
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
|
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
|
|
|
glfwSwapBuffers(window->window);
|
|
}
|
|
|
|
auto frametime = std::chrono::high_resolution_clock::now() - start_time;
|
|
|
|
if ((Global.python_minframetime - frametime).count() > 0.0f)
|
|
std::this_thread::sleep_for(Global.python_minframetime - frametime);
|
|
}
|
|
}
|
|
|
|
void python_screen_viewer::notify_window_fb_size(GLFWwindow const *window, int w, int h) const
|
|
{
|
|
for (auto const &conf : m_windows) {
|
|
if (conf->window == window) {
|
|
conf->fb_size.x = w;
|
|
conf->fb_size.y = h;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
void python_screen_viewer::notify_window_size(GLFWwindow const *window, int w, int h) const
|
|
{
|
|
for (auto const &conf : m_windows) {
|
|
if (conf->window == window) {
|
|
conf->window_size.x = w;
|
|
conf->window_size.y = h;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
void python_screen_viewer::notify_cursor_pos(GLFWwindow const *window, double x, double y) const
|
|
{
|
|
for (auto const &conf : m_windows) {
|
|
if (conf->window == window) {
|
|
conf->cursor_pos.x = static_cast<int>(x);
|
|
conf->cursor_pos.y = static_cast<int>(y);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
void python_screen_viewer::notify_click(GLFWwindow const *window, int button, int action) const
|
|
{
|
|
if (button != GLFW_MOUSE_BUTTON_LEFT || action != GLFW_PRESS)
|
|
return;
|
|
|
|
for (auto const &conf : m_windows) {
|
|
if (conf->window == window) {
|
|
auto pos = glm::vec2(conf->cursor_pos) / glm::vec2(conf->window_size);
|
|
pos.y = 1.0f - pos.y;
|
|
pos = (pos + conf->offset) / conf->scale;
|
|
|
|
m_touchlist->emplace_back(pos);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
python_screen_viewer::window_state::~window_state()
|
|
{
|
|
if (!window)
|
|
return;
|
|
|
|
if (!Global.python_sharectx) {
|
|
GLFWwindow *current = glfwGetCurrentContext();
|
|
|
|
glfwMakeContextCurrent(window);
|
|
|
|
ubo = nullptr;
|
|
shader = nullptr;
|
|
|
|
gl::program::unbind();
|
|
gl::buffer::unbind();
|
|
|
|
glfwMakeContextCurrent(current);
|
|
}
|
|
|
|
glfwDestroyWindow(window);
|
|
}
|