From 47437749cd219f247e91dd9bd2766a1ff39a2e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 9 Jan 2013 16:50:00 -0300 Subject: [PATCH] RenderType is now RenderMode. cTextCache can now assign colors per char. Fordward declared some classes. cFrameBuffer constructor is now protected. --- include/eepp/gaming/cgameobject.hpp | 2 +- include/eepp/gaming/cgameobjectsprite.hpp | 5 +++-- include/eepp/graphics/cframebuffer.hpp | 6 +++--- include/eepp/graphics/csprite.hpp | 6 +++--- include/eepp/graphics/ctextcache.hpp | 11 +++++++++-- include/eepp/physics/cshapecirclesprite.hpp | 4 +++- include/eepp/physics/cshapepolysprite.hpp | 4 +++- include/eepp/ui/base.hpp | 1 - include/eepp/ui/cuicontrol.hpp | 2 +- include/eepp/ui/cuigfx.hpp | 4 ++-- include/eepp/ui/cuisprite.hpp | 8 ++++++-- include/eepp/ui/cuitheme.hpp | 8 ++++++-- projects/linux/ee.creator.user | 2 +- src/eepp/gaming/cgameobject.cpp | 2 +- src/eepp/gaming/cgameobjectsprite.cpp | 7 ++++--- src/eepp/gaming/cgameobjectsubtexture.cpp | 10 +++++----- src/eepp/gaming/cgameobjectsubtextureex.cpp | 4 ++-- src/eepp/gaming/cgameobjectvirtual.cpp | 10 +++++----- src/eepp/gaming/mapeditor/cmapeditor.cpp | 9 +++++---- src/eepp/graphics/csprite.cpp | 4 ++-- src/eepp/graphics/ctextcache.cpp | 22 ++++++++++++++++----- src/eepp/physics/cshapecirclesprite.cpp | 2 ++ src/eepp/physics/cshapepolysprite.cpp | 2 ++ src/eepp/ui/cuicontrol.cpp | 1 + src/eepp/ui/cuigfx.cpp | 4 ++-- src/eepp/ui/cuisprite.cpp | 5 +++-- src/eepp/ui/cuitheme.cpp | 3 +++ src/test/eetest.cpp | 5 ++++- 28 files changed, 99 insertions(+), 54 deletions(-) diff --git a/include/eepp/gaming/cgameobject.hpp b/include/eepp/gaming/cgameobject.hpp index 1fd7da65e..57658d547 100644 --- a/include/eepp/gaming/cgameobject.hpp +++ b/include/eepp/gaming/cgameobject.hpp @@ -67,7 +67,7 @@ class EE_API cGameObject { Uint32 mFlags; cLayer * mLayer; - virtual EE_RENDER_MODE RenderTypeFromFlags(); + virtual EE_RENDER_MODE RenderModeFromFlags(); void AutoFixTilePos(); diff --git a/include/eepp/gaming/cgameobjectsprite.hpp b/include/eepp/gaming/cgameobjectsprite.hpp index 282307521..33f881c53 100644 --- a/include/eepp/gaming/cgameobjectsprite.hpp +++ b/include/eepp/gaming/cgameobjectsprite.hpp @@ -4,8 +4,9 @@ #include #include -#include -using namespace EE::Graphics; +namespace EE { namespace Graphics { +class cSprite; +}} namespace EE { namespace Gaming { diff --git a/include/eepp/graphics/cframebuffer.hpp b/include/eepp/graphics/cframebuffer.hpp index fd8f5253d..3597ba474 100644 --- a/include/eepp/graphics/cframebuffer.hpp +++ b/include/eepp/graphics/cframebuffer.hpp @@ -15,8 +15,6 @@ class EE_API cFrameBuffer { public: static cFrameBuffer * CreateNew( const Uint32& Width, const Uint32& Height, bool DepthBuffer = false, Window::cWindow * window = NULL ); - cFrameBuffer( Window::cWindow * window ); - virtual ~cFrameBuffer(); virtual bool Create( const Uint32& Width, const Uint32& Height ) = 0; @@ -40,7 +38,9 @@ class EE_API cFrameBuffer { const Int32& GetHeight() const; const bool& HasDepthBuffer() const; - protected: + protected: + cFrameBuffer( Window::cWindow * window ); + Window::cWindow * mWindow; Int32 mWidth; Int32 mHeight; diff --git a/include/eepp/graphics/csprite.hpp b/include/eepp/graphics/csprite.hpp index f061b864d..f67f915da 100755 --- a/include/eepp/graphics/csprite.hpp +++ b/include/eepp/graphics/csprite.hpp @@ -136,10 +136,10 @@ class EE_API cSprite { const eeUint& CurrentSubFrame() const; /** Set the Render Type */ - void RenderType( const EE_RENDER_MODE& Effect ); + void RenderMode( const EE_RENDER_MODE& Effect ); /** Get the Render Type */ - const EE_RENDER_MODE& RenderType() const; + const EE_RENDER_MODE& RenderMode() const; /** Set the Blend Mode */ void BlendMode( const EE_BLEND_MODE& Blend ); @@ -361,7 +361,7 @@ class EE_API cSprite { eeInt mRepeations; //!< Number of repetions of the animation, default -1 that equals to loop. - EE_BLEND_MODE mBlend; + EE_BLEND_MODE mBlend; EE_RENDER_MODE mEffect; eeUint mCurrentFrame; diff --git a/include/eepp/graphics/ctextcache.hpp b/include/eepp/graphics/ctextcache.hpp index 07bd3919d..78725ef34 100644 --- a/include/eepp/graphics/ctextcache.hpp +++ b/include/eepp/graphics/ctextcache.hpp @@ -45,13 +45,20 @@ class EE_API cTextCache { const eeColorA& Color() const; /** Set the color of the string rendered */ - void Color(const eeColorA& Color); + void Color(const eeColorA& color); + + /** Set the color of the substring + * @Color The color + * @from The first char to change the color + * @to The last char to change the color + */ + void Color(const eeColorA& color, Uint32 from, Uint32 to ); /** @return The Shadow Font Color */ const eeColorA& ShadowColor() const; /** Set the shadow color of the string rendered */ - void ShadowColor(const eeColorA& Color); + void ShadowColor(const eeColorA& color); const eeInt& GetNumLines() const; protected: diff --git a/include/eepp/physics/cshapecirclesprite.hpp b/include/eepp/physics/cshapecirclesprite.hpp index 46e5668d4..e9e0ffc0a 100644 --- a/include/eepp/physics/cshapecirclesprite.hpp +++ b/include/eepp/physics/cshapecirclesprite.hpp @@ -5,7 +5,9 @@ #ifdef PHYSICS_RENDERER_ENABLED -#include +namespace EE { namespace Graphics { +class cSprite; +}} using namespace EE::Graphics; CP_NAMESPACE_BEGIN diff --git a/include/eepp/physics/cshapepolysprite.hpp b/include/eepp/physics/cshapepolysprite.hpp index f2a763e97..88dd00986 100644 --- a/include/eepp/physics/cshapepolysprite.hpp +++ b/include/eepp/physics/cshapepolysprite.hpp @@ -5,7 +5,9 @@ #ifdef PHYSICS_RENDERER_ENABLED -#include +namespace EE { namespace Graphics { +class cSprite; +}} using namespace EE::Graphics; CP_NAMESPACE_BEGIN diff --git a/include/eepp/ui/base.hpp b/include/eepp/ui/base.hpp index 7e0e28cb7..25d593611 100644 --- a/include/eepp/ui/base.hpp +++ b/include/eepp/ui/base.hpp @@ -22,7 +22,6 @@ using namespace EE::Window; #include #include -#include #include #include using namespace EE::Graphics; diff --git a/include/eepp/ui/cuicontrol.hpp b/include/eepp/ui/cuicontrol.hpp index 0b3055c76..09b24b088 100644 --- a/include/eepp/ui/cuicontrol.hpp +++ b/include/eepp/ui/cuicontrol.hpp @@ -13,11 +13,11 @@ #include #include #include -#include #include namespace EE { namespace UI { +class cUITheme; class cUIManager; class EE_API cUIControl { diff --git a/include/eepp/ui/cuigfx.hpp b/include/eepp/ui/cuigfx.hpp index 7992b8274..06617a971 100644 --- a/include/eepp/ui/cuigfx.hpp +++ b/include/eepp/ui/cuigfx.hpp @@ -44,9 +44,9 @@ class EE_API cUIGfx : public cUIComplexControl { void Color( const eeColorA& color ); - const EE_RENDER_MODE& RenderType() const; + const EE_RENDER_MODE& RenderMode() const; - void RenderType( const EE_RENDER_MODE& render ); + void RenderMode( const EE_RENDER_MODE& render ); const eeVector2i& AlignOffset() const; protected: diff --git a/include/eepp/ui/cuisprite.hpp b/include/eepp/ui/cuisprite.hpp index d260a3abf..412c1f989 100644 --- a/include/eepp/ui/cuisprite.hpp +++ b/include/eepp/ui/cuisprite.hpp @@ -3,6 +3,10 @@ #include +namespace EE { namespace Graphics { +class cSprite; +}} + namespace EE { namespace UI { class EE_API cUISprite : public cUIComplexControl { @@ -44,9 +48,9 @@ class EE_API cUISprite : public cUIComplexControl { void Color( const eeColorA& color ); - const EE_RENDER_MODE& RenderType() const; + const EE_RENDER_MODE& RenderMode() const; - void RenderType( const EE_RENDER_MODE& render ); + void RenderMode( const EE_RENDER_MODE& render ); const eeVector2i& AlignOffset() const; protected: diff --git a/include/eepp/ui/cuitheme.hpp b/include/eepp/ui/cuitheme.hpp index f24fec38b..d6dc76c0e 100644 --- a/include/eepp/ui/cuitheme.hpp +++ b/include/eepp/ui/cuitheme.hpp @@ -3,10 +3,14 @@ #include #include -#include -#include #include +namespace EE { namespace Graphics { +class cSprite; +class cTextureAtlas; +class cFont; +}} + namespace EE { namespace UI { class cUIControl; diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index c2495e344..82f6e8b44 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/src/eepp/gaming/cgameobject.cpp b/src/eepp/gaming/cgameobject.cpp index 6bdf3eab8..7cd78741b 100644 --- a/src/eepp/gaming/cgameobject.cpp +++ b/src/eepp/gaming/cgameobject.cpp @@ -105,7 +105,7 @@ Uint32 cGameObject::DataId() { void cGameObject::DataId( Uint32 Id ){ } -EE_RENDER_MODE cGameObject::RenderTypeFromFlags() { +EE_RENDER_MODE cGameObject::RenderModeFromFlags() { EE_RENDER_MODE Render = RN_NORMAL; if ( ( mFlags & GObjFlags::GAMEOBJECT_MIRRORED ) && ( mFlags & GObjFlags::GAMEOBJECT_FLIPED ) ) { diff --git a/src/eepp/gaming/cgameobjectsprite.cpp b/src/eepp/gaming/cgameobjectsprite.cpp index 3f69d87cb..d2991f0c5 100644 --- a/src/eepp/gaming/cgameobjectsprite.cpp +++ b/src/eepp/gaming/cgameobjectsprite.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -10,7 +11,7 @@ cGameObjectSprite::cGameObjectSprite( const Uint32& Flags, cLayer * Layer, cSpri mSprite( Sprite ) { if ( NULL != mSprite ) - mSprite->RenderType( RenderTypeFromFlags() ); + mSprite->RenderMode( RenderModeFromFlags() ); AssignTilePos(); } @@ -103,12 +104,12 @@ cSprite * cGameObjectSprite::Sprite() const { void cGameObjectSprite::Sprite( cSprite * sprite ) { eeSAFE_DELETE( mSprite ); mSprite = sprite; - mSprite->RenderType( RenderTypeFromFlags() ); + mSprite->RenderMode( RenderModeFromFlags() ); } void cGameObjectSprite::FlagSet( const Uint32& Flag ) { if ( NULL != mSprite ) - mSprite->RenderType( RenderTypeFromFlags() ); + mSprite->RenderMode( RenderModeFromFlags() ); cGameObject::FlagSet( Flag ); } diff --git a/src/eepp/gaming/cgameobjectsubtexture.cpp b/src/eepp/gaming/cgameobjectsubtexture.cpp index e1844fdef..50964c5df 100644 --- a/src/eepp/gaming/cgameobjectsubtexture.cpp +++ b/src/eepp/gaming/cgameobjectsubtexture.cpp @@ -44,10 +44,10 @@ void cGameObjectSubTexture::Draw() { *LM->GetTileColor( Tile, 2 ), *LM->GetTileColor( Tile, 3 ), ALPHA_NORMAL, - RenderTypeFromFlags() + RenderModeFromFlags() ); } else { - mSubTexture->Draw( mPos.x, mPos.y, *LM->GetTileColor( Tile ), GetAngle(), 1.f, ALPHA_NORMAL, RenderTypeFromFlags() ); + mSubTexture->Draw( mPos.x, mPos.y, *LM->GetTileColor( Tile ), GetAngle(), 1.f, ALPHA_NORMAL, RenderModeFromFlags() ); } } else { if ( LM->IsByVertex() ) { @@ -61,14 +61,14 @@ void cGameObjectSubTexture::Draw() { LM->GetColorFromPos( eeVector2f( mPos.x + mSubTexture->DestWidth(), mPos.y + mSubTexture->DestHeight() ) ), LM->GetColorFromPos( eeVector2f( mPos.x + mSubTexture->DestWidth(), mPos.y ) ), ALPHA_NORMAL, - RenderTypeFromFlags() + RenderModeFromFlags() ); } else { - mSubTexture->Draw( mPos.x, mPos.y, LM->GetColorFromPos( eeVector2f( mPos.x, mPos.y ) ), GetAngle(), 1.f, ALPHA_NORMAL, RenderTypeFromFlags() ); + mSubTexture->Draw( mPos.x, mPos.y, LM->GetColorFromPos( eeVector2f( mPos.x, mPos.y ) ), GetAngle(), 1.f, ALPHA_NORMAL, RenderModeFromFlags() ); } } } else { - mSubTexture->Draw( mPos.x, mPos.y, eeColorA(), GetAngle(), 1.f, ALPHA_NORMAL, RenderTypeFromFlags() ); + mSubTexture->Draw( mPos.x, mPos.y, eeColorA(), GetAngle(), 1.f, ALPHA_NORMAL, RenderModeFromFlags() ); } } } diff --git a/src/eepp/gaming/cgameobjectsubtextureex.cpp b/src/eepp/gaming/cgameobjectsubtextureex.cpp index c9420b5e3..0cfb58b71 100644 --- a/src/eepp/gaming/cgameobjectsubtextureex.cpp +++ b/src/eepp/gaming/cgameobjectsubtextureex.cpp @@ -13,7 +13,7 @@ cGameObjectSubTextureEx::cGameObjectSubTextureEx( const Uint32& Flags, cLayer * mColor( Color ), mVertexColors( NULL ) { - mRender = RenderTypeFromFlags(); + mRender = RenderModeFromFlags(); if ( 0 == mAngle ) mAngle = GetAngle(); @@ -84,7 +84,7 @@ void cGameObjectSubTextureEx::Draw() { } void cGameObjectSubTextureEx::FlagSet( const Uint32& Flag ) { - mRender = RenderTypeFromFlags(); + mRender = RenderModeFromFlags(); cGameObject::FlagSet( Flag ); } diff --git a/src/eepp/gaming/cgameobjectvirtual.cpp b/src/eepp/gaming/cgameobjectvirtual.cpp index 5c9a5825a..8bcec901a 100644 --- a/src/eepp/gaming/cgameobjectvirtual.cpp +++ b/src/eepp/gaming/cgameobjectvirtual.cpp @@ -74,10 +74,10 @@ void cGameObjectVirtual::Draw() { *LM->GetTileColor( Tile, 2 ), *LM->GetTileColor( Tile, 3 ), ALPHA_NORMAL, - RenderTypeFromFlags() + RenderModeFromFlags() ); } else { - mSubTexture->Draw( mPos.x, mPos.y, *LM->GetTileColor( Tile ), GetAngle(), 1.f, ALPHA_NORMAL, RenderTypeFromFlags() ); + mSubTexture->Draw( mPos.x, mPos.y, *LM->GetTileColor( Tile ), GetAngle(), 1.f, ALPHA_NORMAL, RenderModeFromFlags() ); } } else { if ( LM->IsByVertex() ) { @@ -91,14 +91,14 @@ void cGameObjectVirtual::Draw() { LM->GetColorFromPos( eeVector2f( mPos.x + mSubTexture->DestWidth(), mPos.y + mSubTexture->DestHeight() ) ), LM->GetColorFromPos( eeVector2f( mPos.x + mSubTexture->DestWidth(), mPos.y ) ), ALPHA_NORMAL, - RenderTypeFromFlags() + RenderModeFromFlags() ); } else { - mSubTexture->Draw( mPos.x, mPos.y, LM->GetColorFromPos( eeVector2f( mPos.x, mPos.y ) ), GetAngle(), 1.f, ALPHA_NORMAL, RenderTypeFromFlags() ); + mSubTexture->Draw( mPos.x, mPos.y, LM->GetColorFromPos( eeVector2f( mPos.x, mPos.y ) ), GetAngle(), 1.f, ALPHA_NORMAL, RenderModeFromFlags() ); } } } else { - mSubTexture->Draw( mPos.x, mPos.y, eeColorA(), GetAngle(), 1.f, ALPHA_NORMAL, RenderTypeFromFlags() ); + mSubTexture->Draw( mPos.x, mPos.y, eeColorA(), GetAngle(), 1.f, ALPHA_NORMAL, RenderModeFromFlags() ); } } else { cPrimitives P; diff --git a/src/eepp/gaming/mapeditor/cmapeditor.cpp b/src/eepp/gaming/mapeditor/cmapeditor.cpp index c0520da7c..c99569e4b 100644 --- a/src/eepp/gaming/mapeditor/cmapeditor.cpp +++ b/src/eepp/gaming/mapeditor/cmapeditor.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -499,13 +500,13 @@ void cMapEditor::ChkClickDI( const cUIEvent * Event ) { void cMapEditor::UpdateGfx() { if ( mChkMirrored->Active() && mChkFliped->Active() ) - mGfxPreview->RenderType( RN_FLIPMIRROR ); + mGfxPreview->RenderMode( RN_FLIPMIRROR ); else if( mChkMirrored->Active() ) - mGfxPreview->RenderType( RN_MIRROR ); + mGfxPreview->RenderMode( RN_MIRROR ); else if ( mChkFliped->Active() ) - mGfxPreview->RenderType( RN_FLIP ); + mGfxPreview->RenderMode( RN_FLIP ); else - mGfxPreview->RenderType( RN_NORMAL ); + mGfxPreview->RenderMode( RN_NORMAL ); if ( mChkRot90->Active() ) mGfxPreview->Angle( 90 ); diff --git a/src/eepp/graphics/csprite.cpp b/src/eepp/graphics/csprite.cpp index db2671f86..6c786c1c6 100755 --- a/src/eepp/graphics/csprite.cpp +++ b/src/eepp/graphics/csprite.cpp @@ -852,11 +852,11 @@ const eeUint& cSprite::CurrentSubFrame() const { return mCurrentSubFrame; } -void cSprite::RenderType( const EE_RENDER_MODE& Effect ) { +void cSprite::RenderMode( const EE_RENDER_MODE& Effect ) { mEffect = Effect; } -const EE_RENDER_MODE& cSprite::RenderType() const { +const EE_RENDER_MODE& cSprite::RenderMode() const { return mEffect; } diff --git a/src/eepp/graphics/ctextcache.cpp b/src/eepp/graphics/ctextcache.cpp index 778c6db67..f6122952a 100644 --- a/src/eepp/graphics/ctextcache.cpp +++ b/src/eepp/graphics/ctextcache.cpp @@ -78,20 +78,32 @@ const eeColorA& cTextCache::Color() const { return mFontColor; } -void cTextCache::Color(const eeColorA& Color) { - if ( mFontColor != Color ) { - mFontColor = Color; +void cTextCache::Color( const eeColorA& color ) { + if ( mFontColor != color ) { + mFontColor = color; mColors.assign( mText.size() * EE_QUAD_VERTEX, mFontColor ); } } +void cTextCache::Color( const eeColorA& color, Uint32 from, Uint32 to ) { + std::size_t s = mText.size(); + + if ( to >= s ) { to = s - 1; } + + if ( from <= to && from < s && to < s ) { + for ( Uint32 i = from * EE_QUAD_VERTEX; i < to * EE_QUAD_VERTEX; i++ ) { + mColors[ i ] = color; + } + } +} + const eeColorA& cTextCache::ShadowColor() const { return mFontShadowColor; } -void cTextCache::ShadowColor(const eeColorA& Color) { - mFontShadowColor = Color; +void cTextCache::ShadowColor(const eeColorA& color) { + mFontShadowColor = color; } std::vector& cTextCache::VertextCoords() { diff --git a/src/eepp/physics/cshapecirclesprite.cpp b/src/eepp/physics/cshapecirclesprite.cpp index 4c4393b10..59f777f0a 100644 --- a/src/eepp/physics/cshapecirclesprite.cpp +++ b/src/eepp/physics/cshapecirclesprite.cpp @@ -2,6 +2,8 @@ #ifdef PHYSICS_RENDERER_ENABLED +#include + CP_NAMESPACE_BEGIN cShapeCircleSprite * cShapeCircleSprite::New( cBody * body, cpFloat radius, cVect offset, cSprite * Sprite, bool AutoDeleteSprite ) { diff --git a/src/eepp/physics/cshapepolysprite.cpp b/src/eepp/physics/cshapepolysprite.cpp index 18b68a2cb..f68334bc4 100644 --- a/src/eepp/physics/cshapepolysprite.cpp +++ b/src/eepp/physics/cshapepolysprite.cpp @@ -2,6 +2,8 @@ #ifdef PHYSICS_RENDERER_ENABLED +#include + CP_NAMESPACE_BEGIN cShapePolySprite * cShapePolySprite::New( cBody * body, int numVerts, cVect *verts, cVect offset, cSprite * Sprite, bool AutoDeleteSprite ) { diff --git a/src/eepp/ui/cuicontrol.cpp b/src/eepp/ui/cuicontrol.cpp index 0dfcca3b3..cd2ca0750 100644 --- a/src/eepp/ui/cuicontrol.cpp +++ b/src/eepp/ui/cuicontrol.cpp @@ -1,4 +1,5 @@ #include +#include #include namespace EE { namespace UI { diff --git a/src/eepp/ui/cuigfx.cpp b/src/eepp/ui/cuigfx.cpp index 19c060ce5..ec03404cc 100644 --- a/src/eepp/ui/cuigfx.cpp +++ b/src/eepp/ui/cuigfx.cpp @@ -126,11 +126,11 @@ void cUIGfx::Color( const eeColorA& color ) { Alpha( color.A() ); } -const EE_RENDER_MODE& cUIGfx::RenderType() const { +const EE_RENDER_MODE& cUIGfx::RenderMode() const { return mRender; } -void cUIGfx::RenderType( const EE_RENDER_MODE& render ) { +void cUIGfx::RenderMode( const EE_RENDER_MODE& render ) { mRender = render; } diff --git a/src/eepp/ui/cuisprite.cpp b/src/eepp/ui/cuisprite.cpp index d8a740e44..354fbd5b5 100644 --- a/src/eepp/ui/cuisprite.cpp +++ b/src/eepp/ui/cuisprite.cpp @@ -1,4 +1,5 @@ #include +#include namespace EE { namespace UI { @@ -90,11 +91,11 @@ void cUISprite::Color( const eeColorA& color ) { Alpha( color.A() ); } -const EE_RENDER_MODE& cUISprite::RenderType() const { +const EE_RENDER_MODE& cUISprite::RenderMode() const { return mRender; } -void cUISprite::RenderType( const EE_RENDER_MODE& render ) { +void cUISprite::RenderMode( const EE_RENDER_MODE& render ) { mRender = render; } diff --git a/src/eepp/ui/cuitheme.cpp b/src/eepp/ui/cuitheme.cpp index 4139d0874..ec628a535 100644 --- a/src/eepp/ui/cuitheme.cpp +++ b/src/eepp/ui/cuitheme.cpp @@ -1,6 +1,9 @@ #include #include #include +#include +#include +#include #include #include #include diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index 55367e7a8..2a98b6572 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -194,6 +194,9 @@ void cEETest::OnFontLoaded( cResourceLoader * ObjLoaded ) { mEEText.Create( TTFB, "Entropia Engine++\nCTRL + Number to change Demo Screen\nRight click to see the PopUp Menu" ); mFBOText.Create( TTFB, "This is a VBO\nInside of a FBO" ); + mFBOText.Color( eeColorA(255,255,0,255), 10, 13 ); + mFBOText.Color( eeColorA(255,255,0,255), 25, 28 ); + mInfoText.Create( FF, "", eeColorA(255,255,255,150) ); } @@ -1085,7 +1088,7 @@ void cEETest::Screen2() { SP.Draw(); #ifndef EE_GLES - CL1.RenderType( RN_ISOMETRIC ); + CL1.RenderMode( RN_ISOMETRIC ); if ( CL1.GetAABB().IntersectCircle( Mousef, 80.f ) ) CL1.Color( eeColorA(255, 0, 0, 200) );