diff --git a/package.json b/package.json index 55b64fb..6fdf8ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.wikitude.phonegap.wikitudeplugin", - "version": "8.5.0", + "version": "8.7.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": "", diff --git a/plugin.xml b/plugin.xml index eacd72d..69d106b 100755 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="8.7.0"> Augmented Reality - Wikitude SDK Plugin diff --git a/src/android/wikitudesdk.aar b/src/android/wikitudesdk.aar index db0ab98..50030c8 100644 Binary files a/src/android/wikitudesdk.aar and b/src/android/wikitudesdk.aar differ diff --git a/src/ios/WTWikitudePlugin.m b/src/ios/WTWikitudePlugin.m index c1c2732..7e7a9db 100644 --- a/src/ios/WTWikitudePlugin.m +++ b/src/ios/WTWikitudePlugin.m @@ -29,7 +29,6 @@ NSString * const kWTWikitudePlugin_requiredFeature_InstantTracking = @"instant_tracking"; NSString * const kWTWikitudePlugin_requiredFeature_ObjectTracking = @"object_tracking"; NSString * const kWTWikitudePlugin_requiredFeature_PhotoLibraryScreenshotImport = @"photo_library_screenshot_import"; -NSString * const kWTWikitudePlugin_requiredFeature_2DTracking = @"2d_tracking"; /* deprecated in Wikitude SDK version 6.0.0 */ NSString * const kWTWikitudePlugin_ArgumentCaptureDeviceResolution = @"camera_resolution"; NSString * const kWTWikitudePlugin_captureDeviceResolution_SD_640x480 = @"sd_640x480"; @@ -226,7 +225,7 @@ + (WTFeatures)requiredFeaturesFromArray:(NSArray *)stringArray { requiredFeatures |= WTFeature_Geo; } - else if ( [featureString isEqualToString:kWTWikitudePlugin_requiredFeature_ImageTracking] || [featureString isEqualToString:kWTWikitudePlugin_requiredFeature_2DTracking] ) + else if ( [featureString isEqualToString:kWTWikitudePlugin_requiredFeature_ImageTracking] ) { requiredFeatures |= WTFeature_ImageTracking; } diff --git a/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp b/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp index ed699de..80016e8 100755 --- a/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp +++ b/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp @@ -69,25 +69,25 @@ namespace wikitude { namespace sdk { enum class DistortionMode { None = 0, - Equidistant, - RadialTangential, - Atan, + Equidistant = 1, + RadialTangential = 2, + Atan = 3, }; class IntrinsicsCalibration { public: - IntrinsicsCalibration(DistortionMode distortionMode_, Point principalPoint_, Point focalLength_, const std::vector& distortion_); + IntrinsicsCalibration(DistortionMode distortionMode_, Point principalPoint_, Point focalLength_, const std::vector& distortion_); DistortionMode getDistortionMode() const; - Point getPrincipalPoint() const; - Point getFocalLength() const; - const std::vector getDistortion() const; + Point getPrincipalPoint() const; + Point getFocalLength() const; + const std::vector getDistortion() const; protected: DistortionMode _distortionMode; - Point _principalPoint; - Point _focalLength; - std::vector _distortion; + Point _principalPoint; + Point _focalLength; + std::vector _distortion; }; /** @class ColorCameraFrameMetadata diff --git a/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp b/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp index c94ed64..0fe4b1f 100755 --- a/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp +++ b/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp @@ -40,6 +40,8 @@ namespace wikitude { namespace sdk { long getId() const; std::int64_t getColorTimestamp() const; const ColorCameraFrameMetadata& getColorMetadata() const; + + const CameraFrame& getCameraFrame(){return _cameraFrame;} const std::vector& get(); diff --git a/src/ios/WikitudeSDK.framework/Info.plist b/src/ios/WikitudeSDK.framework/Info.plist index 7f40c20..656c14c 100755 Binary files a/src/ios/WikitudeSDK.framework/Info.plist and b/src/ios/WikitudeSDK.framework/Info.plist differ diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 b/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 index 9f60364..1ac3ec5 100755 Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 differ diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 b/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 index 5bb6703..928ebda 100755 Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 differ diff --git a/www/WikitudePlugin.js b/www/WikitudePlugin.js index 97c095e..1fa20d2 100644 --- a/www/WikitudePlugin.js +++ b/www/WikitudePlugin.js @@ -14,14 +14,13 @@ /** * The Wikitude SDK can run in different modes. * * Geo means, that objects are placed at latitude/longitude positions. - * * 2DTracking means that only image recognition is used in the ARchitect World. + * * ImageTracking means that only image recognition is used in the ARchitect World. * When your ARchitect World uses both, geo and ir, than set this value to "IrAndGeo". Otherwise, if the ARchitectWorld only needs image recognition, placing "IR" will require less features from the device and therefore, support a wider range of devices. Keep in mind that image recognition requires a dual core cpu to work satisfyingly. */ this.FeatureGeo = "geo"; this.FeatureImageTracking = "image_tracking"; this.FeatureInstantTracking = "instant_tracking"; this.FeatureObjectTracking = "object_tracking"; - this.Feature2DTracking = "2d_tracking"; /** * Start-up configuration: camera position (front or back). @@ -80,7 +79,7 @@ * @param {String} architectWorldPath The path to a local ARchitect world or to a ARchitect world on a server or your * @param {String} worldPath path to an ARchitect world, either on the device or on e.g. your Dropbox. * @param {Array} requiredFeatures augmented reality features: a flags mask for enabling/disabling - * geographic location-based (WikitudePlugin.FeatureGeo) or image recognition-based (WikitudePlugin.Feature2DTracking) tracking. + * geographic location-based (WikitudePlugin.FeatureGeo) or image recognition-based (WikitudePlugin.FeatureImageTracking) tracking. * @param {json object} (optional) startupConfiguration represents the start-up configuration which may look like the following: * { * "cameraPosition": app.WikitudePlugin.CameraPositionBack,