From 4ea6d862f4bca24ed8080d90cd93a9f1ee46c81d Mon Sep 17 00:00:00 2001 From: Kevin Slaughter Date: Fri, 18 Jun 2004 11:29:38 +0000 Subject: [PATCH] Added GL cel shading --- stepmania/Themes/default/metrics.ini | 11 ++++++----- stepmania/src/ScreenOptionsMasterPrefs.cpp | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 708d199c14..fe3f418482 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3434,11 +3434,12 @@ Line4=conf,TextureResolution Line5=conf,TextureColor Line6=conf,MovieColor Line7=conf,SmoothLines -Line8=conf,KeepTexturesInMemory -Line9=conf,RefreshRate -Line10=conf,WaitForVsync -Line11=conf,ShowStats -Line12=conf,ShowBanners +Line8=conf,CelShadeModels +Line9=conf,KeepTexturesInMemory +Line10=conf,RefreshRate +Line11=conf,WaitForVsync +Line12=conf,ShowStats +Line13=conf,ShowBanners [ScreenGameplayOptions] Fallback=ScreenOptionsSubmenu diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index ddc7c5f2ea..f8440647a7 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -356,6 +356,7 @@ MOVE( WaitForVsync, PREFSMAN->m_bVsync ); MOVE( ShowStats, PREFSMAN->m_bShowStats ); MOVE( ShowBanners, PREFSMAN->m_bShowBanners ); MOVE( KeepTexturesInMemory, PREFSMAN->m_bDelayedTextureDelete ); +MOVE( CelShadeModels, PREFSMAN->m_bCelShadeModels ); MOVE( SmoothLines, PREFSMAN->m_bSmoothLines ); static void DisplayResolution( int &sel, bool ToSel, const CStringArray &choices ) @@ -484,6 +485,7 @@ static const ConfOption g_ConfOptions[] = ConfOption( "Texture\nColor", TextureColor, "16BIT","32BIT" ), ConfOption( "Movie\nColor", MovieColor, "16BIT","32BIT" ), ConfOption( "Keep Textures\nIn Memory", KeepTexturesInMemory, "OFF","ON" ), + ConfOption( "CelShade\nModels", CelShadeModels, "OFF","ON" ), ConfOption( "SmoothLines", SmoothLines, "OFF","ON" ), ConfOption( "Refresh\nRate", RefreshRate, "DEFAULT","60","70","72","75","80","85","90","100","120","150" ), ConfOption( "Wait For\nVsync", WaitForVsync, "NO", "YES" ), @@ -511,6 +513,7 @@ int ConfOption::GetEffects() const { DisplayColor, OPT_APPLY_GRAPHICS }, { TextureResolution, OPT_APPLY_GRAPHICS }, { KeepTexturesInMemory, OPT_APPLY_GRAPHICS }, + { CelShadeModels, OPT_APPLY_GRAPHICS }, { SmoothLines, OPT_APPLY_GRAPHICS }, { RefreshRate, OPT_APPLY_GRAPHICS }, { WaitForVsync, OPT_APPLY_GRAPHICS },