16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 18:39:18 +02:00

merge manul

This commit is contained in:
WLs50
2025-03-09 15:36:11 +01:00
parent a687f551a2
commit a5f6397eca
1211 changed files with 483542 additions and 58643 deletions

View File

@@ -80,7 +80,7 @@ public:
Fetch_Material( std::string const &Filename, bool const Loadnow = true ) override;
void
Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) override;
opengl_material const &
IMaterial const *
Material( material_handle const Material ) const override;
// shader methods
auto Fetch_Shader( std::string const &name ) -> std::shared_ptr<gl::program> override;
@@ -91,9 +91,9 @@ public:
Bind_Texture( texture_handle const Texture ) override;
void
Bind_Texture( std::size_t const Unit, texture_handle const Texture ) override;
opengl_texture &
ITexture &
Texture( texture_handle const Texture ) override;
opengl_texture const &
ITexture const &
Texture( texture_handle const Texture ) const override;
// utility methods
void
@@ -120,6 +120,7 @@ public:
info_times() const override;
std::string const &
info_stats() const override;
void MakeScreenshot() override;
opengl_material const & Material( TSubModel const * Submodel ) const;
@@ -369,6 +370,19 @@ private:
bool m_isATI;
static bool renderer_register;
class opengl_imgui_renderer : public imgui_renderer
{
virtual bool Init() override;
virtual void Shutdown() override;
virtual void BeginFrame() override;
virtual void Render() override;
} m_imgui_renderer;
virtual imgui_renderer *GetImguiRenderer() override
{
return &m_imgui_renderer;
}
};
//---------------------------------------------------------------------------