diff --git a/.travis.yml b/.travis.yml index 8e5e95b..52bbbfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,6 @@ language: node_js node_js: - '0.10' -deploy: - provider: npm - email: tech@thisisbd.com - api_key: - secure: deAgwv+1XdbzaGALIC8NY8gVX0+kb6hptcv7+FaWMEXQignoLJkICAi+BBOo5eFF+s4RkwX93Jiyw/jQ689eSNwZmb/kE7SiE39150fNIHemMNM8gRwYsS68jalnNDwBupZ4F5pSJDrEuyEE9cCV5tXRZasKImxXJ3XmO568ZwTYCuQdnM0YnP0/Qu39oAue19zng7bIcdq8u64zmsIIzu6FcZ/GsCDaJasNdCpgVaPwUC/q6Mk2Nux869Pz4BzxZFYXyWCLevbMcmUpwZOQAS33AAJl5F8ik/TQhXvMrEgvbGNAlCwmEhYe3042fVoL3YZgDrYXCO+vtqzY3ucN57FRacZnwbnWBJ/UxGP6t47eULCmbo0O0m32JnM4BSszVYCv4x51On4fAh6Yj2irWJTMSYGql7wVS2xpOP9Xxrw4hB2FvLfFb6w8AQV6aObyaY2n6vR4jyjAJUSfXBvw2uoZj7SsaCvhf5ckhpeIuK9X+q/JxTCZmLzaSIEhqkgA4iqS7D+9THOcX3ScfxnMb05ZPWbxgkT0JRzMAF7dX7VTh4U/9Esz2bKaugQGRtuaTmx2B5Ca8vu7qmjlHqvoodDLjOLU/28O1f49bF7U2LWH00gpOA5i+xSQO25alB2CkLwK0Wqykokc1A5dOkluwWtsvUWa0/959bS/ACYu/4I= - on: - repo: thisisbd/cordova-plugin-vuforia notifications: slack: secure: LyCP//iisSxh/3v9urN/DIzC80LMekzYEe86mIhlq7tV0FChayGHf0skdZSA5o4FqQaR9NpQQ/aWjSJS5vAkZYbOeYIlrD9KrnljYAUAYEsh35RCu813NHv3hQCS3BGFdYiH5bc804ZN5zsUJ7FlsXrpKhrpxpyGdIFJZEbCpFdqoxPjq0jBTZdlXMuHty1a8sYFjB8kbxkyWcBuPYJjmk4JOYfiOys0oJO+MfD9uj5j7+XpyS79nfiLHEpRzwhjKmpSVIk+mKy1R5WY49klz8De2pTzlwN0kH6lvn03wOvT+GUnd5vSOqgTqzAbztZUYK/Ee6oUnnQxqE57xBq8RzhJHAr3h+bqFbxdnPjA1ZknJKy3XCcD0RSG2dYC+fLC6rReNI8TIvwBoxidIMSRPr8acIGRoVuo7laTWXAz3zonPVnS8TiiyHGe2jyHHyvTMgB4vTPYgD91ODEjgiPBRd0oV4aSoFjiKGuFIn6AD1hB+00fUYBFR9dL87VCGR5l9j7Hz3C/chkozwo4pSebpVawCewgskuDY3u3aaDrHBkoNcgdCndOj3I0m50SFhHb7kWuQyLd+myxmgoRtOIjgPMIikMWm75h2Esj0TYd8Rj43tIozQtdKFMKz+TjAOu3/OKHCaa9pbpZmmOHEFZ5WT3YQf8RjjTk0TjPRkiuKlA= diff --git a/LICENSE b/LICENSE index 0aac90e..0a032e6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016 BD Network LTD +Copyright (c) 2016 Matthew Rayner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index c979b41..28f1b81 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,9 @@ cordova plugin add cordova-plugin-vuforia From within your Javascript file, add the following to launch the [Vuforia][vuforia] plugin. ```javascript navigator.VuforiaPlugin.startVuforia( - 'StonesAndChips.xml', - [ 'stones', 'chips' ], - 'Point your camera at either the stones or the chips image...', + 'PluginTest.xml', + [ 'logo', 'iceland', 'canterbury-grass', 'brick-lane' ], + 'Point your camera at a test image...', 'YOUR_VUFORIA_KEY', function(data){ console.log(data); @@ -49,9 +49,31 @@ navigator.VuforiaPlugin.startVuforia( **NOTE**: You will need to replace `YOUR_VUFORIA_KEY` with a valid license key for the plugin to launch correctly. -You will also need to replace the `StonesAndChips.xml` and `[ 'stones', 'chips' ]` array with specific information for your application. These are here for initial setup and demo purposes. +For testing you can use the `targets/PluginTest_Targets.pdf` file, it contains all four testing targets. -For testing you can use the `targets/imagetargets_targets.pdf` file, it contains the stones and chips targets. + +#### Using your own data +##### Cordova `config.xml` +We know that eventually you're going to want to use your own data. You should place your .xml and .dat files inside a `targets` folder at the root of your project, then add the following to your config.xml file: + +```xml + + + + + + + + + +``` + +##### JS Change +You will need to replace the `PluginTest.xml` and `[ 'logo', 'iceland', 'canterbury-grass', 'brick-lane' ]` lines with specific information for your application. These are here for initial setup and demo purposes only. + + +#### Android Steps +That's it... As far as setup goes... You're done! Android is nice and flexible, the plugin **should** have done everything for you! #### iOS Steps @@ -162,25 +184,25 @@ If you wish to submit a bug fix or feature, you can create a pull request and it ## License Cordova-Plugin-Vuforia is licensed under the [MIT License][info-license]. -[logo]: https://cdn.rawgit.com/thisisbd/cordova-plugin-vuforia/d14d00720569fea02d29cded4de3c6e617c87537/images/logo.svg -[stage-3]: https://raw.githubusercontent.com/thisisbd/cordova-plugin-vuforia/master/images/stage-3.gif -[stage-4]: https://raw.githubusercontent.com/thisisbd/cordova-plugin-vuforia/master/images/stage-4.gif -[stage-5-2]: https://raw.githubusercontent.com/thisisbd/cordova-plugin-vuforia/master/images/stage-5-2.gif -[stage-6-2]: https://raw.githubusercontent.com/thisisbd/cordova-plugin-vuforia/master/images/stage-6-2.gif +[logo]: https://cdn.rawgit.com/mattrayner/cordova-plugin-vuforia/d14d00720569fea02d29cded4de3c6e617c87537/images/logo.svg +[stage-3]: https://raw.githubusercontent.com/mattrayner/cordova-plugin-vuforia/master/images/stage-3.gif +[stage-4]: https://raw.githubusercontent.com/mattrayner/cordova-plugin-vuforia/master/images/stage-4.gif +[stage-5-2]: https://raw.githubusercontent.com/mattrayner/cordova-plugin-vuforia/master/images/stage-5-2.gif +[stage-6-2]: https://raw.githubusercontent.com/mattrayner/cordova-plugin-vuforia/master/images/stage-6-2.gif [cordova]: https://cordova.apache.org/ [vuforia]: https://www.vuforia.com/ [npm]: https://www.npmjs.com -[issue-16]: https://github.com/thisisbd/cordova-plugin-vuforia/issues/16 +[issue-16]: https://github.com/mattrayner/cordova-plugin-vuforia/issues/16 [cordova-orientation-issue]: https://github.com/apache/cordova-lib/pull/260 [peugeot]: https://itunes.apple.com/gb/app/new-peugeot-208/id1020630968?mt=8 [info-npm]: https://www.npmjs.com/package/cordova-plugin-vuforia -[info-travis]: https://travis-ci.org/thisisbd/cordova-plugin-vuforia +[info-travis]: https://travis-ci.org/mattrayner/cordova-plugin-vuforia [info-license]: LICENSE -[info-bithound]: https://www.bithound.io/github/thisisbd/cordova-plugin-vuforia +[info-bithound]: https://www.bithound.io/github/mattrayner/cordova-plugin-vuforia [shield-npm]: https://img.shields.io/npm/v/cordova-plugin-vuforia.svg -[shield-travis]: https://img.shields.io/travis/thisisbd/cordova-plugin-vuforia.svg +[shield-travis]: https://img.shields.io/travis/mattrayner/cordova-plugin-vuforia.svg [shield-license]: https://img.shields.io/badge/license-MIT-blue.svg -[shield-bithound]: https://www.bithound.io/github/thisisbd/cordova-plugin-vuforia/badges/score.svg +[shield-bithound]: https://www.bithound.io/github/mattrayner/cordova-plugin-vuforia/badges/score.svg [shield-cordova]: https://img.shields.io/badge/cordova%20support-5.*%20--%206.*-blue.svg diff --git a/package.json b/package.json index 831e1be..b71d001 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "cordova-plugin-vuforia", "description": "Cordova Vuforia Plugin", - "version": "1.0.2", - "homepage": "https://github.com/thisisbd/cordova-plugin-vuforia", + "version": "1.1.0", + "homepage": "https://github.com/mattrayner/cordova-plugin-vuforia", "repository": { "type": "git", - "url": "git@github.com:thisisbd/cordova-plugin-vuforia.git" + "url": "git@github.com:mattrayner/cordova-plugin-vuforia.git" }, "bugs": { - "url": "https://github.com/thisisbd/cordova-plugin-vuforia/issues" + "url": "https://github.com/mattrayner/cordova-plugin-vuforia/issues" }, "cordova": { "id": "cordova-plugin-vuforia", @@ -25,7 +25,7 @@ "cordova-ios", "image", "recognition", - "thisisbd" + "mattrayner" ], "engines": [ { @@ -33,6 +33,6 @@ "version": ">=5.0.0" } ], - "author": "BD Network (Matt Rayner)", + "author": "Matthew Rayner", "license": "MIT" } \ No newline at end of file diff --git a/plugin.xml b/plugin.xml index 7b18c05..bfff410 100644 --- a/plugin.xml +++ b/plugin.xml @@ -4,18 +4,18 @@ xmlns:rim="http://www.blackberry.com/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-vuforia" - version="1.0.2"> + version="1.1.0"> Vuforia Cordova Vuforia Plugin MIT cordova,vuforia,image,recognition,augmented,reality - git@github.com:thisisbd/cordova-plugin-vuforia.git - https://github.com/thisisbd/cordova-plugin-vuforia/issues + git@github.com:mattrayner/cordova-plugin-vuforia.git + https://github.com/mattrayner/cordova-plugin-vuforia/issues Matthew Rayner - Cordova Vuforia Plugin version 1.0.2, Copyright (C) 2016 BD Network + Cordova Vuforia Plugin version 1.1.0, Copyright (C) 2016 Matthew Rayner Cordova Vuforia Plugin comes with ABSOLUTELY NO WARRANTY; see the LICENSE file for more information. This is free software, and you are welcome to redistribute it @@ -31,7 +31,7 @@ - + @@ -52,7 +52,7 @@ @@ -65,7 +65,7 @@ - + @@ -77,30 +77,30 @@ - - - - - - - - - + + + + + + + + + - - + + @@ -144,14 +144,14 @@ - - - - + + + + - - + + diff --git a/src/android/VuforiaPlugin.java b/src/android/VuforiaPlugin.java index f5297fa..106a874 100644 --- a/src/android/VuforiaPlugin.java +++ b/src/android/VuforiaPlugin.java @@ -1,4 +1,4 @@ -package com.bdnetwork.vuforia; +package com.mattrayner.vuforia; import org.apache.cordova.CordovaWebView; import org.apache.cordova.CordovaInterface; @@ -15,7 +15,7 @@ import android.content.Context; import android.util.Log; -import com.bdnetwork.vuforia.app.ImageTargets; +import com.mattrayner.vuforia.app.ImageTargets; public class VuforiaPlugin extends CordovaPlugin { static final String LOGTAG = "Cordova Vuforia Plugin"; diff --git a/src/android/java/com/bdnetwork/vuforia/app/ApplicationControl.java b/src/android/java/com/mattrayner/vuforia/app/ApplicationControl.java similarity index 97% rename from src/android/java/com/bdnetwork/vuforia/app/ApplicationControl.java rename to src/android/java/com/mattrayner/vuforia/app/ApplicationControl.java index 95e4b40..4afde46 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/ApplicationControl.java +++ b/src/android/java/com/mattrayner/vuforia/app/ApplicationControl.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app; +package com.mattrayner.vuforia.app; import com.qualcomm.vuforia.State; diff --git a/src/android/java/com/bdnetwork/vuforia/app/ApplicationException.java b/src/android/java/com/mattrayner/vuforia/app/ApplicationException.java similarity index 97% rename from src/android/java/com/bdnetwork/vuforia/app/ApplicationException.java rename to src/android/java/com/mattrayner/vuforia/app/ApplicationException.java index 9b12090..98f2661 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/ApplicationException.java +++ b/src/android/java/com/mattrayner/vuforia/app/ApplicationException.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app; +package com.mattrayner.vuforia.app; // Used to send back to the activity any error during vuforia processes public class ApplicationException extends Exception diff --git a/src/android/java/com/bdnetwork/vuforia/app/ApplicationSession.java b/src/android/java/com/mattrayner/vuforia/app/ApplicationSession.java similarity index 99% rename from src/android/java/com/bdnetwork/vuforia/app/ApplicationSession.java rename to src/android/java/com/mattrayner/vuforia/app/ApplicationSession.java index df6c563..4f593e4 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/ApplicationSession.java +++ b/src/android/java/com/mattrayner/vuforia/app/ApplicationSession.java @@ -6,7 +6,7 @@ ===============================================================================*/ -package com.bdnetwork.vuforia.app; +package com.mattrayner.vuforia.app; import android.app.Activity; import android.content.pm.ActivityInfo; diff --git a/src/android/java/com/bdnetwork/vuforia/app/ImageTargetRenderer.java b/src/android/java/com/mattrayner/vuforia/app/ImageTargetRenderer.java similarity index 96% rename from src/android/java/com/bdnetwork/vuforia/app/ImageTargetRenderer.java rename to src/android/java/com/mattrayner/vuforia/app/ImageTargetRenderer.java index d827aef..09a7639 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/ImageTargetRenderer.java +++ b/src/android/java/com/mattrayner/vuforia/app/ImageTargetRenderer.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app; +package com.mattrayner.vuforia.app; import java.util.Vector; @@ -26,9 +26,9 @@ import com.qualcomm.vuforia.TrackableResult; import com.qualcomm.vuforia.VIDEO_BACKGROUND_REFLECTION; import com.qualcomm.vuforia.Vuforia; -import com.bdnetwork.vuforia.app.ApplicationSession; -import com.bdnetwork.vuforia.app.utils.LoadingDialogHandler; -import com.bdnetwork.vuforia.app.utils.Texture; +import com.mattrayner.vuforia.app.ApplicationSession; +import com.mattrayner.vuforia.app.utils.LoadingDialogHandler; +import com.mattrayner.vuforia.app.utils.Texture; // The renderer class for the ImageTargets sample. diff --git a/src/android/java/com/bdnetwork/vuforia/app/ImageTargets.java b/src/android/java/com/mattrayner/vuforia/app/ImageTargets.java similarity index 98% rename from src/android/java/com/bdnetwork/vuforia/app/ImageTargets.java rename to src/android/java/com/mattrayner/vuforia/app/ImageTargets.java index a67371d..e524bd0 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/ImageTargets.java +++ b/src/android/java/com/mattrayner/vuforia/app/ImageTargets.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app; +package com.mattrayner.vuforia.app; import java.util.ArrayList; import java.util.Vector; @@ -47,12 +47,12 @@ import com.qualcomm.vuforia.Tracker; import com.qualcomm.vuforia.TrackerManager; import com.qualcomm.vuforia.Vuforia; -import com.bdnetwork.vuforia.app.ApplicationControl; -import com.bdnetwork.vuforia.app.ApplicationException; -import com.bdnetwork.vuforia.app.ApplicationSession; -import com.bdnetwork.vuforia.app.utils.LoadingDialogHandler; -import com.bdnetwork.vuforia.app.utils.ApplicationGLView; -import com.bdnetwork.vuforia.app.utils.Texture; +import com.mattrayner.vuforia.app.ApplicationControl; +import com.mattrayner.vuforia.app.ApplicationException; +import com.mattrayner.vuforia.app.ApplicationSession; +import com.mattrayner.vuforia.app.utils.LoadingDialogHandler; +import com.mattrayner.vuforia.app.utils.ApplicationGLView; +import com.mattrayner.vuforia.app.utils.Texture; public class ImageTargets extends Activity implements ApplicationControl { diff --git a/src/android/java/com/bdnetwork/vuforia/app/utils/ApplicationGLView.java b/src/android/java/com/mattrayner/vuforia/app/utils/ApplicationGLView.java similarity index 99% rename from src/android/java/com/bdnetwork/vuforia/app/utils/ApplicationGLView.java rename to src/android/java/com/mattrayner/vuforia/app/utils/ApplicationGLView.java index 6055984..33fa5f3 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/utils/ApplicationGLView.java +++ b/src/android/java/com/mattrayner/vuforia/app/utils/ApplicationGLView.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app.utils; +package com.mattrayner.vuforia.app.utils; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; diff --git a/src/android/java/com/bdnetwork/vuforia/app/utils/LoadingDialogHandler.java b/src/android/java/com/mattrayner/vuforia/app/utils/LoadingDialogHandler.java similarity index 97% rename from src/android/java/com/bdnetwork/vuforia/app/utils/LoadingDialogHandler.java rename to src/android/java/com/mattrayner/vuforia/app/utils/LoadingDialogHandler.java index 24baa08..fdd3260 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/utils/LoadingDialogHandler.java +++ b/src/android/java/com/mattrayner/vuforia/app/utils/LoadingDialogHandler.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app.utils; +package com.mattrayner.vuforia.app.utils; import java.lang.ref.WeakReference; diff --git a/src/android/java/com/bdnetwork/vuforia/app/utils/MeshObject.java b/src/android/java/com/mattrayner/vuforia/app/utils/MeshObject.java similarity index 98% rename from src/android/java/com/bdnetwork/vuforia/app/utils/MeshObject.java rename to src/android/java/com/mattrayner/vuforia/app/utils/MeshObject.java index 41c90e6..0aa2ed7 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/utils/MeshObject.java +++ b/src/android/java/com/mattrayner/vuforia/app/utils/MeshObject.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app.utils; +package com.mattrayner.vuforia.app.utils; import java.nio.Buffer; import java.nio.ByteBuffer; diff --git a/src/android/java/com/bdnetwork/vuforia/app/utils/Texture.java b/src/android/java/com/mattrayner/vuforia/app/utils/Texture.java similarity index 98% rename from src/android/java/com/bdnetwork/vuforia/app/utils/Texture.java rename to src/android/java/com/mattrayner/vuforia/app/utils/Texture.java index eea1cff..d825c1e 100644 --- a/src/android/java/com/bdnetwork/vuforia/app/utils/Texture.java +++ b/src/android/java/com/mattrayner/vuforia/app/utils/Texture.java @@ -5,7 +5,7 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permission. ===============================================================================*/ -package com.bdnetwork.vuforia.app.utils; +package com.mattrayner.vuforia.app.utils; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/targets/PluginTest.dat b/targets/PluginTest.dat new file mode 100755 index 0000000..5ed2b00 Binary files /dev/null and b/targets/PluginTest.dat differ diff --git a/targets/PluginTest.xml b/targets/PluginTest.xml new file mode 100755 index 0000000..4b3ffa6 --- /dev/null +++ b/targets/PluginTest.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/targets/PluginTest_Targets.pdf b/targets/PluginTest_Targets.pdf new file mode 100644 index 0000000..dfb063d Binary files /dev/null and b/targets/PluginTest_Targets.pdf differ diff --git a/targets/StonesAndChips.dat b/targets/StonesAndChips.dat deleted file mode 100644 index 98a2493..0000000 Binary files a/targets/StonesAndChips.dat and /dev/null differ diff --git a/targets/StonesAndChips.xml b/targets/StonesAndChips.xml deleted file mode 100644 index 2c6da5e..0000000 --- a/targets/StonesAndChips.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/targets/imagetargets_targets.pdf b/targets/imagetargets_targets.pdf deleted file mode 100644 index 3af5135..0000000 Binary files a/targets/imagetargets_targets.pdf and /dev/null differ