From 4c07441c77a799b599a1225dccc3ff8be6d94fe7 Mon Sep 17 00:00:00 2001 From: spartanj Date: Tue, 27 Jul 2010 03:44:40 -0300 Subject: [PATCH] Fixed compilation on windows. Fixed shaders reload ( after context lost ). Fixed some compiler warnings on gcc (mingw32). Added Windows Code::Blocks Project file. --- ee.win.cbp | 260 ++++++++++++++++++++++++++++++++ src/base.hpp | 1 - src/graphics/cshader.cpp | 12 ++ src/graphics/cshader.hpp | 28 ++-- src/graphics/cshaderprogram.cpp | 8 +- src/graphics/cttffont.cpp | 12 +- src/graphics/pixelperfect.hpp | 4 +- src/helper/glew/glew.c | 44 +++--- src/helper/glew/glew.h | 33 ++-- src/helper/zip_utils/unzip.h | 6 +- src/helper/zip_utils/zip.h | 6 +- src/system/base.hpp | 2 +- src/system/clog.cpp | 4 +- src/system/cresourceloader.hpp | 5 +- src/test/ee.cpp | 2 +- src/ui/base.hpp | 2 +- src/ui/cuiborder.cpp | 2 +- src/ui/cuimessage.cpp | 6 +- src/utils/line2.hpp | 2 +- src/utils/quad2.hpp | 4 +- src/utils/size.hpp | 4 +- src/utils/string.cpp | 6 +- src/utils/triangle2.hpp | 2 +- 23 files changed, 365 insertions(+), 90 deletions(-) create mode 100644 ee.win.cbp diff --git a/ee.win.cbp b/ee.win.cbp new file mode 100644 index 000000000..4e377b850 --- /dev/null +++ b/ee.win.cbp @@ -0,0 +1,260 @@ + + + + + + diff --git a/src/base.hpp b/src/base.hpp index c3948327b..38c0ef008 100644 --- a/src/base.hpp +++ b/src/base.hpp @@ -29,7 +29,6 @@ #include #include -#define GLEW_STATIC #include "helper/glew/glew.h" #include diff --git a/src/graphics/cshader.cpp b/src/graphics/cshader.cpp index a48f02e0b..d2b07bea2 100644 --- a/src/graphics/cshader.cpp +++ b/src/graphics/cshader.cpp @@ -37,6 +37,16 @@ void cShader::Init( const Uint32& Type ) { mValid = false; mCompiled = false; mGLId = glCreateShader( mType ); +} + +void cShader::Reload() { + mValid = false; + mCompiled = false; + mGLId = glCreateShader( mType ); + + SetSource( mSource ); + + Compile(); } void cShader::SetSource( const std::string& Source ) { @@ -54,6 +64,8 @@ void cShader::SetSource( const std::vector& Source ) { cLog::instance()->Write( "Can't set source for compiled shaders" ); return; } + + mSource = Source; const char* src = &Source[0]; diff --git a/src/graphics/cshader.hpp b/src/graphics/cshader.hpp index b2f4de563..83b029c1b 100644 --- a/src/graphics/cshader.hpp +++ b/src/graphics/cshader.hpp @@ -10,42 +10,46 @@ class EE_API cShader { public: /** Constructor with type of shader, next you'll need to set the source and compile it. */ cShader( const Uint32& Type ); - + /** Create a type of shader and load the shader from a file, and compile it. */ cShader( const Uint32& Type, const std::string& Filename ); - + virtual ~cShader(); - + /** Set the shader source */ void SetSource( const std::string& Source ); - + /** Set the shader source */ void SetSource( const std::vector& Source ); - + /** Compile the shader */ bool Compile(); - + /** @return If the shader is valid */ bool IsValid() const { return mValid; } - + /** @return If the shader is compiled */ bool IsCompiled() const { return mCompiled; } - + /** @return The log of the compilation */ std::string CompileLog() const { return mCompileLog; } - + /** @return The Shader Type */ Uint32 GetType() const { return mType; } - + /** @return The Shader Id */ - Uint32 GetId() const { return mGLId; } + Uint32 GetId() const { return mGLId; } + + /** Reloads the Shader. */ + void Reload(); protected: GLuint mGLId; GLenum mType; bool mValid; bool mCompiled; std::string mCompileLog; - + std::vector mSource; + void Init( const Uint32& Type ); }; diff --git a/src/graphics/cshaderprogram.cpp b/src/graphics/cshaderprogram.cpp index 92239c009..450c749bc 100644 --- a/src/graphics/cshaderprogram.cpp +++ b/src/graphics/cshaderprogram.cpp @@ -76,16 +76,18 @@ void cShaderProgram::Init() { } void cShaderProgram::Reload() { - mGLId = 0; + mGLId = 0; Init(); - std::vector tmpShader = mShaders; + std::vector tmpShader = mShaders; mShaders.clear(); - for ( eeUint i = 0; i < tmpShader.size(); i++ ) + for ( eeUint i = 0; i < tmpShader.size(); i++ ) { + tmpShader[i]->Reload(); AddShader( tmpShader[i] ); + } Link(); } diff --git a/src/graphics/cttffont.cpp b/src/graphics/cttffont.cpp index afafd75ab..2006e749f 100755 --- a/src/graphics/cttffont.cpp +++ b/src/graphics/cttffont.cpp @@ -78,7 +78,7 @@ bool cTTFFont::iLoad(const eeUint& Size, EE_TTF_FONTSTYLE Style, const bool& Ver mTexWidth = (eeFloat)NextPowOfTwo( mSize * 16 ); mTexHeight = mTexWidth; - TexSize = mTexWidth * mTexHeight; + TexSize = (Uint32)mTexWidth * (Uint32)mTexHeight; if ( ( mSize >= 60 && mNumChars > 256 ) || ( OutlineSize > 2 && mNumChars >= 512 && mSize >= 24 ) ) mTexHeight *= 2; @@ -117,8 +117,8 @@ bool cTTFFont::iLoad(const eeUint& Size, EE_TTF_FONTSTYLE Style, const bool& Ver //Blit the glyph onto the glyph sheet Uint32 * TexGlyph = reinterpret_cast ( TempGlyphSurface ); Uint32 Alpha; - Uint32 w = mTexWidth; - Uint32 h = mTexHeight; + Uint32 w = (Uint32)mTexWidth; + Uint32 h = (Uint32)mTexHeight; Uint32 px, py; for (int y = 0; y < GlyphRect.y; ++y ) { @@ -190,7 +190,7 @@ bool cTTFFont::iLoad(const eeUint& Size, EE_TTF_FONTSTYLE Style, const bool& Ver // Fill the TexO ( the default font alpha channels ) and the TexN ( the new outline ) for ( Int32 y = 0; y < mTexHeight; y++ ) { for( Int32 x = 0; x < mTexWidth; x++) { - Pos = x + y * mTexWidth; + Pos = x + y * (Uint32)mTexWidth; TexO[ Pos ] = mPixels[ Pos ].A(); TexN[ Pos ] = TexO[ Pos ]; } @@ -210,7 +210,7 @@ bool cTTFFont::iLoad(const eeUint& Size, EE_TTF_FONTSTYLE Style, const bool& Ver for ( Int32 y = 0; y < mTexHeight; y++ ) { for( Int32 x = 0; x < mTexWidth; x++) { - Pos = x + y * mTexWidth; + Pos = x + y * (Uint32)mTexWidth; // Fill the outline color mPixels[ Pos ] = eeColorA( OutlineColor.R(), OutlineColor.G(), OutlineColor.B(), alpha[ Pos ] ); @@ -224,7 +224,7 @@ bool cTTFFont::iLoad(const eeUint& Size, EE_TTF_FONTSTYLE Style, const bool& Ver hkFontManager::instance()->CloseFont( mFont ); - mTexId = TF->LoadFromPixels( reinterpret_cast ( &mPixels[0] ), mTexWidth, mTexHeight, 4 ); + mTexId = TF->LoadFromPixels( reinterpret_cast ( &mPixels[0] ), (Uint32)mTexWidth, (Uint32)mTexHeight, 4 ); eeSAFE_DELETE_ARRAY( mPixels ); diff --git a/src/graphics/pixelperfect.hpp b/src/graphics/pixelperfect.hpp index aa7fbbbb7..dd35f1dfe 100644 --- a/src/graphics/pixelperfect.hpp +++ b/src/graphics/pixelperfect.hpp @@ -1,4 +1,4 @@ -#ifndef EE_GRAPHICS_PIXELPERFECT_H +#ifndef EE_GRAPHICS_PIXELPERFECT_H #define EE_GRAPHICS_PIXELPERFECT_H #include "ctexturefactory.hpp" @@ -32,4 +32,4 @@ bool EE_API PixelPerfectCollide( const Uint32& TexId_1, const Uint16& x1, const }} -#endif \ No newline at end of file +#endif diff --git a/src/helper/glew/glew.c b/src/helper/glew/glew.c index 8a123a25b..316ce895a 100644 --- a/src/helper/glew/glew.c +++ b/src/helper/glew/glew.c @@ -4,24 +4,24 @@ ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without +** +** Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, +** +** * Redistributions of source code must retain the above copyright notice, ** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation +** * Redistributions in binary form must reproduce the above copyright notice, +** this list of conditions and the following disclaimer in the documentation ** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products +** * The name of the author may be used to endorse or promote products ** derived from this software without specific prior written permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) @@ -72,12 +72,12 @@ #ifdef MAC_OS_X_VERSION_10_3 -#include +#include void* NSGLGetProcAddress (const GLubyte *name) { static void* image = NULL; - if (NULL == image) + if (NULL == image) { image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY); } @@ -7562,14 +7562,14 @@ static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT) /* ------------------------------------------------------------------------- */ -/* +/* * Search for name in the extensions string. Use of strstr() * is not sufficient because extension names can be prefixes of * other extension names. Could use strtok() but the constant * string returned by glGetString might be in read-only memory. */ GLboolean glewGetExtension (const char* name) -{ +{ GLubyte* p; GLubyte* end; GLuint len = _glewStrLen((const GLubyte*)name); @@ -7600,7 +7600,7 @@ GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) dot = _glewStrCLen(s, '.'); if (dot == 0) return GLEW_ERROR_NO_GL_VERSION; - + major = s[dot-1]-'0'; minor = s[dot+1]-'0'; @@ -7608,7 +7608,7 @@ GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) minor = 0; if (major<0 || major>9) return GLEW_ERROR_NO_GL_VERSION; - + if (major == 1 && minor == 0) { @@ -7621,7 +7621,7 @@ GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) CONST_CAST(GLEW_VERSION_3_2) = GLEW_VERSION_3_3 == GL_TRUE || ( major == 3 && minor >= 2 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_3_1) = GLEW_VERSION_3_2 == GL_TRUE || ( major == 3 && minor >= 1 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_3_0) = GLEW_VERSION_3_1 == GL_TRUE || ( major == 3 ) ? GL_TRUE : GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GLEW_VERSION_3_0 == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE; + CONST_CAST(GLEW_VERSION_2_1) = GLEW_VERSION_3_0 == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_2_0) = GLEW_VERSION_2_1 == GL_TRUE || ( major == 2 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_1_5) = GLEW_VERSION_2_0 == GL_TRUE || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE; CONST_CAST(GLEW_VERSION_1_4) = GLEW_VERSION_1_5 == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE; @@ -9695,7 +9695,7 @@ static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL; static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL; GLboolean wglewGetExtension (const char* name) -{ +{ GLubyte* p; GLubyte* end; GLuint len = _glewStrLen((const GLubyte*)name); @@ -10627,7 +10627,7 @@ static GLboolean _glewInit_GLX_SUN_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT) /* ------------------------------------------------------------------------ */ GLboolean glxewGetExtension (const char* name) -{ +{ GLubyte* p; GLubyte* end; GLuint len; @@ -10899,7 +10899,7 @@ const GLubyte* glewGetString (GLenum name) /* ------------------------------------------------------------------------ */ -GLboolean glewExperimental = GL_FALSE; +GLboolean glewExperimental = GL_FALSE; #if !defined(GLEW_MX) diff --git a/src/helper/glew/glew.h b/src/helper/glew/glew.h index 77f85ddd5..a20654b66 100644 --- a/src/helper/glew/glew.h +++ b/src/helper/glew/glew.h @@ -4,24 +4,24 @@ ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without +** +** Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, +** +** * Redistributions of source code must retain the above copyright notice, ** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation +** * Redistributions in binary form must reproduce the above copyright notice, +** this list of conditions and the following disclaimer in the documentation ** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products +** * The name of the author may be used to endorse or promote products ** derived from this software without specific prior written permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) @@ -55,7 +55,7 @@ /* ** Copyright (c) 2007 The Khronos Group Inc. -** +** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the ** "Materials"), to deal in the Materials without restriction, including @@ -63,10 +63,10 @@ ** distribute, sublicense, and/or sell copies of the Materials, and to ** permit persons to whom the Materials are furnished to do so, subject to ** the following conditions: -** +** ** The above copyright notice and this permission notice shall be included ** in all copies or substantial portions of the Materials. -** +** ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -174,7 +174,8 @@ typedef _W64 int ptrdiff_t; /* * GLEW_STATIC needs to be set when using the static version. * GLEW_BUILD is set when building the DLL version. - */ + */ +#define GLEW_STATIC #ifdef GLEW_STATIC # define GLEWAPI extern #else diff --git a/src/helper/zip_utils/unzip.h b/src/helper/zip_utils/unzip.h index 6f61c2c96..0345bc829 100644 --- a/src/helper/zip_utils/unzip.h +++ b/src/helper/zip_utils/unzip.h @@ -4,7 +4,7 @@ #define ZIP_STD #ifdef ZIP_STD #include -#define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name +#define ZIP_DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name #ifndef MAX_PATH #define MAX_PATH 1024 #endif @@ -26,7 +26,7 @@ typedef FILETIME ZIPFILETIME; #ifndef _zip_H -DECLARE_HANDLE(HZIP); +ZIP_DECLARE_HANDLE(HZIP); #endif // An HZIP identifies a zip file that has been opened @@ -138,7 +138,7 @@ unsigned int FormatZipMessage(ZRESULT code, TCHAR *buf,unsigned int len); #define ZR_ENDED 0x00050000 // the zip creation has already been closed #define ZR_MISSIZE 0x00060000 // the indicated input file size turned out mistaken #define ZR_PARTIALUNZ 0x00070000 // the file had already been partially unzipped -#define ZR_ZMODE 0x00080000 // tried to mix creating/opening a zip +#define ZR_ZMODE 0x00080000 // tried to mix creating/opening a zip // The following come from bugs within the zip library itself #define ZR_BUGMASK 0xFF000000 #define ZR_NOTINITED 0x01000000 // initialisation didn't work diff --git a/src/helper/zip_utils/zip.h b/src/helper/zip_utils/zip.h index b453105fb..638bcb5c1 100644 --- a/src/helper/zip_utils/zip.h +++ b/src/helper/zip_utils/zip.h @@ -4,7 +4,7 @@ #define ZIP_STD #ifdef ZIP_STD #include -#define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name +#define ZIP_DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name #ifndef MAX_PATH #define MAX_PATH 1024 #endif @@ -22,7 +22,7 @@ typedef time_t ZIPFILETIME; #ifndef _unzip_H -DECLARE_HANDLE(HZIP); +ZIP_DECLARE_HANDLE(HZIP); #endif // An HZIP identifies a zip file that is being created @@ -122,7 +122,7 @@ unsigned int FormatZipMessage(ZRESULT code, TCHAR *buf,unsigned int len); #define ZR_ENDED 0x00050000 // the zip creation has already been closed #define ZR_MISSIZE 0x00060000 // the indicated input file size turned out mistaken #define ZR_PARTIALUNZ 0x00070000 // the file had already been partially unzipped -#define ZR_ZMODE 0x00080000 // tried to mix creating/opening a zip +#define ZR_ZMODE 0x00080000 // tried to mix creating/opening a zip // The following come from bugs within the zip library itself #define ZR_BUGMASK 0xFF000000 #define ZR_NOTINITED 0x01000000 // initialisation didn't work diff --git a/src/system/base.hpp b/src/system/base.hpp index 77f269aa3..615e75cef 100644 --- a/src/system/base.hpp +++ b/src/system/base.hpp @@ -9,4 +9,4 @@ #include "../utils/vector2.hpp" using namespace EE::Utils; -#endif \ No newline at end of file +#endif diff --git a/src/system/clog.cpp b/src/system/clog.cpp index 87d4cc0b4..6d37f2688 100755 --- a/src/system/clog.cpp +++ b/src/system/clog.cpp @@ -38,7 +38,7 @@ void cLog::Write(const std::string& Text, const bool& newLine) { void cLog::Write( const char* format, ... ) { int n, size = 256; - std::string tstr( size, NULL ); + std::string tstr( size, '\0' ); va_list args; @@ -66,7 +66,7 @@ void cLog::Write( const char* format, ... ) { else // glibc 2.0 size *= 2; // twice the old size - tstr.resize( size, NULL ); + tstr.resize( size, '\0' ); } } diff --git a/src/system/cresourceloader.hpp b/src/system/cresourceloader.hpp index 4c46ba5db..82bb74372 100644 --- a/src/system/cresourceloader.hpp +++ b/src/system/cresourceloader.hpp @@ -15,7 +15,7 @@ class cResourceLoader { /** @param MaxThreads Set the maximun simultaneous threads to load resources, if not value is seted it will use Num Cores - 1 or 1 thread if single core. */ cResourceLoader( const Uint32& MaxThreads = THREADS_AUTO ); - ~cResourceLoader(); + virtual ~cResourceLoader(); void Add( cObjectLoader * Object ); @@ -49,6 +49,3 @@ class cResourceLoader { }} #endif - - - diff --git a/src/test/ee.cpp b/src/test/ee.cpp index 1670e7722..c5b921e77 100644 --- a/src/test/ee.cpp +++ b/src/test/ee.cpp @@ -274,7 +274,7 @@ void cEETest::Init() { cUIControl::CreateParams Params( cUIManager::instance()->MainControl(), eeVector2i(0,0), eeSize( 320, 240 ), UI_FILL_BACKGROUND | UI_CLIP_ENABLE | UI_BORDER ); - Params.Border.Width( 2.f ); + Params.Border.Width( 2 ); Params.Border.Color( 0xFF979797 ); //Params.Background.Corners(5); Params.Background.Colors( eeColorA( 0x66FAFAFA ), eeColorA( 0xCCFAFAFA ), eeColorA( 0xCCFAFAFA ), eeColorA( 0x66FAFAFA ) ); diff --git a/src/ui/base.hpp b/src/ui/base.hpp index 12fb75bc6..ab7a98609 100644 --- a/src/ui/base.hpp +++ b/src/ui/base.hpp @@ -28,4 +28,4 @@ using namespace EE::Window; #include "../graphics/cprimitives.hpp" using namespace EE::Graphics; -#endif \ No newline at end of file +#endif diff --git a/src/ui/cuiborder.cpp b/src/ui/cuiborder.cpp index 356ce0df8..dc1e2f45f 100644 --- a/src/ui/cuiborder.cpp +++ b/src/ui/cuiborder.cpp @@ -21,4 +21,4 @@ void cUIBorder::Width( const eeUint& width ) { mWidth = width; } -}} \ No newline at end of file +}} diff --git a/src/ui/cuimessage.cpp b/src/ui/cuimessage.cpp index ceb526ab1..32d0e7e5c 100644 --- a/src/ui/cuimessage.cpp +++ b/src/ui/cuimessage.cpp @@ -3,8 +3,8 @@ namespace EE { namespace UI { -cUIMessage::cUIMessage( cUIControl * Ctrl, const Uint32& Msg ) : - mCtrl( Ctrl ), +cUIMessage::cUIMessage( cUIControl * Ctrl, const Uint32& Msg ) : + mCtrl( Ctrl ), mMsg( Msg ) { } @@ -21,4 +21,4 @@ Uint32 cUIMessage::Msg( void ) const { return mMsg; } -}} \ No newline at end of file +}} diff --git a/src/utils/line2.hpp b/src/utils/line2.hpp index 7679d3da1..3f17adb36 100644 --- a/src/utils/line2.hpp +++ b/src/utils/line2.hpp @@ -36,4 +36,4 @@ typedef Line2 eeLine2f; }} -#endif \ No newline at end of file +#endif diff --git a/src/utils/quad2.hpp b/src/utils/quad2.hpp index 3fe09bd4f..28443dc77 100644 --- a/src/utils/quad2.hpp +++ b/src/utils/quad2.hpp @@ -101,8 +101,8 @@ Quad2::Quad2( const Vector2& v1, const Vector2& v2, const Vector2& v V[3] = v4; } -typedef Quad2 eeQuad2f; +typedef Quad2 eeQuad2f; }} -#endif \ No newline at end of file +#endif diff --git a/src/utils/size.hpp b/src/utils/size.hpp index 3d7a7aaca..76ae4e653 100644 --- a/src/utils/size.hpp +++ b/src/utils/size.hpp @@ -62,8 +62,8 @@ void tSize::Height( const T& height ) { this->y = height; } -typedef tSize eeSize; +typedef tSize eeSize; }} -#endif \ No newline at end of file +#endif diff --git a/src/utils/string.cpp b/src/utils/string.cpp index 742d929d8..4ee77fa9a 100644 --- a/src/utils/string.cpp +++ b/src/utils/string.cpp @@ -70,7 +70,7 @@ std::vector < std::wstring > SplitString ( const std::wstring& str, const Uint32 std::wstring tmpstr; for ( eeUint i = 0; i < str.size(); i++ ) { - if ( str[i] == (eeInt)splitchar ) { + if ( str[i] == splitchar ) { tmp.push_back(tmpstr); tmpstr = L""; } else { @@ -112,7 +112,7 @@ void StrFormat( char * Buffer, int BufferSize, const char * format, ... ) { std::string StrFormated( const char * format, ... ) { int n, size = 256; - std::string tstr( size, NULL ); + std::string tstr( size, '\0' ); va_list args; @@ -137,7 +137,7 @@ std::string StrFormated( const char * format, ... ) { else // glibc 2.0 size *= 2; // twice the old size - tstr.resize( size, NULL ); + tstr.resize( size, '\0' ); } } diff --git a/src/utils/triangle2.hpp b/src/utils/triangle2.hpp index 03a4d92c5..3a32a7f6a 100644 --- a/src/utils/triangle2.hpp +++ b/src/utils/triangle2.hpp @@ -29,4 +29,4 @@ typedef Triangle2 eeTriangle2f; }} -#endif \ No newline at end of file +#endif