oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00
Code Wiki Activity

Add video driver selection to settings menu (based uppon idea from webdesigner97)

Browse source
This commit is contained in:
sapier 2014-07-16 14:04:50 +02:00
parent 26f4a5c110
commit 996ea60642
5 changed files with 92 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/main.cpp
View file

@ -1365,41 +1365,43 @@ int main(int argc, char *argv[])
u16 fsaa = g_settings->getU16("fsaa");
// Determine driver
video::E_DRIVER_TYPE driverType;
std::string driverstring = g_settings->get("video_driver");
if (driverstring == "null")
driverType = video::EDT_NULL;
else if (driverstring == "software")
driverType = video::EDT_SOFTWARE;
else if (driverstring == "burningsvideo")
driverType = video::EDT_BURNINGSVIDEO;
else if (driverstring == "direct3d8")
driverType = video::EDT_DIRECT3D8;
else if (driverstring == "direct3d9")
driverType = video::EDT_DIRECT3D9;
else if (driverstring == "opengl")
driverType = video::EDT_OPENGL;
video::E_DRIVER_TYPE driverType = video::EDT_OPENGL;
static const char* driverids[] = {
"null",
"software",
"burningsvideo",
"direct3d8",
"direct3d9",
"opengl"
#ifdef _IRR_COMPILE_WITH_OGLES1_
else if (driverstring == "ogles1")
driverType = video::EDT_OGLES1;
,"ogles1"
#endif
#ifdef _IRR_COMPILE_WITH_OGLES2_
else if (driverstring == "ogles2")
driverType = video::EDT_OGLES2;
,"ogles2"
#endif
else {
errorstream << "WARNING: Invalid video_driver specified; defaulting "
<< "to opengl" << std::endl;
driverType = video::EDT_OPENGL;
,"invalid"
};
std::string driverstring = g_settings->get("video_driver");
for (unsigned int i = 0;
i < (sizeof(driverids)/sizeof(driverids[0]));
i++)
{
if (strcasecmp(driverstring.c_str(), driverids[i]) == 0) {
driverType = (video::E_DRIVER_TYPE) i;
break;
}
if (strcasecmp("invalid", driverids[i]) == 0) {
errorstream << "WARNING: Invalid video_driver specified; defaulting "
<< "to opengl" << std::endl;
break;
}
}
/*
List video modes if requested
*/
MyEventReceiver* receiver = new MyEventReceiver();
if (cmd_args.getFlag("videomodes")) {

32
src/script/lua_api/l_mainmenu.cpp
View file

@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "sound.h"
#include "settings.h"
#include "main.h" // for g_settings
#include "EDriverTypes.h"
#include <IFileArchive.h>
#include <IFileSystem.h>
@ -1001,6 +1002,36 @@ int ModApiMainMenu::l_download_file(lua_State *L)
return 1;
}
/******************************************************************************/
int ModApiMainMenu::l_get_video_drivers(lua_State *L)
{
static const char* drivernames[] = {
"NULL Driver",
"Software",
"Burningsvideo",
"Direct3D 8",
"Direct3D 9",
"OpenGL",
"OGLES1",
"OGLES2"
};
unsigned int index = 1;
lua_newtable(L);
int top = lua_gettop(L);
for (unsigned int i = irr::video::EDT_SOFTWARE;
i < MYMIN(irr::video::EDT_COUNT, (sizeof(drivernames)/sizeof(drivernames[0])));
i++) {
if (irr::IrrlichtDevice::isDriverSupported((irr::video::E_DRIVER_TYPE) i)) {
lua_pushnumber(L,index++);
lua_pushstring(L,drivernames[i]);
lua_settable(L, top);
}
}
return 1;
}
/******************************************************************************/
int ModApiMainMenu::l_gettext(lua_State *L)
{
@ -1094,6 +1125,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
API_FCT(sound_play);
API_FCT(sound_stop);
API_FCT(gettext);
API_FCT(get_video_drivers);
API_FCT(get_screen_info);
API_FCT(do_async_callback);
}

2
src/script/lua_api/l_mainmenu.h
View file

@ -133,6 +133,8 @@ private:
static int l_download_file(lua_State *L);
static int l_get_video_drivers(lua_State *L);
// async
static int l_do_async_callback(lua_State *L);