summaryrefslogtreecommitdiff
path: root/engine/src
diff options
context:
space:
mode:
Diffstat (limited to 'engine/src')
-rw-r--r--engine/src/rendering/backend/opengl.rs33
1 files changed, 15 insertions, 18 deletions
diff --git a/engine/src/rendering/backend/opengl.rs b/engine/src/rendering/backend/opengl.rs
index a85b6da..5b009ca 100644
--- a/engine/src/rendering/backend/opengl.rs
+++ b/engine/src/rendering/backend/opengl.rs
@@ -56,6 +56,8 @@ use opengl_bindings::misc::{
Capability,
DepthFunction as GlDepthFunction,
FaceCullingMode as GlFaceCullingMode,
+ PolygonMode as GlPolygonMode,
+ PolygonModeFace as GlPolygonModeFace,
};
use opengl_bindings::shader::{
Error as GlShaderError,
@@ -87,6 +89,7 @@ use zerocopy::IntoBytes;
use crate::asset::Assets;
use crate::data_types::color::Color;
use crate::data_types::dimens::Dimens;
+use crate::draw_flags::{PolygonMode, PolygonModeFace};
use crate::ecs::actions::Actions;
use crate::ecs::query::term::Without;
use crate::ecs::sole::Single;
@@ -1302,8 +1305,8 @@ fn update_draw_properties(
if update_flags.contains(DrawPropertiesUpdateFlags::POLYGON_MODE_CONFIG) {
opengl_bindings::misc::set_polygon_mode(
gl_context,
- properties.polygon_mode_config.face,
- properties.polygon_mode_config.mode,
+ polygon_mode_face_to_gl(properties.polygon_mode_config.face),
+ polygon_mode_to_gl(properties.polygon_mode_config.mode),
);
}
@@ -1982,27 +1985,21 @@ impl<Value: Copy> From<Dimens<Value>> for opengl_bindings::data_types::Dimens<Va
}
}
-impl From<crate::draw_flags::PolygonMode> for opengl_bindings::misc::PolygonMode
+fn polygon_mode_to_gl(mode: PolygonMode) -> GlPolygonMode
{
- fn from(mode: crate::draw_flags::PolygonMode) -> Self
- {
- match mode {
- crate::draw_flags::PolygonMode::Point => Self::Point,
- crate::draw_flags::PolygonMode::Fill => Self::Fill,
- crate::draw_flags::PolygonMode::Line => Self::Line,
- }
+ match mode {
+ PolygonMode::Point => GlPolygonMode::Point,
+ PolygonMode::Fill => GlPolygonMode::Fill,
+ PolygonMode::Line => GlPolygonMode::Line,
}
}
-impl From<crate::draw_flags::PolygonModeFace> for opengl_bindings::misc::PolygonModeFace
+fn polygon_mode_face_to_gl(face: PolygonModeFace) -> GlPolygonModeFace
{
- fn from(face: crate::draw_flags::PolygonModeFace) -> Self
- {
- match face {
- crate::draw_flags::PolygonModeFace::Front => Self::Front,
- crate::draw_flags::PolygonModeFace::Back => Self::Back,
- crate::draw_flags::PolygonModeFace::FrontAndBack => Self::FrontAndBack,
- }
+ match face {
+ PolygonModeFace::Front => GlPolygonModeFace::Front,
+ PolygonModeFace::Back => GlPolygonModeFace::Back,
+ PolygonModeFace::FrontAndBack => GlPolygonModeFace::FrontAndBack,
}
}