- added new menu option for shader lights and cleaned up the OpenGL menu a bit.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@534 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2009-10-07 21:55:04 +00:00
parent c14c89bd82
commit f1808a1a54

View file

@ -190,24 +190,20 @@ static value_t FogMode[] =
};
static menuitem_t OpenGLItems[] = {
{ more, "Disable GL system", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartDisableGL} },
{ more, "Dynamic Light Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLLightMenu} },
{ more, "Texture Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLTextureMenu} },
{ more, "Shader Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLShaderMenu} },
{ more, "Preferences", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLPrefMenu} },
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ discrete, "Vertical Sync", {&vid_vsync}, {2.0}, {0.0}, {0.0}, {OnOff} },
{ discrete, "Rendering quality", {&gl_render_precise}, {2.0}, {0.0}, {0.0}, {Precision} },
{ more, "Disable GL system", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartDisableGL} },
};
static menuitem_t OpenGLItems2[] = {
{ more, "Disable GL system", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartDisableGL} },
{ more, "Dynamic Light Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLLightMenu} },
{ more, "Texture Options", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLTextureMenu} },
{ more, "Preferences", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartGLPrefMenu} },
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ discrete, "Vertical Sync", {&vid_vsync}, {2.0}, {0.0}, {0.0}, {OnOff} },
{ discrete, "Rendering quality", {&gl_render_precise}, {2.0}, {0.0}, {0.0}, {Precision} },
{ more, "Disable GL system", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t *)StartDisableGL} },
};
@ -234,6 +230,7 @@ menuitem_t GLLightItems[] = {
{ discrete, "Force additive lighting", {&gl_lights_additive}, {2.0}, {0.0}, {0.0}, {YesNo} },
{ slider, "Light intensity", {&gl_lights_intensity}, {0.0}, {1.0}, {0.1f}, {NULL} },
{ slider, "Light size", {&gl_lights_size}, {0.0}, {2.0}, {0.1f}, {NULL} },
{ discrete, "Use shaders for lights", {&gl_dynlight_shader}, {2.0}, {0.0}, {0.0}, {YesNo} },
};
menuitem_t GLPrefItems[] = {
@ -247,6 +244,7 @@ menuitem_t GLPrefItems[] = {
{ discrete, "Sprite billboard", {&gl_billboard_mode}, {2.0}, {0.0}, {0.0}, {BillboardModes} },
{ discrete, "Particle style", {&gl_particles_style}, {3.0}, {0.0}, {0.0}, {Particles} },
{ slider, "Ambient light level", {&gl_light_ambient}, {0.0}, {255.0}, {5.0}, {NULL} },
{ discrete, "Rendering quality", {&gl_render_precise}, {2.0}, {0.0}, {0.0}, {Precision} },
};
menuitem_t GLShaderItems[] = {
@ -343,6 +341,10 @@ void StartGLMenu (void)
void StartGLLightMenu (void)
{
if (gl.maxuniforms < 1024)
{
GLLightMenu.numitems = sizeof(GLLightItems)/sizeof(GLLightItems[0]) - 1;
}
M_SwitchMenu(&GLLightMenu);
}