mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-20 17:25:00 +01:00
Merge branch 'master' into feat/renderers-cleanup
This commit is contained in:
@@ -3526,6 +3526,11 @@ ITexture const &opengl46_renderer::Texture(texture_handle const Texture) const
|
||||
return m_textures.texture(Texture);
|
||||
}
|
||||
|
||||
void opengl46_renderer::Unload_Texture(texture_handle const Texture)
|
||||
{
|
||||
m_textures.unload(Texture);
|
||||
}
|
||||
|
||||
void opengl46_renderer::Update_AnimModel(TAnimModel *model)
|
||||
{
|
||||
model->RaAnimate(m_framestamp);
|
||||
@@ -5042,6 +5047,29 @@ void opengl46_renderer::walk_cull_face(bool const Enabled)
|
||||
glDisable(GL_CULL_FACE);
|
||||
}
|
||||
|
||||
void opengl46_renderer::walk_decal(bool const Enabled)
|
||||
{
|
||||
// the depth is reversed (GL_GEQUAL): a positive offset comes nearer the camera. the depth pass of the scene draws everything a
|
||||
// little farther (glPolygonOffset(-1, -1), Render_Scene_Depth()), the decal goes as much nearer from there
|
||||
if (m_scenedepthpass)
|
||||
{
|
||||
if (Enabled)
|
||||
::glPolygonOffset(-1.f + 2.f, -1.f + 8.f);
|
||||
else
|
||||
::glPolygonOffset(-1.f, -1.f);
|
||||
return;
|
||||
}
|
||||
if (Enabled)
|
||||
{
|
||||
::glEnable(GL_POLYGON_OFFSET_FILL);
|
||||
::glPolygonOffset(2.f, 8.f);
|
||||
}
|
||||
else
|
||||
{
|
||||
::glDisable(GL_POLYGON_OFFSET_FILL);
|
||||
}
|
||||
}
|
||||
|
||||
void opengl46_renderer::walk_glare(bool const Enabled)
|
||||
{
|
||||
if (Enabled)
|
||||
|
||||
@@ -102,6 +102,8 @@ class opengl46_renderer : public gfx_renderer, public gfx::scene_walk {
|
||||
UserData( gfx::geometry_handle const &Geometry ) const override;
|
||||
int
|
||||
Primitive( gfx::geometry_handle const &Geometry ) const override;
|
||||
bool
|
||||
Draws_Timbers() const override { return true; }
|
||||
// material methods
|
||||
material_handle
|
||||
Fetch_Material( std::string const &Filename, bool const Loadnow = true ) override;
|
||||
@@ -138,6 +140,8 @@ class opengl46_renderer : public gfx_renderer, public gfx::scene_walk {
|
||||
Texture( texture_handle const Texture ) override;
|
||||
ITexture const &
|
||||
Texture( texture_handle const Texture ) const override;
|
||||
void
|
||||
Unload_Texture( texture_handle const Texture ) override;
|
||||
// utility methods
|
||||
void
|
||||
Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) override;
|
||||
@@ -225,6 +229,7 @@ class opengl46_renderer : public gfx_renderer, public gfx::scene_walk {
|
||||
std::uint32_t walk_instances_reserve(std::size_t const Count) override;
|
||||
void walk_timbers_expand(std::vector<glm::mat4> const &Origins, std::vector<gl::timber_range> const &Ranges) override;
|
||||
void walk_cull_face(bool const Enabled) override;
|
||||
void walk_decal(bool const Enabled) override;
|
||||
void walk_glare(bool const Enabled) override;
|
||||
void walk_glare_draw(TSubModel *Submodel, gfx::geometry_handle const &Geometry) override;
|
||||
void walk_light_query(TSubModel *Submodel, bool const Begin) override;
|
||||
|
||||
Reference in New Issue
Block a user