aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-17 04:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-10-17 11:49:38 +02:00
parent 364efba09d
commit 8a52b34e09
4 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -196,18 +196,6 @@ CDriverGL::CDriverGL()
_backBufferHeight = 0; _backBufferHeight = 0;
_backBufferWidth = 0; _backBufferWidth = 0;
// autorelease pool for memory management
_autoreleasePool = [[NSAutoreleasePool alloc] init];
// init the application object
[NSApplication sharedApplication];
// create the menu in the top screen bar
setupApplicationMenu();
// finish the application launching
[NSApp finishLaunching];
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
_dpy = 0; _dpy = 0;
@ -373,10 +361,6 @@ CDriverGL::~CDriverGL()
{ {
H_AUTO_OGL(CDriverGL_CDriverGLDtor) H_AUTO_OGL(CDriverGL_CDriverGLDtor)
release(); release();
#if defined(NL_OS_MAC)
[_autoreleasePool release];
#endif
} }
// -------------------------------------------------- // --------------------------------------------------
@ -942,13 +926,6 @@ bool CDriverGL::swapBuffers()
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
// TODO: maybe do this somewhere else?
if(_DestroyWindow)
{
[_autoreleasePool release];
_autoreleasePool = [[NSAutoreleasePool alloc] init];
}
[_ctx flushBuffer]; [_ctx flushBuffer];
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)

17
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -343,9 +343,14 @@ bool CDriverGL::init (uintptr_t windowIcon, emptyProc exitFunc)
retrieveATIDriverVersion(); retrieveATIDriverVersion();
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
// nothing to do
nlunreferenced(windowIcon); nlunreferenced(windowIcon);
// autorelease pool for memory management
_autoreleasePool = [[NSAutoreleasePool alloc] init];
// init the application object
[NSApplication sharedApplication];
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
nlunreferenced(windowIcon); nlunreferenced(windowIcon);
@ -486,6 +491,7 @@ bool CDriverGL::unInit()
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
// nothing to do // nothing to do
[_autoreleasePool release];
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
@ -1466,6 +1472,12 @@ bool CDriverGL::createWindow(const GfxMode &mode)
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
// create the menu in the top screen bar
setupApplicationMenu();
// finish the application launching
[NSApp finishLaunching];
// describe how the window should look like and behave // describe how the window should look like and behave
unsigned int styleMask = NSTitledWindowMask | NSClosableWindowMask | unsigned int styleMask = NSTitledWindowMask | NSClosableWindowMask |
NSMiniaturizableWindowMask | NSResizableWindowMask; NSMiniaturizableWindowMask | NSResizableWindowMask;
@ -1642,6 +1654,7 @@ bool CDriverGL::destroyWindow()
} }
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
if (_DestroyWindow && _ctx) // FIXME: _DestroyWindow may need to be removed here as well if (_DestroyWindow && _ctx) // FIXME: _DestroyWindow may need to be removed here as well
@ -1664,6 +1677,8 @@ bool CDriverGL::destroyWindow()
[[containerView() window] release]; [[containerView() window] release];
[containerView() release]; [containerView() release];
[_glView release]; [_glView release];
[_autoreleasePool release];
} }
_ctx = nil; _ctx = nil;

1
code/nel/src/3d/scene_group.cpp
View file

@ -451,7 +451,6 @@ void CInstanceGroup::serial (NLMISC::IStream& f)
_PointLightArray.clear(); _PointLightArray.clear();
} }
if (version >= 2) if (version >= 2)
f.serial(_GlobalPos); f.serial(_GlobalPos);

2
code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp
View file

@ -172,7 +172,7 @@ void CClientConfigDialog::onClickPlay()
clientFullPath += "ryzom_client_r.exe"; clientFullPath += "ryzom_client_r.exe";
#endif #endif
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
clientFullPath += "Ryzom"; clientFullPath += "Ryzom.app";
#else #else
clientFullPath += "ryzom_client"; clientFullPath += "ryzom_client";
#endif #endif