From cc5c7cad5dbeec4bad4b10c0c0fc2fd40dc8930b Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 20 Sep 2009 22:43:37 +0000 Subject: [PATCH] egg-mkfont and egg-palettize should use png format by default, instead of rgb --- pandatool/src/egg-mkfont/eggMakeFont.cxx | 2 +- pandatool/src/palettizer/palettizer.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandatool/src/egg-mkfont/eggMakeFont.cxx b/pandatool/src/egg-mkfont/eggMakeFont.cxx index 830f90fc19..2806d39785 100644 --- a/pandatool/src/egg-mkfont/eggMakeFont.cxx +++ b/pandatool/src/egg-mkfont/eggMakeFont.cxx @@ -332,7 +332,7 @@ run() { } if (_output_glyph_pattern.empty()) { // Create a default texture filename pattern. - _output_glyph_pattern = get_output_filename().get_fullpath_wo_extension() + "%03d.rgb"; + _output_glyph_pattern = get_output_filename().get_fullpath_wo_extension() + "%03d.png"; } if (_output_palette_pattern.empty()) { // Create a default texture filename pattern. diff --git a/pandatool/src/palettizer/palettizer.cxx b/pandatool/src/palettizer/palettizer.cxx index 8a1874efe1..34da013974 100644 --- a/pandatool/src/palettizer/palettizer.cxx +++ b/pandatool/src/palettizer/palettizer.cxx @@ -116,7 +116,7 @@ Palettizer() { _coverage_threshold = 2.5; _aggressively_clean_mapdir = true; _force_power_2 = true; - _color_type = PNMFileTypeRegistry::get_global_ptr()->get_type_from_extension("rgb"); + _color_type = PNMFileTypeRegistry::get_global_ptr()->get_type_from_extension("png"); _alpha_type = (PNMFileType *)NULL; _shadow_color_type = (PNMFileType *)NULL; _shadow_alpha_type = (PNMFileType *)NULL;