From b58da165c4ae841859ee7c600ec27f7207181a0e Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 16 Nov 2010 21:49:18 +0000 Subject: renamed screenshotformat and screenshotquality cvars, cleaned up mipmap and vbo console messages --- src/render/render.cc | 16 ++++++++-------- src/render/state.cc | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/render') diff --git a/src/render/render.cc b/src/render/render.cc index baf9465..1b0d90e 100644 --- a/src/render/render.cc +++ b/src/render/render.cc @@ -114,19 +114,19 @@ void init(int width, int height) r_physics = core::Cvar::get("r_physics", "0", core::Cvar::Archive); r_physics->set_info("[bool] render physics (local game only)"); - Screenshot::screenshotformat = core::Cvar::get("screenshotformat", "jpg", core::Cvar::Archive); + Screenshot::screenshotformat = core::Cvar::get("screenshot_format", "jpg", core::Cvar::Archive); Screenshot::screenshotformat->set_info("[string] screenshot format: jpg png tga"); - Screenshot::screenshotquality = core::Cvar::get("screenshotquality", "85", core::Cvar::Archive); - Screenshot::screenshotquality->set_info("[int] screenshot jpg quality"); + Screenshot::screenshotquality = core::Cvar::get("screenshot_quality", "90", core::Cvar::Archive); + Screenshot::screenshotquality->set_info("[int] screenshot jpeg quality"); // hardware generate mipmaps - r_mipmap = core::Cvar::get("r_mipmap", "1", core::Cvar::Archive); - r_mipmap->set_info("[bool] use hardware generated mipmaps (recommended on)"); - if (!State::has_generate_mipmaps()) { - con_print << " no hardware generated mipmap support" << std::endl; - (*r_mipmap) = 0.0f; + if (State::has_generate_mipmaps()) { + r_mipmap = core::Cvar::get("r_mipmap", "1", core::Cvar::Archive); + } else { + r_mipmap = core::Cvar::get("r_mipmap", "0", core::Cvar::Archive); } + r_mipmap->set_info("[bool] use hardware generated mipmaps (recommended on)"); Camera::init(); diff --git a/src/render/state.cc b/src/render/state.cc index df2af75..293e464 100644 --- a/src/render/state.cc +++ b/src/render/state.cc @@ -50,11 +50,11 @@ void State::init(int width, int height) con_warn << "Could not determine OpenGL version!" << std::endl; } - con_print << " Hardware generate mipmaps "; + con_print << " hardware generated mipmaps "; if (render_has_generate_mipmaps) - con_print << "enabled" << std::endl; + con_print << "available" << std::endl; else - con_print << "disabled" << std::endl; + con_print << "not available" << std::endl; // initialize gl functions render_has_vbo = true; @@ -82,7 +82,7 @@ void State::init(int width, int height) render_has_vbo = false; } - con_print << " Vertex bufer objects "; + con_print << " vertex bufer objects "; if (render_has_vbo) con_print << "enabled" << std::endl; else -- cgit v1.2.3