sigonasr2/olcPixelGameEngine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PGE v2.14

Browse Source 
Fixed Bug in DrawPartialDecal(), introduced a couple of versions ago. Apologies :ashamed:
This commit is contained in:
Javidx9 2021-02-11 19:36:49 +00:00 committed by GitHub
parent 3374a6924c
commit de7690c926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
olcPixelGameEngine.h
View File

@ -2,7 +2,7 @@
olcPixelGameEngine.h olcPixelGameEngine.h
+-------------------------------------------------------------+ +-------------------------------------------------------------+
| OneLoneCoder Pixel Game Engine v2.13 | | OneLoneCoder Pixel Game Engine v2.14 |
| "What do you need? Pixels... Lots of Pixels..." - javidx9 | | "What do you need? Pixels... Lots of Pixels..." - javidx9 |
+-------------------------------------------------------------+ +-------------------------------------------------------------+
@ -210,6 +210,9 @@
2.11: Made PGEX hooks optional - (provide true to super constructor) 2.11: Made PGEX hooks optional - (provide true to super constructor)
2.12: Fix for MinGW compiler non-compliance :( - why is its sdk structure different?? why??? 2.12: Fix for MinGW compiler non-compliance :( - why is its sdk structure different?? why???
2.13: +GetFontSprite() - allows access to font data 2.13: +GetFontSprite() - allows access to font data
2.14: Fix WIN32 Definition reshuffle
Fix DrawPartialDecal() - messed up dimension during renderer experiment, didnt remove junk code, thanks Alexio
Fix? Strange error regarding GDI+ Image Loader not knowing about COM, SDK change?
!! Apple Platforms will not see these updates immediately - Sorry, I dont have a mac to test... !! !! 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 !! !! Volunteers willing to help appreciated, though PRs are manually integrated with credit !!
@ -287,7 +290,7 @@ int main()
#include <array> #include <array>
#include <cstring> #include <cstring>
#define PGE_VER 213 #define PGE_VER 214
// O------------------------------------------------------------------------------O // O------------------------------------------------------------------------------O
// | COMPILER CONFIGURATION ODDITIES | // | COMPILER CONFIGURATION ODDITIES |
@ -2422,8 +2425,8 @@ namespace olc
olc::vf2d vScreenSpaceDim = olc::vf2d vScreenSpaceDim =
{ {
vScreenSpacePos.x + (2.0f * std::ceil(source_size.x) * vInvScreenSize.x) * scale.x, vScreenSpacePos.x + (2.0f * source_size.x * vInvScreenSize.x) * scale.x,
vScreenSpacePos.y - (2.0f * std::ceil(source_size.y) * vInvScreenSize.y) * scale.y vScreenSpacePos.y - (2.0f * source_size.y * vInvScreenSize.y) * scale.y
}; };
DecalInstance di; DecalInstance di;
@ -2449,8 +2452,8 @@ namespace olc
olc::vf2d vScreenSpaceDim = olc::vf2d vScreenSpaceDim =
{ {
vScreenSpacePos.x + (2.0f * std::ceil(size.x + 0.5f) * vInvScreenSize.x), vScreenSpacePos.x + (2.0f * size.x * vInvScreenSize.x),
vScreenSpacePos.y - (2.0f * std::ceil(size.y + 0.5f) * vInvScreenSize.y) vScreenSpacePos.y - (2.0f * size.y * vInvScreenSize.y)
}; };
DecalInstance di; DecalInstance di;
@ -2548,26 +2551,6 @@ namespace olc
DrawExplicitDecal(nullptr, points.data(), uvs.data(), cols.data(), 4); DrawExplicitDecal(nullptr, points.data(), uvs.data(), cols.data(), 4);
} }
//void PixelGameEngine::DrawPolygonDecal(olc::Decal* decal, const olc::vf2d& pos, const std::vector<olc::vf2d>& vPoints, const std::vector<olc::vf2d>& vTexCoords, const float fAngle, const olc::vf2d& scale, const olc::Pixel& tint)
//{
// DecalInstance di;
// di.decal = decal;
// di.points = vPoints.size();
// di.pos.resize(di.points);
// di.uv.resize(di.points);
// di.w.resize(di.points);
// di.tint.resize(di.points);
// for (uint32_t i = 0; i < di.points; i++)
// {
// di.pos[i] = { (vPoints[i].x * vInvScreenSize.x) * 2.0f - 1.0f, ((vPoints[i].y * vInvScreenSize.y) * 2.0f - 1.0f) * -1.0f };
// di.uv[i] = vTexCoords[i];
// di.tint[i] = tint;
// di.w[i] = 1.0f;
// }
// di.mode = nDecalMode;
// vLayers[nTargetLayer].vecDecalInstance.push_back(di);
//}
void PixelGameEngine::DrawRotatedDecal(const olc::vf2d& pos, olc::Decal* decal, const float fAngle, const olc::vf2d& center, const olc::vf2d& scale, const olc::Pixel& tint) void PixelGameEngine::DrawRotatedDecal(const olc::vf2d& pos, olc::Decal* decal, const float fAngle, const olc::vf2d& center, const olc::vf2d& scale, const olc::Pixel& tint)
{ {
DecalInstance di; DecalInstance di;
@ -4020,6 +4003,7 @@ namespace olc
#define min(a, b) ((a < b) ? a : b) #define min(a, b) ((a < b) ? a : b)
#define max(a, b) ((a > b) ? a : b) #define max(a, b) ((a > b) ? a : b)
#include <objidl.h>
#include <gdiplus.h> #include <gdiplus.h>
#if defined(__MINGW32__) // Thanks Gusgo & Dandistine, but c'mon mingw!! wtf?! #if defined(__MINGW32__) // Thanks Gusgo & Dandistine, but c'mon mingw!! wtf?!
#include <gdiplus/gdiplusinit.h> #include <gdiplus/gdiplusinit.h>