Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Text renderer with support for colors #357

Merged
merged 2 commits into from
Aug 23, 2015

Conversation

pjonnala-eab
Copy link
Contributor

No description provided.

@@ -222,6 +222,8 @@ Engine::Engine(util::Dir *data_dir, const char *windowtitle)
bind_player_switch(input::action_t::SWITCH_TO_PLAYER_6, 6);
bind_player_switch(input::action_t::SWITCH_TO_PLAYER_7, 7);
bind_player_switch(input::action_t::SWITCH_TO_PLAYER_8, 8);

this->text_renderer.reset(new renderer::TextRenderer());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this->text_renderer = std::make_unique<renderer::TextRenderer>()

@TheJJ TheJJ added nice new thing ☺ A new feature that was not there before lang: c++ Done in C++ code labels Aug 21, 2015
@TheJJ
Copy link
Member

TheJJ commented Aug 21, 2015

Nice work! We can merge it soon, i'll integrate it into #287 then but it is functional standalone.

@pjonnala-eab pjonnala-eab changed the title [WIP] Text renderer with support for colors Text renderer with support for colors Aug 21, 2015
std::string text;
};

struct TextRenderBatch {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small thing left: struct names are lowercase-underscored. text_render_batch and text_render_batch_pass.

Would also be nice if you added some /** documentation */ for the members of this class.

@pjonnala-eab
Copy link
Contributor Author

Completed the required changes.

TheJJ added a commit that referenced this pull request Aug 23, 2015
text renderer with support for colors
@TheJJ TheJJ merged commit 16884e7 into SFTtech:master Aug 23, 2015
@TheJJ
Copy link
Member

TheJJ commented Aug 23, 2015

Thanks! Cool stuff.

@pjonnala-eab pjonnala-eab deleted the textrenderer branch August 23, 2015 00:55
mirelon pushed a commit to mirelon/openage that referenced this pull request Jan 15, 2016
text renderer with support for colors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lang: c++ Done in C++ code nice new thing ☺ A new feature that was not there before
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants