@kmamal/sdl 0.9.1 → 0.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -4,18 +4,22 @@
|
|
|
4
4
|
#include "cocoa-window.h"
|
|
5
5
|
|
|
6
6
|
extern "C" CALayer * getCocoaGlView(NSWindow * window) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
@autoreleasepool {
|
|
8
|
+
NSView * view = [window contentView];
|
|
9
|
+
[view setWantsLayer:YES];
|
|
10
|
+
[[view layer] setContentsScale:[window backingScaleFactor]];
|
|
11
|
+
return [view layer];
|
|
12
|
+
}
|
|
11
13
|
}
|
|
12
14
|
|
|
13
15
|
extern "C" CALayer * getCocoaGpuView(NSWindow * window) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
@autoreleasepool {
|
|
17
|
+
NSView * view = [window contentView];
|
|
18
|
+
[view setWantsLayer:YES];
|
|
19
|
+
[view setLayer:[CAMetalLayer layer]];
|
|
20
|
+
[[view layer] setContentsScale:[window backingScaleFactor]];
|
|
21
|
+
return [view layer];
|
|
22
|
+
}
|
|
19
23
|
}
|
|
20
24
|
|
|
21
25
|
extern "C" void reenableInertialScrolling() {
|
|
@@ -942,12 +942,10 @@ _windowUpdateRenderer(
|
|
|
942
942
|
*accelerated = info.flags & SDL_RENDERER_ACCELERATED;
|
|
943
943
|
*vsync = info.flags & SDL_RENDERER_PRESENTVSYNC;
|
|
944
944
|
|
|
945
|
-
ErrorMessage * error;
|
|
946
|
-
|
|
947
945
|
int pixel_width, pixel_height;
|
|
948
946
|
SDL_GetWindowSizeInPixels(window, &pixel_width, &pixel_height);
|
|
949
947
|
|
|
950
|
-
error = _windowUpdateTexture(window, renderer, pixel_width, pixel_height, nullptr);
|
|
948
|
+
ErrorMessage * error = _windowUpdateTexture(window, renderer, pixel_width, pixel_height, nullptr);
|
|
951
949
|
if (error != nullptr) { return error; }
|
|
952
950
|
|
|
953
951
|
return nullptr;
|
|
@@ -2340,7 +2338,7 @@ controller_open (int index, Variant & object)
|
|
|
2340
2338
|
}
|
|
2341
2339
|
|
|
2342
2340
|
ErrorMessage * error = _controllerGetState(controller, object);
|
|
2343
|
-
if (error) { return error; }
|
|
2341
|
+
if (error != nullptr) { return error; }
|
|
2344
2342
|
|
|
2345
2343
|
return nullptr;
|
|
2346
2344
|
}
|
|
@@ -2363,7 +2361,7 @@ controller_addMappings (char ** mappings, int length)
|
|
|
2363
2361
|
{
|
|
2364
2362
|
for (int i = 0; i < length; i++) {
|
|
2365
2363
|
if (SDL_GameControllerAddMapping(mappings[i]) == -1) {
|
|
2366
|
-
RETURN_ERROR("SDL_GameControllerAddMapping(%s) error: %s\n", mappings[i],
|
|
2364
|
+
RETURN_ERROR("SDL_GameControllerAddMapping(%s) error: %s\n", mappings[i], SDL_GetError());
|
|
2367
2365
|
}
|
|
2368
2366
|
}
|
|
2369
2367
|
return nullptr;
|