mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-27 17:46:18 +00:00
Merge with develop
This commit is contained in:
parent
1a7293c697
commit
43f48c6215
6 changed files with 40 additions and 0 deletions
|
@ -58,6 +58,7 @@ IF(LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIR)
|
||||||
ENDIF(NOT LIBOVR_FIND_QUIETLY)
|
ENDIF(NOT LIBOVR_FIND_QUIETLY)
|
||||||
SET(LIBOVR_FOUND "YES")
|
SET(LIBOVR_FOUND "YES")
|
||||||
SET(LIBOVR_DEFINITIONS "-DHAVE_LIBOVR")
|
SET(LIBOVR_DEFINITIONS "-DHAVE_LIBOVR")
|
||||||
|
SET(NL_STEREO_AVAILABLE ON)
|
||||||
IF(UNIX)
|
IF(UNIX)
|
||||||
SET(LIBOVR_LIBRARIES ${LIBOVR_LIBRARY} X11 Xinerama udev pthread)
|
SET(LIBOVR_LIBRARIES ${LIBOVR_LIBRARY} X11 Xinerama udev pthread)
|
||||||
ELSE(UNIX)
|
ELSE(UNIX)
|
||||||
|
|
|
@ -25,6 +25,7 @@ IF(LIBVR_LIBRARY AND LIBVR_INCLUDE_DIR)
|
||||||
ENDIF(NOT LIBVR_FIND_QUIETLY)
|
ENDIF(NOT LIBVR_FIND_QUIETLY)
|
||||||
SET(LIBVR_FOUND "YES")
|
SET(LIBVR_FOUND "YES")
|
||||||
SET(LIBVR_DEFINITIONS "-DHAVE_LIBVR")
|
SET(LIBVR_DEFINITIONS "-DHAVE_LIBVR")
|
||||||
|
SET(NL_STEREO_AVAILABLE ON)
|
||||||
ELSE(LIBVR_LIBRARY AND LIBVR_INCLUDE_DIR)
|
ELSE(LIBVR_LIBRARY AND LIBVR_INCLUDE_DIR)
|
||||||
IF(NOT LIBVR_FIND_QUIETLY)
|
IF(NOT LIBVR_FIND_QUIETLY)
|
||||||
MESSAGE(STATUS "Warning: Unable to find LibVR!")
|
MESSAGE(STATUS "Warning: Unable to find LibVR!")
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
#cmakedefine NL_DSOUND_AVAILABLE ${NL_DSOUND_AVAILABLE}
|
#cmakedefine NL_DSOUND_AVAILABLE ${NL_DSOUND_AVAILABLE}
|
||||||
#cmakedefine NL_XAUDIO2_AVAILABLE ${NL_XAUDIO2_AVAILABLE}
|
#cmakedefine NL_XAUDIO2_AVAILABLE ${NL_XAUDIO2_AVAILABLE}
|
||||||
|
|
||||||
|
#cmakedefine NL_STEREO_AVAILABLE ${NL_STEREO_AVAILABLE}
|
||||||
|
|
||||||
#cmakedefine NL_BIN_PREFIX "${NL_BIN_ABSOLUTE_PREFIX}"
|
#cmakedefine NL_BIN_PREFIX "${NL_BIN_ABSOLUTE_PREFIX}"
|
||||||
#cmakedefine NL_ETC_PREFIX "${NL_ETC_ABSOLUTE_PREFIX}"
|
#cmakedefine NL_ETC_PREFIX "${NL_ETC_ABSOLUTE_PREFIX}"
|
||||||
#cmakedefine NL_SHARE_PREFIX "${NL_SHARE_ABSOLUTE_PREFIX}"
|
#cmakedefine NL_SHARE_PREFIX "${NL_SHARE_ABSOLUTE_PREFIX}"
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
#include "../far_tp.h"
|
#include "../far_tp.h"
|
||||||
#include "nel/gui/interface_link.h"
|
#include "nel/gui/interface_link.h"
|
||||||
#include "../npc_icon.h"
|
#include "../npc_icon.h"
|
||||||
|
#include "user_agent.h"
|
||||||
|
|
||||||
// Game Share
|
// Game Share
|
||||||
#include "game_share/character_summary.h"
|
#include "game_share/character_summary.h"
|
||||||
|
@ -2911,6 +2912,7 @@ REGISTER_ACTION_HANDLER (CHandlerToggleInventory, "toggle_inventory");
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
|
|
||||||
#define GAME_CONFIG_DDX "ui:interface:game_config:content:all"
|
#define GAME_CONFIG_DDX "ui:interface:game_config:content:all"
|
||||||
|
#define GAME_CONFIG_TREE_LIST "ui:interface:game_config:content:sbtree:tree_list"
|
||||||
|
|
||||||
static vector<UDriver::CMode> VideoModes;
|
static vector<UDriver::CMode> VideoModes;
|
||||||
#define GAME_CONFIG_VIDEO_MODES_COMBO "ui:interface:game_config:content:general:video_modes"
|
#define GAME_CONFIG_VIDEO_MODES_COMBO "ui:interface:game_config:content:general:video_modes"
|
||||||
|
@ -3085,6 +3087,29 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
// **** Init Language : look in game_config.lua
|
// **** Init Language : look in game_config.lua
|
||||||
|
|
||||||
|
// display or not VR page
|
||||||
|
NLGUI::CGroupTree* configTree = dynamic_cast<CGroupTree*>(CWidgetManager::getInstance()->getElementFromId(GAME_CONFIG_TREE_LIST));
|
||||||
|
|
||||||
|
if (configTree)
|
||||||
|
{
|
||||||
|
CGroupTree::SNode *rootNode = configTree->getRootNode();
|
||||||
|
|
||||||
|
if (rootNode)
|
||||||
|
{
|
||||||
|
CGroupTree::SNode *graphNode = rootNode->getNodeFromId("graph");
|
||||||
|
|
||||||
|
if (graphNode)
|
||||||
|
{
|
||||||
|
CGroupTree::SNode *vrNode = graphNode->getNodeFromId("vr");
|
||||||
|
|
||||||
|
if (vrNode)
|
||||||
|
{
|
||||||
|
vrNode->setShow(isStereoAvailable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
REGISTER_ACTION_HANDLER (CHandlerGameConfigInit, "game_config_init");
|
REGISTER_ACTION_HANDLER (CHandlerGameConfigInit, "game_config_init");
|
||||||
|
|
|
@ -105,3 +105,12 @@ std::string getDebugVersion()
|
||||||
|
|
||||||
return s_version;
|
return s_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isStereoAvailable()
|
||||||
|
{
|
||||||
|
#ifdef NL_STEREO_AVAILABLE
|
||||||
|
return true;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
|
@ -25,6 +25,8 @@ std::string getVersion();
|
||||||
std::string getDisplayVersion();
|
std::string getDisplayVersion();
|
||||||
std::string getDebugVersion();
|
std::string getDebugVersion();
|
||||||
|
|
||||||
|
bool isStereoAvailable();
|
||||||
|
|
||||||
#endif // CL_USER_AGENT_H
|
#endif // CL_USER_AGENT_H
|
||||||
|
|
||||||
/* End of user_agent.h */
|
/* End of user_agent.h */
|
||||||
|
|
Loading…
Reference in a new issue