1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sun, 17 Jan 2016 12:13:27 +0100
Subject: Replace Arial by generic Font
Also make LiberationSans-Regular.ttf the default (not included).
---
ogre_media/fonts/{arial.fontdef => font.fontdef} | 4 ++--
src/rviz/default_plugin/tf_display.cpp | 2 +-
src/rviz/ogre_helpers/movable_text.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename ogre_media/fonts/{arial.fontdef => font.fontdef} (52%)
diff --git a/ogre_media/fonts/arial.fontdef b/ogre_media/fonts/font.fontdef
similarity index 52%
rename from ogre_media/fonts/arial.fontdef
rename to ogre_media/fonts/font.fontdef
index 651dd24..94497d7 100644
--- a/ogre_media/fonts/arial.fontdef
+++ b/ogre_media/fonts/font.fontdef
@@ -1,7 +1,7 @@
-Arial
+Font
{
type truetype
- source arial.ttf
+ source LiberationSans-Regular.ttf
size 18
resolution 96
}
diff --git a/src/rviz/default_plugin/tf_display.cpp b/src/rviz/default_plugin/tf_display.cpp
index f05a615..8eafa34 100644
--- a/src/rviz/default_plugin/tf_display.cpp
+++ b/src/rviz/default_plugin/tf_display.cpp
@@ -437,7 +437,7 @@ FrameInfo* TFDisplay::createFrame(const std::string& frame)
info->selection_handler_.reset( new FrameSelectionHandler( info, this, context_ ));
info->selection_handler_->addTrackedObjects( info->axes_->getSceneNode() );
- info->name_text_ = new MovableText( frame, "Arial", 0.1 );
+ info->name_text_ = new MovableText( frame, "Font", 0.1 );
info->name_text_->setTextAlignment(MovableText::H_CENTER, MovableText::V_BELOW);
info->name_node_ = names_node_->createChildSceneNode();
info->name_node_->attachObject( info->name_text_ );
diff --git a/src/rviz/ogre_helpers/movable_text.h b/src/rviz/ogre_helpers/movable_text.h
index 8e5ed49..677fbab 100644
--- a/src/rviz/ogre_helpers/movable_text.h
+++ b/src/rviz/ogre_helpers/movable_text.h
@@ -107,7 +107,7 @@ protected:
/******************************** public methods ******************************/
public:
- MovableText(const Ogre::String &caption, const Ogre::String &fontName = "Arial", Ogre::Real charHeight = 1.0,
+ MovableText(const Ogre::String &caption, const Ogre::String &fontName = "Font", Ogre::Real charHeight = 1.0,
const Ogre::ColourValue &color = Ogre::ColourValue::White);
virtual ~MovableText();
|
