Skip to content

MacOS Support for OpenGL3.3, Resizing and keyboard mapping #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Johnnyg63 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

MacOS Support for OpenGL3.3, Resizing and keyboard mapping #400

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0129fce
Update olcPixelGameEngine.h
Johnnyg63 May 20, 2025
896db04
Update olcPixelGameEngine.h
Johnnyg63 May 20, 2025
8cc5e47
Update olcPixelGameEngine.h
Johnnyg63 May 20, 2025
6a180f9
Update olcPixelGameEngine.h
Johnnyg63 May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 93 additions & 24 deletions olcPixelGameEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,12 @@
Updated Geometry2D to support non-segment line intersections
+olcUTIL_Hardware3D.h file v1.01
NOTICE OF DEPRECATION! olc::DecalInstance is to be removed and replaced by olc::GPUTask
2.30:

2.30: Johnnyg63:
+ MacOS support for OpenGL 3.3
+ MacOS support for Window Resize, Full-Screen, minimised
+ MacOS Keyboard support
+ Corrected race condition in ~Decal when the renderer is destroyed before the deconstructor is call (MacOS XCode)
- Removed MacOS ALT key support as it is not supported

!! Apple Platforms will not see these updates immediately - Sorry, I dont have a mac to test... !!
!! Volunteers willing to help appreciated, though PRs are manually integrated with credit !!
Expand Down Expand Up @@ -436,6 +440,9 @@ int main()
#include <algorithm>
#include <array>
#include <cstring>
#if defined (__APPLE__)
#include <cassert> // Johnnyg63: Added missing <cassert> from Develop Branch
#endif
#pragma endregion

#define PGE_VER 230
Expand Down Expand Up @@ -1725,11 +1732,17 @@ namespace X11 {
#define CALLSTYLE
#endif

// Johnnyg63: Adding OpenGL3.3 Support for MacOS
#if defined(__APPLE__)
#define GL_SILENCE_DEPRECATION
#define CALLSTYLE
#define OGL_LOAD(t, n) n;
#define GL_GLEXT_PROTOTYPES
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGl/gl3ext.h>
#include <OpenGL/gl3.h>
#include <OpenGL/glu.h>
#include <OpenGL/gltypes.h>
#endif

#if defined(OLC_PLATFORM_EMSCRIPTEN)
Expand Down Expand Up @@ -1789,10 +1802,24 @@ namespace olc
#if defined(OLC_PLATFORM_EMSCRIPTEN)
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, EGLint interval);
#else
// Johnnyg63: Adding OpenGL3.3 Support for MacOS
#if defined(__APPLE__)
typedef int EGLBoolean;
typedef int32_t EGLint;
typedef void *EGLDisplay;
typedef void *EGLConfig;
typedef void *EGLSurface;
typedef void *EGLContext;

typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, GLint interval);
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
#else
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
#endif

#endif

} // olc namespace
#endif // OpenGL33 Definitions
#pragma endregion
Expand Down Expand Up @@ -2126,7 +2153,9 @@ namespace olc
{
if (id != -1)
{
renderer->DeleteTexture(id);
// Johnnyg63: Added check for null, race condition can occur on MacOS Xcode,
// when the renderer is destroyed before the deconstructor is call (MacOS XCode)
if(renderer != nullptr) renderer->DeleteTexture(id);
id = -1;
}
}
Expand Down Expand Up @@ -5115,11 +5144,20 @@ typedef X11::GLXContext glDeviceContext_t;
typedef X11::GLXContext glRenderContext_t;
#endif

// Johnnyg63: Adding OpenGL3.3 Support for MacOS
#if defined(__APPLE__)
#define GL_SILENCE_DEPRECATION
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#define GL_SILENCE_DEPRECATION
#if defined (OLC_GFX_OPENGL33)
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl3.h>
#include <OpenGL/gl3ext.h>
#include <OpenGL/glu.h>
#else
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
#include <OpenGL/glu.h>
#endif
#endif

namespace olc
Expand All @@ -5145,6 +5183,17 @@ namespace olc
#endif

public:

// Johnnyg63: Added resizing support for MacOS
#if defined (__APPLE__)
// This callback function is called from the window when it is resized (see PrepareDevice -- glutReshapeFunc(reSizeCallBack);)
static void reSizeCallBack(int width, int height)
{
// Update viewport
ptrPGE->olc_UpdateWindowSize(width, height);
}

#endif
void PrepareDevice() override
{
#if defined(OLC_PLATFORM_GLUT)
Expand All @@ -5157,6 +5206,10 @@ namespace olc
glutInitDisplayMode(GLUT_DOUBLE | GLUT_DEPTH | GLUT_RGBA);
// Creates the window and the OpenGL context for it
glutCreateWindow("OneLoneCoder.com - Pixel Game Engine");
// Johnnyg63: Added resizing support for MacOS
#if defined (__APPLE__)
glutReshapeFunc(reSizeCallBack);
#endif
glEnable(GL_TEXTURE_2D); // Turn on texturing
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
#endif
Expand Down Expand Up @@ -5278,7 +5331,7 @@ namespace olc
glDisable(GL_CULL_FACE);
}

