diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project
index dfc6b606..73400338 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project
+++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project
@@ -330,6 +330,11 @@
"type": "string",
"value": "None"
},
+ {
+ "name": "Create Optimization Map (Override)",
+ "type": "bool",
+ "value": false
+ },
{
"name": "Dev Completion Time - Ranger (s)",
"type": "float",
diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
index eb2edbdf..8175345b 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
@@ -429,6 +429,10 @@
+
+
+
+
@@ -511,6 +515,10 @@
+
+
+
+
@@ -849,6 +857,7 @@
+
@@ -886,6 +895,10 @@
+
+
+
+
diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
index 33c5ce18..6970af1d 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
@@ -91,6 +91,12 @@
{ac44510a-638e-4ae5-8529-2c68dddad459}
+
+ {1b310925-7ec7-4584-8c9c-2154a6e0df80}
+
+
+ {aaa148fb-5e34-4c35-a5bf-65ee8f2c0fb1}
+
@@ -645,6 +651,12 @@
Header Files
+
+ Header Files
+
+
+ Header Files\Engine
+
@@ -1085,6 +1097,12 @@
Source Files\Monster Strategies
+
+ Source Files
+
+
+ Source Files\Engine
+
diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp
index 96ebe053..a7cf7a92 100644
--- a/Adventures in Lestoria/AdventuresInLestoria.cpp
+++ b/Adventures in Lestoria/AdventuresInLestoria.cpp
@@ -81,6 +81,7 @@ All rights reserved.
#include "Tutorial.h"
#include "SteamKeyboardCallbackHandler.h"
#include "SteamStatsReceivedHandler.h"
+#include "StageMaskPolygon.h"
INCLUDE_EMITTER_LIST
INCLUDE_ITEM_CATEGORIES
@@ -970,6 +971,19 @@ void AiL::RenderWorld(float fElapsedTime){
PopulateRenderLists();
auto RenderPlayer=[&](vf2d pos,vf2d scale){
+ SetWorldColor(PixelLerp(DARK_BLUE,BLACK,sin(geom2d::pi*GetRunTime()*2)));
+ if(GetCurrentMapData().provideOptimization&&!LoadingScreen::loading){
+ StageMaskPolygon poly{
+ {
+ view.ScreenToWorld(GetMousePos()-vf2d{50,50}),
+ view.ScreenToWorld(GetMousePos()+vf2d{100,-20}),
+ view.ScreenToWorld(GetMousePos()+vf2d{200,200}),
+ view.ScreenToWorld(GetMousePos()+vf2d{-50,150}),
+ view.ScreenToWorld(GetMousePos()+vf2d{-120,90}),
+ },"safeIndicatorGradient.png",PixelLerp(VERY_DARK_BLUE,BLACK,sin(geom2d::pi*GetRunTime()*2))
+ };
+ poly.Draw();
+ }
if(player->IsInvisible())return;
vf2d playerScale=vf2d(player->GetSizeMult(),player->GetSizeMult());
int count=0;
@@ -2217,7 +2231,7 @@ void AiL::InitializeLevel(std::string mapFile,MapName map){
}
}
- if(MAP_DATA[map].MapData.optimized){
+ if(MAP_DATA[map].MapData.optimized||MAP_DATA[map].MapData.provideOptimization){
LOG("Generating optimized map for Map "<Create(MAP_DATA[map].MapData.width*MAP_DATA[map].MapData.tilewidth,MAP_DATA[map].MapData.height*MAP_DATA[map].MapData.tileheight);
@@ -2245,8 +2259,10 @@ void AiL::InitializeLevel(std::string mapFile,MapName map){
SetPixelMode(prevMode);
MAP_DATA[map].optimizedTile->Decal()->Update();
SetDrawTarget(nullptr);
- LOG(" Clearing Layer Data...");
- MAP_DATA[map].LayerData.clear();
+ if(!MAP_DATA[map].MapData.provideOptimization){
+ MAP_DATA[map].LayerData.clear();
+ LOG(" Clearing Layer Data...");
+ }
}
}
@@ -2732,7 +2748,7 @@ bool AiL::IsOverlayLayer(LayerTag&layer){
const geom2d::rectAiL::GetTileCollision(MapName map,vf2d pos,bool upperLevel)const{
const MapTag&mapData=MAP_DATA.at(map).MapData;
if(pos.x<0||pos.y<0||pos.x>=mapData.width*mapData.tilewidth||pos.y>=mapData.height*mapData.tilewidth)return NO_COLLISION;
- if(MAP_DATA.at(map).optimizedTile)return NO_COLLISION; //Overworld map has no collision.
+ if(GetCurrentMapData().optimized)return NO_COLLISION; //Overworld map has no collision.
bool hasTerrain=false;
for(const LayerTag&layer:MAP_DATA.at(map).LayerData){ //Figure out if any tile at this position is terrain. If so, we have a collision box to check.
diff --git a/Adventures in Lestoria/Pixel.cpp b/Adventures in Lestoria/Pixel.cpp
new file mode 100644
index 00000000..e921487f
--- /dev/null
+++ b/Adventures in Lestoria/Pixel.cpp
@@ -0,0 +1,171 @@
+#pragma region License
+/*
+License (OLC-3)
+~~~~~~~~~~~~~~~
+
+Copyright 2018 - 2024 OneLoneCoder.com
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions or derivations of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions or derivative works in binary form must reproduce the above
+copyright notice. This list of conditions and the following disclaimer must be
+reproduced in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+Portions of this software are copyright © 2024 The FreeType
+Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
+All rights reserved.
+
+Links
+~~~~~
+YouTube: https://www.youtube.com/javidx9
+https://www.youtube.com/javidx9extra
+Discord: https://discord.gg/WhwHUMV
+Twitter: https://www.twitter.com/javidx9
+Twitch: https://www.twitch.tv/javidx9
+GitHub: https://www.github.com/onelonecoder
+Homepage: https://www.onelonecoder.com
+Patreon: https://www.patreon.com/javidx9
+Community: https://community.onelonecoder.com
+*/
+#pragma endregion
+
+#include "Pixel.h"
+#include
+
+namespace olc{
+ // O------------------------------------------------------------------------------O
+ // | olc::Pixel IMPLEMENTATION |
+ // O------------------------------------------------------------------------------O
+ #if !defined(OLC_IGNORE_PIXEL)
+ Pixel::Pixel()
+ { r = 0; g = 0; b = 0; a = nDefaultAlpha; }
+
+ Pixel::Pixel(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha)
+ { n = red | (green << 8) | (blue << 16) | (alpha << 24); } // Thanks jarekpelczar
+
+ Pixel::Pixel(uint32_t p)
+ { n = p; }
+
+ bool Pixel::operator==(const Pixel& p) const
+ { return n == p.n; }
+
+ bool Pixel::operator!=(const Pixel& p) const
+ { return n != p.n; }
+
+ Pixel Pixel::operator * (const float i) const
+ {
+ float fR = std::min(255.0f, std::max(0.0f, float(r) * i));
+ float fG = std::min(255.0f, std::max(0.0f, float(g) * i));
+ float fB = std::min(255.0f, std::max(0.0f, float(b) * i));
+ return Pixel(uint8_t(fR), uint8_t(fG), uint8_t(fB), a);
+ }
+
+ Pixel Pixel::operator / (const float i) const
+ {
+ float fR = std::min(255.0f, std::max(0.0f, float(r) / i));
+ float fG = std::min(255.0f, std::max(0.0f, float(g) / i));
+ float fB = std::min(255.0f, std::max(0.0f, float(b) / i));
+ return Pixel(uint8_t(fR), uint8_t(fG), uint8_t(fB), a);
+ }
+
+ Pixel& Pixel::operator *=(const float i)
+ {
+ this->r = uint8_t(std::min(255.0f, std::max(0.0f, float(r) * i)));
+ this->g = uint8_t(std::min(255.0f, std::max(0.0f, float(g) * i)));
+ this->b = uint8_t(std::min(255.0f, std::max(0.0f, float(b) * i)));
+ return *this;
+ }
+
+ Pixel& Pixel::operator /=(const float i)
+ {
+ this->r = uint8_t(std::min(255.0f, std::max(0.0f, float(r) / i)));
+ this->g = uint8_t(std::min(255.0f, std::max(0.0f, float(g) / i)));
+ this->b = uint8_t(std::min(255.0f, std::max(0.0f, float(b) / i)));
+ return *this;
+ }
+
+ Pixel Pixel::operator + (const Pixel& p) const
+ {
+ uint8_t nR = uint8_t(std::min(255, std::max(0, int(r) + int(p.r))));
+ uint8_t nG = uint8_t(std::min(255, std::max(0, int(g) + int(p.g))));
+ uint8_t nB = uint8_t(std::min(255, std::max(0, int(b) + int(p.b))));
+ return Pixel(nR, nG, nB, a);
+ }
+
+ Pixel Pixel::operator - (const Pixel& p) const
+ {
+ uint8_t nR = uint8_t(std::min(255, std::max(0, int(r) - int(p.r))));
+ uint8_t nG = uint8_t(std::min(255, std::max(0, int(g) - int(p.g))));
+ uint8_t nB = uint8_t(std::min(255, std::max(0, int(b) - int(p.b))));
+ return Pixel(nR, nG, nB, a);
+ }
+
+ Pixel& Pixel::operator += (const Pixel& p)
+ {
+ this->r = uint8_t(std::min(255, std::max(0, int(r) + int(p.r))));
+ this->g = uint8_t(std::min(255, std::max(0, int(g) + int(p.g))));
+ this->b = uint8_t(std::min(255, std::max(0, int(b) + int(p.b))));
+ return *this;
+ }
+
+ Pixel& Pixel::operator -= (const Pixel& p) // Thanks Au Lit
+ {
+ this->r = uint8_t(std::min(255, std::max(0, int(r) - int(p.r))));
+ this->g = uint8_t(std::min(255, std::max(0, int(g) - int(p.g))));
+ this->b = uint8_t(std::min(255, std::max(0, int(b) - int(p.b))));
+ return *this;
+ }
+
+ Pixel Pixel::operator * (const Pixel& p) const
+ {
+ uint8_t nR = uint8_t(std::min(255.0f, std::max(0.0f, float(r) * float(p.r) / 255.0f)));
+ uint8_t nG = uint8_t(std::min(255.0f, std::max(0.0f, float(g) * float(p.g) / 255.0f)));
+ uint8_t nB = uint8_t(std::min(255.0f, std::max(0.0f, float(b) * float(p.b) / 255.0f)));
+ uint8_t nA = uint8_t(std::min(255.0f, std::max(0.0f, float(a) * float(p.a) / 255.0f)));
+ return Pixel(nR, nG, nB, nA);
+ }
+
+ Pixel& Pixel::operator *=(const Pixel& p)
+ {
+ this->r = uint8_t(std::min(255.0f, std::max(0.0f, float(r) * float(p.r) / 255.0f)));
+ this->g = uint8_t(std::min(255.0f, std::max(0.0f, float(g) * float(p.g) / 255.0f)));
+ this->b = uint8_t(std::min(255.0f, std::max(0.0f, float(b) * float(p.b) / 255.0f)));
+ this->a = uint8_t(std::min(255.0f, std::max(0.0f, float(a) * float(p.a) / 255.0f)));
+ return *this;
+ }
+
+ Pixel Pixel::inv() const
+ {
+ uint8_t nR = uint8_t(std::min(255, std::max(0, 255 - int(r))));
+ uint8_t nG = uint8_t(std::min(255, std::max(0, 255 - int(g))));
+ uint8_t nB = uint8_t(std::min(255, std::max(0, 255 - int(b))));
+ return Pixel(nR, nG, nB, a);
+ }
+
+ Pixel PixelF(float red, float green, float blue, float alpha)
+ { return Pixel(uint8_t(red * 255.0f), uint8_t(green * 255.0f), uint8_t(blue * 255.0f), uint8_t(alpha * 255.0f)); }
+
+ Pixel PixelLerp(const olc::Pixel& p1, const olc::Pixel& p2, float t)
+ { return (p2 * t) + p1 * (1.0f - t); }
+
+ #endif
+}
\ No newline at end of file
diff --git a/Adventures in Lestoria/Pixel.h b/Adventures in Lestoria/Pixel.h
new file mode 100644
index 00000000..7063816b
--- /dev/null
+++ b/Adventures in Lestoria/Pixel.h
@@ -0,0 +1,109 @@
+#pragma region License
+/*
+License (OLC-3)
+~~~~~~~~~~~~~~~
+
+Copyright 2018 - 2024 OneLoneCoder.com
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions or derivations of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions or derivative works in binary form must reproduce the above
+copyright notice. This list of conditions and the following disclaimer must be
+reproduced in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+Portions of this software are copyright © 2024 The FreeType
+Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
+All rights reserved.
+
+Links
+~~~~~
+YouTube: https://www.youtube.com/javidx9
+https://www.youtube.com/javidx9extra
+Discord: https://discord.gg/WhwHUMV
+Twitter: https://www.twitter.com/javidx9
+Twitch: https://www.twitch.tv/javidx9
+GitHub: https://www.github.com/onelonecoder
+Homepage: https://www.onelonecoder.com
+Patreon: https://www.patreon.com/javidx9
+Community: https://community.onelonecoder.com
+*/
+#pragma endregion
+#pragma once
+#include
+
+// O------------------------------------------------------------------------------O
+// | olc::Pixel IMPLEMENTATION |
+// O------------------------------------------------------------------------------O
+// O------------------------------------------------------------------------------O
+// | olc::Pixel - Represents a 32-Bit RGBA colour |
+// O------------------------------------------------------------------------------O
+namespace olc{
+ constexpr inline uint8_t nDefaultAlpha = 0xFF;
+ constexpr inline uint32_t nDefaultPixel = (nDefaultAlpha << 24);
+ #if !defined(OLC_IGNORE_PIXEL)
+ struct Pixel
+ {
+ union
+ {
+ uint32_t n = nDefaultPixel;
+ struct { uint8_t r; uint8_t g; uint8_t b; uint8_t a; };
+ };
+
+ enum Mode { NORMAL, MASK, ALPHA, CUSTOM };
+
+ Pixel();
+ Pixel(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha = nDefaultAlpha);
+ Pixel(uint32_t p);
+ Pixel& operator = (const Pixel& v) = default;
+ bool operator ==(const Pixel& p) const;
+ bool operator !=(const Pixel& p) const;
+ Pixel operator * (const float i) const;
+ Pixel operator / (const float i) const;
+ Pixel& operator *=(const float i);
+ Pixel& operator /=(const float i);
+ Pixel operator + (const Pixel& p) const;
+ Pixel operator - (const Pixel& p) const;
+ Pixel& operator +=(const Pixel& p);
+ Pixel& operator -=(const Pixel& p);
+ Pixel operator * (const Pixel& p) const;
+ Pixel& operator *=(const Pixel& p);
+ Pixel inv() const;
+ };
+
+ Pixel PixelF(float red, float green, float blue, float alpha = 1.0f);
+ Pixel PixelLerp(const olc::Pixel& p1, const olc::Pixel& p2, float t);
+
+
+ // O------------------------------------------------------------------------------O
+ // | USEFUL CONSTANTS |
+ // O------------------------------------------------------------------------------O
+ static const Pixel
+ GREY(192, 192, 192), DARK_GREY(128, 128, 128), VERY_DARK_GREY(64, 64, 64),
+ RED(255, 0, 0), DARK_RED(128, 0, 0), VERY_DARK_RED(64, 0, 0),
+ YELLOW(255, 255, 0), DARK_YELLOW(128, 128, 0), VERY_DARK_YELLOW(64, 64, 0),
+ GREEN(0, 255, 0), DARK_GREEN(0, 128, 0), VERY_DARK_GREEN(0, 64, 0),
+ CYAN(0, 255, 255), DARK_CYAN(0, 128, 128), VERY_DARK_CYAN(0, 64, 64),
+ BLUE(0, 0, 255), DARK_BLUE(0, 0, 128), VERY_DARK_BLUE(0, 0, 64),
+ MAGENTA(255, 0, 255), DARK_MAGENTA(128, 0, 128), VERY_DARK_MAGENTA(64, 0, 64),
+ WHITE(255, 255, 255), BLACK(0, 0, 0), BLANK(0, 0, 0, 0);
+ #endif
+}
\ No newline at end of file
diff --git a/Adventures in Lestoria/StageMaskPolygon.cpp b/Adventures in Lestoria/StageMaskPolygon.cpp
new file mode 100644
index 00000000..b4af9031
--- /dev/null
+++ b/Adventures in Lestoria/StageMaskPolygon.cpp
@@ -0,0 +1,103 @@
+#pragma region License
+/*
+License (OLC-3)
+~~~~~~~~~~~~~~~
+
+Copyright 2024 Joshua Sigona
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions or derivations of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions or derivative works in binary form must reproduce the above
+copyright notice. This list of conditions and the following disclaimer must be
+reproduced in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+Portions of this software are copyright © 2024 The FreeType
+Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
+All rights reserved.
+*/
+#pragma endregion
+
+#include "StageMaskPolygon.h"
+#include "AdventuresInLestoria.h"
+#include "DEFINES.h"
+#include "LoadingScreen.h"
+#include "util.h"
+
+INCLUDE_game
+INCLUDE_GFX
+
+StageMaskPolygon::StageMaskPolygon(const std::vector&points,const std::string&texture,const Pixel overlayCol)
+:polygon(geom2d::polygon{points}){
+ if(LoadingScreen::loading)ERR("WARNING! A stage mask overlay attempted to initialize itself before the stage finished! THIS IS NOT ALLOWED!");
+ if(!game->MAP_DATA.at(game->GetCurrentMapName()).GetOptimizedMap())ERR(std::format("WARNING! No optimized map found for stage {} while trying to create a Stage Polygon! THIS IS NOT ALLOWED!",game->GetCurrentMapName()));
+
+ if(texture.length()>0)overlay=StageMaskPolygon::StageMaskOverlay{points,texture,overlayCol};
+
+ std::transform(points.begin(),points.end(),std::back_inserter(uvs.pos),[&](const vf2d&point){return point/game->GetCurrentMap().GetOptimizedMap()->Sprite()->Size();});
+}
+
+StageMaskPolygon::StageMaskOverlay::StageMaskOverlay(const std::vector&points,const std::string&texture,const Pixel overlayCol)
+:overlayPolygon(geom2d::polygon{points}),texture(texture),overlayCol(overlayCol){
+ if(!GFX.count(texture))ERR(std::format("WARNING! Texture {} does not exist while trying to initialize Stage Mask Overlay!",texture));
+
+ overlayPolygon.pos.insert(overlayPolygon.pos.begin(),overlayPolygon.middle()); //Insert the middle point to the front of the overlay polygon's point list.
+ //Copy the first point provided from the original polygon to the end of the new overlay polygon since we have to fully connect the polygon for the texture to show up correctly.
+ overlayPolygon.pos.push_back(points[0]);
+ bool first=false;
+ std::transform(overlayPolygon.pos.begin(),overlayPolygon.pos.end(),std::back_inserter(overlayUVs.pos),[&](const vf2d&point){
+ if(!first){
+ first=true;
+ return vf2d{0.f,0.f};
+ }else{
+ return vf2d{1.f,1.f};
+ }
+ });
+}
+
+const Pixel StageMaskPolygon::StageMaskOverlay::GetColor()const{
+ return overlayCol;
+}
+const geom2d::polygon&StageMaskPolygon::StageMaskOverlay::GetPolygon()const{
+ return overlayPolygon;
+}
+
+void StageMaskPolygon::StageMaskOverlay::Draw()const{
+ game->view.DrawPolygonDecal(GFX.at(texture).Decal(),overlayPolygon.pos,overlayUVs.pos,GetColor());
+}
+
+const bool StageMaskPolygon::HasOverlay()const{
+ return overlay.has_value();
+}
+
+void StageMaskPolygon::SetBlendColor(const Pixel overlayCol){
+ if(!HasOverlay())ERR("WARNING! Trying to set the blend color when there is no overlay on this stage mask polygon! THIS IS NOT ALLOWED!");
+ overlay.value().overlayCol=overlayCol;
+}
+
+const StageMaskPolygon::StageMaskOverlay&StageMaskPolygon::GetOverlay()const{
+ return overlay.value();
+}
+
+void StageMaskPolygon::Draw()const{
+ game->view.DrawPolygonDecal(game->GetCurrentMap().GetOptimizedMap()->Decal(),polygon.pos,uvs.pos);
+ if(HasOverlay())GetOverlay().Draw();
+}
\ No newline at end of file
diff --git a/Adventures in Lestoria/StageMaskPolygon.h b/Adventures in Lestoria/StageMaskPolygon.h
new file mode 100644
index 00000000..bb38cde2
--- /dev/null
+++ b/Adventures in Lestoria/StageMaskPolygon.h
@@ -0,0 +1,67 @@
+#pragma region License
+/*
+License (OLC-3)
+~~~~~~~~~~~~~~~
+
+Copyright 2024 Joshua Sigona
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions or derivations of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions or derivative works in binary form must reproduce the above
+copyright notice. This list of conditions and the following disclaimer must be
+reproduced in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+Portions of this software are copyright © 2024 The FreeType
+Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
+All rights reserved.
+*/
+#pragma endregion
+#pragma once
+
+#include "Pixel.h"
+#include "olcUTIL_Geometry2D.h"
+
+class StageMaskPolygon{
+ class StageMaskOverlay{
+ friend class StageMaskPolygon;
+ private:
+ //The stage mask overlay auto-forms a UV mapping where the center is {0,0} and the edges are {1,1}. Use this to shape a texture with the desired outline you want.
+ StageMaskOverlay(const std::vector&points,const std::string&texture,const Pixel overlayCol=BLANK);
+ const Pixel GetColor()const;
+ const geom2d::polygon&GetPolygon()const;
+ void Draw()const;
+ std::string texture;
+ geom2d::polygonoverlayPolygon; //The overlay polygon uses a middle point so that a texture can fade in towards the center.
+ geom2d::polygonoverlayUVs;
+ Pixel overlayCol;
+ };
+public:
+ StageMaskPolygon(const std::vector&points,const std::string&texture="",const Pixel overlayCol=BLANK);
+ void SetBlendColor(const Pixel overlayCol);
+ const bool HasOverlay()const;
+ const StageMaskOverlay&GetOverlay()const;
+ void Draw()const;
+private:
+ geom2d::polygonpolygon;
+ geom2d::polygonuvs;
+ std::optionaloverlay;
+};
\ No newline at end of file
diff --git a/Adventures in Lestoria/TMXParser.h b/Adventures in Lestoria/TMXParser.h
index 225b804e..37312c86 100644
--- a/Adventures in Lestoria/TMXParser.h
+++ b/Adventures in Lestoria/TMXParser.h
@@ -76,6 +76,7 @@ struct MapTag{
int width=0,height=0;
int tilewidth=0,tileheight=0;
bool optimized=false; //An optimized map will require us to flatten it out and use it as a single tile.
+ bool provideOptimization=false; //An optimized map will require us to flatten it out and use it as a single tile.
vi2d playerSpawnLocation;
vi2d MapSize; //The number of tiles in width and height of this map.
vi2d TileSize; //How large in pixels the map's tiles are.
@@ -150,6 +151,7 @@ public:
const std::string_view GetMapDisplayName()const;
const bool HasMoreSpawns()const; //Returns whether or not there are more spawns for the spawn controller.
const int Spawn_pop(); //Grabs the next spawn controller ID and removes it from the stack.
+ const Renderable const*GetOptimizedMap()const;
std::string FormatLayerData(std::ostream& os, std::vectortiles);
std::string FormatSpawnerData(std::ostream& os, std::maptiles);
friend std::ostream& operator << (std::ostream& os, Map& rhs);
@@ -326,6 +328,9 @@ class TMXParser{
spawnControllerIDs.value().pop();
return nextSpawnId;
}
+ const Renderable const*Map::GetOptimizedMap()const{
+ return optimizedTile;
+ }
NPCData::NPCData(){}
NPCData::NPCData(XMLTag npcTag){
const std::arraytags={"Function","NPC Name","Roaming Range","Unlock Condition","Spritesheet","x","y"};
@@ -487,6 +492,9 @@ class TMXParser{
if (newTag.tag=="property"&&newTag.data["name"]=="Optimize"&&newTag.data["value"]=="true") {
parsedMapInfo.MapData.optimized=true;
}else
+ if (newTag.tag=="property"&&newTag.data["name"]=="Create Optimization Map (Override)"&&newTag.data["value"]=="true") {
+ parsedMapInfo.MapData.provideOptimization=true;
+ }else
if (newTag.tag=="property"&&newTag.data["name"]=="Boss Title Display") {
parsedMapInfo.SpawnerData[prevSpawner].bossNameDisplay=newTag.data["value"];
}else
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index 022c6c25..0bb93c6e 100644
--- a/Adventures in Lestoria/Version.h
+++ b/Adventures in Lestoria/Version.h
@@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1
#define VERSION_MINOR 2
#define VERSION_PATCH 3
-#define VERSION_BUILD 9554
+#define VERSION_BUILD 9572
#define stringify(a) stringify_(a)
#define stringify_(a) #a
diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx
index 1d6ce569..9cc4c781 100644
--- a/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx
+++ b/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx
@@ -1,814 +1,389 @@
-