Skip to content
Merged

v2.26 #375

Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion extensions/olcPGEX_Graphics2D.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

Author
~~~~~~
David Barr, aka javidx9, OneLoneCoder 2019
David Barr, aka javidx9, ©OneLoneCoder 2019
*/

/*
Expand All @@ -73,6 +73,9 @@
#define OLC_PGEX_GFX2D

#include <algorithm>

#include "olcPixelGameEngine.h"

#undef min
#undef max

Expand Down
7 changes: 5 additions & 2 deletions extensions/olcPGEX_Graphics3D.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

Author
~~~~~~
David Barr, aka javidx9, OneLoneCoder 2018
David Barr, aka javidx9, ©OneLoneCoder 2018
*/


Expand All @@ -74,6 +74,9 @@
#include <sstream>
#include <string>
#include <cstdint>

#include "olcPixelGameEngine.h"

#undef min
#undef max

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion extensions/olcPGEX_Network.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

Author
~~~~~~
David Barr, aka javidx9, OneLoneCoder 2019, 2020, 2021
David Barr, aka javidx9, ©OneLoneCoder 2019, 2020, 2021

*/

Expand Down
2 changes: 2 additions & 0 deletions extensions/olcPGEX_PopUpMenu.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@

#include <cstdint>

#include "olcPixelGameEngine.h"

namespace olc
{
namespace popup
Expand Down
2 changes: 1 addition & 1 deletion extensions/olcPGEX_QuickGUI.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~
Expand Down
4 changes: 3 additions & 1 deletion extensions/olcPGEX_RayCastWorld.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

Author
~~~~~~
David Barr, aka javidx9, OneLoneCoder 2019, 2020
David Barr, aka javidx9, ©OneLoneCoder 2019, 2020

Revisions:
1.00: Initial Release
Expand All @@ -78,6 +78,8 @@
#include <unordered_map>
#include <algorithm>

#include "olcPixelGameEngine.h"

namespace olc
{
namespace rcw
Expand Down
5 changes: 4 additions & 1 deletion extensions/olcPGEX_Sound.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

Author
~~~~~~
David Barr, aka javidx9, OneLoneCoder 2019
David Barr, aka javidx9, ©OneLoneCoder 2019
*/


Expand All @@ -76,6 +76,9 @@
#include <climits>
#include <condition_variable>
#include <algorithm>

#include "olcPixelGameEngine.h"

#undef min
#undef max

Expand Down
2 changes: 1 addition & 1 deletion extensions/olcPGEX_SplashScreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extensions/olcPGEX_TransformedView.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extensions/olcPGEX_Wireframe.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading