From 3ff648a08f567ef02a80ce3589121ce35eb033c7 Mon Sep 17 00:00:00 2001 From: kearwood Date: Thu, 12 Apr 2012 07:30:01 +0000 Subject: [PATCH] Cleaned up warnings --HG-- extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4039 --- KREngine/KREngine/Classes/KRResource+obj.cpp | 1 - objview/Classes/KRObjViewGLView.mm | 2 -- objview/Classes/KRObjViewViewController.mm | 9 ++++++--- objview/KRObjView.xcodeproj/project.pbxproj | 8 ++++++++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/KREngine/KREngine/Classes/KRResource+obj.cpp b/KREngine/KREngine/Classes/KRResource+obj.cpp index 8e7c646..668db6f 100644 --- a/KREngine/KREngine/Classes/KRResource+obj.cpp +++ b/KREngine/KREngine/Classes/KRResource+obj.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include "KRResource.h" #include "KRMesh.h" diff --git a/objview/Classes/KRObjViewGLView.mm b/objview/Classes/KRObjViewGLView.mm index d2b1f1c..dd18788 100644 --- a/objview/Classes/KRObjViewGLView.mm +++ b/objview/Classes/KRObjViewGLView.mm @@ -137,8 +137,6 @@ } } - KRModelManager *pModelManager = [renderEngine getModelManager]; - [renderEngine setNearZ: 25.0]; [renderEngine setFarZ: 5000.0]; /* diff --git a/objview/Classes/KRObjViewViewController.mm b/objview/Classes/KRObjViewViewController.mm index b402a76..13caf28 100644 --- a/objview/Classes/KRObjViewViewController.mm +++ b/objview/Classes/KRObjViewViewController.mm @@ -32,6 +32,8 @@ #import "KRObjViewViewController.h" #import #import +#import + @implementation KRObjViewViewController @@ -162,11 +164,11 @@ camera_position = KRVector3(-850, -10, -700); - _lastTime= CFAbsoluteTimeGetCurrent(); - displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(drawView:)]; [displayLink setFrameInterval:1]; // Maximum 60fps [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; + + _lastTime= [displayLink timestamp]; } - (void)dealloc @@ -179,7 +181,7 @@ - (void)drawView:(id)sender { - CFTimeInterval time = CFAbsoluteTimeGetCurrent(); + CFTimeInterval time = [displayLink timestamp]; float deltaTime = (time - _lastTime); _lastTime = time; @@ -211,6 +213,7 @@ } NSString *debug_text = [[NSString alloc] initWithUTF8String:szText]; [engine setDebugText: debug_text]; + [debug_text release]; } else { [engine setDebugText: @""]; } diff --git a/objview/KRObjView.xcodeproj/project.pbxproj b/objview/KRObjView.xcodeproj/project.pbxproj index 03954b7..7855757 100644 --- a/objview/KRObjView.xcodeproj/project.pbxproj +++ b/objview/KRObjView.xcodeproj/project.pbxproj @@ -289,6 +289,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -305,6 +306,7 @@ "\"$(SRCROOT)/testflight\"", ); PRODUCT_NAME = KRObjView; + PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; }; @@ -314,6 +316,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = KRObjView_Prefix.pch; @@ -327,6 +330,7 @@ "\"$(SRCROOT)/testflight\"", ); PRODUCT_NAME = KRObjView; + PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; VALIDATE_PRODUCT = YES; @@ -375,6 +379,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = KRObjView_Prefix.pch; @@ -389,6 +395,8 @@ "\"$(SRCROOT)/testflight\"", ); PRODUCT_NAME = KRObjView; + PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; VALIDATE_PRODUCT = YES;