51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "mainmenumanager.h"
-#include "debug.h"
+#include "gui/mainmenumanager.h"
#include "clouds.h"
#include "server.h"
#include "filesys.h"
-#include "guiMainMenu.h"
+#include "gui/guiMainMenu.h"
#include "game.h"
+#include "player.h"
#include "chat.h"
#include "gettext.h"
#include "profiler.h"
-#include "log.h"
#include "serverlist.h"
-#include "guiEngine.h"
-#include "player.h"
+#include "gui/guiEngine.h"
#include "fontengine.h"
-#include "joystick_controller.h"
#include "clientlauncher.h"
#include "version.h"
+#include "renderingengine.h"
+#include "network/networkexceptions.h"
+
+#if USE_SOUND
+ #include "sound_openal.h"
+#endif
/* mainmenumanager.h
*/
-gui::IGUIEnvironment *guienv = NULL;
-gui::IGUIStaticText *guiroot = NULL;
+gui::IGUIEnvironment *guienv = nullptr;
+gui::IGUIStaticText *guiroot = nullptr;
MainMenuManager g_menumgr;
-bool noMenuActive()
+bool isMenuActive()
{
- return g_menumgr.menuCount() == 0;
+ return g_menumgr.menuCount() != 0;
}
// Passed to menus to allow disconnecting and exiting
-MainGameCallback *g_gamecallback = NULL;
+MainGameCallback *g_gamecallback = nullptr;
-
-// Instance of the time getter
-static TimeGetter *g_timegetter = NULL;
-
-u32 getTimeMs()
+#if 0
+// This can be helpful for the next code cleanup
+static void dump_start_data(const GameStartData &data)
{
- if (g_timegetter == NULL)
- return 0;
- return g_timegetter->getTime(PRECISION_MILLI);
-}
-
-u32 getTime(TimePrecision prec) {
- if (g_timegetter == NULL)
- return 0;
- return g_timegetter->getTime(prec);
+ std::cout <<
+ "\ndedicated " << (int)data.is_dedicated_server <<
+ "\nport " << data.socket_port <<
+ "\nworld_path " << data.world_spec.path <<
+ "\nworld game " << data.world_spec.gameid <<
+ "\ngame path " << data.game_spec.path <<
+ "\nplayer name " << data.name <<
+ "\naddress " << data.address << std::endl;
}
+#endif
ClientLauncher::~ClientLauncher()
{
- if (receiver)
- delete receiver;
+ delete input;
+
+ delete receiver;
- if (input)
- delete input;
+ delete g_fontengine;
+ delete g_gamecallback;
- if (g_fontengine)
- delete g_fontengine;
+ delete m_rendering_engine;
- if (device)
- device->drop();
+#if USE_SOUND
+ g_sound_manager_singleton.reset();
+#endif
}
-bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
+bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
{
- init_args(game_params, cmd_args);
+ /* This function is called when a client must be started.
+ * Covered cases:
+ * - Singleplayer (address but map provided)
+ * - Join server (no map but address provided)
+ * - Local server (for main menu only)
+ */
+
+ init_args(start_data, cmd_args);
- // List video modes if requested
- if (list_video_modes)
- return print_video_modes();
+#if USE_SOUND
+ if (g_settings->getBool("enable_sound"))
+ g_sound_manager_singleton = createSoundManagerSingleton();
+#endif
if (!init_engine()) {
errorstream << "Could not initialize game engine." << std::endl;
return false;
}
- // Create time getter
- g_timegetter = new IrrlichtTimeGetter(device);
-
// Speed tests (done after irrlicht is loaded to get timer)
if (cmd_args.getFlag("speedtests")) {
dstream << "Running speed tests" << std::endl;
return true;
}
- video::IVideoDriver *video_driver = device->getVideoDriver();
- if (video_driver == NULL) {
+ if (m_rendering_engine->get_video_driver() == NULL) {
errorstream << "Could not initialize video driver." << std::endl;
return false;
}
- porting::setXorgClassHint(video_driver->getExposedVideoData(), PROJECT_NAME_C);
-
- porting::setXorgWindowIcon(device);
+ m_rendering_engine->setupTopLevelWindow(PROJECT_NAME_C);
/*
This changes the minimum allowed number of vertices in a VBO.
//driver->setMinHardwareBufferVertexCount(50);
// Create game callback for menus
- g_gamecallback = new MainGameCallback(device);
+ g_gamecallback = new MainGameCallback();
- device->setResizable(true);
+ m_rendering_engine->setResizable(true);
- if (random_input)
- input = new RandomInputHandler();
- else
- input = new RealInputHandler(device, receiver);
+ init_input();
- smgr = device->getSceneManager();
- smgr->getParameters()->setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
+ m_rendering_engine->get_scene_manager()->getParameters()->
+ setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
- guienv = device->getGUIEnvironment();
+ guienv = m_rendering_engine->get_gui_env();
skin = guienv->getSkin();
skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255, 255, 255, 255));
skin->setColor(gui::EGDC_3D_LIGHT, video::SColor(0, 0, 0, 0));
skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255, 0, 0, 0));
skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255, 70, 120, 50));
skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255, 255, 255, 255));
-
- g_fontengine = new FontEngine(g_settings, guienv);
+#ifdef HAVE_TOUCHSCREENGUI
+ float density = RenderingEngine::getDisplayDensity();
+ skin->setSize(gui::EGDS_CHECK_BOX_WIDTH, (s32)(17.0f * density));
+ skin->setSize(gui::EGDS_SCROLLBAR_SIZE, (s32)(14.0f * density));
+ skin->setSize(gui::EGDS_WINDOW_BUTTON_WIDTH, (s32)(15.0f * density));
+ if (density > 1.5f) {
+ std::string sprite_path = porting::path_user + "/textures/base/pack/";
+ if (density > 3.5f)
+ sprite_path.append("checkbox_64.png");
+ else if (density > 2.0f)
+ sprite_path.append("checkbox_32.png");
+ else
+ sprite_path.append("checkbox_16.png");
+ // Texture dimensions should be a power of 2
+ gui::IGUISpriteBank *sprites = skin->getSpriteBank();
+ video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
+ video::ITexture *sprite_texture = driver->getTexture(sprite_path.c_str());
+ if (sprite_texture) {
+ s32 sprite_id = sprites->addTextureAsSprite(sprite_texture);
+ if (sprite_id != -1)
+ skin->setIcon(gui::EGDI_CHECK_BOX_CHECKED, sprite_id);
+ }
+ }
+#endif
+ g_fontengine = new FontEngine(guienv);
FATAL_ERROR_IF(g_fontengine == NULL, "Font engine creation failed.");
-#if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2
// Irrlicht 1.8 input colours
skin->setColor(gui::EGDC_EDITABLE, video::SColor(255, 128, 128, 128));
skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255, 96, 134, 49));
-#endif
// Create the menu clouds
if (!g_menucloudsmgr)
- g_menucloudsmgr = smgr->createNewSceneManager();
+ g_menucloudsmgr = m_rendering_engine->get_scene_manager()->createNewSceneManager();
if (!g_menuclouds)
- g_menuclouds = new Clouds(g_menucloudsmgr->getRootSceneNode(),
- g_menucloudsmgr, -1, rand(), 100);
- g_menuclouds->update(v2f(0, 0), video::SColor(255, 200, 200, 255));
+ g_menuclouds = new Clouds(g_menucloudsmgr, -1, rand());
+ g_menuclouds->setHeight(100.0f);
+ g_menuclouds->update(v3f(0, 0, 0), video::SColor(255, 240, 240, 255));
scene::ICameraSceneNode* camera;
- camera = g_menucloudsmgr->addCameraSceneNode(0,
- v3f(0, 0, 0), v3f(0, 60, 100));
+ camera = g_menucloudsmgr->addCameraSceneNode(NULL, v3f(0, 0, 0), v3f(0, 60, 100));
camera->setFarValue(10000);
/*
bool retval = true;
bool *kill = porting::signal_handler_killstatus();
- while (device->run() && !*kill && !g_gamecallback->shutdown_requested)
- {
+ while (m_rendering_engine->run() && !*kill &&
+ !g_gamecallback->shutdown_requested) {
// Set the window caption
const wchar_t *text = wgettext("Main Menu");
- device->setWindowCaption((utf8_to_wide(PROJECT_NAME_C) +
+ m_rendering_engine->get_raw_device()->
+ setWindowCaption((utf8_to_wide(PROJECT_NAME_C) +
L" " + utf8_to_wide(g_version_hash) +
L" [" + text + L"]").c_str());
delete[] text;
try { // This is used for catching disconnects
- guienv->clear();
+ m_rendering_engine->get_gui_env()->clear();
/*
We need some kind of a root node to be able to add
custom gui elements directly on the screen.
Otherwise they won't be automatically drawn.
*/
- guiroot = guienv->addStaticText(L"", core::rect<s32>(0, 0, 10000, 10000));
+ guiroot = m_rendering_engine->get_gui_env()->addStaticText(L"",
+ core::rect<s32>(0, 0, 10000, 10000));
bool game_has_run = launch_game(error_message, reconnect_requested,
- game_params, cmd_args);
+ start_data, cmd_args);
// Reset the reconnect_requested flag
reconnect_requested = false;
if (!game_has_run) {
if (skip_main_menu)
break;
- else
- continue;
+
+ continue;
}
// Break out of menu-game loop to shut down cleanly
- if (!device->run() || *kill) {
- if (g_settings_path != "")
+ if (!m_rendering_engine->run() || *kill) {
+ if (!g_settings_path.empty())
g_settings->updateConfigFile(g_settings_path.c_str());
break;
}
- if (current_playername.length() > PLAYERNAME_SIZE-1) {
- error_message = gettext("Player name too long.");
- playername = current_playername.substr(0, PLAYERNAME_SIZE-1);
- g_settings->set("name", playername);
- continue;
- }
-
- device->getVideoDriver()->setTextureCreationFlag(
+ m_rendering_engine->get_video_driver()->setTextureCreationFlag(
video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map"));
#ifdef HAVE_TOUCHSCREENGUI
- receiver->m_touchscreengui = new TouchScreenGUI(device, receiver);
+ receiver->m_touchscreengui = new TouchScreenGUI(m_rendering_engine->get_raw_device(), receiver);
g_touchscreengui = receiver->m_touchscreengui;
#endif
the_game(
kill,
- random_input,
input,
- device,
- worldspec.path,
- current_playername,
- current_password,
- current_address,
- current_port,
+ m_rendering_engine,
+ start_data,
error_message,
chat_backend,
- &reconnect_requested,
- gamespec,
- simple_singleplayer_mode
+ &reconnect_requested
);
- smgr->clear();
-
-#ifdef HAVE_TOUCHSCREENGUI
- delete g_touchscreengui;
- g_touchscreengui = NULL;
- receiver->m_touchscreengui = NULL;
-#endif
-
} //try
catch (con::PeerNotFoundException &e) {
error_message = gettext("Connection error (timed out?)");
}
#endif
+ m_rendering_engine->get_scene_manager()->clear();
+
+#ifdef HAVE_TOUCHSCREENGUI
+ delete g_touchscreengui;
+ g_touchscreengui = NULL;
+ receiver->m_touchscreengui = NULL;
+#endif
+
// If no main menu, show error and exit
if (skip_main_menu) {
if (!error_message.empty()) {
return retval;
}
-void ClientLauncher::init_args(GameParams &game_params, const Settings &cmd_args)
+void ClientLauncher::init_args(GameStartData &start_data, const Settings &cmd_args)
{
-
skip_main_menu = cmd_args.getFlag("go");
- // FIXME: This is confusing (but correct)
-
- /* If world_path is set then override it unless skipping the main menu using
- * the --go command line param. Else, give preference to the address
- * supplied on the command line
- */
- address = g_settings->get("address");
- if (game_params.world_path != "" && !skip_main_menu)
- address = "";
- else if (cmd_args.exists("address"))
- address = cmd_args.get("address");
+ start_data.address = g_settings->get("address");
+ if (cmd_args.exists("address")) {
+ // Join a remote server
+ start_data.address = cmd_args.get("address");
+ start_data.world_path.clear();
+ start_data.name = g_settings->get("name");
+ }
+ if (!start_data.world_path.empty()) {
+ // Start a singleplayer instance
+ start_data.address = "";
+ }
- playername = g_settings->get("name");
if (cmd_args.exists("name"))
- playername = cmd_args.get("name");
-
- list_video_modes = cmd_args.getFlag("videomodes");
-
- use_freetype = g_settings->getBool("freetype");
+ start_data.name = cmd_args.get("name");
random_input = g_settings->getBool("random_input")
|| cmd_args.getFlag("random-input");
bool ClientLauncher::init_engine()
{
receiver = new MyEventReceiver();
- create_engine_device();
- return device != NULL;
+ m_rendering_engine = new RenderingEngine(receiver);
+ return m_rendering_engine->get_raw_device() != nullptr;
+}
+
+void ClientLauncher::init_input()
+{
+ if (random_input)
+ input = new RandomInputHandler();
+ else
+ input = new RealInputHandler(receiver);
+
+ if (g_settings->getBool("enable_joysticks")) {
+ irr::core::array<irr::SJoystickInfo> infos;
+ std::vector<irr::SJoystickInfo> joystick_infos;
+
+ // Make sure this is called maximum once per
+ // irrlicht device, otherwise it will give you
+ // multiple events for the same joystick.
+ if (m_rendering_engine->get_raw_device()->activateJoysticks(infos)) {
+ infostream << "Joystick support enabled" << std::endl;
+ joystick_infos.reserve(infos.size());
+ for (u32 i = 0; i < infos.size(); i++) {
+ joystick_infos.push_back(infos[i]);
+ }
+ input->joystick.onJoystickConnect(joystick_infos);
+ } else {
+ errorstream << "Could not activate joystick support." << std::endl;
+ }
+ }
}
bool ClientLauncher::launch_game(std::string &error_message,
- bool reconnect_requested, GameParams &game_params,
+ bool reconnect_requested, GameStartData &start_data,
const Settings &cmd_args)
{
- // Initialize menu data
- MainMenuData menudata;
- menudata.address = address;
- menudata.name = playername;
- menudata.password = password;
- menudata.port = itos(game_params.socket_port);
- menudata.script_data.errormessage = error_message;
- menudata.script_data.reconnect_requested = reconnect_requested;
-
+ // Prepare and check the start data to launch a game
+ std::string error_message_lua = error_message;
error_message.clear();
if (cmd_args.exists("password"))
- menudata.password = cmd_args.get("password");
-
- menudata.enable_public = g_settings->getBool("server_announce");
+ start_data.password = cmd_args.get("password");
+
+ if (cmd_args.exists("password-file")) {
+ std::ifstream passfile(cmd_args.get("password-file"));
+ if (passfile.good()) {
+ getline(passfile, start_data.password);
+ } else {
+ error_message = gettext("Provided password file "
+ "failed to open: ")
+ + cmd_args.get("password-file");
+ errorstream << error_message << std::endl;
+ return false;
+ }
+ }
// If a world was commanded, append and select it
- if (game_params.world_path != "") {
- worldspec.gameid = getWorldGameId(game_params.world_path, true);
- worldspec.name = _("[--world parameter]");
+ // This is provieded by "get_world_from_cmdline()", main.cpp
+ if (!start_data.world_path.empty()) {
+ auto &spec = start_data.world_spec;
+
+ spec.path = start_data.world_path;
+ spec.gameid = getWorldGameId(spec.path, true);
+ spec.name = _("[--world parameter]");
- if (worldspec.gameid == "") { // Create new
- worldspec.gameid = g_settings->get("default_game");
- worldspec.name += " [new]";
+ if (spec.gameid.empty()) { // Create new
+ spec.gameid = g_settings->get("default_game");
+ spec.name += " [new]";
}
- worldspec.path = game_params.world_path;
}
/* Show the GUI menu
*/
+ std::string server_name, server_description;
if (!skip_main_menu) {
+ // Initialize menu data
+ // TODO: Re-use existing structs (GameStartData)
+ MainMenuData menudata;
+ menudata.address = start_data.address;
+ menudata.name = start_data.name;
+ menudata.password = start_data.password;
+ menudata.port = itos(start_data.socket_port);
+ menudata.script_data.errormessage = std::move(error_message_lua);
+ menudata.script_data.reconnect_requested = reconnect_requested;
+
main_menu(&menudata);
// Skip further loading if there was an exit signal.
if (*porting::signal_handler_killstatus())
return false;
- address = menudata.address;
+ if (!menudata.script_data.errormessage.empty()) {
+ /* The calling function will pass this back into this function upon the
+ * next iteration (if any) causing it to be displayed by the GUI
+ */
+ error_message = menudata.script_data.errormessage;
+ return false;
+ }
+
int newport = stoi(menudata.port);
if (newport != 0)
- game_params.socket_port = newport;
-
- simple_singleplayer_mode = menudata.simple_singleplayer_mode;
+ start_data.socket_port = newport;
+ // Update world information using main menu data
std::vector<WorldSpec> worldspecs = getAvailableWorlds();
- if (menudata.selected_world >= 0
- && menudata.selected_world < (int)worldspecs.size()) {
+ int world_index = menudata.selected_world;
+ if (world_index >= 0 && world_index < (int)worldspecs.size()) {
g_settings->set("selected_world_path",
- worldspecs[menudata.selected_world].path);
- worldspec = worldspecs[menudata.selected_world];
+ worldspecs[world_index].path);
+ start_data.world_spec = worldspecs[world_index];
}
+
+ start_data.name = menudata.name;
+ start_data.password = menudata.password;
+ start_data.address = std::move(menudata.address);
+ start_data.allow_login_or_register = menudata.allow_login_or_register;
+ server_name = menudata.servername;
+ server_description = menudata.serverdescription;
+
+ start_data.local_server = !menudata.simple_singleplayer_mode &&
+ start_data.address.empty();
+ } else {
+ start_data.local_server = !start_data.world_path.empty() &&
+ start_data.address.empty() && !start_data.name.empty();
}
- if (!menudata.script_data.errormessage.empty()) {
- /* The calling function will pass this back into this function upon the
- * next iteration (if any) causing it to be displayed by the GUI
- */
- error_message = menudata.script_data.errormessage;
+ if (!m_rendering_engine->run())
return false;
- }
- if (menudata.name == "" && !simple_singleplayer_mode) {
+ if (!start_data.isSinglePlayer() && start_data.name.empty()) {
error_message = gettext("Please choose a name!");
+ errorstream << error_message << std::endl;
return false;
}
- playername = menudata.name;
- password = menudata.password;
-
- current_playername = playername;
- current_password = password;
- current_address = address;
- current_port = game_params.socket_port;
-
// If using simple singleplayer mode, override
- if (simple_singleplayer_mode) {
- assert(skip_main_menu == false);
- current_playername = "singleplayer";
- current_password = "";
- current_address = "";
- current_port = myrand_range(49152, 65535);
+ if (start_data.isSinglePlayer()) {
+ start_data.name = "singleplayer";
+ start_data.password = "";
+ start_data.socket_port = myrand_range(49152, 65535);
} else {
- g_settings->set("name", playername);
- if (address != "") {
- ServerListSpec server;
- server["name"] = menudata.servername;
- server["address"] = menudata.address;
- server["port"] = menudata.port;
- server["description"] = menudata.serverdescription;
- ServerList::insert(server);
- }
+ g_settings->set("name", start_data.name);
+ }
+
+ if (start_data.name.length() > PLAYERNAME_SIZE - 1) {
+ error_message = gettext("Player name too long.");
+ start_data.name.resize(PLAYERNAME_SIZE);
+ g_settings->set("name", start_data.name);
+ return false;
}
+ auto &worldspec = start_data.world_spec;
infostream << "Selected world: " << worldspec.name
<< " [" << worldspec.path << "]" << std::endl;
- if (current_address == "") { // If local game
- if (worldspec.path == "") {
+ if (start_data.address.empty()) {
+ // For singleplayer and local server
+ if (worldspec.path.empty()) {
error_message = gettext("No world selected and no address "
"provided. Nothing to do.");
errorstream << error_message << std::endl;
}
// Load gamespec for required game
- gamespec = findWorldSubgame(worldspec.path);
- if (!gamespec.isValid() && !game_params.game_spec.isValid()) {
- error_message = gettext("Could not find or load game \"")
- + worldspec.gameid + "\"";
+ start_data.game_spec = findWorldSubgame(worldspec.path);
+ if (!start_data.game_spec.isValid()) {
+ error_message = gettext("Could not find or load game: ")
+ + worldspec.gameid;
errorstream << error_message << std::endl;
return false;
}
if (porting::signal_handler_killstatus())
return true;
- if (game_params.game_spec.isValid() &&
- game_params.game_spec.id != worldspec.gameid) {
- warningstream << "Overriding gamespec from \""
- << worldspec.gameid << "\" to \""
- << game_params.game_spec.id << "\"" << std::endl;
- gamespec = game_params.game_spec;
- }
-
- if (!gamespec.isValid()) {
+ if (!start_data.game_spec.isValid()) {
error_message = gettext("Invalid gamespec.");
error_message += " (world.gameid=" + worldspec.gameid + ")";
errorstream << error_message << std::endl;
}
}
+ start_data.world_path = start_data.world_spec.path;
return true;
}
void ClientLauncher::main_menu(MainMenuData *menudata)
{
bool *kill = porting::signal_handler_killstatus();
- video::IVideoDriver *driver = device->getVideoDriver();
+ video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
infostream << "Waiting for other menus" << std::endl;
- while (device->run() && *kill == false) {
- if (noMenuActive())
+ while (m_rendering_engine->run() && !*kill) {
+ if (!isMenuActive())
break;
driver->beginScene(true, true, video::SColor(255, 128, 128, 128));
- guienv->drawAll();
+ m_rendering_engine->get_gui_env()->drawAll();
driver->endScene();
// On some computers framerate doesn't seem to be automatically limited
sleep_ms(25);
}
infostream << "Waited for other menus" << std::endl;
- // Cursor can be non-visible when coming from the game
#ifndef ANDROID
- device->getCursorControl()->setVisible(true);
-#endif
-
- /* show main menu */
- GUIEngine mymenu(device, &input->joystick, guiroot,
- &g_menumgr, smgr, menudata, *kill);
-
- smgr->clear(); /* leave scene manager in a clean state */
-}
-
-bool ClientLauncher::create_engine_device()
-{
- // Resolution selection
- bool fullscreen = g_settings->getBool("fullscreen");
- u16 screenW = g_settings->getU16("screenW");
- u16 screenH = g_settings->getU16("screenH");
-
- // bpp, fsaa, vsync
- bool vsync = g_settings->getBool("vsync");
- u16 bits = g_settings->getU16("fullscreen_bpp");
- u16 fsaa = g_settings->getU16("fsaa");
-
- // stereo buffer required for pageflip stereo
- bool stereo_buffer = g_settings->get("3d_mode") == "pageflip";
-
- // Determine driver
- video::E_DRIVER_TYPE driverType = video::EDT_OPENGL;
- std::string driverstring = g_settings->get("video_driver");
- std::vector<video::E_DRIVER_TYPE> drivers
- = porting::getSupportedVideoDrivers();
- u32 i;
- for (i = 0; i != drivers.size(); i++) {
- if (!strcasecmp(driverstring.c_str(),
- porting::getVideoDriverName(drivers[i]))) {
- driverType = drivers[i];
- break;
- }
- }
- if (i == drivers.size()) {
- errorstream << "Invalid video_driver specified; "
- "defaulting to opengl" << std::endl;
- }
+ // Cursor can be non-visible when coming from the game
+ m_rendering_engine->get_raw_device()->getCursorControl()->setVisible(true);
- SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
- params.DriverType = driverType;
- params.WindowSize = core::dimension2d<u32>(screenW, screenH);
- params.Bits = bits;
- params.AntiAlias = fsaa;
- params.Fullscreen = fullscreen;
- params.Stencilbuffer = false;
- params.Stereobuffer = stereo_buffer;
- params.Vsync = vsync;
- params.EventReceiver = receiver;
- params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
- params.ZBufferBits = 24;
-#ifdef __ANDROID__
- params.PrivateData = porting::app_global;
- params.OGLES2ShaderPath = std::string(porting::path_user + DIR_DELIM +
- "media" + DIR_DELIM + "Shaders" + DIR_DELIM).c_str();
+ // Set absolute mouse mode
+ m_rendering_engine->get_raw_device()->getCursorControl()->setRelativeMode(false);
#endif
- device = createDeviceEx(params);
-
- if (device) {
- if (g_settings->getBool("enable_joysticks")) {
- irr::core::array<irr::SJoystickInfo> infos;
- std::vector<irr::SJoystickInfo> joystick_infos;
- // Make sure this is called maximum once per
- // irrlicht device, otherwise it will give you
- // multiple events for the same joystick.
- if (device->activateJoysticks(infos)) {
- infostream << "Joystick support enabled" << std::endl;
- joystick_infos.reserve(infos.size());
- for (u32 i = 0; i < infos.size(); i++) {
- joystick_infos.push_back(infos[i]);
- }
- } else {
- errorstream << "Could not activate joystick support." << std::endl;
- }
- }
- porting::initIrrlicht(device);
- }
+ /* show main menu */
+ GUIEngine mymenu(&input->joystick, guiroot, m_rendering_engine, &g_menumgr, menudata, *kill);
- return device != NULL;
+ /* leave scene manager in a clean state */
+ m_rendering_engine->get_scene_manager()->clear();
}
void ClientLauncher::speed_tests()
// volatile to avoid some potential compiler optimisations
volatile static s16 temp16;
volatile static f32 tempf;
+ // Silence compiler warning
+ (void)temp16;
static v3f tempv3f1;
static v3f tempv3f2;
static std::string tempstring;
tempv3f1 = v3f();
tempv3f2 = v3f();
- tempstring = std::string();
- tempstring2 = std::string();
+ tempstring.clear();
+ tempstring2.clear();
{
infostream << "The following test should take around 20ms." << std::endl;
TimeTaker timer("Testing std::string speed");
const u32 jj = 10000;
for (u32 j = 0; j < jj; j++) {
- tempstring = "";
- tempstring2 = "";
+ tempstring.clear();
+ tempstring2.clear();
const u32 ii = 10;
for (u32 i = 0; i < ii; i++) {
tempstring2 += "asd";
infostream << "Around 5000/ms should do well here." << std::endl;
TimeTaker timer("Testing mutex speed");
- Mutex m;
+ std::mutex m;
u32 n = 0;
u32 i = 0;
do {
infostream << "Done. " << dtime << "ms, " << per_ms << "/ms" << std::endl;
}
}
-
-bool ClientLauncher::print_video_modes()
-{
- IrrlichtDevice *nulldevice;
-
- bool vsync = g_settings->getBool("vsync");
- u16 fsaa = g_settings->getU16("fsaa");
- MyEventReceiver* receiver = new MyEventReceiver();
-
- SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
- params.DriverType = video::EDT_NULL;
- params.WindowSize = core::dimension2d<u32>(640, 480);
- params.Bits = 24;
- params.AntiAlias = fsaa;
- params.Fullscreen = false;
- params.Stencilbuffer = false;
- params.Vsync = vsync;
- params.EventReceiver = receiver;
- params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
-
- nulldevice = createDeviceEx(params);
-
- if (nulldevice == NULL) {
- delete receiver;
- return false;
- }
-
- std::cout << _("Available video modes (WxHxD):") << std::endl;
-
- video::IVideoModeList *videomode_list = nulldevice->getVideoModeList();
-
- if (videomode_list != NULL) {
- s32 videomode_count = videomode_list->getVideoModeCount();
- core::dimension2d<u32> videomode_res;
- s32 videomode_depth;
- for (s32 i = 0; i < videomode_count; ++i) {
- videomode_res = videomode_list->getVideoModeResolution(i);
- videomode_depth = videomode_list->getVideoModeDepth(i);
- std::cout << videomode_res.Width << "x" << videomode_res.Height
- << "x" << videomode_depth << std::endl;
- }
-
- std::cout << _("Active video mode (WxHxD):") << std::endl;
- videomode_res = videomode_list->getDesktopResolution();
- videomode_depth = videomode_list->getDesktopDepth();
- std::cout << videomode_res.Width << "x" << videomode_res.Height
- << "x" << videomode_depth << std::endl;
-
- }
-
- nulldevice->drop();
- delete receiver;
-
- return videomode_list != NULL;
-}
projects / minetest.git / blobdiff