From 810272e101eb724d656cf7f1b3631da736573c94 Mon Sep 17 00:00:00 2001 From: "spartanj@gmail.com" Date: Sun, 2 Dec 2012 23:34:32 -0300 Subject: [PATCH] Fixed Doxyfile. Changed in String class: toStr to ToStr and fromString to FromString ( since everthing else starts with uppercase characters ). Added BitOp static class, just some helpers for bit operations. --- .hgignore | 25 +++++++++++ Doxyfile | 15 +++---- include/eepp/base/string.hpp | 6 +-- include/eepp/gaming/base.hpp | 2 +- include/eepp/graphics/base.hpp | 2 +- include/eepp/system/bitop.hpp | 42 +++++++++++++++++++ include/eepp/system/ctimeelapsed.hpp | 4 +- include/eepp/system/sys.hpp | 2 +- include/eepp/system/tresourcemanager.hpp | 3 +- include/eepp/system/utils.hpp | 34 --------------- include/eepp/ui/base.hpp | 2 +- include/eepp/window/base.hpp | 2 +- projects/linux/ee.creator.user | 6 +-- projects/linux/ee.files | 2 +- src/eepp/gaming/cisomap.cpp | 2 +- src/eepp/gaming/cmap.cpp | 16 +++---- src/eepp/gaming/mapeditor/cmapeditor.cpp | 12 +++--- src/eepp/gaming/mapeditor/cmapproperties.cpp | 12 +++--- src/eepp/gaming/mapeditor/cuilayernew.cpp | 2 +- src/eepp/gaming/mapeditor/cuimapnew.cpp | 12 +++--- src/eepp/graphics/cconsole.cpp | 26 ++++++------ src/eepp/graphics/cshader.cpp | 2 +- src/eepp/graphics/cshaderprogram.cpp | 2 +- src/eepp/graphics/ctextureatlasloader.cpp | 2 +- src/eepp/graphics/ctexturepacker.cpp | 2 +- src/eepp/graphics/renderer/cgl.cpp | 10 ++--- src/eepp/graphics/renderer/crenderergl3.cpp | 2 +- src/eepp/graphics/renderer/crenderergles2.cpp | 2 +- src/eepp/system/filesystem.cpp | 2 +- src/eepp/ui/cuicommondialog.cpp | 6 +-- src/eepp/ui/cuicontrol.cpp | 2 +- src/eepp/ui/cuimanager.cpp | 2 +- src/eepp/ui/cuiprogressbar.cpp | 2 +- src/eepp/ui/cuiskin.cpp | 4 +- src/eepp/ui/cuispinbox.cpp | 8 ++-- src/eepp/ui/cuitheme.cpp | 4 +- src/eepp/ui/tools/ctextureatlasnew.cpp | 6 +-- src/eepp/window/backend/SDL/cwindowsdl.cpp | 2 +- src/eepp/window/backend/SDL2/cwindowsdl2.cpp | 2 +- .../window/backend/SFML/cjoysticksfml.cpp | 2 +- .../window/backend/allegro5/cwindowal.cpp | 2 +- src/eepp/window/cinput.cpp | 1 + src/eepp/window/cinputtextbuffer.cpp | 16 +++---- src/eepp/window/cwindow.cpp | 9 ++-- src/test/eetest.cpp | 18 ++++---- 45 files changed, 184 insertions(+), 155 deletions(-) create mode 100644 .hgignore create mode 100755 include/eepp/system/bitop.hpp delete mode 100755 include/eepp/system/utils.hpp diff --git a/.hgignore b/.hgignore new file mode 100644 index 000000000..b460b0a72 --- /dev/null +++ b/.hgignore @@ -0,0 +1,25 @@ +syntax: glob +data/** +fonts/** +obj/** +libs/** +make/** +bin/** +projects/windows/vc2010/eepp/cdeps/Debug/** +projects/windows/vc2010/eepp/cdeps/Release/** +projects/windows/vc2010/empty_window/Debug/** +projects/windows/vc2010/empty_window/Release/** +projects/windows/vc2010/eepp/Debug/** +projects/windows/vc2010/eepp/Release/** +projects/windows/vc2010/eepp/DebugDynamic/** +projects/windows/vc2010/eepp/ReleaseDynamic/** +projects/windows/vc2010/eepp/eepp/DebugDynamic/** +projects/windows/vc2010/eepp/eepp/ReleaseDynamic/** +projects/windows/vc2010/eepp/eepp/Debug/** +projects/windows/vc2010/eepp/eepp/Release/** +projects/windows/vc2010/empty_window/empty_window.vcxproj.filters +projects/windows/vc2010/empty_window/empty_window.vcxproj.user +projects/src/** +projects/android-project/data/** +log.log +ee* \ No newline at end of file diff --git a/Doxyfile b/Doxyfile index 670cb97b1..ea430c8ba 100644 --- a/Doxyfile +++ b/Doxyfile @@ -95,7 +95,9 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ./src/eepp +INPUT = ./include/eepp + ./src/eepp + INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ @@ -147,15 +149,8 @@ FILE_PATTERNS = *.c \ *.xpm \ *.dox RECURSIVE = YES -EXCLUDE = ./src/eepp/helper/glew \ - ./src/eepp/helper/chipmunk \ - ./src/eepp/helper/glm \ - ./src/eepp/helper/libzip \ - ./src/eepp/helper/SOIL \ - ./src/eepp/helper/stb_vorbis \ - ./src/eepp/helper/zlib \ - ./src/eepp/helper/PlusCallback \ - ./src/eepp/helper/sophist +EXCLUDE = ./include/eepp/helper/ \ + ./src/eepp/helper/ EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = diff --git a/include/eepp/base/string.hpp b/include/eepp/base/string.hpp index 96226608f..fd08a7469 100644 --- a/include/eepp/base/string.hpp +++ b/include/eepp/base/string.hpp @@ -127,7 +127,7 @@ class EE_API String { /** Converts from any basic type to std::string */ template - static std::string toStr(const T& i) { + static std::string ToStr(const T& i) { std::ostringstream ss; ss << i; return ss.str(); @@ -135,14 +135,14 @@ class EE_API String { /** Converts from a string to type */ template - static bool fromString(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) = std::dec ) { + static bool FromString(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) = std::dec ) { std::istringstream iss(s); return !(iss >> f >> t).fail(); } /** Converts from a String to type */ template - static bool fromString(T& t, const String& s, std::ios_base& (*f)(std::ios_base&) = std::dec ) { + static bool FromString(T& t, const String& s, std::ios_base& (*f)(std::ios_base&) = std::dec ) { std::istringstream iss( s.ToUtf8() ); return !(iss >> f >> t).fail(); } diff --git a/include/eepp/gaming/base.hpp b/include/eepp/gaming/base.hpp index 3d3048269..82956b2ae 100644 --- a/include/eepp/gaming/base.hpp +++ b/include/eepp/gaming/base.hpp @@ -8,7 +8,7 @@ #include using namespace EE::Math; -#include +#include #include #include #include diff --git a/include/eepp/graphics/base.hpp b/include/eepp/graphics/base.hpp index e8ddbaa07..46cf5c5bf 100644 --- a/include/eepp/graphics/base.hpp +++ b/include/eepp/graphics/base.hpp @@ -248,7 +248,7 @@ using namespace EE::Math; #include -#include +#include #include #include #include diff --git a/include/eepp/system/bitop.hpp b/include/eepp/system/bitop.hpp new file mode 100755 index 000000000..c1391495c --- /dev/null +++ b/include/eepp/system/bitop.hpp @@ -0,0 +1,42 @@ +#ifndef EE_SYSTEMCUTILS_H +#define EE_SYSTEMCUTILS_H + +#include + +namespace EE { namespace System { + +class BitOp { + public: + + /** Write a bit into the Key in the position defined. + * @param Key The Key to write + * @param Pos The Position of the bit + * @param BitWrite 0 for write 0, any other to write 1. + */ + static inline void WriteBitKey( unsigned int * Key, unsigned int Pos, unsigned int BitWrite ) { + ( BitWrite ) ? ( * Key ) |= ( 1 << Pos ) : ( * Key ) &= ~( 1 << Pos ); + } + + /** Read a bit from a 32 bit key, in the position defined + * @param Key The Key to read + * @param Pos The Position in the key to read + * @return True if the bit is 1 + */ + static inline bool ReadBitKey( Uint32 * Key, Uint32 Pos ) { + return 0 != ( ( * Key ) & ( 1 << Pos ) ); + } + + /** Write a bit flag value + * @param Key The Key to write or remove + * @param Val The Value to write or remove + * @param BitWrite 0 to remove, any value to write + */ + static inline void SetBitFlagValue( Uint32 * Key, Uint32 Val, Uint32 BitWrite ) { + ( BitWrite ) ? ( * Key ) |= Val : ( * Key ) &= ~Val; + } +}; + +} + +} +#endif diff --git a/include/eepp/system/ctimeelapsed.hpp b/include/eepp/system/ctimeelapsed.hpp index cb09cb62a..dd28f7400 100755 --- a/include/eepp/system/ctimeelapsed.hpp +++ b/include/eepp/system/ctimeelapsed.hpp @@ -13,10 +13,10 @@ class EE_API cTimeElapsed : private cTimer { ~cTimeElapsed(); - /** Time elapsed between this call and the last call to Elapsed() */ + /** Time in milliseconds elapsed between this call and the last call to Elapsed() */ eeDouble Elapsed(); - /** Time elapsed between the last Reset ( First Reset is when the class is instantiated ) */ + /** Time in milliseconds elapsed between the last Reset ( First Reset is when the class is instantiated ) */ eeDouble ElapsedSinceStart(); /** Restart the initial counter. ( set it as now ) */ diff --git a/include/eepp/system/sys.hpp b/include/eepp/system/sys.hpp index a3cf22598..2b670db0c 100644 --- a/include/eepp/system/sys.hpp +++ b/include/eepp/system/sys.hpp @@ -13,7 +13,7 @@ class EE_API Sys { /** @return A storage path for config files for every platform */ static std::string GetStoragePath( std::string appname ); - /** @return The number of milliseconds since the EE++ library initialization. Note that this value wraps if the program runs for more than ~49 days. */ + /** @return The number of milliseconds since the first call. Note that this value wraps if the program runs for more than ~49 days. */ static Uint32 GetTicks(); /** Wait a specified number of milliseconds before returning. */ diff --git a/include/eepp/system/tresourcemanager.hpp b/include/eepp/system/tresourcemanager.hpp index e073ddc8f..1183cce19 100644 --- a/include/eepp/system/tresourcemanager.hpp +++ b/include/eepp/system/tresourcemanager.hpp @@ -2,7 +2,6 @@ #define EE_SYSTEMTRESOURCEMANAGER_HPP #include -#include #include namespace EE { namespace System { @@ -98,7 +97,7 @@ T * tResourceManager::Add( T * Resource ) { while ( Count( Resource->Id() ) ) { c++; - Resource->Name( RealName + String::toStr( c ) ); + Resource->Name( RealName + String::ToStr( c ) ); } return Add( Resource ); diff --git a/include/eepp/system/utils.hpp b/include/eepp/system/utils.hpp deleted file mode 100755 index 04c39f377..000000000 --- a/include/eepp/system/utils.hpp +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef EE_SYSTEMCUTILS_H -#define EE_SYSTEMCUTILS_H - -#include - -namespace EE { namespace System { - -/** Write a bit into the Key in the position defined. -* @param Key The Key to write -* @param Pos The Position of the bit -* @param BitWrite 0 for write 0, any other to write 1. -*/ -inline void Write32BitKey( unsigned int * Key, unsigned int Pos, unsigned int BitWrite ) { - ( BitWrite ) ? ( * Key ) |= ( 1 << Pos ) : ( * Key ) &= ~( 1 << Pos ); -} - -/** Read a bit from a 32 bit key, in the position defined -* @param Key The Key to read -* @param Pos The Position in the key to read -* @return True if the bit is 1 -*/ -inline bool Read32BitKey( Uint32 * Key, Uint32 Pos ) { - return 0 != ( ( * Key ) & ( 1 << Pos ) ); -} - -/** Write a 32 bit flag value */ -inline void SetFlagValue( Uint32 * Key, Uint32 Val, Uint32 BitWrite ) { - ( BitWrite ) ? ( * Key ) |= Val : ( * Key ) &= ~Val; -} - -} - -} -#endif diff --git a/include/eepp/ui/base.hpp b/include/eepp/ui/base.hpp index 125197820..9bfba05b5 100644 --- a/include/eepp/ui/base.hpp +++ b/include/eepp/ui/base.hpp @@ -11,7 +11,7 @@ #include using namespace EE::Math; -#include +#include #include #include #include diff --git a/include/eepp/window/base.hpp b/include/eepp/window/base.hpp index 9dae959c7..3f8ebfd74 100644 --- a/include/eepp/window/base.hpp +++ b/include/eepp/window/base.hpp @@ -8,7 +8,7 @@ using namespace EE::Math; #include -#include +#include #include #include #include diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index d523a5e63..f2c96572e 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -48,9 +48,9 @@ Desktop Desktop {388e5431-b31b-42b3-b9ad-9002d279d75d} - 11 + 0 0 - 4 + 0 /home/programming/eepp diff --git a/projects/linux/ee.files b/projects/linux/ee.files index 9040ac613..710a74198 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -336,7 +336,7 @@ ../../src/eepp/ui/tools/ctextureatlaseditor.cpp ../../include/eepp/math/vector3.hpp ../../include/eepp/math/vector2.hpp -../../include/eepp/system/utils.hpp +../../include/eepp/system/bitop.hpp ../../include/eepp/math/triangle2.hpp ../../include/eepp/system/sys.hpp ../../src/eepp/system/sys.cpp diff --git a/src/eepp/gaming/cisomap.cpp b/src/eepp/gaming/cisomap.cpp index f1592d2ab..df1e3f3c7 100755 --- a/src/eepp/gaming/cisomap.cpp +++ b/src/eepp/gaming/cisomap.cpp @@ -57,7 +57,7 @@ void cIsoMap::CreateBaseVertexBuffer() { T->Q = TileQBaseCoords( x, y ); T->Box = Math::Quad2toAABB( T->Q ); - T->TilePosStr = String::toStr( x) + " - " + String::toStr( y ); + T->TilePosStr = String::ToStr( x) + " - " + String::ToStr( y ); for ( i = 0; i < 4; i++ ) T->Color[i] = mMapAmbientColor; diff --git a/src/eepp/gaming/cmap.cpp b/src/eepp/gaming/cmap.cpp index 46285baca..1e2fcdfad 100644 --- a/src/eepp/gaming/cmap.cpp +++ b/src/eepp/gaming/cmap.cpp @@ -99,7 +99,7 @@ void cMap::CreateLightManager() { void cMap::CreateEmptyTile() { //! I create a texture representing an empty tile to render instead of rendering with primitives because is a lot faster, at least with NVIDIA GPUs. cTextureFactory * TF = cTextureFactory::instance(); - std::string tileName( "maptile-" + String::toStr( mTileSize.Width() ) + "x" + String::toStr( mTileSize.Height() ) ); + std::string tileName( "maptile-" + String::ToStr( mTileSize.Width() ) + "x" + String::ToStr( mTileSize.Height() ) ); cTexture * Tex = TF->GetByName( tileName ); @@ -509,7 +509,7 @@ const eeColorA& cMap::BaseColor() const { } void cMap::DrawGrid( const bool& draw ) { - SetFlagValue( &mFlags, MAP_FLAG_DRAW_GRID, draw ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, MAP_FLAG_DRAW_GRID, draw ? 1 : 0 ); } Uint32 cMap::DrawGrid() const { @@ -517,11 +517,11 @@ Uint32 cMap::DrawGrid() const { } void cMap::DrawBackground( const bool& draw ) { - SetFlagValue( &mFlags, MAP_FLAG_DRAW_BACKGROUND, draw ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, MAP_FLAG_DRAW_BACKGROUND, draw ? 1 : 0 ); } void cMap::ShowBlocked( const bool& show ) { - SetFlagValue( &mFlags, MAP_FLAG_SHOW_BLOCKED, show ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, MAP_FLAG_SHOW_BLOCKED, show ? 1 : 0 ); } Uint32 cMap::ShowBlocked() const { @@ -537,7 +537,7 @@ Uint32 cMap::ClipedArea() const { } void cMap::ClipedArea( const bool& clip ) { - SetFlagValue( &mFlags, MAP_FLAG_CLIP_AREA, clip ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, MAP_FLAG_CLIP_AREA, clip ? 1 : 0 ); } Uint32 cMap::ClampBorders() const { @@ -545,7 +545,7 @@ Uint32 cMap::ClampBorders() const { } void cMap::ClampBorders( const bool& clamp ) { - SetFlagValue( &mFlags, MAP_FLAG_CLAMP_BORDERS, clamp ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, MAP_FLAG_CLAMP_BORDERS, clamp ? 1 : 0 ); } Uint32 cMap::DrawTileOver() const { @@ -553,7 +553,7 @@ Uint32 cMap::DrawTileOver() const { } void cMap::DrawTileOver( const bool& draw ) { - SetFlagValue( &mFlags, MAP_FLAG_DRAW_TILE_OVER, draw ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, MAP_FLAG_DRAW_TILE_OVER, draw ? 1 : 0 ); } Uint32 cMap::LightsEnabled() { @@ -561,7 +561,7 @@ Uint32 cMap::LightsEnabled() { } void cMap::LightsEnabled( const bool& enabled ) { - SetFlagValue( &mFlags, MAP_FLAG_LIGHTS_ENABLED, enabled ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, MAP_FLAG_LIGHTS_ENABLED, enabled ? 1 : 0 ); } void cMap::Move( const eeVector2f& offset ) { diff --git a/src/eepp/gaming/mapeditor/cmapeditor.cpp b/src/eepp/gaming/mapeditor/cmapeditor.cpp index 329c3a7b2..581795004 100644 --- a/src/eepp/gaming/mapeditor/cmapeditor.cpp +++ b/src/eepp/gaming/mapeditor/cmapeditor.cpp @@ -329,7 +329,7 @@ void cMapEditor::CreateLightContainer() { mUIRedSlider->Value( 255 ); mUIRedSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cMapEditor::OnRedChange ) ); - mUIRedTxt = mTheme->CreateTextBox( String::toStr( (Uint32)255 ), mLightCont, eeSize(), eeVector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().Width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedTxt = mTheme->CreateTextBox( String::ToStr( (Uint32)255 ), mLightCont, eeSize(), eeVector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().Width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); Txt = mTheme->CreateTextBox( "G:", mLightCont, eeSize(), eeVector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().Width() + 4, mUIRedSlider->Pos().y + mUIRedSlider->Size().Height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); mUIGreenSlider = mTheme->CreateSlider( mLightCont, eeSize( 100, 20 ), eeVector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); @@ -337,7 +337,7 @@ void cMapEditor::CreateLightContainer() { mUIGreenSlider->Value( 255 ); mUIGreenSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cMapEditor::OnGreenChange ) ); - mUIGreenTxt = mTheme->CreateTextBox( String::toStr( (Uint32)255 ), mLightCont, eeSize(), eeVector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().Width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenTxt = mTheme->CreateTextBox( String::ToStr( (Uint32)255 ), mLightCont, eeSize(), eeVector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().Width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); Txt = mTheme->CreateTextBox( "B:", mLightCont, eeSize(), eeVector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().Width() + 4, mUIGreenSlider->Pos().y + mUIGreenSlider->Size().Height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); mUIBlueSlider = mTheme->CreateSlider( mLightCont, eeSize( 100, 20 ), eeVector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); @@ -345,7 +345,7 @@ void cMapEditor::CreateLightContainer() { mUIBlueSlider->Value( 255 ); mUIBlueSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cMapEditor::OnBlueChange ) ); - mUIBlueTxt = mTheme->CreateTextBox( String::toStr( (Uint32)255 ), mLightCont, eeSize(), eeVector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().Width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueTxt = mTheme->CreateTextBox( String::ToStr( (Uint32)255 ), mLightCont, eeSize(), eeVector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().Width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); Txt = mTheme->CreateTextBox( "Light Radius:", mLightCont, eeSize(), eeVector2i( 0, mUIBlueTxt->Pos().y + mUIBlueTxt->Size().Height() + 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); @@ -428,7 +428,7 @@ void cMapEditor::OnRedChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Red = (Uint8)mUIRedSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIRedTxt->Text( String::toStr( (Int32)mUIRedSlider->Value() ) ); + mUIRedTxt->Text( String::ToStr( (Int32)mUIRedSlider->Value() ) ); if ( NULL != mUIMap->GetSelectedLight() ) { eeColor lCol( mUIMap->GetSelectedLight()->Color() ); @@ -441,7 +441,7 @@ void cMapEditor::OnGreenChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Green = (Uint8)mUIGreenSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIGreenTxt->Text( String::toStr( (Uint32)mUIGreenSlider->Value() ) ); + mUIGreenTxt->Text( String::ToStr( (Uint32)mUIGreenSlider->Value() ) ); if ( NULL != mUIMap->GetSelectedLight() ) { eeColor lCol( mUIMap->GetSelectedLight()->Color() ); @@ -454,7 +454,7 @@ void cMapEditor::OnBlueChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Blue = (Uint8)mUIBlueSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIBlueTxt->Text( String::toStr( (Uint32)mUIBlueSlider->Value() ) ); + mUIBlueTxt->Text( String::ToStr( (Uint32)mUIBlueSlider->Value() ) ); if ( NULL != mUIMap->GetSelectedLight() ) { eeColor lCol( mUIMap->GetSelectedLight()->Color() ); diff --git a/src/eepp/gaming/mapeditor/cmapproperties.cpp b/src/eepp/gaming/mapeditor/cmapproperties.cpp index 096b6e8e5..a6903fd1c 100644 --- a/src/eepp/gaming/mapeditor/cmapproperties.cpp +++ b/src/eepp/gaming/mapeditor/cmapproperties.cpp @@ -47,7 +47,7 @@ cMapProperties::cMapProperties( cMap * Map ) : mUIRedSlider->Value( mMap->BaseColor().R() ); mUIRedSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cMapProperties::OnRedChange ) ); - mUIRedTxt = mUITheme->CreateTextBox( String::toStr( (Uint32)mMap->BaseColor().R() ), mUIWindow->Container(), eeSize(), eeVector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().Width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedTxt = mUITheme->CreateTextBox( String::ToStr( (Uint32)mMap->BaseColor().R() ), mUIWindow->Container(), eeSize(), eeVector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().Width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); Txt = mUITheme->CreateTextBox( "Green Color:", mUIWindow->Container(), eeSize(), eeVector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().Width() + 4, mUIRedSlider->Pos().y + mUIRedSlider->Size().Height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); mUIGreenSlider = mUITheme->CreateSlider( mUIWindow->Container(), eeSize( 255, 20 ), eeVector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); @@ -55,7 +55,7 @@ cMapProperties::cMapProperties( cMap * Map ) : mUIGreenSlider->Value( mMap->BaseColor().G() ); mUIGreenSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cMapProperties::OnGreenChange ) ); - mUIGreenTxt = mUITheme->CreateTextBox( String::toStr( (Uint32)mMap->BaseColor().G() ), mUIWindow->Container(), eeSize(), eeVector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().Width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenTxt = mUITheme->CreateTextBox( String::ToStr( (Uint32)mMap->BaseColor().G() ), mUIWindow->Container(), eeSize(), eeVector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().Width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); Txt = mUITheme->CreateTextBox( "Blue Color:", mUIWindow->Container(), eeSize(), eeVector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().Width() + 4, mUIGreenSlider->Pos().y + mUIGreenSlider->Size().Height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); mUIBlueSlider = mUITheme->CreateSlider( mUIWindow->Container(), eeSize( 255, 20 ), eeVector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); @@ -63,7 +63,7 @@ cMapProperties::cMapProperties( cMap * Map ) : mUIBlueSlider->Value( mMap->BaseColor().B() ); mUIBlueSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cMapProperties::OnBlueChange ) ); - mUIBlueTxt = mUITheme->CreateTextBox( String::toStr( (Uint32)mMap->BaseColor().B() ), mUIWindow->Container(), eeSize(), eeVector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().Width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueTxt = mUITheme->CreateTextBox( String::ToStr( (Uint32)mMap->BaseColor().B() ), mUIWindow->Container(), eeSize(), eeVector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().Width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); } Uint32 TxtBoxFlags = UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_HALIGN_CENTER | UI_VALIGN_CENTER; @@ -125,7 +125,7 @@ void cMapProperties::OnRedChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Red = (Uint8)mUIRedSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIRedTxt->Text( String::toStr( (Int32)mUIRedSlider->Value() ) ); + mUIRedTxt->Text( String::ToStr( (Int32)mUIRedSlider->Value() ) ); eeColorA MapCol = mMap->BaseColor(); MapCol.Red = Col.Red; @@ -136,7 +136,7 @@ void cMapProperties::OnGreenChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Green = (Uint8)mUIGreenSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIGreenTxt->Text( String::toStr( (Uint32)mUIGreenSlider->Value() ) ); + mUIGreenTxt->Text( String::ToStr( (Uint32)mUIGreenSlider->Value() ) ); eeColorA MapCol = mMap->BaseColor(); MapCol.Green = Col.Green; @@ -147,7 +147,7 @@ void cMapProperties::OnBlueChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Blue = (Uint8)mUIBlueSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIBlueTxt->Text( String::toStr( (Uint32)mUIBlueSlider->Value() ) ); + mUIBlueTxt->Text( String::ToStr( (Uint32)mUIBlueSlider->Value() ) ); eeColorA MapCol = mMap->BaseColor(); MapCol.Blue = Col.Blue; diff --git a/src/eepp/gaming/mapeditor/cuilayernew.cpp b/src/eepp/gaming/mapeditor/cuilayernew.cpp index 98cbefa0a..8e9688dbf 100644 --- a/src/eepp/gaming/mapeditor/cuilayernew.cpp +++ b/src/eepp/gaming/mapeditor/cuilayernew.cpp @@ -30,7 +30,7 @@ cUILayerNew::cUILayerNew( cUIMap * Map, EE_LAYER_TYPE Type, NewLayerCb newLayerC cUITextBox * Txt = mTheme->CreateTextBox( "Layer Name", mUIWindow->Container(), eeSize(), eeVector2i( 16, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); mUILayerName = mTheme->CreateTextInput( mUIWindow->Container(), eeSize( 120, 22 ), eeVector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); - mUILayerName->Text( "Layer " + String::toStr( mUIMap->Map()->LayerCount() + 1 ) ); + mUILayerName->Text( "Layer " + String::ToStr( mUIMap->Map()->LayerCount() + 1 ) ); cUIPushButton * OKButton = mTheme->CreatePushButton( mUIWindow->Container(), eeSize( 80, 22 ), eeVector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "add" ) ); OKButton->Pos( mUIWindow->Container()->Size().Width() - OKButton->Size().Width() - 4, mUIWindow->Container()->Size().Height() - OKButton->Size().Height() - 4 ); diff --git a/src/eepp/gaming/mapeditor/cuimapnew.cpp b/src/eepp/gaming/mapeditor/cuimapnew.cpp index f25e39789..9758a9323 100644 --- a/src/eepp/gaming/mapeditor/cuimapnew.cpp +++ b/src/eepp/gaming/mapeditor/cuimapnew.cpp @@ -86,7 +86,7 @@ cUIMapNew::cUIMapNew( cUIMap * Map, cb::Callback0 NewMapCb ) : mUIRedSlider->Value( 255 ); mUIRedSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cUIMapNew::OnRedChange ) ); - mUIRedTxt = mTheme->CreateTextBox( String::toStr( 255 ), mUIWindow->Container(), eeSize(), eeVector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().Width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedTxt = mTheme->CreateTextBox( String::ToStr( 255 ), mUIWindow->Container(), eeSize(), eeVector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().Width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); Txt = mTheme->CreateTextBox( "Green Color:", mUIWindow->Container(), eeSize(), eeVector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().Width() + 4, mUIRedSlider->Pos().y + mUIRedSlider->Size().Height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); @@ -95,7 +95,7 @@ cUIMapNew::cUIMapNew( cUIMap * Map, cb::Callback0 NewMapCb ) : mUIGreenSlider->Value( 255 ); mUIGreenSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cUIMapNew::OnGreenChange ) ); - mUIGreenTxt = mTheme->CreateTextBox( String::toStr( 255 ), mUIWindow->Container(), eeSize(), eeVector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().Width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenTxt = mTheme->CreateTextBox( String::ToStr( 255 ), mUIWindow->Container(), eeSize(), eeVector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().Width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); Txt = mTheme->CreateTextBox( "Blue Color:", mUIWindow->Container(), eeSize(), eeVector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().Width() + 4, mUIGreenSlider->Pos().y + mUIGreenSlider->Size().Height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); @@ -104,7 +104,7 @@ cUIMapNew::cUIMapNew( cUIMap * Map, cb::Callback0 NewMapCb ) : mUIBlueSlider->Value( 255 ); mUIBlueSlider->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cUIMapNew::OnBlueChange ) ); - mUIBlueTxt = mTheme->CreateTextBox( String::toStr( 255 ), mUIWindow->Container(), eeSize(), eeVector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().Width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueTxt = mTheme->CreateTextBox( String::ToStr( 255 ), mUIWindow->Container(), eeSize(), eeVector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().Width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); cUIPushButton * OKButton = mTheme->CreatePushButton( mUIWindow->Container(), eeSize( 80, 22 ), eeVector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "ok" ) ); OKButton->Pos( mUIWindow->Container()->Size().Width() - OKButton->Size().Width() - 4, mUIWindow->Container()->Size().Height() - OKButton->Size().Height() - 4 ); @@ -126,21 +126,21 @@ void cUIMapNew::OnRedChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Red = (Uint8)mUIRedSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIRedTxt->Text( String::toStr( (Int32)mUIRedSlider->Value() ) ); + mUIRedTxt->Text( String::ToStr( (Int32)mUIRedSlider->Value() ) ); } void cUIMapNew::OnGreenChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Green = (Uint8)mUIGreenSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIGreenTxt->Text( String::toStr( (Uint32)mUIGreenSlider->Value() ) ); + mUIGreenTxt->Text( String::ToStr( (Uint32)mUIGreenSlider->Value() ) ); } void cUIMapNew::OnBlueChange( const cUIEvent * Event ) { eeColorA Col = mUIBaseColor->Background()->Color(); Col.Blue = (Uint8)mUIBlueSlider->Value(); mUIBaseColor->Background()->Color( Col ); - mUIBlueTxt->Text( String::toStr( (Uint32)mUIBlueSlider->Value() ) ); + mUIBlueTxt->Text( String::ToStr( (Uint32)mUIBlueSlider->Value() ) ); } void cUIMapNew::OKClick( const cUIEvent * Event ) { diff --git a/src/eepp/graphics/cconsole.cpp b/src/eepp/graphics/cconsole.cpp index d6deb479e..660b9d335 100755 --- a/src/eepp/graphics/cconsole.cpp +++ b/src/eepp/graphics/cconsole.cpp @@ -178,7 +178,7 @@ void cConsole::Draw() { if ( mShowFps ) { eeColorA OldColor1( mFont->Color() ); mFont->Color( eeColorA () ); - mFont->SetText( "FPS: " + String::toStr( mWindow->FPS() ) ); + mFont->SetText( "FPS: " + String::ToStr( mWindow->FPS() ) ); mFont->Draw( mWindow->GetWidth() - mFont->GetTextWidth() - 15, 6 ); mFont->Color( OldColor1 ); } @@ -489,11 +489,11 @@ void cConsole::CmdShowCursor ( const std::vector < String >& params ) { if ( params.size() >= 2 ) { Int32 tInt = 0; - bool Res = String::fromString( tInt, params[1] ); + bool Res = String::FromString( tInt, params[1] ); if ( Res && ( tInt == 0 || tInt == 1 ) ) { mWindow->GetCursorManager()->Visible( 0 != tInt ); - PushText( "showcursor " + String::toStr( tInt ) ); + PushText( "showcursor " + String::ToStr( tInt ) ); } else PushText( "Valid parameters are 0 or 1." ); } else { @@ -505,11 +505,11 @@ void cConsole::CmdFrameLimit ( const std::vector < String >& params ) { if ( params.size() >= 2 ) { Int32 tInt = 0; - bool Res = String::fromString( tInt, params[1] ); + bool Res = String::FromString( tInt, params[1] ); if ( Res && ( tInt >= 0 && tInt <= 10000 ) ) { mWindow->FrameRateLimit( tInt ); - PushText( "setfpslimit " + String::toStr( tInt ) ); + PushText( "setfpslimit " + String::ToStr( tInt ) ); return; } } @@ -518,7 +518,7 @@ void cConsole::CmdFrameLimit ( const std::vector < String >& params ) { } void cConsole::CmdGetLog() { - std::vector < String > tvec = String::SplitString( String( String::toStr( cLog::instance()->Buffer() ) ) ); + std::vector < String > tvec = String::SplitString( String( String::ToStr( cLog::instance()->Buffer() ) ) ); if ( tvec.size() > 0 ) { for ( eeUint i = 0; i < tvec.size(); i++ ) PushText( tvec[i] ); @@ -531,7 +531,7 @@ void cConsole::CmdGetLog( const std::vector < String >& params ) { void cConsole::CmdGetGpuExtensions() { char *Exts = GLi->GetExtensions(); - std::vector < String > tvec = String::SplitString( String( String::toStr( std::string( Exts ) ) ), ' ' ); + std::vector < String > tvec = String::SplitString( String( String::ToStr( std::string( Exts ) ) ), ' ' ); if ( tvec.size() > 0 ) { for ( eeUint i = 0; i < tvec.size(); i++ ) PushText( tvec[i] ); @@ -546,11 +546,11 @@ void cConsole::CmdSetGamma( const std::vector < String >& params ) { if ( params.size() >= 2 ) { eeFloat tFloat = 0.f; - bool Res = String::fromString( tFloat, params[1] ); + bool Res = String::FromString( tFloat, params[1] ); if ( Res && ( tFloat > 0.1f && tFloat <= 10.0f ) ) { mWindow->SetGamma( tFloat, tFloat, tFloat ); - PushText( "setgamma " + String::toStr( tFloat ) ); + PushText( "setgamma " + String::ToStr( tFloat ) ); return; } } @@ -562,11 +562,11 @@ void cConsole::CmdSetVolume( const std::vector < String >& params ) { if ( params.size() >= 2 ) { eeFloat tFloat = 0.f; - bool Res = String::fromString( tFloat, params[1] ); + bool Res = String::FromString( tFloat, params[1] ); if ( Res && ( tFloat >= 0.0f && tFloat <= 100.0f ) ) { EE::Audio::cAudioListener::GlobalVolume( tFloat ); - PushText( "setvolume " + String::toStr( tFloat ) ); + PushText( "setvolume " + String::ToStr( tFloat ) ); return; } } @@ -648,11 +648,11 @@ void cConsole::CmdShowFps( const std::vector < String >& params ) { if ( params.size() >= 2 ) { Int32 tInt = 0; - bool Res = String::fromString( tInt, params[1] ); + bool Res = String::FromString( tInt, params[1] ); if ( Res && ( tInt == 0 || tInt == 1 ) ) { mShowFps = 0 != tInt; - PushText( "showfps " + String::toStr( tInt ) ); + PushText( "showfps " + String::ToStr( tInt ) ); return; } } diff --git a/src/eepp/graphics/cshader.cpp b/src/eepp/graphics/cshader.cpp index 11bed5c6a..6d286891e 100644 --- a/src/eepp/graphics/cshader.cpp +++ b/src/eepp/graphics/cshader.cpp @@ -105,7 +105,7 @@ std::string cShader::GetName() { if ( mFilename.size() ) { name = mFilename; } else { - name = String::toStr( mGLId ); + name = String::ToStr( mGLId ); } return name; diff --git a/src/eepp/graphics/cshaderprogram.cpp b/src/eepp/graphics/cshaderprogram.cpp index 5821d6285..49a8adb19 100644 --- a/src/eepp/graphics/cshaderprogram.cpp +++ b/src/eepp/graphics/cshaderprogram.cpp @@ -429,7 +429,7 @@ void cShaderProgram::Name( const std::string& name ) { Uint32 NameCount = cShaderProgramManager::instance()->Exists( mName ); if ( 0 != NameCount || 0 == name.size() ) { - Name( name + String::toStr( NameCount + 1 ) ); + Name( name + String::ToStr( NameCount + 1 ) ); } } diff --git a/src/eepp/graphics/ctextureatlasloader.cpp b/src/eepp/graphics/ctextureatlasloader.cpp index 95eecc11f..b2e9eeda8 100644 --- a/src/eepp/graphics/ctextureatlasloader.cpp +++ b/src/eepp/graphics/ctextureatlasloader.cpp @@ -439,7 +439,7 @@ bool cTextureAtlasLoader::UpdateTextureAtlas( std::string TextureAtlasPath, std: for ( Uint32 z = 0; z < mTempAtlass.size(); z++ ) { if ( z != 0 ) { - tapath = FileSystem::FileRemoveExtension( TextureAtlasPath ) + "_ch" + String::toStr( z ) + "." + cImage::SaveTypeToExtension( mTexGrHdr.Format ); + tapath = FileSystem::FileRemoveExtension( TextureAtlasPath ) + "_ch" + String::ToStr( z ) + "." + cImage::SaveTypeToExtension( mTexGrHdr.Format ); } unsigned char * imgPtr = stbi_load( tapath.c_str(), &x, &y, &c, 0 ); diff --git a/src/eepp/graphics/ctexturepacker.cpp b/src/eepp/graphics/ctexturepacker.cpp index dcaf75549..ecb5a1b1b 100644 --- a/src/eepp/graphics/ctexturepacker.cpp +++ b/src/eepp/graphics/ctexturepacker.cpp @@ -702,7 +702,7 @@ void cTexturePacker::ChildSave( const EE_SAVE_TYPE& Format ) { std::string fFpath = FileSystem::FileRemoveExtension( LastParent->GetFilepath() ); std::string fExt = FileSystem::FileExtension( LastParent->GetFilepath() ); - std::string fName = fFpath + "_ch" + String::toStr( ParentCount ) + "." + fExt; + std::string fName = fFpath + "_ch" + String::ToStr( ParentCount ) + "." + fExt; mChild->Save( fName, Format, mSaveExtensions ); } diff --git a/src/eepp/graphics/renderer/cgl.cpp b/src/eepp/graphics/renderer/cgl.cpp index d4249fed4..f98bd9469 100644 --- a/src/eepp/graphics/renderer/cgl.cpp +++ b/src/eepp/graphics/renderer/cgl.cpp @@ -102,7 +102,7 @@ cRendererGLES2 * cGL::GetRendererGLES2() { } void cGL::WriteExtension( Uint8 Pos, Uint32 BitWrite ) { - Write32BitKey( &mExtensions, Pos, BitWrite ); + BitOp::WriteBitKey( &mExtensions, Pos, BitWrite ); } void cGL::Init() { @@ -317,7 +317,7 @@ void cGL::SetShader( cShaderProgram * Shader ) { } bool cGL::IsLineSmooth() { - return Read32BitKey( &mStateFlags, GLSF_LINE_SMOOTH ); + return BitOp::ReadBitKey( &mStateFlags, GLSF_LINE_SMOOTH ); } void cGL::LineSmooth() { @@ -331,13 +331,13 @@ void cGL::LineSmooth( const bool& Enable ) { GLi->Disable( GL_LINE_SMOOTH ); } - Write32BitKey( &mStateFlags, GLSF_LINE_SMOOTH, Enable ? 1 : 0 ); + BitOp::WriteBitKey( &mStateFlags, GLSF_LINE_SMOOTH, Enable ? 1 : 0 ); } void cGL::PolygonMode() { EE_FILL_MODE Mode = EE_DRAW_FILL; - if ( Read32BitKey( &mStateFlags, GLSF_POLYGON_MODE ) ) + if ( BitOp::ReadBitKey( &mStateFlags, GLSF_POLYGON_MODE ) ) Mode = EE_DRAW_LINE; PolygonMode( Mode ); @@ -349,7 +349,7 @@ void cGL::PolygonMode( const EE_FILL_MODE& Mode ) { else PolygonMode( GL_FRONT_AND_BACK, GL_LINE ); - Write32BitKey( &mStateFlags, GLSF_POLYGON_MODE, Mode == EE_DRAW_LINE ? 1 : 0 ); + BitOp::WriteBitKey( &mStateFlags, GLSF_POLYGON_MODE, Mode == EE_DRAW_LINE ? 1 : 0 ); } std::string cGL::GetVendor() { diff --git a/src/eepp/graphics/renderer/crenderergl3.cpp b/src/eepp/graphics/renderer/crenderergl3.cpp index 7f72acadf..e2e696b44 100644 --- a/src/eepp/graphics/renderer/crenderergl3.cpp +++ b/src/eepp/graphics/renderer/crenderergl3.cpp @@ -581,7 +581,7 @@ void cRendererGL3::ClipPlane( GLenum plane, const GLdouble * equation ) { if ( nplane < EE_MAX_PLANES ) { location = mPlanes[ nplane ]; } else { - std::string planeNum( "dgl_ClipPlane[" + String::toStr( nplane ) + "]" ); + std::string planeNum( "dgl_ClipPlane[" + String::ToStr( nplane ) + "]" ); location = glGetUniformLocation( mCurShader->Handler(), (GLchar*)&planeNum[0] ); } diff --git a/src/eepp/graphics/renderer/crenderergles2.cpp b/src/eepp/graphics/renderer/crenderergles2.cpp index 46fba68d4..bcf51f7f7 100644 --- a/src/eepp/graphics/renderer/crenderergles2.cpp +++ b/src/eepp/graphics/renderer/crenderergles2.cpp @@ -663,7 +663,7 @@ void cRendererGLES2::ClipPlane( GLenum plane, const GLdouble * equation ) { if ( nplane < EE_MAX_PLANES ) { location = mPlanes[ nplane ]; } else { - std::string planeNum( "dgl_ClipPlane[" + String::toStr( nplane ) + "]" ); + std::string planeNum( "dgl_ClipPlane[" + String::ToStr( nplane ) + "]" ); location = glGetUniformLocation( mCurShader->Handler(), (GLchar*)&planeNum[0] ); } diff --git a/src/eepp/system/filesystem.cpp b/src/eepp/system/filesystem.cpp index 1228ad249..e606cf2bf 100644 --- a/src/eepp/system/filesystem.cpp +++ b/src/eepp/system/filesystem.cpp @@ -419,7 +419,7 @@ std::string FileSystem::SizeToString( const Int64& Size ) { default: size = " WTF"; } - return std::string( String::toStr( mem ) + size ); + return std::string( String::ToStr( mem ) + size ); } }} diff --git a/src/eepp/ui/cuicommondialog.cpp b/src/eepp/ui/cuicommondialog.cpp index 6f92dab0b..f137c2f2b 100644 --- a/src/eepp/ui/cuicommondialog.cpp +++ b/src/eepp/ui/cuicommondialog.cpp @@ -369,17 +369,17 @@ bool cUICommonDialog::AllowFolderSelect() { } void cUICommonDialog::SortAlphabetically( const bool& sortAlphabetically ) { - SetFlagValue( &mCDLFlags, CDL_FLAG_SORT_ALPHABETICALLY, sortAlphabetically ? 1 : 0 ); + BitOp::SetBitFlagValue( &mCDLFlags, CDL_FLAG_SORT_ALPHABETICALLY, sortAlphabetically ? 1 : 0 ); RefreshFolder(); } void cUICommonDialog::FoldersFirst( const bool& foldersFirst ) { - SetFlagValue( &mCDLFlags, CDL_FLAG_FOLDERS_FISRT , foldersFirst ? 1 : 0 ); + BitOp::SetBitFlagValue( &mCDLFlags, CDL_FLAG_FOLDERS_FISRT , foldersFirst ? 1 : 0 ); RefreshFolder(); } void cUICommonDialog::AllowFolderSelect( const bool& allowFolderSelect ) { - SetFlagValue( &mCDLFlags, CDL_FLAG_ALLOW_FOLDER_SELECT, allowFolderSelect ? 1 : 0 ); + BitOp::SetBitFlagValue( &mCDLFlags, CDL_FLAG_ALLOW_FOLDER_SELECT, allowFolderSelect ? 1 : 0 ); } std::string cUICommonDialog::GetFullPath() { diff --git a/src/eepp/ui/cuicontrol.cpp b/src/eepp/ui/cuicontrol.cpp index fed7367a3..9de3a7039 100644 --- a/src/eepp/ui/cuicontrol.cpp +++ b/src/eepp/ui/cuicontrol.cpp @@ -975,7 +975,7 @@ cUISkin * cUIControl::GetSkin() { } void cUIControl::WriteCtrlFlag( const Uint32& Flag, const Uint32& Val ) { - SetFlagValue( &mControlFlags, Flag, Val ); + BitOp::SetBitFlagValue( &mControlFlags, Flag, Val ); } void cUIControl::WriteFlag( const Uint32& Flag, const Uint32& Val ) { diff --git a/src/eepp/ui/cuimanager.cpp b/src/eepp/ui/cuimanager.cpp index 6267fb613..d7e3ffb85 100644 --- a/src/eepp/ui/cuimanager.cpp +++ b/src/eepp/ui/cuimanager.cpp @@ -281,7 +281,7 @@ void cUIManager::ClipDisable() { } void cUIManager::HighlightFocus( bool Highlight ) { - SetFlagValue( &mFlags, UI_MANAGER_HIGHLIGHT_FOCUS, Highlight ? 1 : 0 ); + BitOp::SetBitFlagValue( &mFlags, UI_MANAGER_HIGHLIGHT_FOCUS, Highlight ? 1 : 0 ); } bool cUIManager::HighlightFocus() const { diff --git a/src/eepp/ui/cuiprogressbar.cpp b/src/eepp/ui/cuiprogressbar.cpp index c3e2a7675..854b5442a 100644 --- a/src/eepp/ui/cuiprogressbar.cpp +++ b/src/eepp/ui/cuiprogressbar.cpp @@ -162,7 +162,7 @@ const bool& cUIProgressBar::DisplayPercent() const { void cUIProgressBar::UpdateTextBox() { mTextBox->Visible( mDisplayPercent ); mTextBox->Size( mSize ); - mTextBox->Text( String::toStr( (Int32)( ( mProgress / mTotalSteps ) * 100.f ) ) + "%" ); + mTextBox->Text( String::ToStr( (Int32)( ( mProgress / mTotalSteps ) * 100.f ) ) + "%" ); } cUITextBox * cUIProgressBar::TextBox() const { diff --git a/src/eepp/ui/cuiskin.cpp b/src/eepp/ui/cuiskin.cpp index 36733a4f6..e3e2fa753 100644 --- a/src/eepp/ui/cuiskin.cpp +++ b/src/eepp/ui/cuiskin.cpp @@ -33,7 +33,7 @@ cUISkin::~cUISkin() { void cUISkin::SetColor( const Uint32& State, const eeColorA& Color ) { eeASSERT ( State < cUISkinState::StateCount ); - Write32BitKey( &mColorDefault, State, 0 ); + BitOp::WriteBitKey( &mColorDefault, State, 0 ); mColor[ State ] = Color; } @@ -75,7 +75,7 @@ const Uint32& cUISkin::GetType() const { } bool cUISkin::GetColorDefault( const Uint32& State ) { - return Read32BitKey( &mColorDefault, State ); + return BitOp::ReadBitKey( &mColorDefault, State ); } }} diff --git a/src/eepp/ui/cuispinbox.cpp b/src/eepp/ui/cuispinbox.cpp index 93188dfc3..7a120c591 100644 --- a/src/eepp/ui/cuispinbox.cpp +++ b/src/eepp/ui/cuispinbox.cpp @@ -142,7 +142,7 @@ Uint32 cUISpinBox::OnMessage( const cUIMessage * Msg ) { void cUISpinBox::AddValue( const eeFloat& value ) { if ( !mInput->Text().size() ) - mInput->Text( String::toStr( static_cast( mMinValue ) ) ); + mInput->Text( String::ToStr( static_cast( mMinValue ) ) ); Value( mValue + value ); } @@ -154,9 +154,9 @@ void cUISpinBox::InternalValue( const eeFloat& Val, const bool& Force ) { eeFloat fValN = (eeFloat)iValN; if ( fValN == Val ) { - mInput->Text( String::toStr( iValN ) ); + mInput->Text( String::ToStr( iValN ) ); } else { - mInput->Text( String::toStr( Val ) ); + mInput->Text( String::ToStr( Val ) ); } mValue = Val; @@ -213,7 +213,7 @@ void cUISpinBox::Update() { if ( pos != mInput->Text().size() - 1 ) mInput->Text( mInput->Text().substr( 0, mInput->Text().size() - 1 ) ); } else { - bool Res = String::fromString( Val, mInput->Text() ); + bool Res = String::FromString( Val, mInput->Text() ); if ( Res ) Value( Val ); diff --git a/src/eepp/ui/cuitheme.cpp b/src/eepp/ui/cuitheme.cpp index b24092f9e..c8851e74b 100644 --- a/src/eepp/ui/cuitheme.cpp +++ b/src/eepp/ui/cuitheme.cpp @@ -159,7 +159,7 @@ cUITheme * cUITheme::LoadFromTextureAtlas( cUITheme * tTheme, cTextureAtlas * Te tTheme->Add( eeNew( cUISkinSimple, ( ElemFound[i] ) ) ); } - cLog::instance()->Write( "UI Theme Loaded in: " + String::toStr( TE.ElapsedSinceStart() ) + " ( from TextureAtlas )" ); + cLog::instance()->Write( "UI Theme Loaded in: " + String::ToStr( TE.ElapsedSinceStart() ) + " ( from TextureAtlas )" ); return tTheme; } @@ -222,7 +222,7 @@ cUITheme * cUITheme::LoadFromPath( cUITheme * tTheme, const std::string& Path, c tTheme->Add( eeNew( cUISkinSimple, ( ElemFound[i] ) ) ); } - cLog::instance()->Write( "UI Theme Loaded in: " + String::toStr( TE.ElapsedSinceStart() ) + " ( from path )" ); + cLog::instance()->Write( "UI Theme Loaded in: " + String::ToStr( TE.ElapsedSinceStart() ) + " ( from path )" ); return tTheme; } diff --git a/src/eepp/ui/tools/ctextureatlasnew.cpp b/src/eepp/ui/tools/ctextureatlasnew.cpp index 7bc37a906..d251d8c95 100644 --- a/src/eepp/ui/tools/ctextureatlasnew.cpp +++ b/src/eepp/ui/tools/ctextureatlasnew.cpp @@ -43,7 +43,7 @@ cTextureAtlasNew::cTextureAtlasNew( TGCreateCb NewTGCb ) : std::vector Sizes; for ( Uint32 i = 6; i < 14; i++ ) { - Sizes.push_back( String::toStr( 1 << i ) ); + Sizes.push_back( String::ToStr( 1 << i ) ); } mComboWidth->ListBox()->AddListBoxItems( Sizes ); @@ -114,8 +114,8 @@ void cTextureAtlasNew::TextureAtlasSave( const cUIEvent * Event ) { if ( !FileSystem::IsDirectory( FPath ) ) { Int32 w,h,b; - bool Res1 = String::fromString( w, mComboWidth->Text() ); - bool Res2 = String::fromString( h, mComboHeight->Text() ); + bool Res1 = String::FromString( w, mComboWidth->Text() ); + bool Res2 = String::FromString( h, mComboHeight->Text() ); b = static_cast( mPixelSpace->Value() ); if ( Res1 && Res2 ) { diff --git a/src/eepp/window/backend/SDL/cwindowsdl.cpp b/src/eepp/window/backend/SDL/cwindowsdl.cpp index adec307f5..4dbbf5edb 100644 --- a/src/eepp/window/backend/SDL/cwindowsdl.cpp +++ b/src/eepp/window/backend/SDL/cwindowsdl.cpp @@ -333,7 +333,7 @@ void cWindowSDL::Size( Uint32 Width, Uint32 Height, bool Windowed ) { Position( mWinPos.x, mWinPos.y ); } - SetFlagValue( &mWindow.WindowConfig.Style, WindowStyle::Fullscreen, !Windowed ); + BitOp::SetBitFlagValue( &mWindow.WindowConfig.Style, WindowStyle::Fullscreen, !Windowed ); mDefaultView.SetView( 0, 0, Width, Height ); diff --git a/src/eepp/window/backend/SDL2/cwindowsdl2.cpp b/src/eepp/window/backend/SDL2/cwindowsdl2.cpp index 7036dc23d..8b13a864e 100644 --- a/src/eepp/window/backend/SDL2/cwindowsdl2.cpp +++ b/src/eepp/window/backend/SDL2/cwindowsdl2.cpp @@ -312,7 +312,7 @@ void cWindowSDL::Size( Uint32 Width, Uint32 Height, bool Windowed ) { Position( mWinPos.x, mWinPos.y ); } - SetFlagValue( &mWindow.WindowConfig.Style, WindowStyle::Fullscreen, !Windowed ); + BitOp::SetBitFlagValue( &mWindow.WindowConfig.Style, WindowStyle::Fullscreen, !Windowed ); mDefaultView.SetView( 0, 0, Width, Height ); diff --git a/src/eepp/window/backend/SFML/cjoysticksfml.cpp b/src/eepp/window/backend/SFML/cjoysticksfml.cpp index d20793028..881acc616 100644 --- a/src/eepp/window/backend/SFML/cjoysticksfml.cpp +++ b/src/eepp/window/backend/SFML/cjoysticksfml.cpp @@ -20,7 +20,7 @@ cJoystickSFML::~cJoystickSFML() { } void cJoystickSFML::Open() { - mName = "Joystick " + String::toStr( mIndex ); + mName = "Joystick " + String::ToStr( mIndex ); mHats = 0; mButtons = eemin( sf::Joystick::getButtonCount( mIndex ), (unsigned int)32 ); mAxes = sf::Joystick::AxisCount; diff --git a/src/eepp/window/backend/allegro5/cwindowal.cpp b/src/eepp/window/backend/allegro5/cwindowal.cpp index 9908fd630..e50d079f8 100644 --- a/src/eepp/window/backend/allegro5/cwindowal.cpp +++ b/src/eepp/window/backend/allegro5/cwindowal.cpp @@ -304,7 +304,7 @@ void cWindowAl::Size( Uint32 Width, Uint32 Height, bool Windowed ) { Uint32 oldWidth = mWindow.WindowConfig.Width; Uint32 oldHeight = mWindow.WindowConfig.Height; - SetFlagValue( &mWindow.WindowConfig.Style, WindowStyle::Fullscreen, !Windowed ); + BitOp::SetBitFlagValue( &mWindow.WindowConfig.Style, WindowStyle::Fullscreen, !Windowed ); mWindow.WindowConfig.Width = Width; mWindow.WindowConfig.Height = Height; diff --git a/src/eepp/window/cinput.cpp b/src/eepp/window/cinput.cpp index 5b6c66518..b0d55f44d 100644 --- a/src/eepp/window/cinput.cpp +++ b/src/eepp/window/cinput.cpp @@ -114,6 +114,7 @@ void cInput::ProcessEvent( InputEvent * Event ) { mReleaseTrigger |= EE_BUTTON_MASK( Event->button.button ); mClickTrigger |= EE_BUTTON_MASK( Event->button.button ); + // I know this is ugly, but i'm to lazy to fix it, it works... if ( Event->button.button == EE_BUTTON_LEFT ) { mLastButtonLeftClicked = mLastButtonLeftClick; mLastButtonLeftClick = Sys::GetTicks(); diff --git a/src/eepp/window/cinputtextbuffer.cpp b/src/eepp/window/cinputtextbuffer.cpp index d5eb806f1..52db6d1c0 100755 --- a/src/eepp/window/cinputtextbuffer.cpp +++ b/src/eepp/window/cinputtextbuffer.cpp @@ -522,11 +522,11 @@ bool cInputTextBuffer::ChangedSinceLastUpdate() { } void cInputTextBuffer::ChangedSinceLastUpdate( const bool& Changed ) { - Write32BitKey( &mFlags, INPUT_TB_CHANGE_SINCE_LAST_UPDATE, Changed == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_CHANGE_SINCE_LAST_UPDATE, Changed == true ); } void cInputTextBuffer::AutoPrompt( const bool& set ) { - Write32BitKey( &mFlags, INPUT_TB_PROMPT_AUTO_POS, set == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_PROMPT_AUTO_POS, set == true ); if ( set ) { mPromptPos = (eeInt)mText.size(); @@ -542,7 +542,7 @@ bool cInputTextBuffer::Active() const { } void cInputTextBuffer::Active( const bool& Active ) { - Write32BitKey( &mFlags, INPUT_TB_ACTIVE, Active == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_ACTIVE, Active == true ); } bool cInputTextBuffer::SupportNewLine() { @@ -550,12 +550,12 @@ bool cInputTextBuffer::SupportNewLine() { } void cInputTextBuffer::SupportNewLine( const bool& SupportNewLine ) { - Write32BitKey( &mFlags, INPUT_TB_SUPPORT_NEW_LINE, SupportNewLine == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_SUPPORT_NEW_LINE, SupportNewLine == true ); } void cInputTextBuffer::AllowOnlyNumbers( const bool& onlynums, const bool& allowdots ) { - Write32BitKey( &mFlags, INPUT_TB_ALLOW_ONLY_NUMBERS, onlynums == true ); - Write32BitKey( &mFlags, INPUT_TB_ALLOW_DOT_IN_NUMBERS, allowdots == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_ALLOW_ONLY_NUMBERS, onlynums == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_ALLOW_DOT_IN_NUMBERS, allowdots == true ); } bool cInputTextBuffer::AllowOnlyNumbers() { @@ -571,11 +571,11 @@ bool cInputTextBuffer::SupportFreeEditing() const { } void cInputTextBuffer::SupportFreeEditing( const bool& Support ) { - Write32BitKey( &mFlags, INPUT_TB_FREE_EDITING, Support == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_FREE_EDITING, Support == true ); } void cInputTextBuffer::SupportCopyPaste( const bool& support ) { - Write32BitKey( &mFlags, INPUT_TB_SUPPORT_COPY_PASTE, support == true ); + BitOp::WriteBitKey( &mFlags, INPUT_TB_SUPPORT_COPY_PASTE, support == true ); } bool cInputTextBuffer::SupportCopyPaste() { diff --git a/src/eepp/window/cwindow.cpp b/src/eepp/window/cwindow.cpp index 5bb61ceb4..963fe6520 100644 --- a/src/eepp/window/cwindow.cpp +++ b/src/eepp/window/cwindow.cpp @@ -203,7 +203,8 @@ bool cWindow::TakeScreenshot( std::string filepath, const EE_SAVE_TYPE& Format ) return 0 != SOIL_save_screenshot(TmpPath.c_str(), Format, 0, 0, mWindow.WindowConfig.Width, mWindow.WindowConfig.Height ); } else { - std::string Direc = filepath.substr( 0, filepath.find_last_of("/\\") ); + std::string Direc = FileSystem::FileRemoveFileName( filepath ); + if ( !FileSystem::IsDirectory( Direc ) ) FileSystem::MakeDir( Direc ); @@ -360,16 +361,16 @@ void cWindow::SendVideoResizeCb() { void cWindow::LogSuccessfulInit( const std::string& BackendName ) { cLog::instance()->Write( "Engine Initialized Succesfully.\n\tOS: " + Sys::GetOSName() + "\n\tArch: " + Sys::GetOSArchitecture() + - "\n\tCPU Cores: " + String::toStr( Sys::GetCPUCount() ) + + "\n\tCPU Cores: " + String::ToStr( Sys::GetCPUCount() ) + "\n\tProcess Path: " + Sys::GetProcessPath() + - "\n\tDisk Free Space: " + String::toStr( FileSystem::SizeToString( Sys::GetDiskFreeSpace( Sys::GetProcessPath() ) ) ) + + "\n\tDisk Free Space: " + String::ToStr( FileSystem::SizeToString( Sys::GetDiskFreeSpace( Sys::GetProcessPath() ) ) ) + "\n\tWindow/Input Backend: " + BackendName + "\n\tGL Backend: " + GLi->VersionStr() + "\n\tGL Vendor: " + GLi->GetVendor() + "\n\tGL Renderer: " + GLi->GetRenderer() + "\n\tGL Version: " + GLi->GetVersion() + "\n\tGL Shading Language Version: " + GLi->GetShadingLanguageVersion() + - "\n\tResolution: " + String::toStr( GetWidth() ) + "x" + String::toStr( GetHeight() ) + + "\n\tResolution: " + String::ToStr( GetWidth() ) + "x" + String::ToStr( GetHeight() ) + "\n\tGL extensions supported:\n\t\t" + GLi->GetExtensions() ); } diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index 2e4c4433f..86fa3e8ce 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -429,7 +429,7 @@ void cEETest::CreateUI() { std::vector str(wsize); for ( Int32 i = 1; i <= wsize; i++ ) - str[i-1] = "Test ListBox " + String::toStr(i) + " testing it right now!"; + str[i-1] = "Test ListBox " + String::ToStr(i) + " testing it right now!"; mListBox->AddListBoxItems( str ); } @@ -544,7 +544,7 @@ void cEETest::CreateUI() { cUITextInput * TxtInput = eeNew( cUITextInput, ( TxtInputParams ) ); cUIGfx * TxtGfx = eeNew( cUIGfx, ( TxtGfxParams ) ); - TxtBox->Text( "Test " + String::toStr( i+1 ) ); + TxtBox->Text( "Test " + String::ToStr( i+1 ) ); Cell->Cell( 0, TxtBox ); Cell->Cell( 1, TxtGfx ); @@ -721,7 +721,7 @@ void cEETest::ItemClick( const cUIEvent * Event ) { } void cEETest::OnValueChange( const cUIEvent * Event ) { - mTextBoxValue->Text( "Scroll Value:\n" + String::toStr( mScrollBar->Value() ) ); + mTextBoxValue->Text( "Scroll Value:\n" + String::ToStr( mScrollBar->Value() ) ); mProgressBar->Progress( mScrollBar->Value() * 100.f ); } @@ -765,7 +765,7 @@ void cEETest::ButtonClick( const cUIEvent * Event ) { Gfx->StartMovement( eeVector2i( Math::Randi( 0, mWindow->GetWidth() ), -64 ), eeVector2i( Math::Randi( 0, mWindow->GetWidth() ), mWindow->GetHeight() + 64 ), 2500 ); Gfx->CloseFadeOut( 3500 ); - mListBox->AddListBoxItem( "Test ListBox " + String::toStr( mListBox->Count() + 1 ) + " testing it right now!" ); + mListBox->AddListBoxItem( "Test ListBox " + String::ToStr( mListBox->Count() + 1 ) + " testing it right now!" ); } } @@ -785,11 +785,11 @@ void cEETest::CmdSetPartsNum ( const std::vector < String >& params ) { if ( params.size() >= 2 ) { Int32 tInt = 0; - bool Res = String::fromString( tInt, params[1] ); + bool Res = String::FromString( tInt, params[1] ); if ( Res && ( tInt >= 0 && tInt <= 100000 ) ) { PS[2].Create( PSE_WormHole, tInt, TN[5], eeVector2f( mWindow->GetWidth() * 0.5f, mWindow->GetHeight() * 0.5f ), 32, true ); - Con.PushText( "Wormhole Particles Number Changed to: " + String::toStr(tInt) ); + Con.PushText( "Wormhole Particles Number Changed to: " + String::ToStr(tInt) ); } else Con.PushText( "Valid parameters are between 0 and 100000 (0 = no limit)." ); } @@ -828,7 +828,7 @@ void cEETest::LoadTextures() { TNP.resize(12); for ( i = 0; i <= 7; i++ ) { - TN[i] = TF->LoadFromPack( PAK, "t" + String::toStr(i+1) + ".png", ( (i+1) == 7 ) ? true : false, ( (i+1) == 4 ) ? EE_CLAMP_REPEAT : EE_CLAMP_TO_EDGE ); + TN[i] = TF->LoadFromPack( PAK, "t" + String::ToStr(i+1) + ".png", ( (i+1) == 7 ) ? true : false, ( (i+1) == 4 ) ? EE_CLAMP_REPEAT : EE_CLAMP_TO_EDGE ); TNP[i] = TF->GetTexture( TN[i] ); } @@ -838,7 +838,7 @@ void cEETest::LoadTextures() { cTextureAtlas * SG = cTextureAtlasManager::instance()->GetByName( "tiles" ); for ( i = 0; i < 6; i++ ) { - Tiles[i] = SG->GetByName( String::toStr( i+1 ) ); + Tiles[i] = SG->GetByName( String::ToStr( i+1 ) ); } Tiles[6] = SG->Add( TF->LoadFromPack( PAK, "objects/1.png" ), "7" ); @@ -1270,7 +1270,7 @@ void cEETest::Render() { FF2->Draw( "_", 6.f + FF2->GetTextWidth(), 180.f + (eeFloat)LineNum * (eeFloat)FF2->GetFontHeight() ); } - FF2->SetText( "FPS: " + String::toStr( mWindow->FPS() ) ); + FF2->SetText( "FPS: " + String::ToStr( mWindow->FPS() ) ); FF2->Draw( mWindow->GetWidth() - FF2->GetTextWidth() - 15, 0 ); FF2->SetText( InBuf.Buffer() );