Allow Ryzom client to use the new driver.

--HG--
branch : gsoc2013-dfighter
hg/feature/gsoc2013-dfighter
dfighter1985 12 years ago
parent d06f675c08
commit e41a15ae30

@ -3,7 +3,7 @@ IF(WITH_DRIVER_OPENGL)
ENDIF(WITH_DRIVER_OPENGL)
IF(WITH_DRIVER_OPENGL3)
ADD_SUBDIRECTORY(OpenGL3)
ADD_SUBDIRECTORY(opengl3)
ENDIF(WITH_DRIVER_OPENGL3)
IF(WITH_DRIVER_OPENGLES)

@ -843,6 +843,7 @@ void CClientConfig::setValues()
else if (nlstricmp(varPtr->asString(), "OpenGL") == 0 || nlstricmp(varPtr->asString(), "1") == 0) ClientCfg.Driver3D = CClientConfig::OpenGL;
else if (nlstricmp(varPtr->asString(), "Direct3D") == 0 || nlstricmp(varPtr->asString(), "2") == 0) ClientCfg.Driver3D = CClientConfig::Direct3D;
else if (nlstricmp(varPtr->asString(), "OpenGLES") == 0 || nlstricmp(varPtr->asString(), "3") == 0) ClientCfg.Driver3D = CClientConfig::OpenGLES;
else if (nlstricmp(varPtr->asString(), "OpenGL3") == 0 || nlstricmp(varPtr->asString(), "4") == 0) ClientCfg.Driver3D = CClientConfig::OpenGL3;
}
else
cfgWarning ("Default value used for 'Driver3D' !!!");

@ -53,7 +53,7 @@ using std::string;
//---------------------------------------------------
struct CClientConfig
{
enum TDriver3D { DrvAuto = 0, OpenGL, Direct3D, OpenGLES };
enum TDriver3D { DrvAuto = 0, OpenGL, Direct3D, OpenGLES, OpenGL3 };
enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 };
enum TStageLCTUsage { StageUseNoLCT = 0, StageUseAllLCT, StageUsePosOnlyLCT };

@ -819,6 +819,9 @@ void prelogInit()
case CClientConfig::OpenGLES:
driver = UDriver::OpenGlEs;
break;
case CClientConfig::OpenGL3:
driver = UDriver::OpenGl3;
break;
default:
break;
}

Loading…
Cancel
Save