Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes according to Philip's feedback: spacing around operators, removed

Browse source 
unused variables, moved font family names to #defines.
This commit is contained in:
Andrzej Kapolka 2013-05-01 12:17:57 -07:00
parent 15e46bac82
commit 11a750f6a0
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Avatar.cpp
View file

@ -677,7 +677,7 @@ void Avatar::setDisplayingHead( bool displayingHead ) {
static TextRenderer* textRenderer() { static TextRenderer* textRenderer() {
static TextRenderer* renderer = new TextRenderer("Helvetica", 24); static TextRenderer* renderer = new TextRenderer(SANS_FONT_FAMILY, 24);
return renderer; return renderer;
} }

4
interface/src/Log.cpp
View file

@ -24,6 +24,8 @@ namespace {
unsigned const LINE_BUFFER_SIZE = 256; // number of lines that are buffered unsigned const LINE_BUFFER_SIZE = 256; // number of lines that are buffered
unsigned const MAX_MESSAGE_LENGTH = 512; // maximum number of characters for a message unsigned const MAX_MESSAGE_LENGTH = 512; // maximum number of characters for a message
const char* FONT_FAMILY = SANS_FONT_FAMILY;
bool const TEXT_MONOSPACED = true; bool const TEXT_MONOSPACED = true;
float const TEXT_RED = 0.7f; float const TEXT_RED = 0.7f;
@ -196,7 +198,7 @@ void Log::setCharacterSize(unsigned width, unsigned height) {
} }
static TextRenderer* textRenderer() { static TextRenderer* textRenderer() {
static TextRenderer* renderer = new TextRenderer("Helvetica"); static TextRenderer* renderer = new TextRenderer(FONT_FAMILY);
return renderer; return renderer;
} }

4
interface/src/Util.cpp
View file

@ -153,8 +153,8 @@ double diffclock(timeval *clock1,timeval *clock2)
} }
static TextRenderer* textRenderer(int mono) { static TextRenderer* textRenderer(int mono) {
static TextRenderer* monoRenderer = new TextRenderer("Courier"); static TextRenderer* monoRenderer = new TextRenderer(MONO_FONT_FAMILY);
static TextRenderer* proportionalRenderer = new TextRenderer("Helvetica"); static TextRenderer* proportionalRenderer = new TextRenderer(SANS_FONT_FAMILY);
return mono ? monoRenderer : proportionalRenderer; return mono ? monoRenderer : proportionalRenderer;
} }

7
interface/src/Util.h
View file

@ -19,6 +19,13 @@
#include <Orientation.h> #include <Orientation.h>
// the standard sans serif font family
#define SANS_FONT_FAMILY "Helvetica"
// the standard mono font family
#define MONO_FONT_FAMILY "Courier"
void eulerToOrthonormals(glm::vec3 * angles, glm::vec3 * fwd, glm::vec3 * left, glm::vec3 * up); void eulerToOrthonormals(glm::vec3 * angles, glm::vec3 * fwd, glm::vec3 * left, glm::vec3 * up);
float azimuth_to(glm::vec3 head_pos, glm::vec3 source_pos); float azimuth_to(glm::vec3 head_pos, glm::vec3 source_pos);

4
interface/src/ui/MenuColumn.cpp
View file

@ -139,13 +139,11 @@ int MenuColumn::getMaxRowWidth() {
} }
static TextRenderer* textRenderer() { static TextRenderer* textRenderer() {
static TextRenderer* renderer = new TextRenderer("Helvetica", 11); static TextRenderer* renderer = new TextRenderer(SANS_FONT_FAMILY, 11);
return renderer; return renderer;
} }
void MenuColumn::render(int yOffset, int menuHeight, int lineHeight) { void MenuColumn::render(int yOffset, int menuHeight, int lineHeight) {
float scale = 0.09;
int mono = 0;
int numberOfRows = rows.size(); int numberOfRows = rows.size();
if (numberOfRows > 0) { if (numberOfRows > 0) {