Skip to content

Commit

Permalink
Updates Wikitude Cordova plugin to use Wikitude SDK 7.1.0;
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Schacherbauer <andreas.schacherbauer@wikitude.com>
  • Loading branch information
AndreasSchacherbauerWikitude committed Sep 21, 2017
1 parent 9f84bfb commit 8f1e619
Show file tree
Hide file tree
Showing 21 changed files with 316 additions and 568 deletions.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "com.wikitude.phonegap.wikitudeplugin",
"version": "7.0.0",
"version": "7.1.0",
"description": "Augmented Reality Wikitude SDK Plugin \n The Wikitude Cordova Plugin enables developers to embed an augmented reality view into their PhoneGap project. You can create a fully featured app with advanced augmented reality features, including image recognition, purely using HTML, CSS and JavaScript.\n ",
"cordova": {
"id": "",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="com.wikitude.phonegap.WikitudePlugin"
version="7.0.0">
version="7.1.0">

<name>Augmented Reality - Wikitude SDK Plugin</name>

Expand Down
Binary file modified src/android/libs/wikitudesdk.aar
Binary file not shown.
4 changes: 2 additions & 2 deletions src/ios/WikitudeSDK.framework/Headers/InputPlugin.h
Expand Up @@ -52,14 +52,14 @@ namespace wikitude { namespace sdk {
/**
* Defines a function that is used to connect the InputRenderSettings of the InputPlugin with the Wikitude SDK.
*
* @param inputRenderSettings is used to store all rendering related settings(e.g. should the camera frame be mirrored) of the InputPlugin.
* @param inputRenderSettings_ is used to store all rendering related settings(e.g. should the camera frame be mirrored) of the InputPlugin.
*/
using InputRenderSettingsChangedNotifier = std::function<void(InputRenderSettings inputRenderSettings_)>;

/**
* Defines a function that is used to connect the InputFrameSettings of the InputPlugin with the Wikitude SDK.
*
* @param inputFrameSettings is used to store all frame related settings(e.g. color space) of the InputPlugin.
* @param inputFrameSettings_ is used to store all frame related settings(e.g. color space) of the InputPlugin.
*/
using InputFrameSettingsChangedNotifier = std::function<void(InputFrameSettings inputFrameSettings_)>;

Expand Down
2 changes: 1 addition & 1 deletion src/ios/WikitudeSDK.framework/Headers/Plugin.h
Expand Up @@ -183,7 +183,7 @@ namespace wikitude {
*
* The default implementation is empty.
*
* @param errorMessage describes the internal error in more detail
* @param errorMessage_ describes the internal error in more detail
*/
virtual void internalError(const std::string& errorMessage_);

Expand Down
12 changes: 8 additions & 4 deletions src/ios/WikitudeSDK.framework/Headers/PositionableWrapper.h
Expand Up @@ -6,11 +6,14 @@
// Copyright (c) 2015 Wikitude. All rights reserved.
//

#include <functional>

#ifndef __SDKCore__PositionableWrapper__
#define __SDKCore__PositionableWrapper__

#ifdef __cplusplus

#include <functional>


namespace wikitude { namespace sdk_core {

namespace impl {
Expand Down Expand Up @@ -47,7 +50,7 @@ namespace wikitude { namespace sdk_core {
/**
* Ctor
*
* @param positionable_ A pointer to a Positionable object. Ownership of the memory remains with the caller.
* @param positionableFunctionCollection_ A pointer to a Positionable object. Ownership of the memory remains with the caller.
*
*/
PositionableWrapper(const PositionableFunctionCollection& positionableFunctionCollection_);
Expand Down Expand Up @@ -81,7 +84,7 @@ namespace wikitude { namespace sdk_core {
/**
* Sets the 4 by 4 view-matrix.
*
* @param viewdMatrix_ A float pointer referencing 16 float values in a block of consecutive memory.
* @param viewMatrix_ A float pointer referencing 16 float values in a block of consecutive memory.
*
* @discussion For 2D drawables (ImageDrawable, AnimatedImageDrawable, VideoDrawable, Circle, Label, HtmlDrawable) the view-matrix is ignored and recommended to be set to the identity-matrix. For 3D drawables (Model) the view-matrix is to be set to the model-view-matrix, while the world matrix is ignored and recommended to be so to the identity-matrix.
*/
Expand Down Expand Up @@ -119,4 +122,5 @@ namespace wikitude { namespace sdk_core {
using impl::PositionableWrapper;
}}

#endif /* __cplusplus */
#endif /* defined(__SDKCore__PositionableWrapper__) */
Expand Up @@ -8,6 +8,8 @@

#import "WTStartupConfiguration.h"

#import <UIKit/UIScrollView.h>
#import <UIKit/UIDataDetectors.h>
#import <CoreLocation/CLLocation.h>


Expand Down Expand Up @@ -37,6 +39,67 @@
*/
@property (nonatomic, assign) CLLocationDegrees desiredHeadingFilter;

/**
* A Boolean value that determines whether pressing on a link displays a preview of the destination for the link.
*
* Please refer to the UIWebView documentation for more information
*
* The default value is NO
*/
@property (nonatomic, assign) BOOL webViewAllowsLinkPreview;

/**
* A Boolean value indicating whether web content can programmatically display the keyboard.
*
* Please refer to the UIWebView documentation for more information
*
* The default value is YES
*/
@property (nonatomic, assign) BOOL webViewKeyboardDisplayRequiresUserAction;

/**
* The types of data converted to clickable URLs in the web view’s content.
*
* Please refer to the UIWebView documentation for more information
*/
@property (nonatomic, assign) UIDataDetectorTypes webViewDataDetectorTypes;

/**
* A Boolean value that determines whether HTML5 videos play inline or use the native full-screen controller.
*
* Please refer to the UIWebView documentation for more information
*
* The default value is NO on iPhone and YES on iPad
*/
@property (nonatomic, assign) BOOL webViewAllowsInlineMediaPlayback;

/**
* A Boolean value that determines whether HTML5 videos can play automatically or require the user to start playing them.
*
* Please refer to the UIWebView documentation for more information
*
* The default value is YES
*/
@property (nonatomic, assign) BOOL webViewMediaPlaybackRequiresUserAction;

/**
* A Boolean value that determines whether Air Play is allowed from this view.
*
* Please refer to the UIWebView documentation for more information
*
* The default value is YES
*/
@property (nonatomic, assign) BOOL webViewMediaPlaybackAllowsAirPlay;

/**
* A Boolean value that determines whether Picture in Picture playback is allowed from this view.
*
* Please refer to the UIWebView documentation for more information
*
* The default value is YES for devices that support PiP and NO on all other devices
*/
@property (nonatomic, assign) BOOL webViewAllowsPictureInPictureMediaPlayback;

/**
* Defines if the underlying UIWebView scroll view is allowed to scroll horizontally/vertically or zoom.
*
Expand All @@ -46,6 +109,14 @@
*/
@property (nonatomic, assign) BOOL disableWebViewScrollAndZoom;

/**
* Defines the contentInsetAdjustment that is used by the web views scroll view.
*
* Please refer to the UIScrollView documentation for more information
*
* The default value is UIScrollViewContentInsetAdjustmentNever so that the SDK behaves the same on iOS 11 as it did on iOS 10 and below.
*/
@property (nonatomic, assign) UIScrollViewContentInsetAdjustmentBehavior webViewsScrollViewContentInsetAdjustmentBehavior API_AVAILABLE(ios(11.0));

/**
* Utility method to transfer a certain Architect startup configuration to a different one.
Expand Down
Expand Up @@ -9,6 +9,8 @@
#ifndef WikitudeSDK_WTArchitectView_Plugins_h
#define WikitudeSDK_WTArchitectView_Plugins_h

#ifdef __cplusplus

#include <memory>


Expand Down Expand Up @@ -72,4 +74,5 @@ namespace wikitude {

@end

#endif
#endif /* __cplusplus */
#endif /* WikitudeSDK_WTArchitectView_Plugins_h */
6 changes: 2 additions & 4 deletions src/ios/WikitudeSDK.framework/Headers/WTArchitectView.h
Expand Up @@ -253,7 +253,7 @@ extern NSString * const kWTScreenshotImageKey;

/**
* Architect Worlds can be loaded with different required features.
* Features specifies which SDK functionalities are required by the World. For example the WTFeature_2DTracking does not start any GPS location related APIs and the user is not interrupted with a location access alert. As a result any geo related SDK functionalities do not work but the target image recognition is faster and the SDK does not cosume as much CPU performance than with an enabled GPS module. Choose the most suitable mode for your ARchitect World to experience the full functionality and the best performance.
* Features specifies which SDK functionalities are required by the World. For example the WTFeature_ImageTracking does not start any GPS location related APIs and the user is not interrupted with a location access alert. As a result any geo related SDK functionalities do not work but the target image recognition is faster and the SDK does not cosume as much CPU performance than with an enabled GPS module. Choose the most suitable mode for your ARchitect World to experience the full functionality and the best performance.
*/
@property (nonatomic, assign) WTFeatures requiredFeatures;

Expand Down Expand Up @@ -302,8 +302,6 @@ extern NSString * const kWTScreenshotImageKey;
* Enables SDK features based on the given license key.
*
* @param licenseKey Your developer key, provided with your licence information.
*
* @return YES if the license key was valid for this app bundle name, NO otherwise.
*/
- (void)setLicenseKey:(NSString *)licenseKey;

Expand Down Expand Up @@ -358,7 +356,7 @@ extern NSString * const kWTScreenshotImageKey;
* @param startupHandler A block which contains a configuration object as parameter. The WTStartupConfiguration parameter can be used to specify the startup behaviour in more detail.
* @param completionHandler A block which provices information if the SDK could be started or not.
*/
- (void)start:(void (^)(WTArchitectStartupConfiguration *configuration))startupHandler completion:(nullable void (^)(BOOL isRunning, NSError *error))completionHandler;
- (void)start:(nullable void (^)(WTArchitectStartupConfiguration *configuration))startupHandler completion:(nullable void (^)(BOOL isRunning, NSError *error))completionHandler;

/**
* Stops all activity of the ARchitect view (suspends UI updates of background camera, AR objects etc).
Expand Down
Expand Up @@ -27,12 +27,17 @@ NS_ASSUME_NONNULL_BEGIN

/**
* @brief use this method to determine which CMAttitudeReferenceFrame is required for the given Wikitude SDK features
*
* @param requiredFeatures Based on the required features, a different reference frame might be required
*/
+ (CMAttitudeReferenceFrame)requiredAttitudeReferenceFrameForFeatures:(WTFeatures)requiredFeatures;

@end


/**
* WTExternalCMMotionManagerDataAccessModePullDelegate defines optional methods that are used from the SDK to get the most recent sensor values.
*/
@protocol WTExternalCMMotionManagerDataAccessModePullDelegate <NSObject>

@optional
Expand Down Expand Up @@ -72,6 +77,7 @@ NS_ASSUME_NONNULL_BEGIN

@end


/**
* @brief Use this concrete WTExternalCMMotionManagerDataAccessMode subclass to inject CMMotionManager data in case the CMMotionManager is configured to start updates without a block handler.
*/
Expand Down Expand Up @@ -110,13 +116,17 @@ NS_ASSUME_NONNULL_BEGIN
* @brief call this method in in your implementation of CMMotionManger startAccelerometerUpdatesToQueue:withHandler:
*
* @discussion This method only needs to be called in case the CMMotionManger property `deviceMotionAvailable` returns NO
*
* @param accelerometerData the accelerometer data object generated by core motion
*/
- (void)accelerometerDataUpdateAvailable:(CMAccelerometerData *)accelerometerData;

/**
* @brief call this method in your implementation of CLLocationManagerDelegate -locationManager:didUpdateHeading:
*
* @discussion This method only needs to be called in case the CMMotionManager property `devcieMotionAvailable` returns NO or the iOS version is 10.0.x
*
* @param heading the heading object generated by core location
*/
- (void)headingUpdateAvailable:(CLHeading *)heading;

Expand Down

0 comments on commit 8f1e619

Please sign in to comment.