Browse Source

use U+xxxx format for output

David Rose 17 years ago
parent
commit
6fa94a1ec3
2 changed files with 4 additions and 2 deletions
  1. 4 1
      panda/src/text/textAssembler.cxx
  2. 0 1
      panda/src/text/textFont.cxx

+ 4 - 1
panda/src/text/textAssembler.cxx

@@ -30,6 +30,7 @@
 #include "modelNode.h"
 #include "modelNode.h"
 
 
 #include <ctype.h>
 #include <ctype.h>
+#include <stdio.h>  // for sprintf
   
   
 // This is the factor by which CT_small scales the character down.
 // This is the factor by which CT_small scales the character down.
 static const float small_accent_scale = 0.6f;
 static const float small_accent_scale = 0.6f;
@@ -1289,9 +1290,11 @@ assemble_row(TextAssembler::TextRow &row,
                            additional_flags, glyph_scale, advance_scale);
                            additional_flags, glyph_scale, advance_scale);
 
 
       if (!got_glyph) {
       if (!got_glyph) {
+        char buffer[512];
+        sprintf(buffer, "U+%04x", character);
         text_cat.warning()
         text_cat.warning()
           << "No definition in " << font->get_name() 
           << "No definition in " << font->get_name() 
-          << " for character " << character;
+          << " for character " << buffer;
         if (character < 128 && isprint((unsigned int)character)) {
         if (character < 128 && isprint((unsigned int)character)) {
           text_cat.warning(false)
           text_cat.warning(false)
             << " ('" << (char)character << "')";
             << " ('" << (char)character << "')";

+ 0 - 1
panda/src/text/textFont.cxx

@@ -142,7 +142,6 @@ make_invalid_glyph() {
 
 
   _invalid_glyph = new TextGlyph(0, geom, RenderState::make_empty(),
   _invalid_glyph = new TextGlyph(0, geom, RenderState::make_empty(),
                                  _line_height * 0.7f);
                                  _line_height * 0.7f);
-  cerr << "made invalid glyph: " << _invalid_glyph << "\n";
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////