zv0n/game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDLPP: TextRenderer remembers last font/color/outline

Browse Source 
This is used for changeText() and updateSizeAndPosition() so programmer
doesn't have to pass the text configuration with every change of text/size.
This commit is contained in:
zv0n 2021-01-30 16:43:43 +01:00
parent 7f661630c0
commit a818c567fc
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sdlpp/sdlpp_textrenderer.cpp
View File

@ -5,36 +5,34 @@ TextRenderer::TextRenderer( double x, double y, double w, double h,
std::shared_ptr< Renderer > &r ) std::shared_ptr< Renderer > &r )
: RectangleRender( x, y, w, h, r ) {} : RectangleRender( x, y, w, h, r ) {}
TextRenderer::TextRenderer( double x, double y, double w, double h, TextRenderer::TextRenderer( double x, double y, double w, double h,
std::shared_ptr< Renderer > &r, Font &font, std::shared_ptr< Renderer > &r,
std::shared_ptr< Font > font,
const std::string &text, const std::string &color, const std::string &text, const std::string &color,
const std::string &outline_color, double outline_size, const std::string &outline_color,
int flags ) double outline_size, int flags )
: RectangleRender( x, y, w, h, r ) { : RectangleRender( x, y, w, h, r ) {
position_flags = flags; position_flags = flags;
setText( font, text, color, outline_color, outline_size ); setText( font, text, color, outline_color, outline_size );
saveFontConfig( font, color, outline_color, outline_size );
} }
void TextRenderer::setText( Font &font, const std::string &text, void TextRenderer::setText( std::shared_ptr< Font > font,
const std::string &color, const std::string &text, const std::string &color,
const std::string &outline_color, const std::string &outline_color,
double outline_size ) { double outline_size ) {
_text = text; _text = text;
setTextColor( font, color, outline_color, outline_size ); setTextColor( font, color, outline_color, outline_size );
} }
void TextRenderer::setTextColor( Font &font, const std::string &color, void TextRenderer::setTextColor( std::shared_ptr< Font > font,
const std::string &color,
const std::string &outline_color, const std::string &outline_color,
double outline_size ) { double outline_size ) {
int fontSize = 0.6 * getRect().h; saveFontConfig( font, color, outline_color, outline_size );
font.changeFontSize(fontSize); updateSizeAndPosition();
int intOutline = outline_size;
if(intOutline != -1) {
intOutline = outline_size * fontSize;
}
setTexture( font, _text, color, outline_color, intOutline );
font.revertSize();
updateDstRect(); updateDstRect();
} }
void TextRenderer::changeText( const std::string &text ) { void TextRenderer::changeText( const std::string &text ) {
_text = text; _text = text;
updateSizeAndPosition();
} }
void TextRenderer::setFlags( int flags ) { void TextRenderer::setFlags( int flags ) {
position_flags = flags; position_flags = flags;
@ -55,16 +53,26 @@ void TextRenderer::render() {
} }
void TextRenderer::updateSizeAndPosition() { void TextRenderer::updateSizeAndPosition() {
RectangleRender::updateSizeAndPosition(); RectangleRender::updateSizeAndPosition();
int fontSize = 0.6 * getRect().h;
last_font->changeFontSize( fontSize );
int intOutline = last_outline_size;
if ( intOutline != -1 ) {
intOutline = last_outline_size * fontSize;
}
setTexture( *last_font, _text, last_color, last_outline_color, intOutline );
last_font->revertSize();
updateDstRect(); updateDstRect();
} }
std::shared_ptr< RenderObject > TextRenderer::copySelf() { std::shared_ptr< RenderObject > TextRenderer::copySelf() {
auto ret = std::make_shared< TextRenderer >( *this ); auto ret = std::make_shared< TextRenderer >( *this );
copyTo(ret); copyTo( ret );
return ret; return ret;
} }
void TextRenderer::copyTo(std::shared_ptr<RenderObject> other) { void TextRenderer::copyTo( std::shared_ptr< RenderObject > other ) {
RectangleRender::copyTo(other); RectangleRender::copyTo( other );
} }
void TextRenderer::updateDstRect() { void TextRenderer::updateDstRect() {
@ -106,4 +114,13 @@ void TextRenderer::updateDstRect() {
dst_rect.y = rect.y + rect.h - dst_rect.h; dst_rect.y = rect.y + rect.h - dst_rect.h;
} }
} }
void TextRenderer::saveFontConfig( std::shared_ptr< Font > font,
const std::string &color,
const std::string &outline_color,
double outline_size ) {
last_font = font;
last_color = color;
last_outline_color = outline_color;
last_outline_size = outline_size;
}
} // namespace SDLPP } // namespace SDLPP

18
sdlpp/sdlpp_textrenderer.hpp
View File

@ -14,18 +14,18 @@ public:
TextRenderer( double x, double y, double w, double h, TextRenderer( double x, double y, double w, double h,
std::shared_ptr< Renderer > &r ); std::shared_ptr< Renderer > &r );
TextRenderer( double x, double y, double w, double h, TextRenderer( double x, double y, double w, double h,
std::shared_ptr< Renderer > &r, Font &font, std::shared_ptr< Renderer > &r, std::shared_ptr< Font > font,
const std::string &text, const std::string &color = "FFFFFF", const std::string &text, const std::string &color = "FFFFFF",
const std::string &outline_color = "000000", const std::string &outline_color = "000000",
double outline_size = -1, int flags = SDLPP_TEXT_CENTER ); double outline_size = -1, int flags = SDLPP_TEXT_CENTER );
void setText( Font &font, const std::string &text, void setText( std::shared_ptr< Font > font, const std::string &text,
const std::string &color = "FFFFFF", const std::string &color = "FFFFFF",
const std::string &outline_color = "000000", const std::string &outline_color = "000000",
double outline_size = -1 ); double outline_size = -1 );
void setTextColor( Font &font, const std::string &color = "FFFFFF", void setTextColor( std::shared_ptr< Font > font,
const std::string &color = "FFFFFF",
const std::string &outline_color = "000000", const std::string &outline_color = "000000",
double outline_size = -1 ); double outline_size = -1 );
// TODO maybe store Font and actually update texture here
void changeText( const std::string &text ); void changeText( const std::string &text );
void setFlags( int flags ); void setFlags( int flags );
virtual void render() override; virtual void render() override;
@ -33,11 +33,19 @@ public:
virtual std::shared_ptr< RenderObject > copySelf() override; virtual std::shared_ptr< RenderObject > copySelf() override;
private: private:
virtual void copyTo(std::shared_ptr<RenderObject> other) override; virtual void copyTo( std::shared_ptr< RenderObject > other ) override;
void updateDstRect(); void updateDstRect();
void saveFontConfig( std::shared_ptr< Font > font, const std::string &color,
const std::string &outline_color,
double outline_size );
std::string _text{}; std::string _text{};
int position_flags = 0; int position_flags = 0;
SDL_Rect dst_rect{}; SDL_Rect dst_rect{};
std::shared_ptr< Font > last_font;
std::string last_color;
std::string last_outline_color;
double last_outline_size;
}; };
} // end of namespace SDLPP } // end of namespace SDLPP
#endif #endif