RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:27:43 +00:00
Code Issues Activity Actions

LibSoftGPU: Remove OpenGL type for fog mode

Browse source 
Replaces the GLenum used to set up the fog mode in RasterizerOptions
with out own enum.
This commit is contained in:
Stephan Unverwerth 2021-12-22 23:44:29 +01:00 • committed by Brian Gianforcaro
parent 74ed7713fa
commit f4d29bf665
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibGL/SoftwareGLContext.cpp
View file

@ -2356,7 +2356,17 @@ void SoftwareGLContext::gl_fogi(GLenum pname, GLint param)
switch (pname) { switch (pname) {
case GL_FOG_MODE: case GL_FOG_MODE:
options.fog_mode = param; switch (param) {
case GL_LINEAR:
options.fog_mode = SoftGPU::FogMode::Linear;
break;
case GL_EXP:
options.fog_mode = SoftGPU::FogMode::Exp;
break;
case GL_EXP2:
options.fog_mode = SoftGPU::FogMode::Exp2;
break;
}
break; break;
default: default:
RETURN_WITH_ERROR_IF(true, GL_INVALID_ENUM); RETURN_WITH_ERROR_IF(true, GL_INVALID_ENUM);

6
Userland/Libraries/LibSoftGPU/Device.cpp
View file

@ -687,13 +687,13 @@ void Device::submit_triangle(const Triangle& triangle, Vector<size_t> const& ena
if (m_options.fog_enabled) { if (m_options.fog_enabled) {
float factor = 0.0f; float factor = 0.0f;
switch (m_options.fog_mode) { switch (m_options.fog_mode) {
case GL_LINEAR: case FogMode::Linear:
factor = (m_options.fog_end - z) / (m_options.fog_end - m_options.fog_start); factor = (m_options.fog_end - z) / (m_options.fog_end - m_options.fog_start);
break; break;
case GL_EXP: case FogMode::Exp:
factor = exp(-((m_options.fog_density * z))); factor = exp(-((m_options.fog_density * z)));
break; break;
case GL_EXP2: case FogMode::Exp2:
factor = exp(-((m_options.fog_density * z) * (m_options.fog_density * z))); factor = exp(-((m_options.fog_density * z) * (m_options.fog_density * z)));
break; break;
default: default:

8
Userland/Libraries/LibSoftGPU/Device.h
View file

@ -62,6 +62,12 @@ enum class DepthTestFunction {
Greater, Greater,
}; };
enum FogMode {
Linear,
Exp,
Exp2
};
enum class WindingOrder { enum class WindingOrder {
Clockwise, Clockwise,
CounterClockwise, CounterClockwise,
@ -84,7 +90,7 @@ struct RasterizerOptions {
GLenum polygon_mode { GL_FILL }; GLenum polygon_mode { GL_FILL };
FloatVector4 fog_color { 0.0f, 0.0f, 0.0f, 0.0f }; FloatVector4 fog_color { 0.0f, 0.0f, 0.0f, 0.0f };
float fog_density { 1.0f }; float fog_density { 1.0f };
GLenum fog_mode { GL_EXP }; FogMode fog_mode { FogMode::Exp };
bool fog_enabled { false }; bool fog_enabled { false };
float fog_start { 0.0f }; float fog_start { 0.0f };
float fog_end { 1.0f }; float fog_end { 1.0f };