Merge geometry update into master.

pull/30/head
sigonasr2 11 months ago
commit 2c325d81bf
  1. 2
      Adventures in Lestoria/Ability.h
  2. 4
      Adventures in Lestoria/AdventuresInLestoria.cpp
  3. 4
      Adventures in Lestoria/AdventuresInLestoria.h
  4. 1
      Adventures in Lestoria/Attributable.h
  5. 2
      Adventures in Lestoria/AttributableStat.h
  6. 1
      Adventures in Lestoria/Bullet.h
  7. 1
      Adventures in Lestoria/BulletTypes.h
  8. 1
      Adventures in Lestoria/Class.h
  9. 1
      Adventures in Lestoria/ConnectionPoint.h
  10. 2
      Adventures in Lestoria/DamageNumber.h
  11. 2
      Adventures in Lestoria/Effect.h
  12. 1
      Adventures in Lestoria/Emitter.cpp
  13. 2
      Adventures in Lestoria/Emitter.h
  14. 3
      Adventures in Lestoria/EnvironmentalAudio.h
  15. 1
      Adventures in Lestoria/InventoryConsumableWindow.cpp
  16. 1
      Adventures in Lestoria/Item.h
  17. 1
      Adventures in Lestoria/ItemDrop.h
  18. 3
      Adventures in Lestoria/Key.h
  19. 2
      Adventures in Lestoria/Menu.cpp
  20. 1
      Adventures in Lestoria/Merchant.h
  21. 1
      Adventures in Lestoria/Monster.h
  22. 1
      Adventures in Lestoria/MonsterData.cpp
  23. 4
      Adventures in Lestoria/Pathfinding.h
  24. 1
      Adventures in Lestoria/Ranger.cpp
  25. 2
      Adventures in Lestoria/TMXParser.h
  26. 2
      Adventures in Lestoria/TSXParser.h
  27. 1
      Adventures in Lestoria/Thief.cpp
  28. 1
      Adventures in Lestoria/TitleScreen.h
  29. 1
      Adventures in Lestoria/Trapper.cpp
  30. 2
      Adventures in Lestoria/Version.h
  31. 1
      Adventures in Lestoria/Warrior.cpp
  32. 1
      Adventures in Lestoria/Witch.cpp
  33. 1
      Adventures in Lestoria/Wizard.cpp
  34. 1
      Adventures in Lestoria/config.h
  35. 1
      Adventures in Lestoria/olcPGEX_TTF.h
  36. 1
      Adventures in Lestoria/olcPGEX_ViewPort.h
  37. 5
      Adventures in Lestoria/olcPixelGameEngine.h
  38. 2
      Adventures in Lestoria/olcUTIL_Animate2D.h
  39. 4
      Adventures in Lestoria/olcUTIL_Camera2D.h
  40. 3
      Adventures in Lestoria/olcUTIL_DataFile.h
  41. 2009
      Adventures in Lestoria/olcUTIL_Geometry2D.h
  42. 1
      Adventures in Lestoria/pixelGameEngine.cpp
  43. 1
      Adventures in Lestoria/util.h

@ -36,8 +36,8 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "Key.h" #include "Key.h"
#include "olcPixelGameEngine.h"
class Player; class Player;

