diff --git a/KREngine/KREngine/Classes/KRLight.h b/KREngine/KREngine/Classes/KRLight.h index 04ca4ac..16f68b1 100644 --- a/KREngine/KREngine/Classes/KRLight.h +++ b/KREngine/KREngine/Classes/KRLight.h @@ -13,7 +13,7 @@ #import "KRNode.h" #import "KRTexture.h" -static const float KRLIGHT_MIN_INFLUENCE = 0.05f; +static const float KRLIGHT_MIN_INFLUENCE = 0.15f; // 0.05f class KRLight : public KRNode { public: diff --git a/KRWorldBuilder/KRWorldBuilder/en.lproj/KRWBDocument.xib b/KRWorldBuilder/KRWorldBuilder/en.lproj/KRWBDocument.xib index 55626da..df9a821 100644 --- a/KRWorldBuilder/KRWorldBuilder/en.lproj/KRWBDocument.xib +++ b/KRWorldBuilder/KRWorldBuilder/en.lproj/KRWBDocument.xib @@ -2,10 +2,10 @@ 1070 - 11D50b + 11E53 2182 - 1138.32 - 568.00 + 1138.47 + 569.00 com.apple.InterfaceBuilder.CocoaPlugin 2182 @@ -781,7 +781,7 @@ - 100078 + 100079 @@ -804,27 +804,6 @@ ./Classes/KRWBDocument.h - - NSCollectionViewItem - - NSImageView - NSTextField - - - - imageView - NSImageView - - - textField - NSTextField - - - - IBProjectSource - ./Classes/NSCollectionViewItem.h - - 0 diff --git a/objview/Classes/KRObjViewGLView.mm b/objview/Classes/KRObjViewGLView.mm index fbabbe0..34e9438 100644 --- a/objview/Classes/KRObjViewGLView.mm +++ b/objview/Classes/KRObjViewGLView.mm @@ -108,8 +108,8 @@ [renderEngine loadResource: path]; } - [renderEngine setNearZ: 150.0]; - [renderEngine setFarZ: 3000.0]; + [renderEngine setNearZ: 5.0]; + [renderEngine setFarZ: 500.0]; //[renderEngine setNearZ: 1.0]; //[renderEngine setFarZ: 3000.0]; diff --git a/objview/Classes/KRObjViewViewController.mm b/objview/Classes/KRObjViewViewController.mm index 04d6639..211aad1 100644 --- a/objview/Classes/KRObjViewViewController.mm +++ b/objview/Classes/KRObjViewViewController.mm @@ -162,7 +162,7 @@ bLoadedTestInstances = false; cParamDisplayFrames = 0; - camera_position = KRVector3(-850, -10, -700); + camera_position = KRVector3(-85, -1, -70); displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(drawView:)]; [displayLink setFrameInterval:2]; // Maximum 30fps @@ -246,7 +246,7 @@ } - double dScaleFactor = 1000.0f * deltaTime; + double dScaleFactor = 200.0f * deltaTime; camera_position.z += (-cos(camera_pitch) * cos(camera_yaw) * leftStickDeltaX + -cos(camera_pitch) * cos(camera_yaw - 90.0f * d2r) * -leftStickDeltaY) * dScaleFactor; camera_position.x += (cos(camera_pitch) * sin(camera_yaw) * leftStickDeltaX + cos(camera_pitch) * sin(camera_yaw - 90.0f * d2r) * -leftStickDeltaY) * dScaleFactor; diff --git a/objview/KRObjView-Info.plist b/objview/KRObjView-Info.plist index 868a072..af8d293 100644 --- a/objview/KRObjView-Info.plist +++ b/objview/KRObjView-Info.plist @@ -6,14 +6,12 @@ English CFBundleDisplayName ${PRODUCT_NAME} - UIFileSharingEnabled - CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile CFBundleIdentifier - com.kearwood.${PRODUCT_NAME:rfc1034identifier} + com.kearwood.${PRODUCT_NAME:rfc1034identifier}2 CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -30,6 +28,8 @@ MainWindow NSMainNibFile~ipad MainWindow-iPad + UIFileSharingEnabled + UISupportedInterfaceOrientations UIInterfaceOrientationLandscapeLeft diff --git a/objview/KRObjView.xcodeproj/project.pbxproj b/objview/KRObjView.xcodeproj/project.pbxproj index 4ff3e82..a993013 100644 --- a/objview/KRObjView.xcodeproj/project.pbxproj +++ b/objview/KRObjView.xcodeproj/project.pbxproj @@ -51,7 +51,7 @@ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* KRObjViewAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KRObjViewAppDelegate.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1D3623250D0F684500981E51 /* KRObjViewAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = KRObjViewAppDelegate.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 1D6058910D05DD3D006BFB54 /* KRObjView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KRObjView.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D6058910D05DD3D006BFB54 /* KRObjView2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KRObjView2.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; @@ -116,7 +116,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 1D6058910D05DD3D006BFB54 /* KRObjView.app */, + 1D6058910D05DD3D006BFB54 /* KRObjView2.app */, ); name = Products; sourceTree = ""; @@ -240,7 +240,7 @@ ); name = KRObjView; productName = AVCapTest; - productReference = 1D6058910D05DD3D006BFB54 /* KRObjView.app */; + productReference = 1D6058910D05DD3D006BFB54 /* KRObjView2.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -335,7 +335,7 @@ "\"$(SRCROOT)/TestFlightSDK0.8\"", "\"$(SRCROOT)/testflight\"", ); - PRODUCT_NAME = KRObjView; + PRODUCT_NAME = KRObjView2; 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/**"; @@ -359,7 +359,7 @@ "\"$(SRCROOT)/TestFlightSDK0.8\"", "\"$(SRCROOT)/testflight\"", ); - PRODUCT_NAME = KRObjView; + PRODUCT_NAME = KRObjView2; 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/**"; @@ -424,7 +424,7 @@ "\"$(SRCROOT)/TestFlightSDK0.8\"", "\"$(SRCROOT)/testflight\"", ); - PRODUCT_NAME = KRObjView; + PRODUCT_NAME = KRObjView2; PROVISIONING_PROFILE = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "833D5E39-C2AD-4221-9136-B9DCF6FF81A1"; TARGETED_DEVICE_FAMILY = "1,2";