Skip to content

Commit

Permalink
Merge pull request #11 from fatalhck/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
fatalhck committed Dec 16, 2016
2 parents 0cb9344 + a7e6d4f commit ba1866b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Findr/Classes/FindrConfiguration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ internal func deltaAngle(_ angle1: Double, angle2: Double) -> Double

//MARK: FindrViewController Delegate
protocol FindrViewControllerDelegate {

func findrViewController(findrViewController: FindrViewController, failToOpenWithError error: Error)
func findrViewControllerUpdateAngleForAnnotation(findrViewController: FindrViewController,annotation: FindrAnnotation , angle: CGFloat)
func findrViewControllerFixedVerticalPositionForAnnotation(findrViewController: FindrViewController)-> CGFloat?
func findrViewControllerWillShowAnnotationView(findrViewController: FindrViewController, annotationView: FindrAnnotationView)
Expand Down
11 changes: 5 additions & 6 deletions Findr/Classes/FindrViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -653,11 +653,7 @@ open class FindrViewController: UIViewController, FindrTrackingManagerDelegate
// var yPos: CGFloat = (self.view.bounds.size.height * 0.65) - (annotationViewHeight * CGFloat(annotation.verticalLevel))
// yPos -= CGFloat( powf(Float(annotation.verticalLevel), 2) * 4)
//
//




//
return CGFloat(scale)
}

Expand Down Expand Up @@ -1062,7 +1058,10 @@ open class FindrViewController: UIViewController, FindrTrackingManagerDelegate
}
else
{
print("HDAugmentedReality: Cannot create capture session, use createCaptureSession method to check if device is capable for augmented reality.")
//print("HDAugmentedReality: Cannot create capture session, use createCaptureSession method to check if device is capable for augmented reality.")
if let error = captureSessionResult.error {
delegate?.findrViewController(findrViewController: self, failToOpenWithError: error)
}
}
}

Expand Down

0 comments on commit ba1866b

Please sign in to comment.