SumGuyV5/SDLPongCPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BoxSizer to Sizer

Browse Source
This commit is contained in:
Richard Allen
2018-08-15 22:04:06 -04:00
parent 353dc21750
commit bd3c111fa1
67 changed files with 369 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SDLPongCPP/Game/Equipment/cPaddle.hpp
+2 -2
View File
@@ -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_
SDLPongCPP/Game/PongStart/cPongStart.cpp
+2 -2
View File
@@ -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);
TrooperEngineDLL/TrooperEngine/FXEngine/cGFX.hpp
+2 -2
View File
@@ -13,9 +13,9 @@
using UtilityEngine::cString;
namespace EXPORT_FROM_MYDLL FXEngine {
namespace FXEngine {
/* Singleton */
class cGFX
class EXPORT_FROM_MYDLL cGFX
{
private:
cGFX();
TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/Enums.hpp
+1 -1
View File
@@ -19,7 +19,7 @@ namespace GUIHelpers {
CWINDOW,
CPANEL,
CLAYOUT,
CBOXSIZER,
CSIZER,
CBUTTON,
CTEXTBUTTON,
CLABEL,
TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.cpp
+11 -8
View File
@@ -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
TrooperEngineDLL/TrooperEngine/GUIEngine/GUIHelpers/cXMLoader.hpp
+3 -3
View File
@@ -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;
TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.cpp
+2 -1
View File
@@ -55,13 +55,14 @@ 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;
}
TrooperEngineDLL/TrooperEngine/GUIEngine/cGUI.hpp
+1
View File
@@ -36,6 +36,7 @@ namespace GUIEngine {
MouseButton3,
Keyboard
};
/// Functions
static cGUI& Inst();
static void Delete();
TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.cpp
+2
View File
@@ -25,6 +25,8 @@ void cLabel::Create(cWindow* parent, const signed int id, const cString& label /
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);
}
TrooperEngineDLL/TrooperEngine/GUIEngine/cLabel.hpp
-2
View File
@@ -54,8 +54,6 @@ namespace GUIEngine {
private:
void SetSize();
private:
VideoEngine::cSprite m_sprite;
TextTypeEngine::cText* mp_text;/// = nullptr
TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.cpp → TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.cpp
+10 -10
View File
@@ -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;
}
TrooperEngineDLL/TrooperEngine/GUIEngine/cBoxSizer.hpp → TrooperEngineDLL/TrooperEngine/GUIEngine/cSizer.hpp
+8 -8
View File
@@ -1,5 +1,5 @@
#ifndef _CBOXSIZER_HPP_
#define _CBOXSIZER_HPP_
#ifndef _CSIZER_HPP_
#define _CSIZER_HPP_
/*** SDL Header Files ***/
#include <SDL.h>
@@ -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_
#endif/// END IFNDEF _CSIZER_HPP_
TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.cpp
+53 -3
View File
@@ -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<cWindow*>::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*>& 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;
TrooperEngineDLL/TrooperEngine/GUIEngine/cWindow.hpp
+4
View File
@@ -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 );
TrooperEngineDLL/TrooperEngine/MathEngine/Vector/Vector4.hpp
-4
View File
@@ -21,14 +21,10 @@ namespace MathEngine {
Vector4& operator = ( const SDL_Rect& copy );
bool operator==(const SDL_Rect& other) const;
Vector4( const iVector4& copy );
Vector4& operator = ( const iVector4& copy );
bool operator==(const Vector4& other) const;
float w;
};/// END STRUCT DEFINITION Vector4
}/// END NAMESPACE DEFINITION MathEngine
TrooperEngineDLL/TrooperEngine/MathEngine/cCollision.cpp
+21 -21
View File
@@ -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);
TrooperEngineDLL/TrooperEngine/MathEngine/iVector/iVector2.hpp
-3
View File
@@ -28,9 +28,6 @@ namespace MathEngine {
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
TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.cpp
+14 -9
View File
@@ -7,6 +7,15 @@ using VideoEngine::cSprite;
using MathEngine::iVector2;
using MathEngine::iVector4;
cSprite::cSprite( VideoEngine::cImage** image, VideoEngine::cCamera** camera /*= nullptr*/ )
: mpp_image(image), mpp_camera(camera)
{
setPosition(0, 0);
setStartImageArea(0, 0);
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*/ )
@@ -18,15 +27,6 @@ cSprite::cSprite( const signed long int xpos /*= 0*/, const signed long int ypos
setEndImageArea(Uint16(warea), Uint16(harea));
}
cSprite::cSprite( VideoEngine::cImage** image, VideoEngine::cCamera** camera /*= nullptr*/ )
: mpp_image(image), mpp_camera(camera)
{
setPosition(0, 0);
setStartImageArea(0, 0);
setEndImageArea(Uint16((*mpp_image)->getWidth()), Uint16((*mpp_image)->getHeight()));
}
cSprite::cSprite( const cSprite& copy )
{
Copy(copy);
@@ -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;
TrooperEngineDLL/TrooperEngine/VideoEngine/cSprite.hpp
+2
View File
@@ -6,6 +6,7 @@
/*** Custom Header Files ***/
#include "cImage.hpp"
#include "cImageFile.hpp"
#include "cCamera.hpp"
#include "../TextTypeEngine/cText.hpp"
@@ -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 );
TrooperEngineDLL/TrooperEngineDLL.vcxproj
+2 -2
View File
@@ -126,7 +126,7 @@
<ClInclude Include="TrooperEngine\EventEngine\cEvent.hpp" />
<ClInclude Include="TrooperEngine\EventEngine\cEventControl.hpp" />
<ClInclude Include="TrooperEngine\FXEngine\cGFX.hpp" />
<ClInclude Include="TrooperEngine\GUIEngine\cBoxSizer.hpp" />
<ClInclude Include="TrooperEngine\GUIEngine\cSizer.hpp" />
<ClInclude Include="TrooperEngine\GUIEngine\cButton.hpp" />
<ClInclude Include="TrooperEngine\GUIEngine\cGUI.hpp" />
<ClInclude Include="TrooperEngine\GUIEngine\cLayout.hpp" />
@@ -178,7 +178,7 @@
<ClCompile Include="TrooperEngine\EventEngine\cEvent.cpp" />
<ClCompile Include="TrooperEngine\EventEngine\cEventControl.cpp" />
<ClCompile Include="TrooperEngine\FXEngine\cGFX.cpp" />
<ClCompile Include="TrooperEngine\GUIEngine\cBoxSizer.cpp" />
<ClCompile Include="TrooperEngine\GUIEngine\cSizer.cpp" />
<ClCompile Include="TrooperEngine\GUIEngine\cButton.cpp" />
<ClCompile Include="TrooperEngine\GUIEngine\cGUI.cpp" />
<ClCompile Include="TrooperEngine\GUIEngine\cLayout.cpp" />
TrooperEngineDLL/TrooperEngineDLL.vcxproj.filters
+6 -6
View File
@@ -150,9 +150,6 @@
<ClInclude Include="TrooperEngine\GUIEngine\cGUI.hpp">
<Filter>TrooperEngine\GUIEngine</Filter>
</ClInclude>
<ClInclude Include="TrooperEngine\GUIEngine\cBoxSizer.hpp">
<Filter>TrooperEngine\GUIEngine</Filter>
</ClInclude>
<ClInclude Include="TrooperEngine\MathEngine\iVector\iVector4.hpp">
<Filter>TrooperEngine\MathEngine\iVector</Filter>
</ClInclude>
@@ -219,6 +216,9 @@
<ClInclude Include="TrooperEngine\TextTypeEngine\TextTypeHelpers\cFontHolder.hpp">
<Filter>TrooperEngine\TextTypeEngine\TextTypeHelpers</Filter>
</ClInclude>
<ClInclude Include="TrooperEngine\GUIEngine\cSizer.hpp">
<Filter>TrooperEngine\GUIEngine</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="TrooperEngine\AudioEngine\cAudio.cpp">
@@ -332,9 +332,6 @@
<ClCompile Include="TrooperEngine\UtilityEngine\cString.cpp">
<Filter>TrooperEngine\UtilityEngine</Filter>
</ClCompile>
<ClCompile Include="TrooperEngine\GUIEngine\cBoxSizer.cpp">
<Filter>TrooperEngine\GUIEngine</Filter>
</ClCompile>
<ClCompile Include="TrooperEngine\UtilityEngine\MSUNIX\msunix.cpp">
<Filter>TrooperEngine\UtilityEngine\MSUNIX</Filter>
</ClCompile>
@@ -368,5 +365,8 @@
<ClCompile Include="TrooperEngine\TextTypeEngine\TextTypeHelpers\cFontHolder.cpp">
<Filter>TrooperEngine\TextTypeEngine\TextTypeHelpers</Filter>
</ClCompile>
<ClCompile Include="TrooperEngine\GUIEngine\cSizer.cpp">
<Filter>TrooperEngine\GUIEngine</Filter>
</ClCompile>
</ItemGroup>
</Project>
TrooperEngineDLL/dllExportFiles/TrooperEngine.hpp
+1 -1
View File
@@ -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"
TrooperEngineTest/GUIEngineTest/GUIXMLTest.cpp
+4 -4
View File
@@ -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<GUIEngine::cWindow*> 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 };
TrooperEngineTest/GUIEngineTest/GUIXMLTest.hpp
+1 -1
View File
@@ -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 );
TrooperEngineTest/TrooperEngineTest.vcxproj
+1 -1
View File
@@ -170,7 +170,7 @@
<ItemGroup>
<Xml Include="xml\GUI.xml" />
<Xml Include="xml\GUIXMLAlignTest.xml" />
<Xml Include="xml\GUIXMLBoxSizerTest.xml" />
<Xml Include="xml\GUIXMLSizerTest.xml" />
<Xml Include="xml\GUIXMLDefaultTest.xml">
<SubType>Designer</SubType>
</Xml>
TrooperEngineTest/TrooperEngineTest.vcxproj.filters
+1 -1
View File
@@ -95,7 +95,7 @@
<Xml Include="xml\GUIXMLAlignTest.xml">
<Filter>xml</Filter>
</Xml>
<Xml Include="xml\GUIXMLBoxSizerTest.xml">
<Xml Include="xml\GUIXMLSizerTest.xml">
<Filter>xml</Filter>
</Xml>
</ItemGroup>
TrooperEngineTest/xml/GUIXMLAlignTest.xml
+3 -3
View File
@@ -2,8 +2,8 @@
<Panel size="400,400">
<debug/>
<Layout>
<Label align="left" text="Hello world Left" />
<Label align="center" text="Hello world Center" />
<Label align="right" text="Hello world Right" />
<Label align="left">Hello world Left</Label>
<Label align="center">Hello world Center</Label>
<Label align="right">Hello world Right</Label>
</Layout>
</Panel>
TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Panel size="200,200">
<debug />
<Layout>
<Boxsizer />
<Label text="Box Sizer" />
<Boxsizer />
</Layout>
</Panel>
TrooperEngineTest/xml/GUIXMLDefaultTest.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<Panel size="200,200">
<debug/>
<Layout>
<Label text="Hello world" />
<Label>Hello world</Label>
<Include dir ="xml/" filename="include.xml"/>
</Layout>
</Panel>
TrooperEngineTest/xml/GUIXMLSizerTest.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Panel size="200,200">
<debug />
<Layout>
<!--<Include dir ="xml/" filename="include.xml"/>-->
<Sizer />
<Label>Sizer</Label>
<Sizer />
<Sizer />
</Layout>
</Panel>
TrooperEngineTest/xml/include.xml
+2 -2
View File
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<Boxsizer />
<Label text="Box Sizer" />
<Sizer />
<Label>Sizer</Label>