eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-10 23:25:15 +01:00
Code Issues 144 Wiki Activity

Merge remote-tracking branch 'origin/feat/switch-blades' into feat/renderers-cleanup

Browse Source
This commit is contained in:
Hirek
2026-10-29 23:55:04 +01:00
parent a99882278a 80379b991c
commit 765153ad91
145 changed files with 36946 additions and 3791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rendering/vulkan14/vulkan14frame.cpp
View File

@@ -2385,6 +2385,11 @@ bool vulkan14_renderer::render_reflections(viewport_config &Viewport)
{
return false;
}
// the top view of the editor shows nothing the reflections would be seen on: the cube map stays as it was
if (EditorModeFlag && Global.EditorOrtho)
{
return false;
}
if (m_environmentupdateface >= 6)
{
// no update in progress, check whether it's time for another one
@@ -4291,6 +4296,15 @@ scene::basic_node const *vulkan14_renderer::Pick_Node() const
return m_picksceneryitem;
}
void vulkan14_renderer::Forget_Node(scene::basic_node const *Node)
{
if (m_picksceneryitem == Node)
{
m_picksceneryitem = nullptr;
}
std::replace_if(m_picksceneryitems.begin(), m_picksceneryitems.end(), [Node](scene::basic_node const *Item) { return Item == Node; }, nullptr);
}
glm::dvec3 vulkan14_renderer::Mouse_Position() const
{
return m_worldmousecoordinates;

2
rendering/vulkan14/vulkan14renderer.h
View File

@@ -79,6 +79,7 @@ class vulkan14_renderer : public gfx_renderer, public gfx::scene_walk
bool Replace(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type, std::size_t const Offset = 0) override;
bool Replace_Indexed(gfx::index_array &Indices, gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry) override;
bool Append(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type) override;
void Erase(gfx::geometry_handle const &Geometry) override;
gfx::index_array const &Indices(gfx::geometry_handle const &Geometry) const override;
gfx::vertex_array const &Vertices(gfx::geometry_handle const &Geometry) const override;
gfx::userdata_array const &UserData(gfx::geometry_handle const &Geometry) const override;
@@ -109,6 +110,7 @@ class vulkan14_renderer : public gfx_renderer, public gfx::scene_walk
void Pick_Node_Callback(std::function<void(scene::basic_node *)> Callback) override;
TSubModel const *Pick_Control() const override;
scene::basic_node const *Pick_Node() const override;
void Forget_Node(scene::basic_node const *Node) override;
glm::dvec3 Mouse_Position() const override;
bool Mouse_Hit() const override;
glm::mat4 Camera_View_Matrix() const override;

7
rendering/vulkan14/vulkan14scene.cpp
View File

@@ -1289,6 +1289,13 @@ bool vulkan14_renderer::Append(gfx::vertex_array &Vertices, gfx::userdata_array
return m_geometry.append(Vertices, Userdata, Geometry);
}
void vulkan14_renderer::Erase(gfx::geometry_handle const &Geometry)
{
// made while no walk of the passes draws (gfx::walk_sync)
gfx::walk_sync::change change;
m_geometry.erase(Geometry);
}
gfx::index_array const &vulkan14_renderer::Indices(gfx::geometry_handle const &Geometry) const
{
return m_geometry.indices(Geometry);