Merge branch 'master' into custom-maps

Author: bnjm

ARKit.js

@@ -5,17 +5,17 @@
 //  Copyright © 2017 HippoAR. All rights reserved.
 //
 
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-
 import {
   StyleSheet,
   View,
   Text,
   NativeModules,
   requireNativeComponent,
 } from 'react-native';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 
+import { pickColors, pickColorsFromFile } from './lib/pickColors';
 import generateId from './components/lib/generateId';
 
 const ARKitManager = NativeModules.ARKitManager;
@@ -170,6 +170,8 @@ ARKit.exportModel = presetId => {
   return ARKitManager.exportModel(property).then(result => ({ ...result, id }));
 };
 
+ARKit.pickColors = pickColors;
+ARKit.pickColorsFromFile = pickColorsFromFile;
 ARKit.propTypes = {
   debug: PropTypes.bool,
   planeDetection: PropTypes.bool,

index.js

@@ -25,6 +25,8 @@ import DeviceMotion from './DeviceMotion';
 import startup from './startup';
 import withProjectedPosition from './hocs/withProjectedPosition';
 
+import * as colorUtils from './lib/colorUtils';
+
 ARKit.Box = ARBox;
 ARKit.Sphere = ARSphere;
 ARKit.Cylinder = ARCylinder;
@@ -44,6 +46,7 @@ ARKit.Light = ARLight;
 startup();
 
 export {
+  colorUtils,
   ARKit,
   DeviceMotion,
   ARBox,

ios/RCTARKit.h

@@ -61,8 +61,8 @@ typedef void (^RCTARKitReject)(NSString *code, NSString *message, NSError *error
 - (void)hitTestSceneObjects:(CGPoint)tapPoint resolve:(RCTARKitResolve) resolve reject:(RCTARKitReject)reject;
 - (SCNVector3)projectPoint:(SCNVector3)point;
 - (float)getCameraDistanceToPoint:(SCNVector3)point;
-- (UIImage *)getSnaphshot;
-- (UIImage *)getSnaphshotCamera;
+- (UIImage *)getSnapshot:(NSDictionary*)selection;
+- (UIImage *)getSnapshotCamera:(NSDictionary*)selection;
 - (void)focusScene;
 - (void)clearScene;
 - (NSDictionary *)readCameraPosition;

ios/RCTARKit.m

@@ -252,16 +252,19 @@ - (void)hitTestSceneObjects:(const CGPoint)tapPoint resolve:(RCTARKitResolve)res
 }
 
 
-- (UIImage *)getSnaphshot {
+- (UIImage *)getSnapshot:(NSDictionary *)selection {
     UIImage *image = [self.arView snapshot];
-    return image;
+    
+    
+    return [self cropImage:image toSelection:selection];
+    
 }
 
 
 
 
 
-- (UIImage *)getSnaphsotCamera {
+- (UIImage *)getSnapshotCamera:(NSDictionary *)selection {
     CVPixelBufferRef pixelBuffer = self.arView.session.currentFrame.capturedImage;
     CIImage *ciImage = [CIImage imageWithCVPixelBuffer:pixelBuffer];
 
@@ -274,11 +277,102 @@ - (UIImage *)getSnaphsotCamera {
 
     UIImage *image = [UIImage imageWithCGImage:videoImage scale: 1.0 orientation:UIImageOrientationRight];
     CGImageRelease(videoImage);
-    return image;
+    
+    UIImage *cropped = [self cropImage:image toSelection:selection];
+    return cropped;
+    
 }
 
 
 
+- (UIImage *)cropImage:(UIImage *)imageToCrop toRect:(CGRect)rect
+{
+    //CGRect CropRect = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height+15);
+    
+    CGImageRef imageRef = CGImageCreateWithImageInRect([imageToCrop CGImage], rect);
+    UIImage *cropped = [UIImage imageWithCGImage:imageRef];
+    CGImageRelease(imageRef);
+    
+    return cropped;
+}
+
+static inline double radians (double degrees) {return degrees * M_PI/180;}
+UIImage* rotate(UIImage* src, UIImageOrientation orientation)
+{
+    UIGraphicsBeginImageContext(src.size);
+    
+    CGContextRef context = UIGraphicsGetCurrentContext();
+        [src drawAtPoint:CGPointMake(0, 0)];
+    if (orientation == UIImageOrientationRight) {
+        CGContextRotateCTM (context, radians(90));
+    } else if (orientation == UIImageOrientationLeft) {
+        CGContextRotateCTM (context, radians(-90));
+    } else if (orientation == UIImageOrientationDown) {
+        // NOTHING
+    } else if (orientation == UIImageOrientationUp) {
+        CGContextRotateCTM (context, radians(90));
+    }
+    
+
+    
+    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return image;
+}
+- (UIImage *)cropImage:(UIImage *)imageToCrop toSelection:(NSDictionary *)selection
+{
+    
+    // selection is in view-coordinate system
+    // where as the image is a camera picture with arbitary size
+    // also, the camera picture is cut of so that it "covers" the self.bounds
+    // if selection is nil, crop to the viewport
+    
+    UIImage * image = rotate(imageToCrop, imageToCrop.imageOrientation);
+    
+    float arViewWidth = self.bounds.size.width;
+    float arViewHeight = self.bounds.size.height;
+    float imageWidth = image.size.width;
+    float imageHeight = image.size.height;
+    
+    float arViewRatio = arViewHeight/arViewWidth;
+    float imageRatio = imageHeight/imageWidth;
+    float imageToArWidth = imageWidth/arViewWidth;
+    float imageToArHeight = imageHeight/arViewHeight;
+    
+    float finalHeight;
+    float finalWidth;
+    
+    
+    if (arViewRatio > imageRatio)
+    {
+        finalHeight = arViewHeight*imageToArHeight;
+        finalWidth = arViewHeight*imageToArHeight /arViewRatio;
+    }
+    else
+    {
+        finalWidth = arViewWidth*imageToArWidth;
+        finalHeight = arViewWidth * imageToArWidth * arViewRatio;
+    }
+    
+    float topOffset = (image.size.height - finalHeight)/2;
+    float leftOffset = (image.size.width - finalWidth)/2;
+    
+    
+    float x = leftOffset;
+    float y = topOffset;
+    float width = finalWidth;
+    float height = finalHeight;
+    if(selection && selection != [NSNull null]) {
+        x = leftOffset+ [selection[@"x"] floatValue]*imageToArWidth;
+        y = topOffset+[selection[@"y"] floatValue]*imageToArHeight;
+        width = [selection[@"width"] floatValue]*imageToArWidth;
+        height = [selection[@"height"] floatValue]*imageToArHeight;
+    }
+    CGRect rect = CGRectMake(x, y, width, height);
+    
+    UIImage *cropped = [self cropImage:image toRect:rect];
+    return cropped;
+}
 
 
 #pragma mark - plane hit detection
@@ -408,7 +502,7 @@ - (void)renderer:(id <SCNSceneRenderer>)renderer willUpdateNode:(SCNNode *)node
 
 - (void)renderer:(id <SCNSceneRenderer>)renderer didUpdateNode:(SCNNode *)node forAnchor:(ARAnchor *)anchor {
     ARPlaneAnchor *planeAnchor = (ARPlaneAnchor *)anchor;
-
+    
     if (self.onPlaneUpdate) {
         self.onPlaneUpdate(@{
                              @"id": planeAnchor.identifier.UUIDString,

ios/RCTARKit.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		10ED47A71F38BC01004DF043 /* DeviceMotion.m in Sources */ = {isa = PBXBuildFile; fileRef = 10ED47A61F38BC00004DF043 /* DeviceMotion.m */; };
 		10FEF6141F774C9000EC21AE /* RCTARKitIO.m in Sources */ = {isa = PBXBuildFile; fileRef = 10FEF6101F774C8F00EC21AE /* RCTARKitIO.m */; };
 		10FEF6151F774C9000EC21AE /* RCTARKitNodes.m in Sources */ = {isa = PBXBuildFile; fileRef = 10FEF6121F774C9000EC21AE /* RCTARKitNodes.m */; };
+		B1990B221FCEEBD60001AE2F /* color-grabber.m in Sources */ = {isa = PBXBuildFile; fileRef = B1990B211FCEEBD60001AE2F /* color-grabber.m */; };
 		B3E7B58A1CC2AC0600A0062D /* RCTARKit.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RCTARKit.m */; };
 /* End PBXBuildFile section */
 
@@ -63,6 +64,8 @@
 		134814201AA4EA6300B7C361 /* libRCTARKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTARKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		B14C36631F960C500047CB67 /* PocketSVG.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PocketSVG.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B14C36651F960C6E0047CB67 /* PocketSVG.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PocketSVG.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B1990B201FCEEBD60001AE2F /* color-grabber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "color-grabber.h"; sourceTree = "<group>"; };
+		B1990B211FCEEBD60001AE2F /* color-grabber.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "color-grabber.m"; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RCTARKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTARKit.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RCTARKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTARKit.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -102,6 +105,7 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				B1990B1F1FCEEBD60001AE2F /* color-grabber */,
 				106999E21F3EC2FB00032829 /* components */,
 				10ED47A51F38BC00004DF043 /* DeviceMotion.h */,
 				10ED47A61F38BC00004DF043 /* DeviceMotion.m */,
@@ -132,6 +136,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		B1990B1F1FCEEBD60001AE2F /* color-grabber */ = {
+			isa = PBXGroup;
+			children = (
+				B1990B201FCEEBD60001AE2F /* color-grabber.h */,
+				B1990B211FCEEBD60001AE2F /* color-grabber.m */,
+			);
+			path = "color-grabber";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -192,6 +205,7 @@
 				10FEF6141F774C9000EC21AE /* RCTARKitIO.m in Sources */,
 				10DCBC4B1F7CE836008C89E7 /* ARGeosManager.m in Sources */,
 				10FEF6151F774C9000EC21AE /* RCTARKitNodes.m in Sources */,
+				B1990B221FCEEBD60001AE2F /* color-grabber.m in Sources */,
 				10E553291F1391350059B7EC /* Plane.m in Sources */,
 				1021FE1C1F3EDB98000E7339 /* ARModelManager.m in Sources */,
 				1021FE1D1F3EDB9B000E7339 /* ARTextManager.m in Sources */,