minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-02 16:20:27 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup line endings (#245)

Browse Source 
The exact commands to make this commit were:

git reset --hard origin/master
find -type f |  # list all regular files
  grep -E '\.(h|cpp|fsh|vsh|mm)|LICENSE$' |  # filter for text files
  xargs -n 1 -P $(nproc) sed -i 's:\s*$::'  # for each file, trim trailing whitespace including the CR
git commit -a
This commit is contained in:
Vitaliy
2023-10-03 21:37:00 +03:00
committed by GitHub
parent ea1b58387e
commit 9954667c45
303 changed files with 99367 additions and 99367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/Irrlicht/CIrrDeviceOSX.mm
View File

@ -471,12 +471,12 @@ static bool firstLaunch = true;
- (id)initWithDevice:(irr::CIrrDeviceMacOSX*)device
{
self = [super init];
if (self)
Device = device;
Quit = false;
return (self);
}
@ -528,7 +528,7 @@ static bool firstLaunch = true;
{
NSWindow *window;
NSRect frame;
window = [aNotification object];
frame = [window frame];
Device->setResize((int)frame.size.width,(int)frame.size.height);
@ -646,15 +646,15 @@ bool CIrrDeviceMacOSX::createWindow()
CGDisplayErr error;
bool result = false;
Display = CGMainDisplayID();
CGRect displayRect;
CGDisplayModeRef displaymode, olddisplaymode;
ScreenWidth = (int)CGDisplayPixelsWide(Display);
ScreenHeight = (int)CGDisplayPixelsHigh(Display);
const NSBackingStoreType type = (CreationParams.DriverType == video::EDT_OPENGL) ? NSBackingStoreBuffered : NSBackingStoreNonretained;
// TODO: fullscreen
//if (!CreationParams.Fullscreen)
{
@ -662,25 +662,25 @@ bool CIrrDeviceMacOSX::createWindow()
{
int x = (CreationParams.WindowPosition.X > 0) ? CreationParams.WindowPosition.X : 0;
int y = (CreationParams.WindowPosition.Y > 0) ? CreationParams.WindowPosition.Y : 0;
if (CreationParams.WindowPosition.Y > -1)
{
int screenHeight = [[[NSScreen screens] objectAtIndex:0] frame].size.height;
y = screenHeight - y - CreationParams.WindowSize.Height;
}
Window = [[NSWindow alloc] initWithContentRect:NSMakeRect(x, y, CreationParams.WindowSize.Width,CreationParams.WindowSize.Height) styleMask:NSTitledWindowMask+NSClosableWindowMask+NSResizableWindowMask backing:type defer:FALSE];
if (CreationParams.WindowPosition.X == -1 && CreationParams.WindowPosition.Y == -1)
[Window center];
}
DeviceWidth = CreationParams.WindowSize.Width;
DeviceHeight = CreationParams.WindowSize.Height;
result = true;
}
if (result)
{
if (Window)
@ -691,7 +691,7 @@ bool CIrrDeviceMacOSX::createWindow()
[Window makeKeyAndOrderFront:nil];
}
}
return result;
}
@ -706,7 +706,7 @@ void CIrrDeviceMacOSX::setResize(int width, int height)
if (CreationParams.DriverType == video::EDT_OPENGL)
{
NSOpenGLContext* Context = (NSOpenGLContext*)ContextManager->getContext().OpenGLOSX.Context;
if (Context)
[Context update];
}
@ -741,13 +741,13 @@ void CIrrDeviceMacOSX::createDriver()
{
os::Printer::log("Could not create OpenGL driver.", ELL_ERROR);
}
if (Window)
if (Window)
{
[[Window contentView] setWantsBestResolutionOpenGLSurface:NO];
[(NSOpenGLContext*)ContextManager->getContext().OpenGLOSX.Context setView:[Window contentView]];
}
else
else
{
[(NSView*)CreationParams.WindowId setWantsBestResolutionOpenGLSurface:NO];
[(NSOpenGLContext*)ContextManager->getContext().OpenGLOSX.Context setView:(NSView*)CreationParams.WindowId];
@ -1082,7 +1082,7 @@ void CIrrDeviceMacOSX::postMouseEvent(void *event,irr::SEvent &ievent)
{
ievent.MouseInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
ievent.MouseInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
postEventFromUser(ievent);
}
@ -1162,8 +1162,8 @@ void CIrrDeviceMacOSX::setCursorVisible(bool visible)
else
CGDisplayHideCursor(CGMainDisplayID());
}
void CIrrDeviceMacOSX::setWindow(NSWindow* window)
{
Window = window;
@ -1326,7 +1326,7 @@ void CIrrDeviceMacOSX::restoreWindow()
{
[Window deminiaturize:[NSApp self]];
}
//! Get the position of this window on screen
core::position2di CIrrDeviceMacOSX::getWindowPosition()
{