Commit a2946ae7 authored by teella's avatar teella

OSX sync with latest 1.4.1



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1381 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 2601d0b8
......@@ -47,7 +47,7 @@ namespace irr
virtual bool isWindowActive() const;
//! presents a surface in the client area
virtual void present(video::IImage* surface, s32 windowId = 0, core::rect<s32>* src=0 );
virtual void present(video::IImage* surface, void* windowId=0, core::rect<s32>* src=0 );
//! notifies the device that it should close itself
virtual void closeDevice();
......
......@@ -191,7 +191,7 @@ bool CIrrDeviceMacOSX::createWindow()
windowattribs[index++] = (NSOpenGLPixelFormatAttribute)2;
}
if (CreationParams.StencilBuffer)
if (CreationParams.Stencilbuffer)
{
windowattribs[index++] = NSOpenGLPFAStencilSize;
windowattribs[index++] = (NSOpenGLPixelFormatAttribute)1;
......@@ -257,7 +257,7 @@ bool CIrrDeviceMacOSX::createWindow()
fullattribs[index++] = (CGLPixelFormatAttribute)2;
}
if (CreationParams.StencilBuffer)
if (CreationParams.Stencilbuffer)
{
fullattribs[index++] = kCGLPFAStencilSize;
fullattribs[index++] = (CGLPixelFormatAttribute)1;
......@@ -463,10 +463,6 @@ void CIrrDeviceMacOSX::sleep(u32 timeMs, bool pauseTimer=false)
Timer->start();
}
void CIrrDeviceMacOSX::present(video::IImage* image, s32 windowId, core::rect<s32>* src )
{
}
void CIrrDeviceMacOSX::setWindowCaption(const wchar_t* text)
{
size_t size;
......@@ -666,6 +662,11 @@ void CIrrDeviceMacOSX::setResizeAble(bool resize)
// todo: implement resize
}
void CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rect<s32>* src )
{
// todo: implement
}
video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList()
{
if (!VideoModeList.getVideoModeCount()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment