# HG changeset patch
# User martin_bede
# Date 1357239437 -3600
# Node ID 9a7024b2a4d310a910af92b5d60f76e1aad137c0
# Parent  274afc318dca5bae562bcc48baae7abe60f17d14
Removed wiggle 3D mode, reorder the list of 3D modes.

diff -r 274afc318dca -r 9a7024b2a4d3 QTfrontend/ui/page/pageoptions.cpp
--- a/QTfrontend/ui/page/pageoptions.cpp	Fri Jan 04 03:13:21 2013 +0100
+++ b/QTfrontend/ui/page/pageoptions.cpp	Thu Jan 03 19:57:17 2013 +0100
@@ -368,15 +368,14 @@
             CBStereoMode->addItem(QComboBox::tr("Blue/Red"));
             CBStereoMode->addItem(QComboBox::tr("Red/Green"));
             CBStereoMode->addItem(QComboBox::tr("Green/Red"));
-            CBStereoMode->addItem(QComboBox::tr("Side-by-side"));
-            CBStereoMode->addItem(QComboBox::tr("Top-Bottom"));
-            CBStereoMode->addItem(QComboBox::tr("Wiggle"));
             CBStereoMode->addItem(QComboBox::tr("Red/Cyan grayscale"));
             CBStereoMode->addItem(QComboBox::tr("Cyan/Red grayscale"));
             CBStereoMode->addItem(QComboBox::tr("Red/Blue grayscale"));
             CBStereoMode->addItem(QComboBox::tr("Blue/Red grayscale"));
             CBStereoMode->addItem(QComboBox::tr("Red/Green grayscale"));
             CBStereoMode->addItem(QComboBox::tr("Green/Red grayscale"));
+            CBStereoMode->addItem(QComboBox::tr("Side-by-side"));
+            CBStereoMode->addItem(QComboBox::tr("Top-Bottom"));
 
             GBAstereolayout->addWidget(CBStereoMode);
             GBAlayout->addLayout(GBAstereolayout);
diff -r 274afc318dca -r 9a7024b2a4d3 hedgewars/ArgParsers.inc
--- a/hedgewars/ArgParsers.inc	Fri Jan 04 03:13:21 2013 +0100
+++ b/hedgewars/ArgParsers.inc	Thu Jan 03 19:57:17 2013 +0100
@@ -105,13 +105,13 @@
 begin
     GrayScale:= false;
 {$IFDEF USE_S3D_RENDERING}
-    if (tmp > 9) and (tmp < 16) then
+    if (tmp > 6) and (tmp < 13) then
         begin
         // set the gray anaglyph rendering
         GrayScale:= true;
-        cStereoMode:= TStereoMode(max(0, min(ord(high(TStereoMode)), tmp-9)))
+        cStereoMode:= TStereoMode(max(0, min(ord(high(TStereoMode)), tmp-6)))
         end
-    else if tmp <= 9 then
+    else if tmp <= 6 then
         // set the fullcolor anaglyph
         cStereoMode:= TStereoMode(max(0, min(ord(high(TStereoMode)), tmp)))
     else
diff -r 274afc318dca -r 9a7024b2a4d3 hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Fri Jan 04 03:13:21 2013 +0100
+++ b/hedgewars/uStore.pas	Thu Jan 03 19:57:17 2013 +0100
@@ -547,7 +547,7 @@
         DeleteFramebuffer(defaultFrame, depthv, texv);
 {$ENDIF}
 {$IFDEF USE_S3D_RENDERING}
-    if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) or (cStereoMode = smAFR) then
+    if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
         begin
         DeleteFramebuffer(framel, depthl, texl);
         DeleteFramebuffer(framer, depthr, texr);
@@ -813,7 +813,7 @@
 {$ENDIF}
 
 {$IFDEF USE_S3D_RENDERING}
-    if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) or (cStereoMode = smAFR) then
+    if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
     begin
         // prepare left and right frame buffers and associated textures
         if glLoadExtension('GL_EXT_framebuffer_object') then
diff -r 274afc318dca -r 9a7024b2a4d3 hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas	Fri Jan 04 03:13:21 2013 +0100
+++ b/hedgewars/uTypes.pas	Thu Jan 03 19:57:17 2013 +0100
@@ -169,7 +169,7 @@
     TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle);
 
     TRenderMode = (rmDefault, rmLeftEye, rmRightEye);
-    TStereoMode = (smNone, smRedCyan, smCyanRed, smRedBlue, smBlueRed, smRedGreen, smGreenRed, smHorizontal, smVertical, smAFR);
+    TStereoMode = (smNone, smRedCyan, smCyanRed, smRedBlue, smBlueRed, smRedGreen, smGreenRed, smHorizontal, smVertical);
 
     THHFont = record
             Handle: PTTF_Font;
diff -r 274afc318dca -r 9a7024b2a4d3 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Fri Jan 04 03:13:21 2013 +0100
+++ b/hedgewars/uWorld.pas	Thu Jan 03 19:57:17 2013 +0100
@@ -987,15 +987,6 @@
         DrawWorldStereo(Lag, rmDefault)
         end
 {$IFDEF USE_S3D_RENDERING}
-    else if (cStereoMode = smAFR) then
-        begin
-        AFRToggle:= not AFRToggle;
-        glClear(GL_COLOR_BUFFER_BIT);
-        if AFRToggle then
-            DrawWorldStereo(Lag, rmLeftEye)
-        else
-            DrawWorldStereo(Lag, rmRightEye)
-        end
     else if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
         begin
         // create left fb