Merge pull request #375 from OneLoneCoder/develop

OneLoneCoder · web-flow · commit 705bc92080d3 · 2024-07-24T21:05:57.000+01:00
v2.26
diff --git a/extensions/olcPGEX_Graphics2D.h b/extensions/olcPGEX_Graphics2D.h
@@ -56,7 +56,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019
+	David Barr, aka javidx9, ©OneLoneCoder 2019
 */
 
 /*
@@ -73,6 +73,9 @@
 #define OLC_PGEX_GFX2D
 
 #include <algorithm>
+
+#include "olcPixelGameEngine.h"
+
 #undef min
 #undef max
 
diff --git a/extensions/olcPGEX_Graphics3D.h b/extensions/olcPGEX_Graphics3D.h
@@ -61,7 +61,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2018
+	David Barr, aka javidx9, ©OneLoneCoder 2018
 */
 
 
@@ -74,6 +74,9 @@
 #include <sstream>
 #include <string>
 #include <cstdint>
+
+#include "olcPixelGameEngine.h"
+
 #undef min
 #undef max
 
@@ -203,7 +206,7 @@ namespace olc
 			void SetTransform(olc::GFX3D::mat4x4 &transform);
 			void SetTexture(olc::Sprite *texture);
 			//void SetMipMapTexture(olc::GFX3D::MipMap *texture);
-			void SetLightSource(uint32_t nSlot, uint32_t nType, olc::Pixel col, olc::GFX3D::vec3d pos, olc::GFX3D::vec3d dir = { 0.0f, 0.0f, 1.0f }, float fParam = 0.0f);
+			void SetLightSource(uint32_t nSlot, uint32_t nType, olc::Pixel col, olc::GFX3D::vec3d pos, olc::GFX3D::vec3d dir = { 0.0f, 0.0f, 1.0f, 1.0f }, float fParam = 0.0f);
 			uint32_t Render(std::vector<olc::GFX3D::triangle> &triangles, uint32_t flags = RENDER_CULL_CW | RENDER_TEXTURED | RENDER_DEPTH);
 			uint32_t Render(std::vector<olc::GFX3D::triangle> &triangles, uint32_t flags, int nOffset, int nCount);
 			uint32_t RenderLine(olc::GFX3D::vec3d &p1, olc::GFX3D::vec3d &p2, olc::Pixel col = olc::WHITE);
diff --git a/extensions/olcPGEX_Network.h b/extensions/olcPGEX_Network.h
@@ -51,7 +51,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019, 2020, 2021
+	David Barr, aka javidx9, ©OneLoneCoder 2019, 2020, 2021
 
 */
 
diff --git a/extensions/olcPGEX_PopUpMenu.h b/extensions/olcPGEX_PopUpMenu.h
@@ -159,6 +159,8 @@
 
 #include <cstdint>
 
+#include "olcPixelGameEngine.h"
+
 namespace olc
 {
 	namespace popup
diff --git a/extensions/olcPGEX_QuickGUI.h b/extensions/olcPGEX_QuickGUI.h
@@ -56,7 +56,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019, 2020, 2021, 2022, 2023, 2024
+	David Barr, aka javidx9, ©OneLoneCoder 2019, 2020, 2021, 2022, 2023, 2024
 
 	Changes
 	~~~~~~~
diff --git a/extensions/olcPGEX_RayCastWorld.h b/extensions/olcPGEX_RayCastWorld.h
@@ -64,7 +64,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019, 2020
+	David Barr, aka javidx9, ©OneLoneCoder 2019, 2020
 
 	Revisions:
 	1.00:	Initial Release
@@ -78,6 +78,8 @@
 #include <unordered_map>
 #include <algorithm>
 
+#include "olcPixelGameEngine.h"
+
 namespace olc
 {
 	namespace rcw
diff --git a/extensions/olcPGEX_Sound.h b/extensions/olcPGEX_Sound.h
@@ -64,7 +64,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019
+	David Barr, aka javidx9, ©OneLoneCoder 2019
 */
 
 
@@ -76,6 +76,9 @@
 #include <climits>
 #include <condition_variable>
 #include <algorithm>
+
+#include "olcPixelGameEngine.h"
+
 #undef min
 #undef max
 
diff --git a/extensions/olcPGEX_SplashScreen.h b/extensions/olcPGEX_SplashScreen.h
@@ -58,7 +58,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019, 2020, 2021, 2022, 2023, 2024
+	David Barr, aka javidx9, ©OneLoneCoder 2019, 2020, 2021, 2022, 2023, 2024
 
 	Revisions:
 	1.00:	Initial Release
diff --git a/extensions/olcPGEX_TransformedView.h b/extensions/olcPGEX_TransformedView.h
@@ -59,7 +59,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019, 2020, 2021, 2022, 2023, 2024
+	David Barr, aka javidx9, ©OneLoneCoder 2019, 2020, 2021, 2022, 2023, 2024
 
 	Revisions:
 	1.00:	Initial Release
diff --git a/extensions/olcPGEX_Wireframe.h b/extensions/olcPGEX_Wireframe.h
@@ -57,7 +57,7 @@
 
 	Author
 	~~~~~~
-	David Barr, aka javidx9, �OneLoneCoder 2019, 2020, 2021, 2022
+	David Barr, aka javidx9, ©OneLoneCoder 2019, 2020, 2021, 2022
 
 	Revisions:
 	1.00:	Initial Release
diff --git a/olcPixelGameEngine.h b/olcPixelGameEngine.h

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,8 @@`
`159`	`159`
`160`	`160`	`#include <cstdint>`
`161`	`161`
	`162`	`+#include "olcPixelGameEngine.h"`
	`163`	`+`
`162`	`164`	`namespace olc`
`163`	`165`	`{`
`164`	`166`	`namespace popup`