OneLoneCoder · OneLoneCoder · Mar 2, 2026 · Feb 2, 2026 · Feb 2, 2026 · Feb 2, 2026
diff --git a/.gitignore b/.gitignore
@@ -81,3 +81,7 @@ examples/xdg-decoration.o
 examples/xdg-shell.c
 examples/xdg-shell.h
 examples/xdg-shell.o
+
+# stb image headerss
+stb_image_write.h
+stb_image.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,10 +26,10 @@ file(GLOB sources
 if(NOT EMSCRIPTEN)
     add_custom_command(
         OUTPUT olcPixelGameEngine3.h
-        COMMAND ${olcGimmeHead_BINARY_DIR}/${CMAKE_CFG_INTDIR}/gimme-head ${CMAKE_CURRENT_SOURCE_DIR}/dev/src/sh_template.h ${CMAKE_BINARY_DIR}/olcPixelGameEngine3.h
+        COMMAND ${olcGimmeHead_BINARY_DIR}/${CMAKE_CFG_INTDIR}/gimme-head${CMAKE_EXECUTABLE_SUFFIX} ${CMAKE_CURRENT_SOURCE_DIR}/dev/src/sh_template.h ${CMAKE_BINARY_DIR}/olcPixelGameEngine3.h
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dev/src
         DEPENDS ${sources}
-        DEPENDS ${olcGimmeHead_BINARY_DIR}/${CMAKE_CFG_INTDIR}/gimme-head
+        DEPENDS ${olcGimmeHead_BINARY_DIR}/${CMAKE_CFG_INTDIR}/gimme-head${CMAKE_EXECUTABLE_SUFFIX}
     )
 else()
     add_custom_command(
@@ -52,3 +52,7 @@ add_dependencies(olcPixelGameEngine3 CopyHeader)
 if(BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
+
+if(BUILD_TEST)
+    add_subdirectory(dev/tests)
+endif()
diff --git a/README.md b/README.md
@@ -1,58 +1,59 @@
-# Linux build
+# Building
 
-## Cmake
+## CMake
 
-### Building X11 (Default)
+Configure with:
 ```bash
-cmake -B build -DBUILD_EXAMPLES=ON
-cmake --build build
+cmake -S . -B build
 ```
 
-Header file should now be located at `build/olcPixelGameEngine3.h`.
-
-Examples will be located at `build/examples`
-
-### Building for Wayland
+**Note**: If using emscripten prepend the configuration command with ``emcmake``
 
+Build with:
 ```bash
-cmake -B build -DBUILD_EXAMPLES=ON -DBUILD_WAYLAND=ON
 cmake --build build
 ```
-
 Header file should now be located at `build/olcPixelGameEngine3.h`.
 
-Examples will be located at `build/examples`
+### Available CMake Configuration Flags
 
+* ``-DBUILD_EXAMPLES=ON`` - builds examples, will be located at `build/examples`
+* ``-DBUILD_WAYLAND=ON``  - if examples are built, build them using wayland. Linux ONLY!
+* ``-DUSE_STB=ON``        - build using stb_image for the image loader (See section on STB Image)
 
-## Manually build a single example with GCC
+## Manually on Linux
 
 ```bash
 cd examples
+```
+
+### Using GCC
+
+```bash
 g++ -ggdb olcPGE3_ImageQuads.cpp -o olcPGE3_ImageQuads -std=c++20 -lpng -lGL -lX11 -lpthread
 ```
 
-## Manually build a single example with Clang
+### Using Clang
 
 ```bash
-cd examples
 clang++ -ggdb olcPGE3_ImageQuads.cpp -o olcPGE3_ImageQuads -std=c++20 -lpng -lGL -lX11 -lpthread
 ```
 
-# Emscripten build
+### Using Emscripten
 
-## Cmake
 ```bash
-emcmake cmake -B build -DBUILD_EXAMPLES=ON
-cmake --build build
+emcc olcPGE3_ImageQuads.cpp -o olcPGE3_ImageQuads.html -sASYNCIFY -sALLOW_MEMORY_GROWTH=1 -sSTACK_SIZE=1048576 -sEXPORTED_RUNTIME_METHODS=HEAPF32 -sMAX_WEBGL_VERSION=2 -sMIN_WEBGL_VERSION=2 -sUSE_LIBPNG=1 -sLLD_REPORT_UNDEFINED --preload-file assets@assets
 ```
-Header file should now be located at `build/olcPixelGameEngine3.h`.
 
-Examples will be located at `build/examples`
+# Using STB Image
 
+## Get the headers
+Aquire [stb_image.h](https://github.com/nothings/stb/blob/master/stb_image.h) and [stb_image_write.h](https://github.com/nothings/stb/blob/master/stb_image_write.h). Place them in the root directory of the repo.
 
-## Manually build a single example
+### CMake
+Use the same configuration command you've chosen from above, and simply add ``-DUSE_STB=ON`` to the end of it. 
+
+### GCC or Clang or EM++
+
+Use the build commands you've chosen from above, and simply add ``-DOLC_USE_STB_IMAGE=1`` to the end of it.
 
-```bash
-cd examples
-emcc olcPGE3_ImageQuads.cpp -o olcPGE3_ImageQuads.html -sASYNCIFY -sALLOW_MEMORY_GROWTH=1 -sSTACK_SIZE=1048576 -sEXPORTED_RUNTIME_METHODS=HEAPF32 -sMAX_WEBGL_VERSION=2 -sMIN_WEBGL_VERSION=2 -sUSE_LIBPNG=1 -sLLD_REPORT_UNDEFINED --preload-file assets@assets
-```
diff --git a/dev/msvc/olcPGE3.sln b/dev/msvc/olcPGE3.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.3.11408.92 d18.3
+VisualStudioVersion = 18.3.11408.92
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "olcPGE3", "olcPGE3.vcxproj", "{E7ACE477-3385-4FDE-95AD-26E40DF508CC}"
 EndProject

diff --git a/dev/msvc/olcPGE3.vcxproj b/dev/msvc/olcPGE3.vcxproj
@@ -195,13 +195,17 @@
     <ClInclude Include="..\src\api_opengl.h" />
     <ClInclude Include="..\src\config.h" />
     <ClInclude Include="..\src\core.h" />
-    <ClInclude Include="..\src\draw2d.h" />
+    <ClInclude Include="..\src\draw.h" />
+    <ClInclude Include="..\src\extension.h" />
     <ClInclude Include="..\src\font.h" />
     <ClInclude Include="..\src\gputask.h" />
     <ClInclude Include="..\src\gpu_iface.h" />
     <ClInclude Include="..\src\gpu_opengl33.h" />
     <ClInclude Include="..\src\host_android.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\src\host_apple_macos.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -236,6 +240,9 @@
     <ClInclude Include="..\src\image.h" />
     <ClInclude Include="..\src\imload_android.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\src\imload_iface.h" />
     <ClInclude Include="..\src\imload_lib_png.h">
@@ -252,12 +259,14 @@
     </ClInclude>
     <ClInclude Include="..\src\imload_wingdi.h" />
     <ClInclude Include="..\src\matrix3d.h" />
+    <ClInclude Include="..\src\matrix4d.h" />
     <ClInclude Include="..\src\olcpge3.h" />
     <ClInclude Include="..\src\pixel.h" />
     <ClInclude Include="..\src\polyform.h" />
     <ClInclude Include="..\src\sh_template.h" />
     <ClInclude Include="..\src\transform2d.h" />
     <ClInclude Include="..\src\vector2d.h" />
+    <ClInclude Include="..\src\vector4d.h" />
     <ClInclude Include="..\src\window.h" />
   </ItemGroup>
   <ItemGroup>
@@ -269,13 +278,16 @@
     </ClCompile>
     <ClCompile Include="..\src\api_opengl.cpp" />
     <ClCompile Include="..\src\core.cpp" />
-    <ClCompile Include="..\src\draw2d.cpp" />
-    <ClCompile Include="..\src\draw2d_sw.cpp" />
+    <ClCompile Include="..\src\draw.cpp" />
+    <ClCompile Include="..\src\draw_batch.cpp" />
     <ClCompile Include="..\src\font.cpp" />
     <ClCompile Include="..\src\gpu_iface.cpp" />
     <ClCompile Include="..\src\gpu_opengl33.cpp" />
     <ClCompile Include="..\src\host_android.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\host_apple_macos.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -307,6 +319,9 @@
     <ClCompile Include="..\src\image.cpp" />
     <ClCompile Include="..\src\imload_android.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\imload_lib_png.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -320,36 +335,20 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\src\imload_wingdi.cpp" />
-    <ClCompile Include="..\src\window.cpp" />
-    <ClCompile Include="..\tests\test_main.cpp">
+    <ClCompile Include="..\src\imload_stb_image.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>
     </ClCompile>
-    <ClCompile Include="..\tests\test_matrices.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="..\src\imload_wingdi.cpp" />
+    <ClCompile Include="..\src\window.cpp" />
     <ClCompile Include="..\tests\test_mh.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>
     </ClCompile>
-    <ClCompile Include="..\tests\test_pixels.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\tests\test_vector2d.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">