Removed FastCard option

ChangeLog

@@ -5,6 +5,9 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140216 ]
+	* Removed the FastCard option. Not necessary on todays hardware?!
+
 	[ 20140215 ]
 	* Enabled previously disabled polygon smoothing & color material
 	  when setting fastcard to true

README.md

@@ -119,7 +119,7 @@ If you want to change this behaviour, this happens around line 1075 of `src/Open
 | /                        | Drop a waypoint test (formally undocumented) |
 | [ ]                      | Adjust idle animation for testing            |
 
-### Console Commands
+### Console/Config Commands
 
 Console commands (BOOL is now '0' or '1' for less typing).
 Pressing <UP> will go back to last command entered (saves typing).

include/Render.h

@@ -89,14 +89,13 @@ class Render
         fEntityModels           = (1 << 6),
         fFog                    = (1 << 7),
         fUsePortals             = (1 << 8),
-        fFastCard               = (1 << 9),
-        fGL_Lights              = (1 << 10),
-        fOneRoom                = (1 << 11),
-        fRenderPonytail         = (1 << 12),
-        fMultiTexture           = (1 << 13),
-        fUpdateRoomListPerFrame = (1 << 14),
-        fAnimateAllModels       = (1 << 15),
-        fAllRooms               = (1 << 16)
+        fGL_Lights              = (1 << 9),
+        fOneRoom                = (1 << 10),
+        fRenderPonytail         = (1 << 11),
+        fMultiTexture           = (1 << 12),
+        fUpdateRoomListPerFrame = (1 << 13),
+        fAnimateAllModels       = (1 << 14),
+        fAllRooms               = (1 << 15)
     } RenderFlags;
 
     typedef enum {
@@ -173,7 +172,7 @@ class Render
      * Mongoose - Created, factored out of World
      ------------------------------------------------------*/
 
-    void Init(int width, int height, bool fastCard);
+    void Init(int width, int height);
     /*------------------------------------------------------
      * Pre  :
      * Post : Starts and sets up OpenGL target

include/System.h

@@ -182,8 +182,6 @@ public:
 
     void setDriverGL(const char *driver);
 
-    void setFastCardPerformance(bool isFast);
-
     virtual void shutdown(int code) = 0;
 
     virtual void swapBuffersGL() = 0;
@@ -193,7 +191,6 @@ public:
 protected:
     unsigned int m_width;              //!< Width of the viewport
     unsigned int m_height;             //!< Height of the viewport
-    bool m_fastCard;                   //!< Assume expensive calls are fine if true
     char *m_driver;                    //!< String for dynamic use of GL library
     float m_clipNear;                  //!< Clip near distance
     float m_clipFar;                   //!< Clip far distance

src/OpenRaider.cpp

@@ -886,12 +886,11 @@ void OpenRaider::start()
 
     // Mongoose 2002.08.13, This starts GL context
     printf("\n[Starting video subsystem...]\n");
-    setFastCardPerformance(true);
     initVideo(m_width, m_height, false);
 
     // Mongoose 2002.01.02, Disable rendering to avoid GL call conflicts
     m_render.setMode(Render::modeDisabled);
-    m_render.Init(m_width, m_height, m_fastCard);
+    m_render.Init(m_width, m_height);
     m_render.initTextures(m_homeDir, &m_texOffset, &mLevelTextureOffset);
 
     m_render.RegisterCamera(&m_camera);
@@ -3353,10 +3352,6 @@ void OpenRaider::handleCommand(char *cmd, unsigned int mode)
             {
                 m_height = atoi(cmd);
             }
-            else if (rc_command("FastCard", cmd))
-            {
-                rc_get_bool(cmd, &m_fastCard);
-            }
             else if (rc_command("FullScreen", cmd))
             {
                 rc_get_bool(cmd, &b);

src/Render.cpp

@@ -197,7 +197,6 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
         unsigned int *nextId)
 {
     char filename[128];
-    bool fastCard = mFlags & Render::fFastCard;
     const char *console = "Toggle the Console with [`] key";
     const char *menu = "Press <esc> for menu";
     int font_id;
@@ -217,10 +216,7 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     mTexture.setMaxTextureCount(128);  /* TR never needs more than 32 iirc
                                           However, color texturegen is a lot */
 
-    if (fastCard)
-    {
-        mTexture.setFlag(Texture::fUseMipmaps);
-    }
+    mTexture.setFlag(Texture::fUseMipmaps);
 
     printf("Processing Textures:\n");
 
@@ -425,19 +421,12 @@ void renderTrace(int color, vec3_t start, vec3_t end)
 }
 
 
