Develop

dev/msvc/olcPGE3_BuildSH/olcPGE3_BuildSH.vcxproj

@@ -46,8 +46,8 @@
     <ClCompile Include="..\..\..\examples\olcPGE3_CirclesEllipses.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\examples\olcPGE3_Extensions.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -58,8 +58,8 @@
     <ClCompile Include="..\..\..\examples\olcPGE3_Fish.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\examples\olcPGE3_ImageRegion.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

dev/src/api_macos.h

@@ -24,6 +24,7 @@
 #include <OpenGL/gl.h>
 #include <OpenGL/OpenGL.h>
 #include <CoreGraphics/CoreGraphics.h>
+#include <ImageIO/ImageIO.h>
 
 extern "C" {
     // NSRect (OSX rectangle structure same as GCRect C structure)
@@ -56,7 +57,7 @@ extern "C" {
 
     // Window API - as implemented in api_macos.c
     struct Window* window_init           (double x, double y, double width, double height);
-    void window_create                   (struct Window* self);
+    void window_create                   (struct Window* self, unsigned long styleMask);
     void window_show                     (struct Window* self);
     void window_destroy                  (struct Window* self);
     void window_setTitle                 (struct Window* self, const char* title);
@@ -72,6 +73,8 @@ extern "C" {
     void window_setContentViewFrame      (struct Window* self, double* x, double* y, double* width, double* height);
     void window_setCursorVisibility      (struct Window* self, BOOL visible);
     void window_setCursorPosition        (struct Window* self, double x, double y);
+    void window_toggleFullScreen         (struct Window* self);
+    bool window_isFullScreen             (struct Window* self);
 
     // OpenGL Renderer API - as implemented in api_macos.c
     struct OpenGLRenderer* opengl_init    (void);
@@ -85,9 +88,15 @@ extern "C" {
     void opengl_destroy                   (struct OpenGLRenderer* self);
     bool opengl_resetContextForSize       (struct OpenGLRenderer* self, double width, double height);
 
+    // Pixel Struct used by Image Loader API
+    typedef struct {
+        uint8_t r; uint8_t g; uint8_t b; uint8_t a;
+    } imageloader_pixel_t;
+
     // Image Loader API - as implemented in api_macos.c
     struct ImageLoader* imageloader_init        (void);
     BOOL imageloader_loadFromFile               (struct ImageLoader* self, const char* filePath);
+    BOOL imageloader_loadFromMemory             (struct ImageLoader* self, const uint8_t* data, size_t bytes);
     void imageloader_destroy                    (struct ImageLoader* self);
     unsigned char* imageloader_getPixelData     (const struct ImageLoader* self);
     void imageloader_getImageInfo               (const struct ImageLoader* self, int* width, int* height, int* bytesPerPixel);

dev/src/api_macos_wrapper.hpp

@@ -81,6 +81,7 @@ namespace olc {
                 ~Application() {
                     if (app_) {
                         application_destroy(app_);  // application_destroy now handles delete internally
+                        app_ = nullptr;
                     }
                 }
 
@@ -96,10 +97,9 @@ namespace olc {
                     if (app_) application_run(app_);
                 }
 
-                void terminate() noexcept {
+                void stop() noexcept {
                     if (app_) {
                         application_stop(app_);
-                        app_ = nullptr;
                     }
                 }
 
@@ -220,10 +220,10 @@ namespace olc {
                 struct ::Window* getCHandle() const noexcept { return window_; }
 
                 // Create and show the window
-                void show() {
+                void show(unsigned long styleMask) {
                     if (window_) {
                         setTitle(title_);
-                        window_create(window_);
+                        window_create(window_, styleMask);
                         window_show(window_);
                     }
                 }
@@ -481,6 +481,19 @@ namespace olc {
                     }
                 }
 
+                void toggleFullScreen() noexcept {
+                    if (window_) {
+                        window_toggleFullScreen(window_);
+                    }
+                }
+
+                bool isFullScreen() noexcept {
+                    if (window_) {
+                        return window_isFullScreen(window_);
+                    }
+                    return false;
+                }
+
 
                 // Non-copyable but movable
                 Window(const Window&) = delete;
@@ -639,6 +652,15 @@ namespace olc {
                     }
                     return false;
                 }
+
+                bool loadFromMemory(const uint8_t* data, size_t bytes) {
+                    if (loader_) {
+                        BOOL result = imageloader_loadFromMemory(loader_, data, bytes);
+                        loaded_ = (result != 0);
+                        return loaded_;
+                    }
+                    return false;
+                }
 
                 bool isLoaded() const noexcept {
                     return loaded_ && loader_ && imageloader_isLoaded(loader_);
@@ -876,9 +898,7 @@ namespace olc {
             public:
                 explicit EventHandler(Window& window) noexcept : window_(window) {}
 
-                ~EventHandler() noexcept {
-                    disable();
-                }
+                ~EventHandler() noexcept {}
 
                 // Event handler setters - now using template helper
                 void onKeyDown(std::function<void(const KeyEvent&)> handler) {

dev/src/core.cpp

@@ -64,6 +64,10 @@ namespace olc
 	{
 	}
 
+	PGEWindow::PGEWindow(const WindowConfig& config) : Window(config), draw()
+	{
+	}
+
 	bool PGEWindow::Create(const olc::vi2d& vScreenSize, const olc::vi2d& vPixelSize)
 	{
 		//pRenderer->RetargetDevice(pHost->GetHostWindowDescriptor(this));
@@ -256,7 +260,24 @@ namespace olc
 
 	bool PGEWindow::CreateImageFromMemory(olc::Image& image, const uint8_t* data, const size_t bytes, const ImageConfig& cfg)
 	{
-		olc_IgnoreUnused(image, data, bytes, cfg);
+		if (pImageLoader->CreateImageFromMemory(image, data, bytes))
+		{
+			// Image has loaded ok, and populated into pixel vector
+			// 
+			// Create GPU Image
+			auto id = pRenderer->CreateTexture(image.Size(), cfg);
+			if (id == 0)
+			{
+				image.Create({ 0,0 });
+				return false;
+			}
+
+			// Associate CPU object with GPU Resource
+			image.SetGPUID(id);
+			return true;
+		}
+
+		std::cout << "Create From Memory Failed\n";
 		return false;
 	}
 
@@ -361,6 +382,8 @@ namespace olc
 	bool PixelGameEngine::Construct(const PGEConfig& cfg)
 	{		
 		config = cfg;
+		// Also assign the window level config since that is what the Host will see
+		Window::config = cfg;
 
 		// Check for constructor sAppName, if not set use Config sAppName
 		if (sAppName.empty())
@@ -578,7 +601,7 @@ namespace olc
 			{
 				if (!pgex->OnBeforeSystemUpdate(this, fDT))
 				{
-					std::cout << "PGE OnContextTick(): User aborted in extension OnAfterUserCreate()\n";
+					std::cout << "PGE OnContextTick(): User aborted in extension OnBeforeSystemUpdate()\n";
 					return false;
 				}
 			}

dev/src/core.h

@@ -31,25 +31,37 @@
 namespace olc
 {
 	// A grouping of all settable PGE properties
-	struct PGEConfig
+	struct PGEConfig : public WindowConfig
 	{
 		// Size of "screen" in PGE pixels
 		olc::vi2d vScreenSize = { 256, 240 };
 		// Size of a PGE pixel
 		olc::vi2d vPixelSize = { 4, 4 };
 		// Top left location of shown main window
 		olc::vi2d vWindowOffset = { 30,30 };
+
+		// These three are inherited from WindowConfig
 		// Start in full-screen mode
 		bool bFullScreen = false;
 		// Allow full screen as an option with ALT-ENTER
 		bool bFullScreenable = true;
 		// Allow the window to be resized by user
 		bool bResizeable = true;
+		// Allow the window border to be hidden by user
+		bool bShowWindowBorder = true;
+		// Allow the window title bar to be hidden by user
+		bool bShowWindowTilebar = true;
+		// Allow the windows minimise button to be hidden by user
+		bool bShowWindowMinimiseButton = true;
+		// Allow the windows maximised button to be hidden by user
+		bool bShowWindowMaximiseButton = true;
+		// Allow the windows close button to be hidden by user
+		bool bShowWindowCloseButton = true;
 		// Synchronise rendering with monitor
 		bool bVSync = OLC_DEFAULT_VSYNC;
 		// Behave like a host window, resizing the screen in response to window resize
 		bool bRealWindow = false;
-		// Ensure aspect ratio of "screen" is mainatined regardless of window size
+		// Ensure aspect ratio of "screen" is maintained regardless of window size
 		bool bRetainAspectRatio = true;
 		// Force "screen" pixels to be integer in size
 		bool bForceIntegerPixelSize = false;
@@ -68,6 +80,7 @@ namespace olc
 	{
 	public:
 		PGEWindow();
+		PGEWindow(const WindowConfig& config);
 		bool Create(const olc::vi2d& vScreenSize, const olc::vi2d& vPixelSize);
 
 	public:

dev/src/draw.cpp

@@ -715,6 +715,8 @@ const GPUTask& olc::Draw::FilledTriangle(const olc::vf2d& p1, const olc::vf2d& p
 	return FilledTriangle(p1, p2, p3, col, col, col, tint);
 }
 
+
+
 const GPUTask& olc::Draw::FilledTriangle(const olc::vf2d& p1, const olc::vf2d& p2, const olc::vf2d& p3, const olc::Pixel c1, const olc::Pixel c2, const olc::Pixel c3, const olc::Pixel tint)
 {
 	PrepareTargetForHW();
@@ -946,16 +948,7 @@ GPUTask& olc::Draw::Mesh(const olc::Structure structure, const std::vector<olc::
 		)));
 }
 
-ImageBatch olc::Draw::CreateImageBatch(olc::Image &image)
-{
-	PrepareImageForHW(image);
-	PrepareTargetForHW();
 
-	ImageBatch b;
-	b.task.structure = olc::Structure::List;
-	b.task.pImage = &image;
-	return b;
-}
 
 
 const GPUTask& olc::Draw::Image(olc::ImageRegion image, const olc::vf2d& pos, const olc::vf2d& scale, const olc::Pixel tint)

dev/src/draw.h

@@ -123,14 +123,14 @@
 
 	[#] FilledPolygon(structure, points[], col, [tint])		
 	[#] FilledPolygon(structure, points[], colours[], [tint])	
-	[ ] FilledPolygon(batch, structure, points[], col)	
+	[#] FilledPolygon(batch, structure, points[], col)	
 	[#] FilledPolygon(batch, structure, points[], colours[])	
 
 	[#] TexturedTriangle(p1, p2, p3, c1, c2, c3, uv1, uv2, uv3, image, [tint])
-	[ ] TexturedTriangle(batch, p1, p2, p3, c1, c2, c3, uv1, uv2, uv3, image, [tint])
+	[#] TexturedTriangle(batch, p1, p2, p3, c1, c2, c3, uv1, uv2, uv3, image, [tint])
 
 	[#] TexturedPolygon(structure, points[], colours[], uvs[], image, [tint])	
-	[ ] TexturedPolygon(batch, structure, points[], colours[], uvs[], image, [tint])
+	[#] TexturedPolygon(batch, structure, points[], colours[], uvs[], image, [tint])
 
 	[#] String(pos, text, col, [scale], [font])
 	[#] StringProp(pos, text, col, [scale], [font])
@@ -152,6 +152,7 @@
 	[#] Batch(LineBtach, [tint])
 	[#] Batch(FilledBatch, [tint])
 	[#] Batch(ImageBatch, [tint])
+	[#] Batch(TexturedBatch, [tint])
 
 
 	3D Rendering Functions
@@ -186,6 +187,7 @@ namespace olc
 	struct ImageBatch { GPUTask task; };
 	struct FilledBatch { GPUTask task; };
 	struct LineBatch { GPUTask task; };
+	struct TextureBatch { GPUTask task; };
 
 	class Draw
 	{
@@ -589,6 +591,20 @@ namespace olc
 			const olc::Pixel col = olc::Colour::WHITE,
 			const olc::Pixel tint = olc::Colour::WHITE);
 
+		// Draws a textured triangle, with per vertex colouring into a batch
+		const TextureBatch& TexturedTriangle(
+			olc::TextureBatch& batch,
+			const olc::vf2d& p1,
+			const olc::vf2d& p2,
+			const olc::vf2d& p3,
+			const olc::Pixel c1,
+			const olc::Pixel c2,
+			const olc::Pixel c3,
+			const olc::vf2d& t1,
+			const olc::vf2d& t2,
+			const olc::vf2d& t3,
+			const olc::Pixel tint = olc::Colour::WHITE);
+
 		// Draws a textured triangle, with per vertex colouring
 		const GPUTask& TexturedTriangle(
 			const olc::vf2d& p1,
@@ -650,6 +666,14 @@ namespace olc
 			const std::vector<olc::Pixel>& vecColours,
 			const olc::Pixel tint = olc::Colour::WHITE);
 
+		// Draws a filled polygon with multiple colours into a btach
+		const FilledBatch& FilledPolygon(
+			FilledBatch& batch,
+			const olc::Structure structure,
+			const std::vector<olc::vf2d>& vecPoints,
+			const olc::Pixel col = olc::Colour::WHITE,
+			const olc::Pixel tint = olc::Colour::WHITE);
+
 		// Draws a filled polygon with multiple colours into a btach
 		const FilledBatch& FilledPolygon(
 			FilledBatch& batch,
@@ -673,6 +697,15 @@ namespace olc
 			const olc::Pixel tint = olc::Colour::WHITE);
 
 
+		// Draws a textured polygon with per vertex colouring into a batch
+		const TextureBatch& TexturedPolygon(
+			olc::TextureBatch& batch,
+			const olc::Structure structure,
+			const std::vector<olc::vf2d>& vecPoints,
+			const std::vector<olc::Pixel>& vecColours,
+			const std::vector<olc::vf2d>& vecTexCoords,			
+			const olc::Pixel tint = olc::Colour::WHITE);
+
 
 		// Draws a textured polygon with per vertex colouring
 		const GPUTask& TexturedPolygon(
@@ -861,6 +894,14 @@ namespace olc
 		// Draws a line shape batch to the current target
 		const GPUTask& Batch(olc::LineBatch& batch, const olc::Pixel tint = olc::Colour::WHITE);
 
+		// Create a Textured batch for efficient repeated drawing of
+		// the same source texture on a polygon with per vertex colouring
+		TextureBatch CreateTextureBatch(olc::Image& image);
+
+		// Draws an image batch to the current target
+		const GPUTask& Batch(olc::TextureBatch& batch, const olc::Pixel tint = olc::Colour::WHITE);
+
+
 
 	public: // GPU Task Creator Functions (not normally called by user)
 		GPUTask TaskDrawLine(