@ -35,9 +35,9 @@ Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
All rights reserved. All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "olcUTIL_Camera2D.h"
#include "olcPGEX_TransformedView.h" #include "olcPGEX_TransformedView.h"
#include "AdventuresInLestoria.h" #include "AdventuresInLestoria.h"
#include "olcUTIL_Camera2D.h"
#include "DamageNumber.h" #include "DamageNumber.h"
#include "Bullet.h" #include "Bullet.h"
#include "Ability.h" #include "Ability.h"
@ -1461,7 +1461,7 @@ void AiL::RenderCooldowns(){
for(Ability&a:cooldowns){ for(Ability&a:cooldowns){
if(a.name!="???"){ if(a.name!="???"){
DrawCooldown(iconPos,a); DrawCooldown(iconPos,a);
iconPos+={32,0}; iconPos+=vf2d{32,0};
} }
} }

@ -36,13 +36,12 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h" #include "olcUTIL_Camera2D.h"
#include "Animation.h" #include "Animation.h"
#include "olcUTIL_Animate2D.h" #include "olcUTIL_Animate2D.h"
#include "Monster.h" #include "Monster.h"
#include "olcPGEX_TransformedView.h" #include "olcPGEX_TransformedView.h"
#include "Player.h" #include "Player.h"
#include "olcUTIL_Camera2D.h"
#include "Bullet.h" #include "Bullet.h"
#include "Effect.h" #include "Effect.h"
#include "Map.h" #include "Map.h"
@ -55,6 +54,7 @@ All rights reserved.
#endif #endif
#include "Audio.h" #include "Audio.h"
#include "olcPGEX_SplashScreen.h" #include "olcPGEX_SplashScreen.h"
#include "olcPixelGameEngine.h"
class AiL : public olc::PixelGameEngine class AiL : public olc::PixelGameEngine
{ {

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "MonsterAttribute.h" #include "MonsterAttribute.h"
#include "DEFINES.h" #include "DEFINES.h"
#include <variant> #include <variant>

@ -36,9 +36,9 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "safemap.h" #include "safemap.h"
#include <variant> #include <variant>
#include <optional>
using namespace std::string_view_literals; using namespace std::string_view_literals;

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "Animation.h" #include "Animation.h"
#include "olcUTIL_Animate2D.h" #include "olcUTIL_Animate2D.h"
#include "Monster.h" #include "Monster.h"

@ -37,7 +37,6 @@ All rights reserved.
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "Bullet.h" #include "Bullet.h"
#include "olcPixelGameEngine.h"
struct EnergyBolt:public Bullet{ struct EnergyBolt:public Bullet{
float lastParticleSpawn=0; float lastParticleSpawn=0;

@ -38,7 +38,6 @@ All rights reserved.
#pragma once #pragma once
#include "Ability.h" #include "Ability.h"
#include "Animation.h" #include "Animation.h"
#include "olcPixelGameEngine.h"
#undef GetClassInfo #undef GetClassInfo

@ -37,6 +37,7 @@ All rights reserved.
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcUTIL_Geometry2D.h" #include "olcUTIL_Geometry2D.h"
#include <array>
struct ConnectionPoint{ struct ConnectionPoint{
friend class State_OverworldMap; friend class State_OverworldMap;

@ -36,7 +36,7 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h" #include "olcUTIL_Geometry2D.h"
enum DamageNumberType{ enum DamageNumberType{
HEALTH_LOSS, HEALTH_LOSS,

@ -36,9 +36,7 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "Animation.h" #include "Animation.h"
#include "olcUTIL_Animate2D.h"
struct Effect{ struct Effect{
friend class AiL; friend class AiL;

@ -36,6 +36,7 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "Emitter.h" #include "Emitter.h"
#include <memory>
std::vector<std::unique_ptr<Emitter>>EMITTER_LIST; std::vector<std::unique_ptr<Emitter>>EMITTER_LIST;

@ -36,7 +36,7 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h" #include "olcUTIL_Geometry2D.h"
struct Emitter{ struct Emitter{
friend class AiL; friend class AiL;

@ -36,7 +36,8 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h" #include "olcUTIL_Geometry2D.h"
#include <map>
using EnvironmentalAudioSoundName=std::string; using EnvironmentalAudioSoundName=std::string;
using FileName=std::string; using FileName=std::string;

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "AdventuresInLestoria.h" #include "AdventuresInLestoria.h"
#include "olcPixelGameEngine.h"
#include "safemap.h" #include "safemap.h"
#include "Item.h" #include "Item.h"
#include "MenuItemButton.h" #include "MenuItemButton.h"

@ -39,7 +39,6 @@ All rights reserved.
#include <string> #include <string>
#include <functional> #include <functional>
#include <map> #include <map>
#include "olcPixelGameEngine.h"
#include "olcUTIL_DataFile.h" #include "olcUTIL_DataFile.h"
#include "AttributableStat.h" #include "AttributableStat.h"
#include "BitwiseEnum.h" #include "BitwiseEnum.h"

@ -35,7 +35,6 @@ Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
All rights reserved. All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "olcPixelGameEngine.h"
#include "Item.h" #include "Item.h"
#include "util.h" #include "util.h"
#include "AdventuresInLestoria.h" #include "AdventuresInLestoria.h"

@ -36,8 +36,9 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include <set> #include <set>
#include <string>
#include <map>
//Future-proof game controller support. //Future-proof game controller support.
enum InputType{ enum InputType{

@ -81,7 +81,7 @@ INCLUDE_WINDOW_SIZE
using A=Attribute; using A=Attribute;
Menu::Menu(vf2d pos,vf2d size) Menu::Menu(vf2d pos,vf2d size)
:pos(pos==CENTERED?WINDOW_SIZE/2-size/2:vi2d{pos}),size(size){ :pos(pos==CENTERED?vi2d{WINDOW_SIZE/2-size/2}:vi2d{pos}),size(size){
this->window=ViewPort::rectViewPort({-24,-24},this->size+vi2d{48,48},this->pos); this->window=ViewPort::rectViewPort({-24,-24},this->size+vi2d{48,48},this->pos);
} }

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "FunctionPriming.h" #include "FunctionPriming.h"
class Item; class Item;

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "Animation.h" #include "Animation.h"
#include "State.h" #include "State.h"
#include "Buff.h" #include "Buff.h"

@ -35,7 +35,6 @@ Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
All rights reserved. All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "olcPixelGameEngine.h"
#include "Monster.h" #include "Monster.h"
#include "Animation.h" #include "Animation.h"
#include "config.h" #include "config.h"

@ -36,8 +36,10 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h" #include "olcUTIL_Geometry2D.h"
#include <set> #include <set>
#include <vector>
#include <map>
struct Pathfinding{ struct Pathfinding{
struct sNode struct sNode

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "Class.h" #include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h" #include "DEFINES.h"
#include "Player.h" #include "Player.h"
#include "Effect.h" #include "Effect.h"

@ -36,8 +36,8 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h" #include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h"
#include <sstream> #include <sstream>
#include <set> #include <set>
#include "EnvironmentalAudio.h" #include "EnvironmentalAudio.h"

@ -36,11 +36,9 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include <sstream> #include <sstream>
#include "TMXParser.h" #include "TMXParser.h"
#include "Map.h" #include "Map.h"
#include "olcUTIL_Geometry2D.h"
#include "olcUTIL_DataFile.h" #include "olcUTIL_DataFile.h"
#include "Error.h" #include "Error.h"

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "Class.h" #include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h" #include "DEFINES.h"
#include "Player.h" #include "Player.h"
#include "Effect.h" #include "Effect.h"

@ -37,6 +37,7 @@ All rights reserved.
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h" #include "olcPixelGameEngine.h"
class TitleScreen{ class TitleScreen{

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "Class.h" #include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h" #include "DEFINES.h"
#include "Player.h" #include "Player.h"
#include "Effect.h" #include "Effect.h"

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_PATCH 1 #define VERSION_PATCH 1
#define VERSION_BUILD 5586 #define VERSION_BUILD 5618
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "Class.h" #include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h" #include "DEFINES.h"
#include "Player.h" #include "Player.h"
#include "Effect.h" #include "Effect.h"

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "Class.h" #include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h" #include "DEFINES.h"
#include "Player.h" #include "Player.h"
#include "Effect.h" #include "Effect.h"

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#include "Class.h" #include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h" #include "DEFINES.h"
#include "Player.h" #include "Player.h"
#include "Effect.h" #include "Effect.h"

@ -36,7 +36,6 @@ All rights reserved.
*/ */
#pragma endregion #pragma endregion
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_DataFile.h" #include "olcUTIL_DataFile.h"
using namespace olc; using namespace olc;

@ -38,6 +38,7 @@ All rights reserved.
#ifndef OLC_PGEX_TTF_H #ifndef OLC_PGEX_TTF_H
#define OLC_PGEX_TTF_H #define OLC_PGEX_TTF_H
#include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h" #include "olcPixelGameEngine.h"
#ifdef WIN32 #ifdef WIN32

@ -1,6 +1,5 @@
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "olcPGEX_TTF.h" #include "olcPGEX_TTF.h"
#include "olcUTIL_Geometry2D.h" #include "olcUTIL_Geometry2D.h"

@ -401,6 +401,7 @@ return 0;
#include <array> #include <array>
#include <cstring> #include <cstring>
#include "Error.h" #include "Error.h"
#include "olcUTIL_Geometry2D.h"
#pragma endregion #pragma endregion
#define PGE_VER 223 #define PGE_VER 223
@ -669,7 +670,7 @@ namespace olc
}; };
#define OLC_IGNORE_VEC2D
// O------------------------------------------------------------------------------O // O------------------------------------------------------------------------------O
// | olc::vX2d - A generic 2D vector type | // | olc::vX2d - A generic 2D vector type |
@ -7547,4 +7548,4 @@ using namespace olc;
#define PI 3.14159f #define PI 3.14159f
using Color=PixelGameEngine; using Color=olc::PixelGameEngine;

@ -54,8 +54,8 @@ David Barr, aka javidx9, <EFBFBD>OneLoneCoder 2019, 2020, 2021, 2022
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h" #include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h"
namespace olc::utils::Animate2D namespace olc::utils::Animate2D
{ {

@ -51,10 +51,8 @@ Author
David Barr, aka javidx9, <EFBFBD>OneLoneCoder 2019, 2020, 2021, 2022 David Barr, aka javidx9, <EFBFBD>OneLoneCoder 2019, 2020, 2021, 2022
*/ */
#pragma once #pragma once
#include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h"
namespace olc::utils namespace olc::utils
{ {

@ -53,7 +53,7 @@ David Barr, aka javidx9, <EFBFBD>OneLoneCoder 2019, 2020, 2021, 2022
*/ */
#pragma once #pragma once
#include "olcPixelGameEngine.h"
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@ -63,7 +63,6 @@ David Barr, aka javidx9, <EFBFBD>OneLoneCoder 2019, 2020, 2021, 2022
#include <sstream> #include <sstream>
#include <numeric> #include <numeric>
#include "Error.h" #include "Error.h"
#include "olcPixelGameEngine.h"
using namespace std::literals; using namespace std::literals;

File diff suppressed because it is too large Load Diff

@ -41,6 +41,7 @@ All rights reserved.
#include "olcPGEX_TTF.h" #include "olcPGEX_TTF.h"
#define OLC_PGEX_VIEWPORT #define OLC_PGEX_VIEWPORT
#include "olcPGEX_ViewPort.h" #include "olcPGEX_ViewPort.h"
#include "olcUTIL_Geometry2D.h"
#define OLC_PGE_APPLICATION #define OLC_PGE_APPLICATION
#include "olcPixelGameEngine.h" #include "olcPixelGameEngine.h"
#define OLC_PGEX_TRANSFORMEDVIEW #define OLC_PGEX_TRANSFORMEDVIEW

@ -38,6 +38,7 @@ All rights reserved.
#pragma once #pragma once
#include <stdlib.h> #include <stdlib.h>
#include "olcUTIL_Geometry2D.h" #include "olcUTIL_Geometry2D.h"
#include "olcPGEX_TTF.h"
#include <random> #include <random>
namespace olc::util{ namespace olc::util{

Loading…
Cancel
Save