Revert "doom3"

This reverts commit 59e480a0a8369a264115e486a747d3f304517531.

diff --git a/plugins/entity/light.cpp b/plugins/entity/light.cpp
index 3d1c9348b14d1d051da48411ac7043fb8a97b5fa..9d8b92472c5f3165f546dc4c62beb109da1246e7 100644 (file)
--- a/plugins/entity/light.cpp
+++ b/plugins/entity/light.cpp
@@ -1698,7 +1698,6 @@ scene::Instance* erase( scene::Instantiable::Observer* observer, const scene::Pa
 };
 
 void Light_Construct( LightType lightType ){
-#if !defined( DISABLE_DOOM3_LIGHTING )
        g_lightType = lightType;
        if ( g_lightType == LIGHTTYPE_DOOM3 ) {
                LightShader::m_defaultShader = "lights/defaultPointLight";
@@ -1708,13 +1707,10 @@ void Light_Construct( LightType lightType ){
        }
        RenderLightRadiiFill::m_state = GlobalShaderCache().capture( "$Q3MAP2_LIGHT_SPHERE" );
        RenderLightCenter::m_state = GlobalShaderCache().capture( "$BIGPOINT" );
-#endif // !DISABLE_DOOM3_LIGHTING
 }
 void Light_Destroy(){
-#if !defined( DISABLE_DOOM3_LIGHTING )
        GlobalShaderCache().release( "$Q3MAP2_LIGHT_SPHERE" );
        GlobalShaderCache().release( "$BIGPOINT" );
-#endif // !DISABLE_DOOM3_LIGHTING
 }
 
 scene::Node& New_Light( EntityClass* eclass ){

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 90bad3b21392ac089225f9f5150904f6be017ee5..233262b5a6e5ade6370e07015159a5ef872ed02d 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -1742,11 +1742,9 @@ void CamWnd_constructToolbar( ui::Toolbar toolbar ){
 void CamWnd_registerShortcuts(){
        toggle_add_accelerator( "ToggleCubicClip" );
 
-#if !defined( DISABLE_DOOM3_LIGHTING )
        if ( g_pGameDescription->mGameType == "doom3" ) {
                command_connect_accelerator( "TogglePreview" );
        }
-#endif // !DISABLE_DOOM3_LIGHTING
 
        command_connect_accelerator( "FOVInc" );
        command_connect_accelerator( "FOVDec" );
@@ -1780,7 +1778,6 @@ void CamWnd_SetMode( camera_draw_mode mode ){
        }
 }
 
-#if !defined( DISABLE_DOOM3_LIGHTING )
 void CamWnd_TogglePreview( void ){
        // gametype must be doom3 for this function to work
        // if the gametype is not doom3 something is wrong with the
@@ -1790,7 +1787,6 @@ void CamWnd_TogglePreview( void ){
        // switch between textured and lighting mode
        CamWnd_SetMode( ( CamWnd_GetMode() == cd_lighting ) ? cd_texture : cd_lighting );
 }
-#endif // !DISABLE_DOOM3_LIGHTING
 
 
 CameraModel* g_camera_model = 0;
@@ -1887,7 +1883,6 @@ void Camera_constructPreferences( PreferencesPage& page ){
                make_property<Camera_FarClip>()
                );
 
-#if !defined( DISABLE_DOOM3_LIGHTING )
        if ( g_pGameDescription->mGameType == "doom3" ) {
                const char* render_mode[] = { "Wireframe", "Flatshade", "Textured", "Lighting" };
 
@@ -1898,7 +1893,6 @@ void Camera_constructPreferences( PreferencesPage& page ){
                        );
        }
        else
-#endif // !DISABLE_DOOM3_LIGHTING
        {
                const char* render_mode[] = { "Wireframe", "Flatshade", "Textured" };
 
@@ -1987,11 +1981,9 @@ void CamWnd_Construct(){
        GlobalCommands_insert( "LookThroughSelected", makeCallbackF(GlobalCamera_LookThroughSelected) );
        GlobalCommands_insert( "LookThroughCamera", makeCallbackF(GlobalCamera_LookThroughCamera) );
 
-#if !defined( DISABLE_DOOM3_LIGHTING )
        if ( g_pGameDescription->mGameType == "doom3" ) {
                GlobalCommands_insert( "TogglePreview", makeCallbackF(CamWnd_TogglePreview), Accelerator( GDK_KEY_F3 ) );
        }
-#endif // !DISABLE_DOOM3_LIGHTING
 
        GlobalCommands_insert( "FOVInc", makeCallbackF(FOV_increase), Accelerator( GDK_KEY_KP_Multiply, (GdkModifierType)GDK_SHIFT_MASK ) );
        GlobalCommands_insert( "FOVDec", makeCallbackF(FOV_decrease), Accelerator( GDK_KEY_KP_Divide, (GdkModifierType)GDK_SHIFT_MASK ) );

diff --git a/radiant/renderstate.cpp b/radiant/renderstate.cpp
index 4999dcce9d8c27e1b9b302a5d82ab557bbef876e..6b30a19c4d7fced23411a2e7df0570a195dce965 100644 (file)
--- a/radiant/renderstate.cpp
+++ b/radiant/renderstate.cpp
@@ -1577,7 +1577,6 @@ void ShaderCache_Construct(){
        GlobalTexturesCache().attach( *g_ShaderCache );
        GlobalShaderSystem().attach( *g_ShaderCache );
 
-#if !defined( DISABLE_DOOM3_LIGHTING )
        if ( g_pGameDescription->mGameType == "doom3" ) {
                g_defaultPointLight = g_ShaderCache->capture( "lights/defaultPointLight" );
                //Shader* overbright =
@@ -1612,11 +1611,9 @@ void ShaderCache_Construct(){
                }
 #endif
        }
-#endif // !DISABLE_DOOM3_LIGHTING
 }
 
 void ShaderCache_Destroy(){
-#if !defined( DISABLE_DOOM3_LIGHTING )
        if ( g_pGameDescription->mGameType == "doom3" ) {
                g_ShaderCache->release( "lights/defaultPointLight" );
                g_ShaderCache->release( "$OVERBRIGHT" );
@@ -1632,7 +1629,6 @@ void ShaderCache_Destroy(){
                }
 #endif
        }
-#endif // !DISABLE_DOOM3_LIGHTING
 
        GlobalShaderSystem().detach( *g_ShaderCache );
        GlobalTexturesCache().detach( *g_ShaderCache );