From 37c8b096b1a46fb6a4ea4654e8dc535dd8cc57cc Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Wed, 11 Sep 2013 01:35:23 +0200
Subject: [PATCH] Added OpenGL3 as a driver option to the configuration tool.

--HG--
branch : gsoc2013-dfighter
---
 .../display_settings_widget.cpp               |  16 +-
 .../display_settings_widget.h                 |   4 +-
 .../display_settings_widget.ui                | 156 ++++++++++--------
 3 files changed, 107 insertions(+), 69 deletions(-)

diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
index f6775a0b7..1771f23cf 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
@@ -32,6 +32,7 @@ CDisplaySettingsWidget::CDisplaySettingsWidget( QWidget *parent ) :
 
 	connect( autoRadioButton, SIGNAL( clicked( bool ) ), this, SLOT( onSomethingChanged() ) );
 	connect( openglRadioButton, SIGNAL( clicked( bool ) ), this, SLOT( onSomethingChanged() ) );
+	connect( openGL3RB, SIGNAL( clicked( bool ) ), this, SLOT( onSomethingChanged() ) );
 	connect( direct3dRadioButton, SIGNAL( clicked( bool ) ), this, SLOT( onSomethingChanged() ) );
 	connect( fullscreenRadioButton, SIGNAL( clicked( bool ) ), this, SLOT( onSomethingChanged() ) );
 	connect( windowedRadioButton, SIGNAL( clicked( bool ) ), this, SLOT( onSomethingChanged() ) );
@@ -65,6 +66,12 @@ void CDisplaySettingsWidget::load()
 	case DRV_DIRECT3D:
 		direct3dRadioButton->setChecked( true );
 		break;
+	case DRV_GLES:
+		openglRadioButton->setChecked( true );
+		break;
+	case DRV_OPENGL3:
+		openGL3RB->setChecked( true );
+		break;
 	}
 
 	updateVideoModes();
@@ -99,6 +106,8 @@ void CDisplaySettingsWidget::save()
 
 	if( openglRadioButton->isChecked() )
 		s.config.setString( "Driver3D", std::string( "OpenGL" ) );
+	else if( openGL3RB->isChecked() )
+		s.config.setString( "Driver3D", std::string( "OpenGL3" ) );
 	else if( direct3dRadioButton->isChecked() )
 		s.config.setString( "Driver3D", std::string( "Direct3D" ) );
 	else
@@ -217,11 +226,16 @@ E3DDriver CDisplaySettingsWidget::getDriverFromConfigString(std::string &str) co
 		return DRV_OPENGL;
 	if( str.compare( "2" ) == 0 )
 		return DRV_DIRECT3D;
+	if( str.compare( "3" ) == 0 )
+		return DRV_GLES;
+	if( str.compare( "4" ) == 0 )
+		return DRV_OPENGL3;
 	if( str.compare( "OpenGL" ) == 0 )
 		return DRV_OPENGL;
 	if( str.compare( "Direct3D" ) == 0)
 		return DRV_DIRECT3D;
-
+	if( str.compare( "OpenGL3" ) == 0 )
+		return DRV_OPENGL3;
 
 	return DRV_AUTO;
 }
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.h b/code/ryzom/tools/client/client_config_qt/display_settings_widget.h
index f67ec8b15..7389a5459 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_widget.h
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_widget.h
@@ -27,7 +27,9 @@ enum E3DDriver
 {
 	DRV_AUTO,
 	DRV_OPENGL,
-	DRV_DIRECT3D
+	DRV_DIRECT3D,
+	DRV_GLES,
+	DRV_OPENGL3
 };
 
 /**
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/display_settings_widget.ui
index 2e24b455f..8f1f6bcdf 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_widget.ui
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_widget.ui
@@ -6,106 +6,128 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>391</width>
-    <height>429</height>
+    <width>408</width>
+    <height>415</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Display</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
     <widget class="QGroupBox" name="driverGroupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
       <string>Driver</string>
      </property>
+     <widget class="QLabel" name="label">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>23</y>
+        <width>249</width>
+        <height>16</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Specify if Ryzom is to be run in OpenGL or Direct3D.</string>
+      </property>
+     </widget>
+     <widget class="QWidget" name="">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>50</y>
+        <width>69</width>
+        <height>88</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QRadioButton" name="autoRadioButton">
+         <property name="text">
+          <string>Auto</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="openglRadioButton">
+         <property name="text">
+          <string>OpenGL</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="openGL3RB">
+         <property name="text">
+          <string>OpenGL3</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="direct3dRadioButton">
+         <property name="text">
+          <string>Direct3D</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="parametersGroupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Parameters</string>
+     </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
-       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <layout class="QVBoxLayout" name="verticalLayout_6">
         <item>
-         <widget class="QLabel" name="label">
+         <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>Specify if Ryzom is to be run in OpenGL or Direct3D.</string>
+           <string>Specify if Ryzom is to be run in full screen or window mode:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="autoRadioButton">
+         <widget class="QRadioButton" name="fullscreenRadioButton">
           <property name="text">
-           <string>Auto</string>
+           <string>Full screen</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="openglRadioButton">
+         <widget class="QLabel" name="label_3">
           <property name="text">
-           <string>OpenGL</string>
+           <string>Specify a video mode</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="direct3dRadioButton">
+         <widget class="QComboBox" name="videomodeComboBox"/>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="windowedRadioButton">
           <property name="text">
-           <string>Direct3D</string>
+           <string>Windowed</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="parametersGroupBox">
-     <property name="title">
-      <string>Parameters</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Specify if Ryzom is to be run in full screen or window mode:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="fullscreenRadioButton">
-        <property name="text">
-         <string>Full screen</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Specify a video mode</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="videomodeComboBox"/>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>34</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="windowedRadioButton">
-        <property name="text">
-         <string>Windowed</string>
-        </property>
-       </widget>
-      </item>
-      <item>
+      <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_2">