From bd3c111fa138d365ee4df199c27b3262281fb130 Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Wed, 15 Aug 2018 22:04:06 -0400 Subject: [PATCH] BoxSizer to Sizer --- SDLPongCPP/Game/Equipment/cBall.cpp | 4 +- SDLPongCPP/Game/Equipment/cCourt.cpp | 2 +- SDLPongCPP/Game/Equipment/cPaddle.cpp | 2 +- SDLPongCPP/Game/Equipment/cPaddle.hpp | 4 +- SDLPongCPP/Game/PongStart/cPongStart.cpp | 4 +- .../TrooperEngine/AudioEngine/cMusic.cpp | 6 +- .../TrooperEngine/EventEngine/cEvent.cpp | 34 +++++------ .../TrooperEngine/EventEngine/cEvent.hpp | 34 +++++------ .../EventEngine/cEventControl.cpp | 4 +- .../EventEngine/cEventControl.hpp | 4 +- .../TrooperEngine/FXEngine/cGFX.hpp | 4 +- .../GUIEngine/GUIHelpers/Enums.hpp | 2 +- .../GUIEngine/GUIHelpers/cObject.cpp | 2 +- .../GUIEngine/GUIHelpers/cObject.hpp | 2 +- .../GUIEngine/GUIHelpers/cXMLoader.cpp | 19 ++++--- .../GUIEngine/GUIHelpers/cXMLoader.hpp | 6 +- .../TrooperEngine/GUIEngine/cGUI.cpp | 7 ++- .../TrooperEngine/GUIEngine/cGUI.hpp | 1 + .../TrooperEngine/GUIEngine/cLabel.cpp | 18 +++--- .../TrooperEngine/GUIEngine/cLabel.hpp | 12 ++-- .../TrooperEngine/GUIEngine/cLayout.cpp | 8 +-- .../TrooperEngine/GUIEngine/cPanel.cpp | 4 +- .../GUIEngine/{cBoxSizer.cpp => cSizer.cpp} | 20 +++---- .../GUIEngine/{cBoxSizer.hpp => cSizer.hpp} | 16 +++--- .../TrooperEngine/GUIEngine/cTextButton.cpp | 14 ++--- .../TrooperEngine/GUIEngine/cTextButton.hpp | 8 +-- .../TrooperEngine/GUIEngine/cWindow.cpp | 56 ++++++++++++++++++- .../TrooperEngine/GUIEngine/cWindow.hpp | 4 ++ .../TrooperEngine/InputEngine/cJoystick.hpp | 12 ++-- .../MathEngine/Vector/Vector2.cpp | 4 +- .../MathEngine/Vector/Vector2.hpp | 4 +- .../MathEngine/Vector/Vector3.cpp | 4 +- .../MathEngine/Vector/Vector3.hpp | 4 +- .../MathEngine/Vector/Vector4.cpp | 6 +- .../MathEngine/Vector/Vector4.hpp | 8 +-- .../TrooperEngine/MathEngine/cCollision.cpp | 42 +++++++------- .../MathEngine/iVector/iVector2.cpp | 6 +- .../MathEngine/iVector/iVector2.hpp | 9 +-- .../MathEngine/iVector/iVector3.cpp | 8 +-- .../MathEngine/iVector/iVector3.hpp | 8 +-- .../MathEngine/iVector/iVector4.cpp | 8 +-- .../MathEngine/iVector/iVector4.hpp | 8 +-- .../TrooperEngine/TextTypeEngine/cText.cpp | 2 +- .../TrooperEngine/TimingEngine/cTiming.cpp | 2 +- .../TrooperEngine/TimingEngine/cTiming.hpp | 2 +- .../UtilityEngine/MSUNIX/msunix.cpp | 4 +- .../UtilityEngine/MSUNIX/msunix.hpp | 4 +- .../TrooperEngine/UtilityEngine/cString.cpp | 54 +++++++++--------- .../TrooperEngine/UtilityEngine/cString.hpp | 54 +++++++++--------- .../VideoEngine/cAnimatedSprite.cpp | 4 +- .../TrooperEngine/VideoEngine/cCamera.cpp | 2 +- .../TrooperEngine/VideoEngine/cImage.cpp | 14 ++--- .../TrooperEngine/VideoEngine/cRenderer.hpp | 2 +- .../TrooperEngine/VideoEngine/cSprite.cpp | 31 +++++----- .../TrooperEngine/VideoEngine/cSprite.hpp | 6 +- TrooperEngineDLL/TrooperEngineDLL.vcxproj | 4 +- .../TrooperEngineDLL.vcxproj.filters | 12 ++-- .../dllExportFiles/TrooperEngine.hpp | 2 +- .../GUIEngineTest/GUIXMLTest.cpp | 8 +-- .../GUIEngineTest/GUIXMLTest.hpp | 2 +- TrooperEngineTest/TrooperEngineTest.vcxproj | 2 +- .../TrooperEngineTest.vcxproj.filters | 2 +- TrooperEngineTest/xml/GUIXMLAlignTest.xml | 6 +- TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml | 9 --- TrooperEngineTest/xml/GUIXMLDefaultTest.xml | 2 +- TrooperEngineTest/xml/GUIXMLSizerTest.xml | 11 ++++ TrooperEngineTest/xml/include.xml | 4 +- 67 files changed, 369 insertions(+), 308 deletions(-) rename TrooperEngineDLL/TrooperEngine/GUIEngine/{cBoxSizer.cpp => cSizer.cpp} (50%) rename TrooperEngineDLL/TrooperEngine/GUIEngine/{cBoxSizer.hpp => cSizer.hpp} (73%) delete mode 100644 TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml create mode 100644 TrooperEngineTest/xml/GUIXMLSizerTest.xml diff --git a/SDLPongCPP/Game/Equipment/cBall.cpp b/SDLPongCPP/Game/Equipment/cBall.cpp index 4b3aed1..8c8bbd7 100644 --- a/SDLPongCPP/Game/Equipment/cBall.cpp +++ b/SDLPongCPP/Game/Equipment/cBall.cpp @@ -5,8 +5,8 @@ using Equipment::cBall; cBall::cBall( const signed long int xpos /*= 0*/, const signed long int ypos /*= 0*/, const signed long int xarea /*= 0*/, const signed long int yarea /*= 0*/, const unsigned long int warea /*= 0*/, const unsigned long int harea /*= 0*/, VideoEngine::cImage** image /*= nullptr*/, VideoEngine::cCamera** camera /*= nullptr*/ ) -: cSprite(xpos, ypos, xarea, yarea, warea, harea, image, camera), - m_pause(false), m_ballState(Serve), m_speed(-10.0, -10.0), m_maxSpeed(10), m_minSpeed(5), m_boucedAllReady(false) + : cSprite(xpos, ypos, xarea, yarea, warea, harea, image, camera), + m_pause(false), m_ballState(Serve), m_speed(-10.0, -10.0), m_maxSpeed(10), m_minSpeed(5), m_boucedAllReady(false) {} cBall::~cBall() diff --git a/SDLPongCPP/Game/Equipment/cCourt.cpp b/SDLPongCPP/Game/Equipment/cCourt.cpp index b548e0d..efaf08e 100644 --- a/SDLPongCPP/Game/Equipment/cCourt.cpp +++ b/SDLPongCPP/Game/Equipment/cCourt.cpp @@ -9,7 +9,7 @@ using MathEngine::Vector4; using MathEngine::Vector2; cCourt::cCourt( cBall* ball /*= nullptr*/, cPaddle* player1 /*= nullptr*/, cPaddle* player2 /*= nullptr*/, VideoEngine::cImage** image /*= nullptr*/ ) -: cSprite( 0, 0, 0, 0, 640, 480, image), mp_ball(ball), m_pause(false) + : cSprite( 0, 0, 0, 0, 640, 480, image), mp_ball(ball), m_pause(false) { m_topWall.x = 0.0f; m_topWall.y = 0.0f; diff --git a/SDLPongCPP/Game/Equipment/cPaddle.cpp b/SDLPongCPP/Game/Equipment/cPaddle.cpp index 2c205d4..64294f4 100644 --- a/SDLPongCPP/Game/Equipment/cPaddle.cpp +++ b/SDLPongCPP/Game/Equipment/cPaddle.cpp @@ -5,7 +5,7 @@ using Equipment::cPaddle; cPaddle::cPaddle( const signed long int xpos /*= 0*/, const signed long int ypos /*= 0*/, const signed long int xarea /*= 0*/, const signed long int yarea /*= 0*/, const unsigned long int warea /*= 0*/, const unsigned long int harea /*= 0*/, VideoEngine::cImage** image /*= nullptr*/, VideoEngine::cCamera** camera /*= nullptr*/ ) -: cSprite( xpos, ypos, xarea, yarea, warea, harea, image, camera ), m_speed(0.0), m_pause(false), m_state(Still) + : cSprite( xpos, ypos, xarea, yarea, warea, harea, image, camera ), m_speed(0.0), m_pause(false), m_state(Still) {} cPaddle::~cPaddle() diff --git a/SDLPongCPP/Game/Equipment/cPaddle.hpp b/SDLPongCPP/Game/Equipment/cPaddle.hpp index 274928f..d0ee56e 100644 --- a/SDLPongCPP/Game/Equipment/cPaddle.hpp +++ b/SDLPongCPP/Game/Equipment/cPaddle.hpp @@ -41,9 +41,9 @@ namespace Equipment { private: double m_speed; - bool m_pause;// = false + bool m_pause;/// = false - eState m_state;// = Still + eState m_state;/// = Still };/// END CLASS DEFINITION cPaddle }/// END NAMESPACE DEFINITION Equipment #endif/// END IFNDEF _CPADDLE_HPP_ \ No newline at end of file diff --git a/SDLPongCPP/Game/PongStart/cPongStart.cpp b/SDLPongCPP/Game/PongStart/cPongStart.cpp index 15233e6..1ec0513 100644 --- a/SDLPongCPP/Game/PongStart/cPongStart.cpp +++ b/SDLPongCPP/Game/PongStart/cPongStart.cpp @@ -123,8 +123,8 @@ void cPongStart::MainMenu() void cPongStart::Start() { - VideoEngine::cImageFile* p_image = new VideoEngine::cImageFile("img/", "Equipment.png", true, 0, 0, 0); - VideoEngine::cImageFile* p_court = new VideoEngine::cImageFile("img/", "Court.png"); + VideoEngine::cImage* p_image = new VideoEngine::cImageFile("img/", "Equipment.png", true, 0, 0, 0); + VideoEngine::cImage* p_court = new VideoEngine::cImageFile("img/", "Court.png"); Equipment::cBall* ball = new Equipment::cBall(400, 400, 17, 65, 12, 12, &p_image); Equipment::cPaddle* paddle = new Equipment::cPaddle(0, 0, 0, 0, 16, 77, &p_image); diff --git a/TrooperEngineDLL/TrooperEngine/AudioEngine/cMusic.cpp b/TrooperEngineDLL/TrooperEngine/AudioEngine/cMusic.cpp index d7e1e21..cafe492 100644 --- a/TrooperEngineDLL/TrooperEngine/AudioEngine/cMusic.cpp +++ b/TrooperEngineDLL/TrooperEngine/AudioEngine/cMusic.cpp @@ -6,7 +6,7 @@ cMusic::cMusic() {} /* Copy constructor */ -cMusic::cMusic(const cMusic& copy) +cMusic::cMusic( const cMusic& copy ) { copy; } @@ -20,13 +20,13 @@ void cMusic::PlayMusic() {} /* Fades in the music for time */ -void cMusic::FadeIn(const unsigned int time /*= 1000*/) const +void cMusic::FadeIn( const unsigned int time /*= 1000*/ ) const { time; } /* Fades out the music for time */ -void cMusic::FideOut(const unsigned int time /*= 1000*/) const +void cMusic::FideOut( const unsigned int time /*= 1000*/ ) const { time; } diff --git a/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.cpp b/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.cpp index c5c7b1f..08f03cb 100644 --- a/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.cpp +++ b/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.cpp @@ -70,13 +70,13 @@ cEvent::cEvent() //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnKeyDown(SDL_Keycode sym, Uint16 mod)//, Uint16 unicode) +/*virtual*/ void cEvent::OnKeyDown( SDL_Keycode sym, Uint16 mod )//, Uint16 unicode) { sym, mod; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnKeyUp(SDL_Keycode sym, Uint16 mod)//, Uint16 unicode) +/*virtual*/ void cEvent::OnKeyUp( SDL_Keycode sym, Uint16 mod )//, Uint16 unicode) { sym, mod; //Pure virtual, do nothing @@ -92,79 +92,79 @@ cEvent::cEvent() //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnMouseMove(int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle) +/*virtual*/ void cEvent::OnMouseMove( int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle ) { mX, mY, relX, relY, Left, Right, Middle; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnMouseWheel(bool Up, bool Down) +/*virtual*/ void cEvent::OnMouseWheel( bool Up, bool Down ) { Up, Down; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnLButtonDown(int mX, int mY) +/*virtual*/ void cEvent::OnLButtonDown( int mX, int mY ) { mX, mY; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnLButtonUp(int mX, int mY) +/*virtual*/ void cEvent::OnLButtonUp( int mX, int mY ) { mX, mY; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnRButtonDown(int mX, int mY) +/*virtual*/ void cEvent::OnRButtonDown( int mX, int mY ) { mX, mY; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnRButtonUp(int mX, int mY) +/*virtual*/ void cEvent::OnRButtonUp( int mX, int mY ) { mX, mY; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnMButtonDown(int mX, int mY) +/*virtual*/ void cEvent::OnMButtonDown( int mX, int mY ) { mX, mY; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnMButtonUp(int mX, int mY) +/*virtual*/ void cEvent::OnMButtonUp( int mX, int mY ) { mX, mY; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnJoyAxis(SDL_JoystickID which, Uint8 axis, Sint16 value) +/*virtual*/ void cEvent::OnJoyAxis( SDL_JoystickID which, Uint8 axis, Sint16 value ) { which, axis, value; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnJoyButtonDown(SDL_JoystickID which, Uint8 button) +/*virtual*/ void cEvent::OnJoyButtonDown( SDL_JoystickID which, Uint8 button ) { which, button; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnJoyButtonUp(SDL_JoystickID which, Uint8 button) +/*virtual*/ void cEvent::OnJoyButtonUp( SDL_JoystickID which, Uint8 button ) { which, button; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnJoyHat(SDL_JoystickID which, Uint8 hat, Uint8 value) +/*virtual*/ void cEvent::OnJoyHat( SDL_JoystickID which, Uint8 hat, Uint8 value ) { which, hat, value; //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnJoyBall(SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel) +/*virtual*/ void cEvent::OnJoyBall( SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel ) { which, ball, xrel, yrel; //Pure virtual, do nothing @@ -180,7 +180,7 @@ cEvent::cEvent() //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnResize(int w, int h) +/*virtual*/ void cEvent::OnResize( int w, int h ) { w, h; //Pure virtual, do nothing @@ -196,7 +196,7 @@ cEvent::cEvent() //Pure virtual, do nothing } -/*virtual*/ void cEvent::OnUser(Uint32 type, int code, void* data1, void* data2) +/*virtual*/ void cEvent::OnUser( Uint32 type, int code, void* data1, void* data2 ) { type, code, data1, data2; //Pure virtual, do nothing diff --git a/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.hpp b/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.hpp index e2ac13d..a425c58 100644 --- a/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.hpp +++ b/TrooperEngineDLL/TrooperEngine/EventEngine/cEvent.hpp @@ -22,51 +22,51 @@ namespace EventEngine { virtual void OnInputBlur(); - virtual void OnKeyDown(SDL_Keycode sym, Uint16 mod);//, Uint16 unicode); + virtual void OnKeyDown( SDL_Keycode sym, Uint16 mod );//, Uint16 unicode); - virtual void OnKeyUp(SDL_Keycode sym, Uint16 mod);//, Uint16 unicode); + virtual void OnKeyUp( SDL_Keycode sym, Uint16 mod );//, Uint16 unicode); virtual void OnMouseFocus(); virtual void OnMouseBlur(); - virtual void OnMouseMove(int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle); + virtual void OnMouseMove( int mX, int mY, int relX, int relY, bool Left, bool Right, bool Middle ); - virtual void OnMouseWheel(bool Up, bool Down); //Not implemented + virtual void OnMouseWheel( bool Up, bool Down ); //Not implemented - virtual void OnLButtonDown(int mX, int mY); + virtual void OnLButtonDown( int mX, int mY ); - virtual void OnLButtonUp(int mX, int mY); + virtual void OnLButtonUp( int mX, int mY ); - virtual void OnRButtonDown(int mX, int mY); + virtual void OnRButtonDown( int mX, int mY ); - virtual void OnRButtonUp(int mX, int mY); + virtual void OnRButtonUp( int mX, int mY ); - virtual void OnMButtonDown(int mX, int mY); + virtual void OnMButtonDown( int mX, int mY ); - virtual void OnMButtonUp(int mX, int mY); + virtual void OnMButtonUp( int mX, int mY ); - virtual void OnJoyAxis(SDL_JoystickID which, Uint8 axis, Sint16 value); + virtual void OnJoyAxis( SDL_JoystickID which, Uint8 axis, Sint16 value ); - virtual void OnJoyButtonDown(SDL_JoystickID which, Uint8 button); + virtual void OnJoyButtonDown( SDL_JoystickID which, Uint8 button ); - virtual void OnJoyButtonUp(SDL_JoystickID which, Uint8 button); + virtual void OnJoyButtonUp( SDL_JoystickID which, Uint8 button ); - virtual void OnJoyHat(SDL_JoystickID which, Uint8 hat, Uint8 value); + virtual void OnJoyHat( SDL_JoystickID which, Uint8 hat, Uint8 value ); - virtual void OnJoyBall(SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel); + virtual void OnJoyBall( SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel ); virtual void OnMinimize(); virtual void OnRestore(); - virtual void OnResize(int w, int h); + virtual void OnResize( int w, int h ); virtual void OnExpose(); virtual void OnExit(); - virtual void OnUser(Uint32 type, int code, void* data1, void* data2); + virtual void OnUser( Uint32 type, int code, void* data1, void* data2 ); private: void OnWindowsEvent( const SDL_Event& event ); void OnMouseButtonDown( const SDL_Event& event ); diff --git a/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.cpp b/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.cpp index e536f97..a38c719 100644 --- a/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.cpp +++ b/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.cpp @@ -86,12 +86,12 @@ void cEventControl::CheckEvents() } } -void cEventControl::AddEvent(EventEngine::cEvent* event) +void cEventControl::AddEvent( EventEngine::cEvent* event ) { m_children.push_back(event); } -const bool cEventControl::RemoveEvent(EventEngine::cEvent* event) +const bool cEventControl::RemoveEvent( EventEngine::cEvent* event ) { bool rtn = false; std::vector::iterator it; diff --git a/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.hpp b/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.hpp index 4eb12cd..1908d09 100644 --- a/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.hpp +++ b/TrooperEngineDLL/TrooperEngine/EventEngine/cEventControl.hpp @@ -33,8 +33,8 @@ namespace EventEngine { /* Checks for Events */ void CheckEvents(); - void AddEvent(EventEngine::cEvent* event); - const bool RemoveEvent(EventEngine::cEvent* event); + void AddEvent( EventEngine::cEvent* event ); + const bool RemoveEvent( EventEngine::cEvent* event ); std::vector& GetEvents(); diff --git a/TrooperEngineDLL/TrooperEngine/FXEngine/cGFX.hpp b/TrooperEngineDLL/TrooperEngine/FXEngine/cGFX.hpp index e37a15b..9cb44e0 100644 --- a/TrooperEngineDLL/TrooperEngine/FXEngine/cGFX.hpp +++ b/TrooperEngineDLL/TrooperEngine/FXEngine/cGFX.hpp @@ -13,9 +13,9 @@ using UtilityEngine::cString; -namespace EXPORT_FROM_MYDLL FXEngine { +namespace FXEngine { /* Singleton */ - class cGFX + class EXPORT_FROM_MYDLL cGFX { private: cGFX(); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/Enums.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/Enums.hpp index a65c96e..a0f113f 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/Enums.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/Enums.hpp @@ -19,7 +19,7 @@ namespace GUIHelpers { CWINDOW, CPANEL, CLAYOUT, - CBOXSIZER, + CSIZER, CBUTTON, CTEXTBUTTON, CLABEL, diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.cpp index e8e6b0f..a0bf0e2 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.cpp @@ -13,7 +13,7 @@ cObject::cObject( const signed int id ) /*virtual*/ cObject::~cObject() {} -bool cObject::operator == (const cObject& other) +bool cObject::operator == ( const cObject& other ) { if (m_id == other.getID()) return true; diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.hpp index 32bd1d0..e1b4bdf 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cObject.hpp @@ -14,7 +14,7 @@ namespace GUIHelpers { cObject( const signed int id ); virtual ~cObject(); - bool operator == (const cObject& other); + bool operator == ( const cObject& other ); ///Functions diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.cpp index ca60de7..9537d28 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.cpp @@ -21,20 +21,22 @@ cXMLoader::~cXMLoader() {} /// Functions -void cXMLoader::Load( const cString& filename, const cString& dir /*= ""*/, GUIEngine::cWindow* parent /*= nullptr*/ ) +const bool cXMLoader::Load( const cString& filename, const cString& dir /*= ""*/, GUIEngine::cWindow* parent /*= nullptr*/ ) { + bool rtn = false; cString file = dir + filename; tinyxml2::XMLDocument doc; if (doc.LoadFile(file.c_str()) != tinyxml2::XMLError::XML_NO_ERROR) cUtility::Inst().Message("Could not load file. " + file + " Error='" + doc.ErrorName() + "'."); else { + rtn = true; tinyxml2::XMLElement* element = doc.FirstChildElement(); if (element == nullptr) cUtility::Inst().Message("No tag found."); else { - //OK check for defaults + /// OK check for defaults tinyxml2::XMLElement* defaultEl = element->FirstChildElement("default"); if (defaultEl != nullptr) Default(*defaultEl); @@ -44,7 +46,7 @@ void cXMLoader::Load( const cString& filename, const cString& dir /*= ""*/, GUIE GetElement(*element, parent); } } - + return rtn; } void cXMLoader::GetElement( tinyxml2::XMLElement& element, GUIEngine::cWindow* parent /*= nullptr*/ ) const @@ -62,8 +64,8 @@ void cXMLoader::GetElement( tinyxml2::XMLElement& element, GUIEngine::cWindow* p tmp = LayoutBuild(element, parent); if (name == "label") tmp = LabelBuild(element, parent); - if (name == "boxsizer") - tmp = BoxSizerBuild(element, parent); + if (name == "sizer") + tmp = SizerBuild(element, parent); tinyxml2::XMLElement* child = element.FirstChildElement(); if (child != nullptr) @@ -191,7 +193,7 @@ GUIEngine::cLabel* cXMLoader::LabelBuild( const tinyxml2::XMLElement& element, G return rtn; } -GUIEngine::cBoxSizer* cXMLoader::BoxSizerBuild(const tinyxml2::XMLElement& element, GUIEngine::cWindow* parent) const +GUIEngine::cSizer* cXMLoader::SizerBuild(const tinyxml2::XMLElement& element, GUIEngine::cWindow* parent) const { signed long int id = getID(element); //GUIHelpers::eOrientation orientation = getOrientation(element); @@ -203,7 +205,7 @@ GUIEngine::cBoxSizer* cXMLoader::BoxSizerBuild(const tinyxml2::XMLElement& eleme cString txt = getText(element); - GUIEngine::cBoxSizer* rtn = new GUIEngine::cBoxSizer(parent, id, align, layout, pos, size, pad); + GUIEngine::cSizer* rtn = new GUIEngine::cSizer(parent, id, align, layout, pos, size, pad); return rtn; } @@ -384,7 +386,8 @@ const GUIHelpers::Padding cXMLoader::getPadding( const tinyxml2::XMLElement& ele const cString cXMLoader::getText( const tinyxml2::XMLElement& element ) const { - return GetAttribute(element, "text"); + //return GetAttribute(element, "text"); + return element.GetText(); } const GUIHelpers::RGBA cXMLoader::getColour( const tinyxml2::XMLElement& element ) const diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.hpp index 0bc93cc..9d4ad6f 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.hpp @@ -14,7 +14,7 @@ #include "../cPanel.hpp" #include "../cLayout.hpp" #include "../cLabel.hpp" -#include "../cBoxSizer.hpp" +#include "../cSizer.hpp" #include "../../UtilityEngine/cString.hpp" @@ -27,7 +27,7 @@ namespace GUIHelpers { cXMLoader(); ~cXMLoader(); - void Load( const cString& filename, const cString& dir = "", GUIEngine::cWindow* parent = nullptr ); + const bool Load( const cString& filename, const cString& dir = "", GUIEngine::cWindow* parent = nullptr ); private: void GetElement( tinyxml2::XMLElement& element, GUIEngine::cWindow* parent = nullptr ) const; @@ -41,7 +41,7 @@ namespace GUIHelpers { GUIEngine::cPanel* PanelBuild( const tinyxml2::XMLElement& element, GUIEngine::cWindow* parent ) const; GUIEngine::cLayout* LayoutBuild( const tinyxml2::XMLElement& element, GUIEngine::cWindow* parent ) const; GUIEngine::cLabel* LabelBuild( const tinyxml2::XMLElement& element, GUIEngine::cWindow* parent ) const; - GUIEngine::cBoxSizer* BoxSizerBuild( const tinyxml2::XMLElement& element, GUIEngine::cWindow* parent ) const; + GUIEngine::cSizer* SizerBuild( const tinyxml2::XMLElement& element, GUIEngine::cWindow* parent ) const; const cString getDir( const tinyxml2::XMLElement& element ) const; const cString getFileName( const tinyxml2::XMLElement& element ) const; diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp index 4bfbccc..162f35a 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp @@ -55,17 +55,18 @@ const bool cGUI::Initialize( const cString& filename, const cString& dir /*= ""* bool rtn = IsInit(); GUIHelpers::cXMLoader xml; - xml.Load(filename, dir); + rtn = xml.Load(filename, dir); //GUIHelpers::cXMLoader::Inst().Load(filename, dir); // if (rtn == false) { // setFont( filename, dir, size ); // cUtility::Inst().Message("GUI initialized."); // } + m_inited = rtn; return rtn; } -void cGUI::Event(const MathEngine::iVector2& location, const eGUIEventType& type) +void cGUI::Event( const MathEngine::iVector2& location, const eGUIEventType& type ) { location; type; @@ -112,7 +113,7 @@ void cGUI::Display() } /// Sets -void cGUI::setDebugLevel(const unsigned long int debugLevel) +void cGUI::setDebugLevel( const unsigned long int debugLevel ) { m_debugLevel = debugLevel; } diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp index d2d33ac..17c6491 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp @@ -36,6 +36,7 @@ namespace GUIEngine { MouseButton3, Keyboard }; + /// Functions static cGUI& Inst(); static void Delete(); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp index 52b6f4b..7677f32 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp @@ -5,9 +5,9 @@ using GUIEngine::cLabel; /*static*/ const cString cLabel::sNAME = "label"; /*static*/ const GUIHelpers::eLayout cLabel::sLAYOUT = GUIHelpers::eLayout::WRAP_CONTENT; -cLabel::cLabel(cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign& align /*= sALIGN*/, +cLabel::cLabel( cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, - const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/) + const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { mp_text = new TextTypeEngine::cText(label); Create(parent, id, label, align, layout, pos, size, padding, name); @@ -20,11 +20,13 @@ cLabel::cLabel(cWindow* parent, const signed int id, const cString& label /*= "" } /// Functions -void cLabel::Create(cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign& align /*= sALIGN*/, +void cLabel::Create( cWindow* parent, const signed int id, const cString& label /*= ""*/, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, - const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/) + const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { cWindow::Create(parent, id, sORIENTATION, align, layout, pos, size, padding, name); + if (layout == GUIHelpers::eLayout::DEFAULT_LAYOUT) + setLayout(sLAYOUT); if (this->getParent() != nullptr) { this->getParent()->AddChild(this); } @@ -54,12 +56,12 @@ void cLabel::GenerateTexture() } /// Sets -void cLabel::setFontColour(const GUIHelpers::RGBA& colour) +void cLabel::setFontColour( const GUIHelpers::RGBA& colour ) { mp_text->setColour(colour); } -void cLabel::setFontSize(const unsigned long int size) +void cLabel::setFontSize( const unsigned long int size ) { mp_text->setSize(size); SetSize(); @@ -71,7 +73,7 @@ void cLabel::setText(const cString& text) SetSize(); } -void cLabel::setFont(const TextTypeEngine::cFont* font) +void cLabel::setFont( const TextTypeEngine::cFont* font ) { mp_text->setFont((TextTypeEngine::cFont**)(&font)); } @@ -113,7 +115,7 @@ const cString& cLabel::getText() const // cWindow::RePos(); // } -/*virtual*/ void cLabel::RebuildLayout(const GUIHelpers::eLayout& layout) +/*virtual*/ void cLabel::RebuildLayout( const GUIHelpers::eLayout& layout ) { SetSize(); } diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp index 393e996..d72ce61 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp @@ -19,15 +19,15 @@ namespace GUIEngine { static const cString sNAME; /*= "label";*/ static const GUIHelpers::eLayout sLAYOUT;/* = GUIHelpers::eLayout::WRAP_CONTENT;*/ - cLabel(cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign& align = sALIGN, + cLabel( cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, - const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME); + const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); virtual ~cLabel(); /// Functions - void Create(cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign& align = sALIGN, + void Create( cWindow* parent, const signed int id, const cString& label = "", const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, - const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME); + const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); virtual void Display(); @@ -49,13 +49,11 @@ namespace GUIEngine { //virtual void Resize(); - virtual void RebuildLayout(const GUIHelpers::eLayout& layout); + virtual void RebuildLayout( const GUIHelpers::eLayout& layout ); private: void SetSize(); - - private: VideoEngine::cSprite m_sprite; TextTypeEngine::cText* mp_text;/// = nullptr diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp index f1bf86b..dc5d22a 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cLayout.cpp @@ -5,9 +5,9 @@ using GUIEngine::cLayout; /*static*/ const cString cLayout::sNAME = "layout"; /*static*/ const GUIHelpers::eOrientation cLayout::sORIENTATION = GUIHelpers::eOrientation::VERTICAL; -cLayout::cLayout(cWindow* parent, const signed int id, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, +cLayout::cLayout( cWindow* parent, const signed int id, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, - const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/) + const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { Create(parent, id, orientation, align, layout, pos, size, padding, name); } @@ -16,9 +16,9 @@ cLayout::cLayout(cWindow* parent, const signed int id, const GUIHelpers::eOrient {} /// Functions -/*virtual*/ void cLayout::Create(cWindow* parent, const signed int id, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, +/*virtual*/ void cLayout::Create( cWindow* parent, const signed int id, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, - const GUIHelpers::Padding& padding/* = sPADDING*/, const cString& name /*= sNAME*/) + const GUIHelpers::Padding& padding/* = sPADDING*/, const cString& name /*= sNAME*/ ) { GUIHelpers::eOrientation ori = orientation; if (ori == GUIHelpers::eOrientation::DEFAULT_ORIENTATION) diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp index 3265ba3..a316033 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cPanel.cpp @@ -16,9 +16,9 @@ cPanel::cPanel( cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, con {} /// Functions -/*virtual*/ void cPanel::Create(cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, +/*virtual*/ void cPanel::Create( cWindow* parent /*= nullptr*/, const signed int id /*= -1*/, const GUIHelpers::eOrientation& orientation /*= sORIENTATION*/, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, - const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/) + const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { padding; cLayout::Create( parent, id, orientation, align, layout, pos, size, { 0,0,0,0 }, name ); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp similarity index 50% rename from TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.cpp rename to TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp index fcfbda1..2febb6a 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp @@ -1,22 +1,22 @@ -#include "cBoxSizer.hpp" +#include "cSizer.hpp" -using GUIEngine::cBoxSizer; +using GUIEngine::cSizer; -/*static*/ const cString cBoxSizer::sNAME = "boxsizer"; -/*static*/ GUIHelpers::Size cBoxSizer::sSIZE = { 5, 5 }; +/*static*/ const cString cSizer::sNAME = "sizer"; +/*static*/ GUIHelpers::Size cSizer::sSIZE = { 5, 5 }; -cBoxSizer::cBoxSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, +cSizer::cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos /*= sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { Create(parent, id, align, layout, pos, size, padding, name); } -/*virtual*/ cBoxSizer::~cBoxSizer() +/*virtual*/ cSizer::~cSizer() {} /// Functions -void cBoxSizer::Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, +void cSizer::Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align /*= sALIGN*/, const GUIHelpers::eLayout& layout /*= sLAYOUT*/, const GUIHelpers::Position& pos/* = sPOSITION*/, const GUIHelpers::Size& size /*= sSIZE*/, const GUIHelpers::Padding& padding /*= sPADDING*/, const cString& name /*= sNAME*/ ) { @@ -29,12 +29,12 @@ void cBoxSizer::Create( cWindow* parent, const signed int id, const GUIHelpers:: } } -/*virtual*/ const GUIHelpers::eType cBoxSizer::getType() const +/*virtual*/ const GUIHelpers::eType cSizer::getType() const { - return GUIHelpers::eType::CBOXSIZER; + return GUIHelpers::eType::CSIZER; } -/*virtual*/ const GUIHelpers::RGBA& cBoxSizer::getDebugColour() const +/*virtual*/ const GUIHelpers::RGBA& cSizer::getDebugColour() const { return GUIHelpers::CYAN; } \ No newline at end of file diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp similarity index 73% rename from TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.hpp rename to TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp index 6e71eff..1049160 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp @@ -1,5 +1,5 @@ -#ifndef _CBOXSIZER_HPP_ -#define _CBOXSIZER_HPP_ +#ifndef _CSIZER_HPP_ +#define _CSIZER_HPP_ /*** SDL Header Files ***/ #include @@ -20,16 +20,16 @@ using UtilityEngine::cString; namespace GUIEngine { - class EXPORT_FROM_MYDLL cBoxSizer : public cWindow + class EXPORT_FROM_MYDLL cSizer : public cWindow { public: - static const cString sNAME; /*= "boxsizer";*/ + static const cString sNAME; /*= "sizer";*/ static GUIHelpers::Size sSIZE; /*= { 5, 5 }*/ - cBoxSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, + cSizer( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, const GUIHelpers::Position& pos = sPOSITION, const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); - virtual ~cBoxSizer(); + virtual ~cSizer(); /// Functions void Create( cWindow* parent, const signed int id, const GUIHelpers::eAlign& align = sALIGN, const GUIHelpers::eLayout& layout = sLAYOUT, @@ -40,6 +40,6 @@ namespace GUIEngine { virtual const GUIHelpers::RGBA& getDebugColour() const; private: private: - };/// END CLASS DEFINITION cBoxSizer + };/// END CLASS DEFINITION cSizer }/// END NAMESPACE DEFINITION GUIEngine -#endif/// END IFNDEF _CBOXSIZER_HPP_ \ No newline at end of file +#endif/// END IFNDEF _CSIZER_HPP_ \ No newline at end of file diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp index 65fba82..930bc93 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.cpp @@ -4,9 +4,9 @@ using GUIEngine::cTextButton; /*static*/ const cString cTextButton::sNAME = "textButton"; -cTextButton::cTextButton(cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align /*= GUIHelpers::eAlign::CENTER*/, +cTextButton::cTextButton( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align /*= GUIHelpers::eAlign::CENTER*/, const GUIHelpers::eLayout& layout /*= GUIHelpers::eLayout::FILL_PARENT*/, const GUIHelpers::Position& pos /*= POSITION*/, - const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/) + const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ ) : m_label(this, -1, text) { Create(parent, id, text, align, layout, pos, size, padding, name); @@ -16,26 +16,26 @@ cTextButton::cTextButton(cWindow* parent, const signed int id, const cString& te {} ///Functions -void cTextButton::Create(cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align /*= GUIHelpers::eAlign::CENTER*/, +void cTextButton::Create( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align /*= GUIHelpers::eAlign::CENTER*/, const GUIHelpers::eLayout& layout /*= GUIHelpers::eLayout::FILL_PARENT*/, const GUIHelpers::Position& pos /*= POSITION*/, - const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/) + const GUIHelpers::Size& size /*= SIZE*/, const GUIHelpers::Padding& padding /*= PADDING*/, const cString& name /*= NAME*/ ) { cButton::Create(parent, id, align, layout, pos, size, padding, name); setText(text); } /// Sets -void cTextButton::setText(const cString& text) +void cTextButton::setText( const cString& text ) { m_label.setText(text); } -void cTextButton::setTextColour(const GUIHelpers::RGBA& colour) +void cTextButton::setTextColour( const GUIHelpers::RGBA& colour ) { m_label.setFontColour(colour); } -void cTextButton::setTextSize(const unsigned long int size) +void cTextButton::setTextSize( const unsigned long int size ) { m_label.setSize(size); } diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp index c799906..1d1b6cf 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cTextButton.hpp @@ -28,15 +28,15 @@ namespace GUIEngine { public: static const cString sNAME; /*= "button";*/ - cTextButton(cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER, + cTextButton( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER, const GUIHelpers::eLayout& layout = GUIHelpers::eLayout::FILL_PARENT, const GUIHelpers::Position& pos = sPOSITION, - const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME); + const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); virtual ~cTextButton(); /// Functions - void Create(cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER, + void Create( cWindow* parent, const signed int id, const cString& text, const GUIHelpers::eAlign& align = GUIHelpers::eAlign::CENTER, const GUIHelpers::eLayout& layout = GUIHelpers::eLayout::FILL_PARENT, const GUIHelpers::Position& pos = sPOSITION, - const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME); + const GUIHelpers::Size& size = sSIZE, const GUIHelpers::Padding& padding = sPADDING, const cString& name = sNAME ); /// Sets void setText( const cString& text ); diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.cpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.cpp index 3ec1193..bb89dfa 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.cpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.cpp @@ -287,11 +287,50 @@ cWindow* cWindow::getParent() return mp_parent; } +const unsigned long int cWindow::getFillParentSize() +{ + unsigned long int rtn = 0; + + int count = 0; + + GUIHelpers::Size size = getSize(false); + + std::vector::iterator it; + + for (it = m_children.begin(); it < m_children.end(); it++) { + if ((*it)->getLayout() == GUIHelpers::eLayout::WRAP_CONTENT) { + size -= (*it)->getSize(); + } + else { + count++; + } + } + + switch (m_orientation) { + case GUIHelpers::eOrientation::VERTICAL: + rtn = size.y; + break; + case GUIHelpers::eOrientation::HORIZONTAL: + rtn = size.x; + break; + default: + break; + } + + //if ((rtn % count) != 0) + + rtn /= count; + + return rtn; +} + /*virtual*/ const GUIHelpers::eType cWindow::getType() const { return GUIHelpers::eType::CWINDOW; } + + /// protected /*virtual*/ void cWindow::Resize() @@ -316,12 +355,19 @@ cWindow* cWindow::getParent() mySize = mp_parent->getSize(false); if (mp_parent->getType() == GUIHelpers::eType::CLAYOUT) { - if (mp_parent->getChildren().size() > 1) + unsigned long int fillSize = 0; + if (mp_parent->getChildren().size() > 1) { + fillSize = mp_parent->getFillParentSize(); mySize -= mp_parent->getChildrenSize(this); - if (mp_parent->getOrientation() == GUIHelpers::eOrientation::VERTICAL) + } + if (mp_parent->getOrientation() == GUIHelpers::eOrientation::VERTICAL) { mySize.x = m_size.x; - if (mp_parent->getOrientation() == GUIHelpers::eOrientation::HORIZONTAL) + mySize.y = fillSize; + } + if (mp_parent->getOrientation() == GUIHelpers::eOrientation::HORIZONTAL) { mySize.y = m_size.y; + mySize.x = fillSize; + } } mySize.x -= m_padding.x + m_padding.w; @@ -460,6 +506,10 @@ std::vector& cWindow::getChildren() } /// private +void cWindow::Rebuild(cWindow * const parent, const GUIHelpers::eLayout & layout) +{ +} + void cWindow::AddSize( const int x, const int y, GUIHelpers::Size& mySize ) const { int addFrom = x; diff --git a/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.hpp b/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.hpp index d49e19e..f068800 100644 --- a/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.hpp +++ b/TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.hpp @@ -89,8 +89,12 @@ namespace GUIEngine { cWindow* getParent(); + const unsigned long int getFillParentSize(); + virtual const GUIHelpers::eType getType() const; + + virtual void Resize(); virtual void RebuildLayout( const GUIHelpers::eLayout& layout ); diff --git a/TrooperEngineDLL/TrooperEngine/InputEngine/cJoystick.hpp b/TrooperEngineDLL/TrooperEngine/InputEngine/cJoystick.hpp index fb8fda7..2d3b2aa 100644 --- a/TrooperEngineDLL/TrooperEngine/InputEngine/cJoystick.hpp +++ b/TrooperEngineDLL/TrooperEngine/InputEngine/cJoystick.hpp @@ -18,17 +18,17 @@ namespace InputEngine { virtual ~cJoystick(); /// Functions - virtual void OnEvent(const SDL_Event& event); + virtual void OnEvent( const SDL_Event& event ); - virtual void OnJoyAxis(SDL_JoystickID which, Uint8 axis, Sint16 value); + virtual void OnJoyAxis( SDL_JoystickID which, Uint8 axis, Sint16 value ); - virtual void OnJoyButtonDown(SDL_JoystickID which, Uint8 button); + virtual void OnJoyButtonDown( SDL_JoystickID which, Uint8 button ); - virtual void OnJoyButtonUp(SDL_JoystickID which, Uint8 button); + virtual void OnJoyButtonUp( SDL_JoystickID which, Uint8 button ); - virtual void OnJoyHat(SDL_JoystickID which, Uint8 hat, Uint8 value); + virtual void OnJoyHat( SDL_JoystickID which, Uint8 hat, Uint8 value ); - virtual void OnJoyBall(SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel); + virtual void OnJoyBall( SDL_JoystickID which, Uint8 ball, Sint16 xrel, Sint16 yrel ); /// Used when looking for keys that have been add to the check list void JoystickCheck(); diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.cpp b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.cpp index 10c1ae7..140da39 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.cpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.cpp @@ -16,7 +16,7 @@ Vector2::Vector2( const SDL_Rect& copy ) y = float(copy.y); } -Vector2& Vector2::operator=( const SDL_Rect& copy ) +Vector2& Vector2::operator = ( const SDL_Rect& copy ) { x = float(copy.x); y = float(copy.y); @@ -30,7 +30,7 @@ Vector2::Vector2( const iVector2& copy ) y = float(copy.y); } -Vector2& Vector2::operator=( const iVector2& copy ) +Vector2& Vector2::operator = ( const iVector2& copy ) { x = float(copy.x); y = float(copy.y); diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.hpp b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.hpp index 72f45a5..66ef83d 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.hpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector2.hpp @@ -16,11 +16,11 @@ namespace MathEngine { Vector2( const SDL_Rect& copy ); - Vector2& operator=( const SDL_Rect& copy ); + Vector2& operator = ( const SDL_Rect& copy ); Vector2( const iVector2& copy ); - Vector2& operator=( const iVector2& copy ); + Vector2& operator = ( const iVector2& copy ); float x; float y; diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.cpp b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.cpp index d0b22dc..9fddfa6 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.cpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.cpp @@ -17,7 +17,7 @@ Vector3::Vector3( const SDL_Rect& copy ) z = float(copy.w); } -Vector3& Vector3::operator=( const SDL_Rect& copy ) +Vector3& Vector3::operator = ( const SDL_Rect& copy ) { x = float(copy.x); y = float(copy.y); @@ -33,7 +33,7 @@ Vector3::Vector3( const iVector3& copy ) z = float(copy.z); } -Vector3& Vector3::operator=( const iVector3& copy ) +Vector3& Vector3::operator = ( const iVector3& copy ) { x = float(copy.x); y = float(copy.y); diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.hpp b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.hpp index a01f57d..03eb13c 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.hpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector3.hpp @@ -19,11 +19,11 @@ namespace MathEngine { Vector3( const SDL_Rect& copy ); - Vector3& operator=( const SDL_Rect& copy ); + Vector3& operator = ( const SDL_Rect& copy ); Vector3( const iVector3& copy ); - Vector3& operator=( const iVector3& copy ); + Vector3& operator = ( const iVector3& copy ); float z; };/// END STRUCT DEFINITION Vector3 diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.cpp b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.cpp index 2c549d9..ab0eb00 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.cpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.cpp @@ -5,7 +5,7 @@ using MathEngine::Vector4; using MathEngine::iVector4; -Vector4::Vector4( const float X /*= 0.0f*/, const float Y /*= 0.0f*/, const float Z /*= 0.0f*/, const float W /*= 0.0f*/) +Vector4::Vector4( const float X /*= 0.0f*/, const float Y /*= 0.0f*/, const float Z /*= 0.0f*/, const float W /*= 0.0f*/ ) : Vector3( X, Y, Z ), w(W) {} @@ -17,7 +17,7 @@ Vector4::Vector4( const SDL_Rect& copy ) w = float(copy.h); } -Vector4& Vector4::operator=( const SDL_Rect& copy ) +Vector4& Vector4::operator = ( const SDL_Rect& copy ) { x = float(copy.x); y = float(copy.y); @@ -35,7 +35,7 @@ Vector4::Vector4( const iVector4& copy ) w = float(copy.w); } -Vector4& Vector4::operator=( const iVector4& copy ) +Vector4& Vector4::operator = ( const iVector4& copy ) { x = float(copy.x); y = float(copy.y); diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.hpp b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.hpp index 8e45540..59c7525 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.hpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.hpp @@ -19,15 +19,11 @@ namespace MathEngine { Vector4( const SDL_Rect& copy ); - Vector4& operator=( const SDL_Rect& copy ); - - bool operator==(const SDL_Rect& other) const; + Vector4& operator = ( const SDL_Rect& copy ); Vector4( const iVector4& copy ); - Vector4& operator=( const iVector4& copy ); - - bool operator==(const Vector4& other) const; + Vector4& operator = ( const iVector4& copy ); float w; };/// END STRUCT DEFINITION Vector4 diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/cCollision.cpp b/TrooperEngineDLL/TrooperEngine/MathEngine/cCollision.cpp index 1ded2db..cd1793d 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/cCollision.cpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/cCollision.cpp @@ -18,31 +18,31 @@ cCollision::~cCollision() /*static*/ const bool cCollision::BoundingBox( const SDL_Rect& a, const SDL_Rect& b ) { if ((b.x + b.w) < a.x) - return false; //just checking if their + return false; /// just checking if their if ((a.x + a.w) < b.x ) - return false; //bounding boxes even touch + return false; /// bounding boxes even touch if ((b.y + b.h) < a.y) return false; if ((a.y + a.h) < b.y) return false; - return true; //bounding boxes intersect + return true; /// bounding boxes intersect } /*static*/ const bool cCollision::BoundingBox( const Vector4& a, const Vector4& b ) { if ((b.x + b.z) < a.x) - return false; //just checking if their + return false; /// just checking if their if ((a.x + a.z) < b.x ) - return false; //bounding boxes even touch + return false; /// bounding boxes even touch if ((b.y + b.w) < a.y) return false; if ((a.y + a.w) < b.y) return false; - return true; //bounding boxes intersect + return true; /// bounding boxes intersect } /*static*/ const bool cCollision::BoundingBox( const SDL_Rect& a, const Vector4& b ) @@ -60,16 +60,16 @@ cCollision::~cCollision() /*static*/ const bool cCollision::BoundingBox( const iVector4& a, const iVector4& b ) { if ((b.x + b.z) < a.x) - return false; //just checking if their + return false; /// just checking if their if ((a.x + a.z) < b.x ) - return false; //bounding boxes even touch + return false; /// bounding boxes even touch if ((b.y + b.w) < a.y) return false; if ((a.y + a.w) < b.y) return false; - return true; //bounding boxes intersect + return true; /// bounding boxes intersect } /*static*/ const bool cCollision::BoundingBox( const SDL_Rect& a, const iVector4& b ) @@ -102,16 +102,16 @@ cCollision::~cCollision() rtn.x = 0.0f; rtn.y = 0.0f; - //Check if left side of b is inside of a + /// Check if left side of b is inside of a if (b.x < a.x) rtn.x = (float)(b.x - a.x); - //Check if right side of b is inside of a + /// Check if right side of b is inside of a if ((b.x + b.w) > (a.x + a.w)) rtn.x = (float)((b.x + b.w) - (a.x + a.w)); - //Check if top side of b is inside of a + /// Check if top side of b is inside of a if (b.y < a.y) rtn.y = (float)(b.y - a.y); - //Check if botton side of b is inside of a + /// Check if bottom side of b is inside of a if ((b.y + b.h) > (a.y + a.h)) rtn.y = (float)((b.y + b.h) - (a.y + a.h)); @@ -124,16 +124,16 @@ cCollision::~cCollision() rtn.x = 0.0f; rtn.y = 0.0f; - //Check if left side of b is inside of a + /// Check if left side of b is inside of a if (b.x < a.x) rtn.x = a.x - b.x; - //Check if right side of b is inside of a + /// Check if right side of b is inside of a if ((b.x + b.z) > (a.x + a.z)) rtn.x = (a.x + a.z) - (b.x + b.z); - //Check if top side of b is inside of a + /// Check if top side of b is inside of a if (b.y < a.y) rtn.y = a.y - b.y; - //Check if botton side of b is inside of a + /// Check if bottom side of b is inside of a if ((b.y + b.w) > (a.y + a.w)) rtn.y = (a.y + a.w) - (b.y + b.w); @@ -160,16 +160,16 @@ cCollision::~cCollision() rtn.x = 0; rtn.y = 0; - //Check if left side of b is inside of a + /// Check if left side of b is inside of a if (b.x < a.x) rtn.x = b.x - a.x; - //Check if right side of b is inside of a + /// Check if right side of b is inside of a if ((b.x + b.z) > (a.x + a.z)) rtn.x = (b.x + b.z) - (a.x + a.z); - //Check if top side of b is inside of a + /// Check if top side of b is inside of a if (b.y < a.y) rtn.y = b.y - a.y; - //Check if botton side of b is inside of a + /// Check if bottom side of b is inside of a if ((b.y + b.w) > (a.y + a.w)) rtn.y = (b.y + b.w) - (a.y + a.w); diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.cpp b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.cpp index cf96bc9..9facb2f 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.cpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.cpp @@ -74,7 +74,7 @@ iVector2& iVector2::operator += ( const SDL_Rect& other ) return *this; } -iVector2& iVector2::operator -= (const iVector2& other) +iVector2& iVector2::operator -= ( const iVector2& other ) { x -= int(other.x); y -= int(other.y); @@ -82,7 +82,7 @@ iVector2& iVector2::operator -= (const iVector2& other) return *this; } -iVector2& iVector2::operator -= (const SDL_Rect& other) +iVector2& iVector2::operator -= ( const SDL_Rect& other ) { x -= int(other.x); y -= int(other.y); @@ -90,7 +90,7 @@ iVector2& iVector2::operator -= (const SDL_Rect& other) return *this; } -iVector2 operator + (const iVector2& lhs, const iVector2& rhs) +iVector2 operator + ( const iVector2& lhs, const iVector2& rhs ) { iVector2 rs = lhs; rs += rhs; diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.hpp b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.hpp index 2e9453d..ede4955 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.hpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.hpp @@ -25,15 +25,12 @@ namespace MathEngine { iVector2& operator += ( const iVector2& other ); iVector2& operator += ( const SDL_Rect& other ); - iVector2& operator -= (const iVector2& other); - iVector2& operator -= (const SDL_Rect& other); - - iVector2& operator + ( const iVector2& other ); - iVector2& operator + ( const SDL_Rect& other ); + iVector2& operator -= ( const iVector2& other ); + iVector2& operator -= ( const SDL_Rect& other ); int x; int y; };/// END STRUCT DEFINITION iVector2 }/// END NAMESPACE DEFINITION MathEngine -MathEngine::iVector2 operator + (const MathEngine::iVector2& lhs, const MathEngine::iVector2& rhs); +MathEngine::iVector2 operator + ( const MathEngine::iVector2& lhs, const MathEngine::iVector2& rhs ); #endif/// END IFNDEF _IVECTOR2_HPP_ \ No newline at end of file diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.cpp b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.cpp index 4efadd6..d0949f5 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.cpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.cpp @@ -21,7 +21,7 @@ iVector3::iVector3( const SDL_Rect& copy ) z = int(copy.w); } -iVector3& iVector3::operator=( const SDL_Rect& copy ) +iVector3& iVector3::operator = ( const SDL_Rect& copy ) { x = int(copy.x); y = int(copy.y); @@ -30,7 +30,7 @@ iVector3& iVector3::operator=( const SDL_Rect& copy ) return *this; } -bool iVector3::operator==( const SDL_Rect& other ) const +bool iVector3::operator == ( const SDL_Rect& other ) const { bool rtn = false; if ( x == other.x ) @@ -47,7 +47,7 @@ iVector3::iVector3( const Vector3& copy ) z = int(copy.z); } -iVector3& iVector3::operator=( const Vector3& copy ) +iVector3& iVector3::operator = ( const Vector3& copy ) { x = int(copy.x); y = int(copy.y); @@ -56,7 +56,7 @@ iVector3& iVector3::operator=( const Vector3& copy ) return *this; } -bool iVector3::operator==( const iVector3& other ) const +bool iVector3::operator == ( const iVector3& other ) const { bool rtn = false; if ( x == other.x ) diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.hpp b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.hpp index 94576fa..c6b9f5b 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.hpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector3.hpp @@ -21,15 +21,15 @@ namespace MathEngine { iVector3( const SDL_Rect& copy ); - iVector3& operator=( const SDL_Rect& copy ); + iVector3& operator = ( const SDL_Rect& copy ); - bool operator==( const SDL_Rect& other ) const; + bool operator == ( const SDL_Rect& other ) const; iVector3( const Vector3& copy ); - iVector3& operator=( const Vector3& copy ); + iVector3& operator = ( const Vector3& copy ); - bool operator==( const iVector3& other ) const; + bool operator == ( const iVector3& other ) const; int z; };/// END STRUCT DEFINITION iVector3 diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.cpp b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.cpp index 580de46..dddc3f9 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.cpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.cpp @@ -26,7 +26,7 @@ iVector4::iVector4( const SDL_Rect& copy ) w = int(copy.h); } -iVector4& iVector4::operator=( const SDL_Rect& copy ) +iVector4& iVector4::operator = ( const SDL_Rect& copy ) { x = int(copy.x); y = int(copy.y); @@ -36,7 +36,7 @@ iVector4& iVector4::operator=( const SDL_Rect& copy ) return *this; } -bool iVector4::operator==( const SDL_Rect& other ) const +bool iVector4::operator == ( const SDL_Rect& other ) const { bool rtn = false; if ( x == other.x ) @@ -55,7 +55,7 @@ iVector4::iVector4( const Vector4& copy ) w = int(copy.w); } -iVector4& iVector4::operator=( const Vector4& copy ) +iVector4& iVector4::operator = ( const Vector4& copy ) { x = int(copy.x); y = int(copy.y); @@ -65,7 +65,7 @@ iVector4& iVector4::operator=( const Vector4& copy ) return *this; } -bool iVector4::operator==( const iVector4& other ) const +bool iVector4::operator == ( const iVector4& other ) const { bool rtn = false; if ( x == other.x ) diff --git a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.hpp b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.hpp index 0caa85e..f69601d 100644 --- a/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.hpp +++ b/TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector4.hpp @@ -23,15 +23,15 @@ namespace MathEngine { iVector4( const SDL_Rect& copy ); - iVector4& operator=( const SDL_Rect& copy ); + iVector4& operator = ( const SDL_Rect& copy ); - bool operator==( const SDL_Rect& other ) const; + bool operator == ( const SDL_Rect& other ) const; iVector4( const Vector4& copy ); - iVector4& operator=( const Vector4& copy ); + iVector4& operator = ( const Vector4& copy ); - bool operator==( const iVector4& other ) const; + bool operator == ( const iVector4& other ) const; int w; };/// END STRUCT DEFINITION iVector4 diff --git a/TrooperEngineDLL/TrooperEngine/TextTypeEngine/cText.cpp b/TrooperEngineDLL/TrooperEngine/TextTypeEngine/cText.cpp index c8281fb..4876254 100644 --- a/TrooperEngineDLL/TrooperEngine/TextTypeEngine/cText.cpp +++ b/TrooperEngineDLL/TrooperEngine/TextTypeEngine/cText.cpp @@ -70,7 +70,7 @@ void cText::Red() } /// Sets -void cText::setSize(const unsigned long int size /*= 8*/) +void cText::setSize( const unsigned long int size /*= 8*/ ) { if (m_size != size) { m_size = size; diff --git a/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.cpp b/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.cpp index be49ed2..b374bb5 100644 --- a/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.cpp +++ b/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.cpp @@ -19,7 +19,7 @@ cTiming::~cTiming() CleanUp(); } -cTiming& cTiming::operator=( const cTiming& copy ) +cTiming& cTiming::operator = ( const cTiming& copy ) { if (this != ©) setFTP(copy.getFTP()); diff --git a/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.hpp b/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.hpp index 31d58a1..e617274 100644 --- a/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.hpp +++ b/TrooperEngineDLL/TrooperEngine/TimingEngine/cTiming.hpp @@ -21,7 +21,7 @@ namespace TimingEngine { ~cTiming(); public: - cTiming& operator=( const cTiming& copy ); + cTiming& operator = ( const cTiming& copy ); /// Functions static cTiming& Inst(); diff --git a/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.cpp b/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.cpp index 6649ebd..de9d05a 100644 --- a/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.cpp +++ b/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.cpp @@ -1,6 +1,6 @@ #include "msunix.hpp" -int vasprintf(char ** ret, const char * format, va_list ap) +int vasprintf( char ** ret, const char * format, va_list ap ) { int len; char *buffer; @@ -25,7 +25,7 @@ int vasprintf(char ** ret, const char * format, va_list ap) return len - 1; }*/ -int setenv(const char *name, const char *value, int overwrite) +int setenv( const char *name, const char *value, int overwrite ) { int errcode = 0; if(!overwrite) { diff --git a/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.hpp b/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.hpp index fff4124..45de3e6 100644 --- a/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.hpp +++ b/TrooperEngineDLL/TrooperEngine/UtilityEngine/MSUNIX/msunix.hpp @@ -7,8 +7,8 @@ #include #include -int vasprintf(char ** ret, const char * format, va_list ap); +int vasprintf( char ** ret, const char * format, va_list ap ); //int snprintf(char * str, size_t size, const char * format, ...); -int setenv(const char *name, const char *value, int overwrite); +int setenv( const char *name, const char *value, int overwrite ); #endif // __MSUNIX__ diff --git a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.cpp b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.cpp index 65373e0..bef076a 100644 --- a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.cpp +++ b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.cpp @@ -19,12 +19,12 @@ cString::cString() clear(); } -cString::cString(const char* s) +cString::cString( const char* s ) { copy_str(s); } -cString::cString(const cString& copy) +cString::cString( const cString& copy ) { copy_str(copy); } @@ -35,7 +35,7 @@ cString::~cString() clear(); } -const char* cString::alloc_str(size_t sz) +const char* cString::alloc_str( size_t sz ) { if (mp_str) clear(); @@ -57,7 +57,7 @@ const char* cString::c_str() const return mp_str; } -const char* cString::copy_str(const char* copy) +const char* cString::copy_str( const char* copy ) { if (copy) { size_t len = strnlen(copy, __cString__MAX_LEN); @@ -87,7 +87,7 @@ size_t cString::size() const } /// string format -cString& cString::format(const char* format, ...) +cString& cString::format( const char* format, ... ) { char * buffer; @@ -165,18 +165,18 @@ const char& cString::last_char() const } /// non-destructive split -const std::vector cString::split(const char match) const +const std::vector cString::split( const char match ) const { const char match_s[2] = { match, 0 }; return split(match_s, -1); } -const std::vector cString::split(const char* match) const +const std::vector cString::split( const char* match ) const { return split(match, -1); } -const std::vector cString::split(const char* match, int max_split) const +const std::vector cString::split( const char* match, int max_split ) const { std::vector rtn; if (length() < 1) @@ -206,7 +206,7 @@ const std::vector cString::split(const char* match, int max_split) cons return rtn; } -const cString& cString::char_repl(const char& match, const char& repl) +const cString& cString::char_repl( const char& match, const char& repl ) { for (size_t i = 0; mp_str[i]; ++i) { if (mp_str[i] == match) mp_str[i] = repl; @@ -214,7 +214,7 @@ const cString& cString::char_repl(const char& match, const char& repl) return *this; } -long int cString::char_find(const char& match) const +long int cString::char_find( const char& match ) const { for (size_t i = 0; mp_str[i]; ++i) { if (mp_str[i] == match) @@ -223,7 +223,7 @@ long int cString::char_find(const char& match) const return -1; } -cString cString::substr(size_t start, size_t length) const +cString cString::substr( size_t start, size_t length ) const { cString rs; char * buf; @@ -242,7 +242,7 @@ cString cString::substr(size_t start, size_t length) const return rs; } -long int cString::find(const cString& match) +long int cString::find( const cString& match ) { char * pos = strstr(mp_str, match.c_str()); if (pos) @@ -251,7 +251,7 @@ long int cString::find(const cString& match) return -1; } -const cString cString::replace(const cString& match, const cString& repl) +const cString cString::replace( const cString& match, const cString& repl ) { cString rs; long f1 = find(match); @@ -296,25 +296,25 @@ const long int cString::ToInt() const return strtol(mp_str, NULL, 10); } -cString& cString::operator = (const char* rhs) +cString& cString::operator = ( const char* rhs ) { copy_str(rhs); return *this; } -cString& cString::operator = (const cString& rhs) +cString& cString::operator = ( const cString& rhs ) { copy_str(rhs.c_str()); return *this; } -cString& cString::operator += (const char rhs) +cString& cString::operator += ( const char rhs ) { operator+=(&rhs); return *this; } -cString& cString::operator += (const char* rhs) +cString& cString::operator += ( const char* rhs ) { if (rhs) { size_t newlen = m_len + strnlen(rhs, __cString__MAX_LEN); @@ -335,13 +335,13 @@ cString& cString::operator += (const char* rhs) return *this; } -cString& cString::operator += (const cString& rhs) +cString& cString::operator += ( const cString& rhs ) { operator+=(rhs.c_str()); return *this; } -bool cString::operator == (const char* rhs) const +bool cString::operator == ( const char* rhs ) const { if (std::strncmp(this->c_str(), rhs, __cString__MAX_LEN) == 0) return true; @@ -349,7 +349,7 @@ bool cString::operator == (const char* rhs) const return false; } -bool cString::operator == (const cString& rhs) const +bool cString::operator == ( const cString& rhs ) const { if (std::strncmp(this->c_str(), rhs.c_str(), __cString__MAX_LEN) == 0) return true; @@ -357,7 +357,7 @@ bool cString::operator == (const cString& rhs) const return false; } -bool cString::operator != (const char* rhs) const +bool cString::operator != ( const char* rhs ) const { if (std::strncmp(this->c_str(), rhs, __cString__MAX_LEN) != 0) return true; @@ -365,7 +365,7 @@ bool cString::operator != (const char* rhs) const return false; } -bool cString::operator != (const cString& rhs) const +bool cString::operator != ( const cString& rhs ) const { if (std::strncmp(this->c_str(), rhs.c_str(), __cString__MAX_LEN) != 0) return true; @@ -373,7 +373,7 @@ bool cString::operator != (const cString& rhs) const return false; } -bool cString::operator > (const cString& rhs) const +bool cString::operator > ( const cString& rhs ) const { if (std::strncmp(this->c_str(), rhs.c_str(), __cString__MAX_LEN) > 0) return true; @@ -381,7 +381,7 @@ bool cString::operator > (const cString& rhs) const return false; } -bool cString::operator < (const cString& rhs) const +bool cString::operator < ( const cString& rhs ) const { if (std::strncmp(this->c_str(), rhs.c_str(), __cString__MAX_LEN) < 0) return true; @@ -389,7 +389,7 @@ bool cString::operator < (const cString& rhs) const return false; } -bool cString::operator >= (const cString& rhs) const +bool cString::operator >= ( const cString& rhs ) const { if (std::strncmp(this->c_str(), rhs.c_str(), __cString__MAX_LEN) >= 0) return true; @@ -397,7 +397,7 @@ bool cString::operator >= (const cString& rhs) const return false; } -bool cString::operator <= (const cString& rhs) const +bool cString::operator <= ( const cString& rhs ) const { if (std::strncmp(this->c_str(), rhs.c_str(), __cString__MAX_LEN) <= 0) return true; @@ -414,7 +414,7 @@ cString::operator std::string () const return std::string(c_str()); } -cString operator + (const cString& lhs, const cString& rhs) +cString operator + ( const cString& lhs, const cString& rhs ) { cString rs = lhs; rs += rhs; diff --git a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.hpp b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.hpp index b3b81f9..7e6aa12 100644 --- a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.hpp +++ b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cString.hpp @@ -23,52 +23,52 @@ namespace UtilityEngine { { public: cString(); /// default constructor - cString(const char* s); - cString(const cString& copy); /// copy constructor + cString( const char* s ); + cString( const cString& copy ); /// copy constructor ~cString(); - const char* alloc_str(size_t sz); /// smart alloc string + const char* alloc_str( size_t sz ); /// smart alloc string void clear(); /// frees the string const char* c_str() const; /// getter - const char* copy_str(const char* copy); /// alloc & copy + const char* copy_str( const char* copy ); /// alloc & copy /// utility methods bool have_value() const; size_t length() const; size_t size() const; - cString& format(const char* format, ...); + cString& format( const char* format, ... ); cString& trim(); cString lower() const; cString upper() const; const char& first_char() const; const char& last_char() const; - const std::vector split(const char match) const; - const std::vector split(const char* match) const; - const std::vector split(const char* match, int max_split) const; - long int char_find(const char& match) const; - const cString& char_repl(const char& match, const char& repl); - cString substr(size_t start, size_t length) const; - long int find(const cString& match); - const cString replace(const cString& match, const cString& repl); + const std::vector split( const char match ) const; + const std::vector split( const char* match ) const; + const std::vector split( const char* match, int max_split ) const; + long int char_find( const char& match ) const; + const cString& char_repl( const char& match, const char& repl ); + cString substr( size_t start, size_t length ) const; + long int find( const cString& match ); + const cString replace( const cString& match, const cString& repl ); const bool IsInt() const; const long int ToInt() const; /// operators - cString& operator = (const char* rhs); /// assignment operator - cString& operator = (const cString& rhs); /// assignment operator - cString& operator += (const char rhs); - cString& operator += (const char* rhs); /// concatenation operator - cString& operator += (const cString& rhs); /// concatenation operator + cString& operator = ( const char* rhs ); /// assignment operator + cString& operator = ( const cString& rhs ); /// assignment operator + cString& operator += ( const char rhs ); + cString& operator += ( const char* rhs ); /// concatenation operator + cString& operator += ( const cString& rhs ); /// concatenation operator - bool operator == (const char* rhs) const; /// comparisons - bool operator == (const cString& rhs) const; - bool operator != (const char* rhs) const; - bool operator != (const cString& rhs) const; - bool operator > (const cString& rhs) const; - bool operator < (const cString& rhs) const; - bool operator >= (const cString& rhs) const; - bool operator <= (const cString& rhs) const; + bool operator == ( const char* rhs ) const; /// comparisons + bool operator == ( const cString& rhs ) const; + bool operator != ( const char* rhs ) const; + bool operator != ( const cString& rhs ) const; + bool operator > ( const cString& rhs ) const; + bool operator < ( const cString& rhs ) const; + bool operator >= ( const cString& rhs ) const; + bool operator <= ( const cString& rhs ) const; /// conversion operators operator const char* () const; /// c-string type @@ -81,5 +81,5 @@ namespace UtilityEngine { };/// END CLASS DEFINITION cString }/// END NAMESPACE DEFINITION UtilityEngine /// function overloads -UtilityEngine::cString operator + (const UtilityEngine::cString& lhs, const UtilityEngine::cString& rhs); +UtilityEngine::cString operator + ( const UtilityEngine::cString& lhs, const UtilityEngine::cString& rhs ); #endif/// END IFNDEF _CSTRING_HPP_ diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cAnimatedSprite.cpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cAnimatedSprite.cpp index 42bf794..d61e1ea 100644 --- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cAnimatedSprite.cpp +++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cAnimatedSprite.cpp @@ -4,14 +4,14 @@ using VideoEngine::cAnimatedSprite; cAnimatedSprite::cAnimatedSprite( const unsigned long int x /*= 0*/, const unsigned long int y /*= 0*/, const unsigned long int fps /*= 16*/ ) -: m_nextTime(0), m_RATE(0) + : m_nextTime(0), m_RATE(0) { setFPS(fps); setIncrement(x, y); } cAnimatedSprite::cAnimatedSprite( const cAnimatedSprite& copy ) -: m_nextTime(0), m_RATE(0) + : m_nextTime(0), m_RATE(0) { setFPS(copy.getFPS()); setIncrement(copy.getXIncrement(), copy.getYIncrement()); diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cCamera.cpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cCamera.cpp index cca590e..128c073 100644 --- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cCamera.cpp +++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cCamera.cpp @@ -9,7 +9,7 @@ using UtilityEngine::cUtility; cCamera::cCamera( const signed long int xPos /*= 0*/, const signed long int yPos /*= 0*/, const unsigned long int reswidth /*= 640*/, const unsigned long int reshight /*= 480*/ ) -: mp_texture(nullptr) + : mp_texture(nullptr) { m_position.x = Sint16(xPos); m_position.y = Sint16(yPos); diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cImage.cpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cImage.cpp index be34faa..967706e 100644 --- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cImage.cpp +++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cImage.cpp @@ -9,27 +9,27 @@ using UtilityEngine::cUtility; cImage::cImage( const bool transparent /*= false*/, const unsigned char red /*= 0*/, const unsigned char blue /*= 0*/, const unsigned char green /*= 255*/, const unsigned char translevel /*= 255*/, const bool isSurface /*= false*/ ) -: mp_texture(nullptr), mp_surface(nullptr), m_transparent(transparent), -m_transRed(red), m_transBlue(blue), m_transGreen(green), m_transLevel(translevel), m_isSurface(isSurface) + : mp_texture(nullptr), mp_surface(nullptr), m_transparent(transparent), + m_transRed(red), m_transBlue(blue), m_transGreen(green), m_transLevel(translevel), m_isSurface(isSurface) {} cImage::cImage( SDL_Surface* surface ) -: mp_texture(nullptr), mp_surface(nullptr), m_transparent(false), -m_transRed(0), m_transBlue(0), m_transGreen(255), m_transLevel(255) + : mp_texture(nullptr), mp_surface(nullptr), m_transparent(false), + m_transRed(0), m_transBlue(0), m_transGreen(255), m_transLevel(255) { setImage(surface); } cImage::cImage( SDL_Texture* texture ) : mp_texture(nullptr), mp_surface(nullptr), m_transparent(false), - m_transRed(0), m_transBlue(0), m_transGreen(255), m_transLevel(255) + m_transRed(0), m_transBlue(0), m_transGreen(255), m_transLevel(255) { setImage(texture); } cImage::cImage( const cImage& copy, const bool surfaceCopy /*= true*/) -: mp_texture(nullptr), mp_surface(nullptr), m_transparent(copy.getTransparent()), m_transRed(copy.getRedTrans()), -m_transBlue(copy.getBlueTrans()), m_transGreen(copy.getGreenTrans()), m_transLevel(copy.getLevelTrans()) + : mp_texture(nullptr), mp_surface(nullptr), m_transparent(copy.getTransparent()), m_transRed(copy.getRedTrans()), + m_transBlue(copy.getBlueTrans()), m_transGreen(copy.getGreenTrans()), m_transLevel(copy.getLevelTrans()) { if (surfaceCopy == true) mp_texture = copy.getImage(); diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cRenderer.hpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cRenderer.hpp index 5e654ce..527c792 100644 --- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cRenderer.hpp +++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cRenderer.hpp @@ -47,7 +47,7 @@ namespace VideoEngine { SDL_Texture* SurfaceToTexture( SDL_Surface* surface ); SDL_Surface* TextureToSurface( SDL_Texture* texture ); - void CopyTexture( SDL_Texture* src, SDL_Texture* dst, bool software = false); + void CopyTexture( SDL_Texture* src, SDL_Texture* dst, bool software = false ); SDL_Surface* CopySurface( SDL_Surface* src ); diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.cpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.cpp index fb97b09..9cff9ba 100644 --- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.cpp +++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.cpp @@ -7,19 +7,8 @@ using VideoEngine::cSprite; using MathEngine::iVector2; using MathEngine::iVector4; -cSprite::cSprite( const signed long int xpos /*= 0*/, const signed long int ypos /*= 0*/, const signed long int xarea /*= 0*/, - const signed long int yarea /*= 0*/, const unsigned long int warea /*= 0*/, const unsigned long int harea /*= 0*/, - VideoEngine::cImage** image /*= nullptr*/, VideoEngine::cCamera** camera /*= nullptr*/ ) -: mpp_image(image), mpp_camera(camera) -{ - setPosition(Sint16(xpos), Sint16(ypos)); - - setStartImageArea(Sint16(xarea), Sint16(yarea)); - setEndImageArea(Uint16(warea), Uint16(harea)); -} - cSprite::cSprite( VideoEngine::cImage** image, VideoEngine::cCamera** camera /*= nullptr*/ ) -: mpp_image(image), mpp_camera(camera) + : mpp_image(image), mpp_camera(camera) { setPosition(0, 0); @@ -27,6 +16,17 @@ cSprite::cSprite( VideoEngine::cImage** image, VideoEngine::cCamera** camera /*= setEndImageArea(Uint16((*mpp_image)->getWidth()), Uint16((*mpp_image)->getHeight())); } +cSprite::cSprite( const signed long int xpos /*= 0*/, const signed long int ypos /*= 0*/, const signed long int xarea /*= 0*/, + const signed long int yarea /*= 0*/, const unsigned long int warea /*= 0*/, const unsigned long int harea /*= 0*/, + VideoEngine::cImage** image /*= nullptr*/, VideoEngine::cCamera** camera /*= nullptr*/ ) + : mpp_image(image), mpp_camera(camera) +{ + setPosition(Sint16(xpos), Sint16(ypos)); + + setStartImageArea(Sint16(xarea), Sint16(yarea)); + setEndImageArea(Uint16(warea), Uint16(harea)); +} + cSprite::cSprite( const cSprite& copy ) { Copy(copy); @@ -156,7 +156,7 @@ void cSprite::setPosition( const MathEngine::iVector2& position /*= MathEngine:: setPosition(position.x, position.y); } -void cSprite::setImageArea( const MathEngine::iVector4& area /*= MathEngine::iVector4(0,0,0,0)*/) +void cSprite::setImageArea( const MathEngine::iVector4& area /*= MathEngine::iVector4(0,0,0,0)*/ ) { if (area == iVector4(0,0,0,0)) { setStartImageArea(0,0); @@ -189,6 +189,11 @@ void cSprite::setImage( VideoEngine::cImage** image ) mpp_image = image; } +void cSprite::setImage(VideoEngine::cImageFile** image) +{ + setImage((VideoEngine::cImage**) image); +} + void cSprite::setCamera( VideoEngine::cCamera** camera ) { mpp_camera = camera; diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.hpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.hpp index f9a8786..b010c8b 100644 --- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.hpp +++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.hpp @@ -6,6 +6,7 @@ /*** Custom Header Files ***/ #include "cImage.hpp" +#include "cImageFile.hpp" #include "cCamera.hpp" #include "../TextTypeEngine/cText.hpp" @@ -27,13 +28,13 @@ namespace VideoEngine { cSprite( const signed long int xpos = 0, const signed long int ypos = 0, const signed long int xarea = 0, const signed long int yarea = 0, const unsigned long int warea = 0, const unsigned long int harea = 0, VideoEngine::cImage** image = nullptr, VideoEngine::cCamera** camera = nullptr ); - + cSprite( const cSprite& copy ); cSprite& operator=( const cSprite& copy ); ~cSprite(); /// Functions - cSprite& Copy(const cSprite& copy); + cSprite& Copy( const cSprite& copy ); /* Draws the sprite to the video buffer */ void Draw(); /* Draws the sprite to the camera */ @@ -67,6 +68,7 @@ namespace VideoEngine { /* Sets the pointer to a pointer for the image that the sprite will use */ void setImage( VideoEngine::cImage** image ); + void setImage( VideoEngine::cImageFile** image ); /* Sets the pointer to a pointer for the camera the sprite will be draw on */ void setCamera( VideoEngine::cCamera** camera ); diff --git a/TrooperEngineDLL/TrooperEngineDLL.vcxproj b/TrooperEngineDLL/TrooperEngineDLL.vcxproj index c7d8299..b565c63 100644 --- a/TrooperEngineDLL/TrooperEngineDLL.vcxproj +++ b/TrooperEngineDLL/TrooperEngineDLL.vcxproj @@ -126,7 +126,7 @@ - + @@ -178,7 +178,7 @@ - + diff --git a/TrooperEngineDLL/TrooperEngineDLL.vcxproj.filters b/TrooperEngineDLL/TrooperEngineDLL.vcxproj.filters index 70c4d83..22910e5 100644 --- a/TrooperEngineDLL/TrooperEngineDLL.vcxproj.filters +++ b/TrooperEngineDLL/TrooperEngineDLL.vcxproj.filters @@ -150,9 +150,6 @@ TrooperEngine\GUIEngine - - TrooperEngine\GUIEngine - TrooperEngine\MathEngine\iVector @@ -219,6 +216,9 @@ TrooperEngine\TextTypeEngine\TextTypeHelpers + + TrooperEngine\GUIEngine + @@ -332,9 +332,6 @@ TrooperEngine\UtilityEngine - - TrooperEngine\GUIEngine - TrooperEngine\UtilityEngine\MSUNIX @@ -368,5 +365,8 @@ TrooperEngine\TextTypeEngine\TextTypeHelpers + + TrooperEngine\GUIEngine + \ No newline at end of file diff --git a/TrooperEngineDLL/dllExportFiles/TrooperEngine.hpp b/TrooperEngineDLL/dllExportFiles/TrooperEngine.hpp index c7e3768..8f8940f 100644 --- a/TrooperEngineDLL/dllExportFiles/TrooperEngine.hpp +++ b/TrooperEngineDLL/dllExportFiles/TrooperEngine.hpp @@ -70,7 +70,7 @@ #include "../TrooperEngine/GUIEngine/cLabel.hpp" #include "../TrooperEngine/GUIEngine/cButton.hpp" #include "../TrooperEngine/GUIEngine/cTextButton.hpp" -#include "../TrooperEngine/GUIEngine/cBoxSizer.hpp" +#include "../TrooperEngine/GUIEngine/cSizer.hpp" /*** GUIHelper ***/ #include "../TrooperEngine/GUIEngine/GUIHelpers/GUIUtility.hpp" diff --git a/TrooperEngineTest/GUIEngineTest/GUIXMLTest.cpp b/TrooperEngineTest/GUIEngineTest/GUIXMLTest.cpp index 5b12468..069a1a0 100644 --- a/TrooperEngineTest/GUIEngineTest/GUIXMLTest.cpp +++ b/TrooperEngineTest/GUIEngineTest/GUIXMLTest.cpp @@ -27,7 +27,7 @@ void GUIXMLTest() // align = leftRight; // } - GUIXMLBoxSizerTest(); + GUIXMLSizerTest(); } void GUIXMLDefaultTest() @@ -270,11 +270,11 @@ void GUIXMLAlignTest( const GUIHelpers::eAlign one /*= GUIHelpers::eAlign::DEFAU GUIEngine::cGUI::Inst().Delete(); } -void GUIXMLBoxSizerTest() +void GUIXMLSizerTest() { UTest u("GUI XML BoxSizer"); - LoadFile("GUIXMLBoxSizerTest.xml", true); + LoadFile("GUIXMLSizerTest.xml", true); std::vector objects = GUIEngine::cGUI::Inst().GetObjects(); @@ -297,7 +297,7 @@ void GUIXMLBoxSizerTest() cWindowTest("Layout", u, layout, sets); - GUIEngine::cBoxSizer* boxsizer = (GUIEngine::cBoxSizer*)layout->getChildren()[0]; + GUIEngine::cSizer* boxsizer = (GUIEngine::cSizer*)layout->getChildren()[0]; sets.pos = { 51, 15 }; sets.size = { 172, 5 }; diff --git a/TrooperEngineTest/GUIEngineTest/GUIXMLTest.hpp b/TrooperEngineTest/GUIEngineTest/GUIXMLTest.hpp index 8c1fa34..1b4c13b 100644 --- a/TrooperEngineTest/GUIEngineTest/GUIXMLTest.hpp +++ b/TrooperEngineTest/GUIEngineTest/GUIXMLTest.hpp @@ -25,7 +25,7 @@ void GUIXMLPositionTest(); void GUIXMLAlignTest( const GUIHelpers::eAlign one = GUIHelpers::eAlign::DEFAULT_ALIGN, const GUIHelpers::eAlign two = GUIHelpers::eAlign::DEFAULT_ALIGN, const GUIHelpers::eAlign three = GUIHelpers::eAlign::DEFAULT_ALIGN, const GUIHelpers::eOrientation orientation = GUIHelpers::eOrientation::DEFAULT_ORIENTATION); -void GUIXMLBoxSizerTest(); +void GUIXMLSizerTest(); void LoadFile( const cString& filename, const bool show = false ); diff --git a/TrooperEngineTest/TrooperEngineTest.vcxproj b/TrooperEngineTest/TrooperEngineTest.vcxproj index a450fb5..91ec715 100644 --- a/TrooperEngineTest/TrooperEngineTest.vcxproj +++ b/TrooperEngineTest/TrooperEngineTest.vcxproj @@ -170,7 +170,7 @@ - + Designer diff --git a/TrooperEngineTest/TrooperEngineTest.vcxproj.filters b/TrooperEngineTest/TrooperEngineTest.vcxproj.filters index 4da9876..32af47e 100644 --- a/TrooperEngineTest/TrooperEngineTest.vcxproj.filters +++ b/TrooperEngineTest/TrooperEngineTest.vcxproj.filters @@ -95,7 +95,7 @@ xml - + xml diff --git a/TrooperEngineTest/xml/GUIXMLAlignTest.xml b/TrooperEngineTest/xml/GUIXMLAlignTest.xml index 3447c0c..e9e14b2 100644 --- a/TrooperEngineTest/xml/GUIXMLAlignTest.xml +++ b/TrooperEngineTest/xml/GUIXMLAlignTest.xml @@ -2,8 +2,8 @@ - diff --git a/TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml b/TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml deleted file mode 100644 index bc243e4..0000000 --- a/TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/TrooperEngineTest/xml/GUIXMLDefaultTest.xml b/TrooperEngineTest/xml/GUIXMLDefaultTest.xml index 43631c2..cc9a6bd 100644 --- a/TrooperEngineTest/xml/GUIXMLDefaultTest.xml +++ b/TrooperEngineTest/xml/GUIXMLDefaultTest.xml @@ -2,7 +2,7 @@ - diff --git a/TrooperEngineTest/xml/GUIXMLSizerTest.xml b/TrooperEngineTest/xml/GUIXMLSizerTest.xml new file mode 100644 index 0000000..773a5f8 --- /dev/null +++ b/TrooperEngineTest/xml/GUIXMLSizerTest.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/TrooperEngineTest/xml/include.xml b/TrooperEngineTest/xml/include.xml index 7268c44..9232197 100644 --- a/TrooperEngineTest/xml/include.xml +++ b/TrooperEngineTest/xml/include.xml @@ -1,3 +1,3 @@ - -