From fb23c8ef78c913eb43e4d96cf398aed7bb6a5a47 Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Fri, 22 Mar 2013 18:16:44 -0700 Subject: [PATCH] OSD Debug text can now be used by the host application. --- KREngine/kraken/KRCamera.cpp | 10 ++++++---- KREngine/kraken/KREngine.h | 1 + KREngine/kraken/KREngine.mm | 6 ++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/KREngine/kraken/KRCamera.cpp b/KREngine/kraken/KRCamera.cpp index 777be63..d9ed5a1 100644 --- a/KREngine/kraken/KRCamera.cpp +++ b/KREngine/kraken/KRCamera.cpp @@ -658,10 +658,12 @@ void KRCamera::renderPost() const char *szText = settings.m_debug_text.c_str(); - bool show_active_textures = true; - std::string debug_text = getDebugText(); - if(debug_text.length() > 0) { - szText = debug_text.c_str(); + std::string debug_text; + if(settings.debug_display != KRRenderSettings::KRENGINE_DEBUG_DISPLAY_NONE) { + debug_text = getDebugText();; + if(debug_text.length() > 0) { + szText = debug_text.c_str(); + } } if(*szText) { diff --git a/KREngine/kraken/KREngine.h b/KREngine/kraken/KREngine.h index 5f2ac7d..7fd6480 100644 --- a/KREngine/kraken/KREngine.h +++ b/KREngine/kraken/KREngine.h @@ -54,6 +54,7 @@ namespace kraken { @property(nonatomic, readonly) NSDictionary *parameter_names; @property(nonatomic, assign) KRContext *context; @property(nonatomic, retain) NSString *debug_text; +@property(nonatomic, assign, readonly) KRRenderSettings *settings; - (id)init; - (BOOL)loadResource:(NSString *)path; diff --git a/KREngine/kraken/KREngine.mm b/KREngine/kraken/KREngine.mm index 6a00289..17039eb 100644 --- a/KREngine/kraken/KREngine.mm +++ b/KREngine/kraken/KREngine.mm @@ -236,6 +236,12 @@ void kraken::set_parameter(const std::string ¶meter_name, float parameter_va return 49; } + +-(KRRenderSettings *)settings +{ + return &_settings; +} + -(NSString *)getParameterNameWithIndex: (int)i { return [[self.parameter_names allKeysForObject:[NSNumber numberWithInt:i]] objectAtIndex:0];