Merge pull request #382 from OneLoneCoder/develop

Develop
OneLoneCoder · Sep 2, 2024 · 7f266f3 · 7f266f3
2 parents 705bc92 + 27ef0f8
commit 7f266f3
Show file tree

Hide file tree

Showing 5 changed files with 422 additions and 116 deletions.
diff --git a/extensions/olcPGEX_SplashScreen.h b/extensions/olcPGEX_SplashScreen.h
@@ -211,7 +211,7 @@ namespace olc
 			}
 
 		olc::vi2d vSize = pge->GetTextSizeProp("Copyright OneLoneCoder.com 2024");
-		pge->DrawStringPropDecal(olc::vf2d(float(pge->ScreenWidth()/2) - vSize.x/2, float(pge->ScreenHeight()) - vSize.y * 3.0f), "Copyright OneLoneCoder.com 2023", olc::PixelF(1.0f, 1.0f, 1.0f, 0.5f), olc::vf2d(1.0, 2.0f));
+		pge->DrawStringPropDecal(olc::vf2d(float(pge->ScreenWidth()/2) - vSize.x/2, float(pge->ScreenHeight()) - vSize.y * 3.0f), "Copyright OneLoneCoder.com 2024", olc::PixelF(1.0f, 1.0f, 1.0f, 0.5f), olc::vf2d(1.0, 2.0f));
 		return true;
 	}
 

diff --git a/olcPixelGameEngine.h b/olcPixelGameEngine.h
@@ -3,7 +3,7 @@
 	olcPixelGameEngine.h
 
 	+-------------------------------------------------------------+
-	|           OneLoneCoder Pixel Game Engine v2.26              |
+	|           OneLoneCoder Pixel Game Engine v2.27              |
 	|  "What do you need? Pixels... Lots of Pixels..." - javidx9  |
 	+-------------------------------------------------------------+
 
@@ -331,6 +331,13 @@
 		  +adv_FlushLayerDecals() - [ADVANCED] Force layer's decal render to buffer
 		  +FillTriangleDecal() - Draws a triangle decal
 		  +GradientTriangleDecal() - Draws a triangle decal with unique vertex colours
+	2.27: Restructuring of connected files (post-jam clean up)
+		  +Guarding olc::v_2d with less faff
+		  +Updated olcUTIL_Geometry2D.h
+		  +Updated olcUTIL_QuadTree.h
+		  +Updated olcUTIL_Animate2D.h
+		  +Updated olcUTIL_SplashScreen.h
+		  +File Resolution for PGEtinker.com
 		  
     !! 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     !!
@@ -410,7 +417,7 @@ int main()
 #include <cstring>
 #pragma endregion
 
-#define PGE_VER 226
+#define PGE_VER 227
 
 // O------------------------------------------------------------------------------O
 // | COMPILER CONFIGURATION ODDITIES                                              |
@@ -686,7 +693,7 @@ namespace olc
 	// O------------------------------------------------------------------------------O
 	// | olc::vX2d - A generic 2D vector type                                         |
 	// O------------------------------------------------------------------------------O
-#if !defined(OLC_IGNORE_VEC2D)
+#if !defined(OLC_VECTOR2D_DEFINED)
 	template <class T>
 	struct v2d_generic
 	{
@@ -758,6 +765,8 @@ namespace olc
 	typedef v2d_generic<uint32_t> vu2d;
 	typedef v2d_generic<float> vf2d;
 	typedef v2d_generic<double> vd2d;
+
+#define OLC_VECTOR2D_DEFINED 1
 #endif
 
 

diff --git a/utilities/olcUTIL_Animate2D.h b/utilities/olcUTIL_Animate2D.h
@@ -58,8 +58,8 @@
 
 #pragma once
 
-#include "olcPixelGameEngine.h"
 #include "utilities/olcUTIL_Geometry2D.h"
+#include "olcPixelGameEngine.h"
 #include <unordered_map>
 
 namespace olc::utils::Animate2D