kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up warnings

Browse Source 
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4039
This commit is contained in:
kearwood
2012-04-12 07:30:01 +00:00
parent aa5ca4ee45
commit 3ff648a08f
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
KREngine/KREngine/Classes/KRResource+obj.cpp
View File

@@ -15,7 +15,6 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <vector.h>
#include "KRResource.h" #include "KRResource.h"
#include "KRMesh.h" #include "KRMesh.h"

2
objview/Classes/KRObjViewGLView.mm
View File

@@ -137,8 +137,6 @@
} }
} }
KRModelManager *pModelManager = [renderEngine getModelManager];
[renderEngine setNearZ: 25.0]; [renderEngine setNearZ: 25.0];
[renderEngine setFarZ: 5000.0]; [renderEngine setFarZ: 5000.0];
/* /*

9
objview/Classes/KRObjViewViewController.mm
View File

@@ -32,6 +32,8 @@
#import "KRObjViewViewController.h" #import "KRObjViewViewController.h"
#import <KRMat4.h> #import <KRMat4.h>
#import <KRModelManager.h> #import <KRModelManager.h>
#import <QuartzCore/QuartzCore.h>
@implementation KRObjViewViewController @implementation KRObjViewViewController
@@ -162,11 +164,11 @@
camera_position = KRVector3(-850, -10, -700); camera_position = KRVector3(-850, -10, -700);
_lastTime= CFAbsoluteTimeGetCurrent();
displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(drawView:)]; displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(drawView:)];
[displayLink setFrameInterval:1]; // Maximum 60fps [displayLink setFrameInterval:1]; // Maximum 60fps
[displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
_lastTime= [displayLink timestamp];
} }
- (void)dealloc - (void)dealloc
@@ -179,7 +181,7 @@
- (void)drawView:(id)sender - (void)drawView:(id)sender
{ {
CFTimeInterval time = CFAbsoluteTimeGetCurrent(); CFTimeInterval time = [displayLink timestamp];
float deltaTime = (time - _lastTime); float deltaTime = (time - _lastTime);
_lastTime = time; _lastTime = time;
@@ -211,6 +213,7 @@
} }
NSString *debug_text = [[NSString alloc] initWithUTF8String:szText]; NSString *debug_text = [[NSString alloc] initWithUTF8String:szText];
[engine setDebugText: debug_text]; [engine setDebugText: debug_text];
[debug_text release];
} else { } else {
[engine setDebugText: @""]; [engine setDebugText: @""];
} }

8
objview/KRObjView.xcodeproj/project.pbxproj
View File

@@ -289,6 +289,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@@ -305,6 +306,7 @@
"\"$(SRCROOT)/testflight\"", "\"$(SRCROOT)/testflight\"",
); );
PRODUCT_NAME = KRObjView; PRODUCT_NAME = KRObjView;
PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**";
}; };
@@ -314,6 +316,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Kearwood Gilbert (G7RHEU3F3A)";
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = KRObjView_Prefix.pch; GCC_PREFIX_HEADER = KRObjView_Prefix.pch;
@@ -327,6 +330,7 @@
"\"$(SRCROOT)/testflight\"", "\"$(SRCROOT)/testflight\"",
); );
PRODUCT_NAME = KRObjView; PRODUCT_NAME = KRObjView;
PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
@@ -375,6 +379,8 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; 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; COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = KRObjView_Prefix.pch; GCC_PREFIX_HEADER = KRObjView_Prefix.pch;
@@ -389,6 +395,8 @@
"\"$(SRCROOT)/testflight\"", "\"$(SRCROOT)/testflight\"",
); );
PRODUCT_NAME = KRObjView; PRODUCT_NAME = KRObjView;
PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;