void SetDecalMode(const olc::DecalMode& mode)
void SetDecalMode(const olc::DecalMode& mode) override // Johnnyg63: Removed override warning
{
if (mode != nDecalMode)
{
Expand Down Expand Up @@ -5387,7 +5440,7 @@ namespace olc

}

void Set3DProjection(const std::array<float, 16>& mat)
void Set3DProjection(const std::array<float, 16>& mat) override // Johnnyg63: Removed override warning
{
matProjection = mat;
}
Expand Down Expand Up @@ -5739,6 +5792,16 @@ namespace olc
olc::Renderable rendBlankQuad;

public:
// Johnnyg63: Added resizing support for MacOS
#if defined (__APPLE__)
// This callback function is called from the window when it is resized (see PrepareDevice -- glutReshapeFunc(reSizeCallBack);)
static void reSizeCallBack(int width, int height)
{
// Update viewport
ptrPGE->olc_UpdateWindowSize(width, height);
}

#endif
void PrepareDevice() override
{
#if defined(OLC_PLATFORM_GLUT)
Expand All @@ -5748,9 +5811,18 @@ namespace olc
glutInit(&argc, argv);
glutInitWindowPosition(0, 0);
glutInitWindowSize(512, 512);
glutInitDisplayMode(GLUT_DOUBLE | GLUT_DEPTH | GLUT_RGBA);
// Johnnyg63 Adding OpenGL3.3 Support for MacOS
// Note: Order is important, therefore glutCreateWindow must occur before glutReshapeFunc()
#if defined(__APPLE__)
glutInitDisplayMode(GLUT_DOUBLE | GLUT_DEPTH | GLUT_RGBA | GLUT_3_2_CORE_PROFILE);
// Creates the window and the OpenGL context for it
glutCreateWindow("OneLoneCoder.com - Pixel Game Engine");
glutReshapeFunc(reSizeCallBack);
#else
// Creates the window and the OpenGL context for it
glutCreateWindow("OneLoneCoder.com - Pixel Game Engine");
glutInitDisplayMode(GLUT_DOUBLE | GLUT_DEPTH | GLUT_RGBA);
#endif
glEnable(GL_TEXTURE_2D); // Turn on texturing
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
#endif
Expand Down Expand Up @@ -6154,7 +6226,7 @@ namespace olc
glViewport(pos.x, pos.y, size.x, size.y);
}

void Set3DProjection(const std::array<float, 16>& mat)
void Set3DProjection(const std::array<float, 16>& mat) override // Johnnyg63: Removed override warning
{
matProjection = mat;
}
Expand Down Expand Up @@ -7203,7 +7275,7 @@ namespace olc {

// [window setStyleMask: NSWindowStyleMaskClosable | ~NSWindowStyleMaskResizable]
SEL setStyleMaskSel = sel_registerName("setStyleMask:");
((void (*)(id, SEL, NSUInteger))objc_msgSend)(window, setStyleMaskSel, 7);
((void (*)(id, SEL, NSUInteger))objc_msgSend)(window, setStyleMaskSel, 15); // Johnnyg63: Updated to 15 to allow for NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable

hasEnabledCocoa = true;
}
Expand Down Expand Up @@ -7278,20 +7350,20 @@ namespace olc {
// what's going on here and have no readily available testing
// suite either - its for MAC users. However broken as of 2.29

// Johnnyg63 WOZ ERE later - corrected key mapping
// and removed GLUT_ACTIVE_ALT as it is not supported in PGE
glutKeyboardFunc([](unsigned char key, int x, int y) -> void {
switch (glutGetModifiers()) {
case GLUT_ACTIVE_ALT:
case 0: //This is when there are no modifiers
if ('a' <= key && key <= 'z') key -= 32;
break;
case GLUT_ACTIVE_SHIFT:
// ptrPGE->olc_UpdateKeyState(Key::SHIFT, true);
ptrPGE->olc_UpdateKeyState((int32_t)Key::SHIFT, true);
break;
case GLUT_ACTIVE_CTRL:
if ('a' <= key && key <= 'z') key -= 32;
// ptrPGE->olc_UpdateKeyState(Key::CTRL, true);
break;
case GLUT_ACTIVE_ALT:
if ('a' <= key && key <= 'z') key -= 32;
ptrPGE->olc_UpdateKeyState((int32_t)Key::CTRL, true);
break;
}

Expand All @@ -7301,19 +7373,16 @@ namespace olc {

glutKeyboardUpFunc([](unsigned char key, int x, int y) -> void {
switch (glutGetModifiers()) {
case GLUT_ACTIVE_ALT:
case 0: //This is when there are no modifiers
if ('a' <= key && key <= 'z') key -= 32;
break;
case GLUT_ACTIVE_SHIFT:
// ptrPGE->olc_UpdateKeyState(Key::SHIFT, false);
ptrPGE->olc_UpdateKeyState((int32_t)Key::SHIFT, false);
break;
case GLUT_ACTIVE_CTRL:
if ('a' <= key && key <= 'z') key -= 32;
// ptrPGE->olc_UpdateKeyState(Key::CTRL, false);
break;
case GLUT_ACTIVE_ALT:
if ('a' <= key && key <= 'z') key -= 32;
//No ALT in PGE
ptrPGE->olc_UpdateKeyState((int32_t)Key::CTRL, false);
break;
}

Expand Down