mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-17 04:51:52 +00:00
Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea
This commit is contained in:
parent
798d207d0d
commit
1a4a7bafab
12 changed files with 3 additions and 170 deletions
|
@ -60,7 +60,6 @@ public:
|
|||
{
|
||||
StereoDisplay,
|
||||
StereoHMD,
|
||||
StereoNGHMD,
|
||||
};
|
||||
|
||||
enum TStereoDeviceLibrary
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
/**
|
||||
* \file stereo_ng_hmd.h
|
||||
* \brief IStereoNGHMD
|
||||
* \date 2014-04-01 10:53GMT
|
||||
* \author Jan Boon (Kaetemi)
|
||||
* IStereoNGHMD
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2014 by authors
|
||||
*
|
||||
* This file is part of NL3D.
|
||||
* NL3D is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* NL3D is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with NL3D. If not, see
|
||||
* <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef NL3D_STEREO_NG_HMD_H
|
||||
#define NL3D_STEREO_NG_HMD_H
|
||||
#include <nel/misc/types_nl.h>
|
||||
|
||||
// STL includes
|
||||
|
||||
// NeL includes
|
||||
|
||||
// Project includes
|
||||
#include <nel/3d/stereo_hmd.h>
|
||||
|
||||
namespace NL3D {
|
||||
|
||||
/**
|
||||
* \brief IStereoNGHMD
|
||||
* \date 2014-04-01 10:53GMT
|
||||
* \author Jan Boon (Kaetemi)
|
||||
* IStereoNGHMD
|
||||
*/
|
||||
class IStereoNGHMD : public IStereoHMD
|
||||
{
|
||||
public:
|
||||
IStereoNGHMD();
|
||||
virtual ~IStereoNGHMD();
|
||||
|
||||
/// Kill the player
|
||||
virtual void killUser() const = 0;
|
||||
|
||||
}; /* class IStereoNGHMD */
|
||||
|
||||
} /* namespace NL3D */
|
||||
|
||||
#endif /* #ifndef NL3D_STEREO_NG_HMD_H */
|
||||
|
||||
/* end of file */
|
|
@ -697,8 +697,6 @@ SOURCE_GROUP(Stereo FILES
|
|||
../../include/nel/3d/stereo_display.h
|
||||
stereo_hmd.cpp
|
||||
../../include/nel/3d/stereo_hmd.h
|
||||
stereo_ng_hmd.cpp
|
||||
../../include/nel/3d/stereo_ng_hmd.h
|
||||
stereo_ovr.cpp
|
||||
stereo_ovr_fp.cpp
|
||||
../../include/nel/3d/stereo_ovr.h
|
||||
|
|
|
@ -1,55 +0,0 @@
|
|||
/**
|
||||
* \file stereo_hmd.cpp
|
||||
* \brief IStereoNGHMD
|
||||
* \date 2014-04-01 10:53GMT
|
||||
* \author Jan Boon (Kaetemi)
|
||||
* IStereoNGHMD
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2014 by authors
|
||||
*
|
||||
* This file is part of NL3D.
|
||||
* NL3D is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* NL3D is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with NL3D. If not, see
|
||||
* <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <nel/misc/types_nl.h>
|
||||
#include <nel/3d/stereo_ng_hmd.h>
|
||||
|
||||
// STL includes
|
||||
|
||||
// NeL includes
|
||||
// #include <nel/misc/debug.h>
|
||||
|
||||
// Project includes
|
||||
|
||||
using namespace std;
|
||||
// using namespace NLMISC;
|
||||
|
||||
namespace NL3D {
|
||||
|
||||
IStereoNGHMD::IStereoNGHMD()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
IStereoNGHMD::~IStereoNGHMD()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
} /* namespace NL3D */
|
||||
|
||||
/* end of file */
|
|
@ -28,7 +28,6 @@ using namespace NLMISC;
|
|||
NL3D::UDriver *Driver = 0; // The main 3D Driver
|
||||
NL3D::IStereoDisplay *StereoDisplay = NULL; // Stereo display
|
||||
NL3D::IStereoHMD *StereoHMD = NULL; // Head mount display
|
||||
NL3D::IStereoNGHMD *StereoNGHMD = NULL; // HMD with player death support
|
||||
CSoundManager *SoundMngr = 0; // the sound manager
|
||||
NL3D::UMaterial GenericMat; // Generic Material
|
||||
NL3D::UTextContext *TextContext = 0; // Context for all the text in the client.
|
||||
|
@ -69,8 +68,6 @@ bool PermanentlyBanned = false;
|
|||
bool IgnoreEntityDbUpdates = false;
|
||||
bool FreeTrial = false;
|
||||
|
||||
bool NoLogout = false;
|
||||
|
||||
std::vector<std::pair<
|
||||
std::string, std::string> > VRDeviceCache;
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ namespace NL3D
|
|||
class UWaterEnvMap;
|
||||
class IStereoDisplay;
|
||||
class IStereoHMD;
|
||||
class IStereoNGHMD;
|
||||
}
|
||||
|
||||
class CEntityAnimationManager;
|
||||
|
@ -82,7 +81,6 @@ const float ExtraZoneLoadingVision = 100.f;
|
|||
extern NL3D::UDriver *Driver; // The main 3D Driver
|
||||
extern NL3D::IStereoDisplay *StereoDisplay; // Stereo display
|
||||
extern NL3D::IStereoHMD *StereoHMD; // Head mount display
|
||||
extern NL3D::IStereoNGHMD *StereoNGHMD; // HMD with player death support
|
||||
extern CSoundManager *SoundMngr; // the sound manager
|
||||
extern NL3D::UMaterial GenericMat; // Generic Material
|
||||
extern NL3D::UTextContext *TextContext; // Context for all the text in the client.
|
||||
|
@ -130,8 +128,6 @@ extern std::string Cookie, FSAddr;
|
|||
extern std::string RingMainURL;
|
||||
extern bool FreeTrial;
|
||||
|
||||
extern bool NoLogout;
|
||||
|
||||
void resetTextContext (const char *font, bool resetInterfaceManager);
|
||||
|
||||
#endif // CL_GLOBAL_H
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#include "nel/3d/u_text_context.h"
|
||||
#include "nel/3d/u_shape_bank.h"
|
||||
#include "nel/3d/stereo_hmd.h"
|
||||
#include "nel/3d/stereo_ng_hmd.h"
|
||||
// Net.
|
||||
#include "nel/net/email.h"
|
||||
// Ligo.
|
||||
|
@ -640,15 +639,10 @@ void initStereoDisplayDevice()
|
|||
StereoDisplay = IStereoDisplay::createDevice(*deviceInfo);
|
||||
if (StereoDisplay)
|
||||
{
|
||||
if (deviceInfo->Class == CStereoDeviceInfo::StereoHMD
|
||||
|| deviceInfo->Class == CStereoDeviceInfo::StereoNGHMD)
|
||||
if (deviceInfo->Class == CStereoDeviceInfo::StereoHMD)
|
||||
{
|
||||
nlinfo("VR [C]: Stereo display device is a HMD");
|
||||
StereoHMD = static_cast<IStereoHMD *>(StereoDisplay);
|
||||
if (deviceInfo->Class == CStereoDeviceInfo::StereoNGHMD)
|
||||
{
|
||||
StereoNGHMD = static_cast<IStereoNGHMD *>(StereoDisplay);
|
||||
}
|
||||
}
|
||||
if (Driver) // VR_DRIVER
|
||||
{
|
||||
|
|
|
@ -1089,7 +1089,6 @@ void CInterfaceManager::configureQuitDialogBox()
|
|||
// Show Launch Editor if not in editor mode
|
||||
CInterfaceElement *eltCancel = quitDlg->getElement(quitDialogStr+":cancel");
|
||||
CInterfaceElement *eltEdit = quitDlg->getElement(quitDialogStr+":launch_editor");
|
||||
|
||||
if (eltEdit)
|
||||
{
|
||||
if (UserRoleInSession != R2::TUserRole::ur_editor && !sessionOwner)
|
||||
|
@ -1160,18 +1159,6 @@ void CInterfaceManager::configureQuitDialogBox()
|
|||
eltQuitNow->setActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (NoLogout)
|
||||
{
|
||||
eltEdit->setY(0);
|
||||
eltEdit->setActive(false);
|
||||
eltQuit->setY(0);
|
||||
eltQuit->setActive(false);
|
||||
eltQuitNow->setY(0);
|
||||
eltQuitNow->setActive(false);
|
||||
eltRet->setY(0);
|
||||
eltRet->setActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
// Make all controls have the same size
|
||||
|
|
|
@ -21,9 +21,6 @@
|
|||
// INCLUDES //
|
||||
//////////////
|
||||
#include "stdpch.h"
|
||||
|
||||
#include "nel/3d/stereo_ng_hmd.h"
|
||||
|
||||
// Client.
|
||||
#include "../../input.h"
|
||||
#include "../user_controls.h"
|
||||
|
@ -31,7 +28,6 @@
|
|||
#include "../../view.h"
|
||||
#include "../../interface_v3/interface_manager.h"
|
||||
#include "../../entities.h"
|
||||
#include "global.h"
|
||||
|
||||
|
||||
///////////
|
||||
|
@ -65,9 +61,6 @@ void CUserControls::deathModeStart()
|
|||
_InternalView = false;
|
||||
// Show/hide all or parts of the user body (after _InternaView is set).
|
||||
UserEntity->updateVisualDisplay();
|
||||
// Kill the player
|
||||
if (StereoNGHMD)
|
||||
StereoNGHMD->killUser();
|
||||
}// deathModeStart //
|
||||
|
||||
//-----------------------------------------------
|
||||
|
|
|
@ -3555,13 +3555,6 @@ void impulseSetNpcIconTimer(NLMISC::CBitMemStream &impulse)
|
|||
CNPCIconCache::getInstance().setMissionGiverTimer(delay);
|
||||
}
|
||||
|
||||
void impulseEventDisableLogoutButton(NLMISC::CBitMemStream &impulse)
|
||||
{
|
||||
NoLogout = true;
|
||||
CInterfaceManager *im = CInterfaceManager::getInstance();
|
||||
im->configureQuitDialogBox();
|
||||
}
|
||||
|
||||
//-----------------------------------------------
|
||||
// initializeNetwork :
|
||||
//-----------------------------------------------
|
||||
|
@ -3711,8 +3704,6 @@ void initializeNetwork()
|
|||
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_DESC", impulseSetNpcIconDesc );
|
||||
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SVR_EVENT_MIS_AVL", impulseServerEventForMissionAvailability );
|
||||
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_TIMER", impulseSetNpcIconTimer );
|
||||
|
||||
GenericMsgHeaderMngr.setCallback( "EVENT:DISABLE_LOGOUT_BUTTON", impulseEventDisableLogoutButton );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
#include "nel/3d/u_visual_collision_manager.h"
|
||||
#include "nel/3d/u_shape_bank.h"
|
||||
#include "nel/3d/stereo_hmd.h"
|
||||
#include "nel/3d/stereo_ng_hmd.h"
|
||||
// Client
|
||||
#include "global.h"
|
||||
#include "release.h"
|
||||
|
@ -517,13 +516,9 @@ void releaseStereoDisplayDevice()
|
|||
{
|
||||
if (StereoDisplay)
|
||||
{
|
||||
if (NoLogout && StereoNGHMD)
|
||||
StereoNGHMD->killUser();
|
||||
|
||||
delete StereoDisplay;
|
||||
StereoDisplay = NULL;
|
||||
StereoHMD = NULL;
|
||||
StereoNGHMD = NULL;
|
||||
}
|
||||
IStereoDisplay::releaseAllLibraries();
|
||||
}
|
||||
|
|
|
@ -1111,8 +1111,8 @@
|
|||
sendto="EGS"
|
||||
format="u32 u32 uc"
|
||||
description="set the cursom of the item in inventory $inventory in slot $slot to $text" />
|
||||
<leaf name="DISABLE_LOGOUT_BUTTON"
|
||||
description="disables the logout button on the client" />
|
||||
<leaf name="DUMMY"
|
||||
description="stupid server....." />
|
||||
</branch>
|
||||
<branch name="TOTEM">
|
||||
<leaf name="BUILD"
|
||||
|
|
Loading…
Reference in a new issue