-void Render::Init(int width, int height, bool fast_card)
+void Render::Init(int width, int height)
 {
     char *s;
 
-
     mWidth = width;
     mHeight = height;
-    mFlags |= Render::fFastCard;
-
-    if (!fast_card)
-    {
-        mFlags ^= Render::fFastCard;
-    }
 
     // Print driver support information
     printf("\n## GL Driver Info ##\n");
@@ -493,44 +482,25 @@ void Render::Init(int width, int height, bool fast_card)
     glDisable(GL_LIGHTING);
 
     // Set up alpha blending
-    if (fast_card)
-    {
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-        //glEnable(GL_ALPHA_TEST); // Disable per pixel alpha blending
-        glAlphaFunc(GL_GREATER, 0);
-    }
-    else
-    {
-        glDisable(GL_BLEND);
-        glDisable(GL_ALPHA_TEST);
-    }
+    //glEnable(GL_ALPHA_TEST); // Disable per pixel alpha blending
+    glAlphaFunc(GL_GREATER, 0);
 
     glPointSize(5.0);
 
     // Setup shading
     glShadeModel(GL_SMOOTH);
 
-    if (fast_card)
-    {
-        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-        glHint(GL_FOG_HINT, GL_NICEST);
-        glEnable(GL_COLOR_MATERIAL);
-        glEnable(GL_DITHER);
+    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+    glHint(GL_FOG_HINT, GL_NICEST);
+    glEnable(GL_COLOR_MATERIAL);
+    glEnable(GL_DITHER);
 
-        // AA polygon edges
-        //glEnable(GL_POLYGON_SMOOTH);
-        //glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
-    }
-    else
-    {
-        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-        glHint(GL_FOG_HINT, GL_FASTEST);
-        glDisable(GL_COLOR_MATERIAL);
-        glDisable(GL_DITHER);
-        glDisable(GL_POLYGON_SMOOTH);
-    }
+    // AA polygon edges
+    glEnable(GL_POLYGON_SMOOTH);
+    glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
 
     glDisable(GL_LINE_SMOOTH);
     glDisable(GL_POINT_SMOOTH);
@@ -687,16 +657,13 @@ void Render::setMode(int n)
             glDisable(GL_TEXTURE_2D);
             break;
         default:
-            if (mFlags & Render::fFastCard)
+            if (mMode == Render::modeLoadScreen)
             {
-                if (mMode == Render::modeLoadScreen)
-                {
-                    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-                }
-                else
-                {
-                    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-                }
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+            }
+            else
+            {
+                glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
             }
 
             glClearColor(BLACK[0], BLACK[1], BLACK[2], BLACK[3]);

src/System.cpp

@@ -43,7 +43,6 @@ System::System()
 {
     m_width = 800;
     m_height = 600;
-    m_fastCard = true;
 
     m_driver = 0x0;
 
@@ -412,12 +411,6 @@ void System::setDriverGL(const char *driver)
 }
 
 
-void System::setFastCardPerformance(bool is_fast)
-{
-    m_fastCard = is_fast;
-}
-
-
 void System::resetTicks()
 {
     system_timer(0);
@@ -485,49 +478,28 @@ void System::initGL()
     glDisable(GL_LIGHTING);
 
     // Set up alpha blending
-    if (m_fastCard)
-    {
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-        //glEnable(GL_ALPHA_TEST); // Disable per pixel alpha blending
-        glAlphaFunc(GL_GREATER, 0);
-    }
-    else
-    {
-        glDisable(GL_BLEND);
-        glDisable(GL_ALPHA_TEST);
-    }
+    //glEnable(GL_ALPHA_TEST); // Disable per pixel alpha blending
+    glAlphaFunc(GL_GREATER, 0);
 
     glPointSize(5.0);
 
     // Setup shading
     glShadeModel(GL_SMOOTH);
 
-    if (m_fastCard)
-    {
-        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-        glHint(GL_FOG_HINT, GL_NICEST);
-        glEnable(GL_COLOR_MATERIAL);
-        glEnable(GL_DITHER);
+    glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+    glHint(GL_FOG_HINT, GL_NICEST);
+    glEnable(GL_COLOR_MATERIAL);
+    glEnable(GL_DITHER);
 
-        // AA polygon edges
-        glEnable(GL_POLYGON_SMOOTH);
-        glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
+    // AA polygon edges
+    glEnable(GL_POLYGON_SMOOTH);
+    glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
 
-        glEnable(GL_POINT_SMOOTH);
-        glEnable(GL_FOG);
-    }
-    else
-    {
-        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-        glHint(GL_FOG_HINT, GL_FASTEST);
-        glDisable(GL_COLOR_MATERIAL);
-        glDisable(GL_DITHER);
-        glDisable(GL_POLYGON_SMOOTH);
-        glDisable(GL_POINT_SMOOTH);
-        glDisable(GL_FOG);
-    }
+    glEnable(GL_POINT_SMOOTH);
+    glEnable(GL_FOG);
 
     glDisable(GL_LINE_SMOOTH);
     glDisable(GL_AUTO_NORMAL);