Skip to content

Commit

Permalink
Merge pull request #1 from mattrayner/mattrayner/update-vuforia-sdk-t…
Browse files Browse the repository at this point in the history
…o-5.5.9

Update Vuforia SDK to 5.5.9
  • Loading branch information
mattrayner authored Aug 3, 2016
2 parents 7d5841a + b6b4b47 commit ce9e484
Show file tree
Hide file tree
Showing 92 changed files with 3,003 additions and 880 deletions.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Cordova Vuforia SDK plugin is designed to inject the Vuforia SDK into any Cordova project. It was specifically created to be used with [Cordova-Plugin-Vuforia][cordova-plugin-vuforia].

[![NPM Version][shield-npm]][info-npm]
[![Vuforia Version][shield-vuforia]][info-vuforia]
[![Build Status][shield-travis]][info-travis]
[![License][shield-license]][info-license]

Expand All @@ -12,10 +13,10 @@ This 'plugin' simply a way of injecting the Vuforia SDK code into a Cordova proj
If you wish to submit a bug fix or feature, you can create a pull request and it will be merged pending a code review.

1. Clone it
2. Create your feature branch (git checkout -b my-new-feature)
3. Commit your changes (git commit -am 'Add some feature')
4. Push to the branch (git push origin my-new-feature)
5. Create a new Pull Request
1. Create your feature branch (git checkout -b my-new-feature)
1. Commit your changes (git commit -am 'Add some feature')
1. Push to the branch (git push origin my-new-feature)
1. Create a new Pull Request

## License
Cordova-Plugin-Vuforia-SDK is licensed under the [MIT License][info-license].
Expand All @@ -24,10 +25,12 @@ Cordova-Plugin-Vuforia-SDK is licensed under the [MIT License][info-license].
[logo]: https://cdn.rawgit.com/mattrayner/cordova-plugin-vuforia-sdk/cf3e9a58f18e2eabf2a6b9a91c75fadd1cf0a118/docs/logo.svg

[info-npm]: https://www.npmjs.com/package/cordova-plugin-vuforia-sdk
[info-vuforia]: https://developer.vuforia.com
[info-travis]: https://travis-ci.org/mattrayner/cordova-plugin-vuforia-sdk
[info-license]: LICENSE

[shield-npm]: https://img.shields.io/npm/v/cordova-plugin-vuforia-sdk.svg
[shield-vuforia]: https://img.shields.io/badge/Vuforia-v5.5.9-5bb73b.svg
[shield-travis]: https://img.shields.io/travis/mattrayner/cordova-plugin-vuforia-sdk.svg
[shield-license]: https://img.shields.io/badge/license-MIT-blue.svg

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-vuforia-sdk",
"version": "0.0.2",
"version": "1.0.0",
"description": "A Cordova wrapper for the Vuforia SDK",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-vuforia-sdk"
version="0.0.2">
version="1.0.0">
<name>Vuforia SDK</name>
<description>Cordova Vuforia SDK Plugin</description>
<license>MIT</license>
Expand All @@ -14,7 +14,7 @@
<author>Matthew Rayner</author>

<info>
Cordova Vuforia SDK Plugin version 0.0.2, Copyright (C) 2016 Matthew Rayner
Cordova Vuforia SDK Plugin version 1.0.0, Copyright (C) 2016 Matthew Rayner
Cordova Vuforia SDK Plugin comes with ABSOLUTELY NO WARRANTY; see the
LICENSE file for more information.
This is free software, and you are welcome to redistribute it
Expand Down
Binary file modified src/vuforia/Vuforia.jar
100755 → 100644
Binary file not shown.
58 changes: 0 additions & 58 deletions src/vuforia/include/QCAR/QCAR_iOS.h

This file was deleted.

85 changes: 0 additions & 85 deletions src/vuforia/include/QCAR/Renderer.h

This file was deleted.

66 changes: 0 additions & 66 deletions src/vuforia/include/QCAR/System.h

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*===============================================================================
Copyright (c) 2015-2016 PTC Inc. All Rights Reserved.
Copyright (c) 2010-2014 Qualcomm Connected Experiences, Inc. All Rights Reserved.
Vuforia is a trademark of QUALCOMM Incorporated, registered in the United States
and other countries. Trademarks of QUALCOMM Incorporated are used with permission.
Vuforia is a trademark of PTC Inc., registered in the United States and other
countries.
@file
Area.h
Expand All @@ -11,16 +13,16 @@ and other countries. Trademarks of QUALCOMM Incorporated are used with permissio
Header file for Area class.
===============================================================================*/

#ifndef _QCAR_AREA_H_
#define _QCAR_AREA_H_
#ifndef _VUFORIA_AREA_H_
#define _VUFORIA_AREA_H_

#include <QCAR/QCAR.h>
#include <Vuforia/Vuforia.h>

namespace QCAR
namespace Vuforia
{

/// Area is the base class for 2D shapes used in Vuforia
class QCAR_API Area
class VUFORIA_API Area
{
public:
enum TYPE {
Expand All @@ -37,7 +39,7 @@ class QCAR_API Area
Area& operator=(const Area& other);
};

} // namespace QCAR
} // namespace Vuforia


#endif // _QCAR_AREA_H_
#endif // _VUFORIA_AREA_H_
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
/*===============================================================================
Copyright (c) 2015-2016 PTC Inc. All Rights Reserved.
Copyright (c) 2014 Qualcomm Connected Experiences, Inc. All Rights Reserved.
Vuforia is a trademark of QUALCOMM Incorporated, registered in the United States
and other countries. Trademarks of QUALCOMM Incorporated are used with permission.
Vuforia is a trademark of PTC Inc., registered in the United States and other
countries.
@file
Box3D.h
@brief
Header file for Box3D class.
===============================================================================*/
#ifndef _QCAR_BOX3D_H_
#define _QCAR_BOX3D_H_
#ifndef _VUFORIA_BOX3D_H_
#define _VUFORIA_BOX3D_H_

#include <QCAR/QCAR.h>
#include <QCAR/Vectors.h>
#include <Vuforia/Vuforia.h>
#include <Vuforia/Vectors.h>

namespace QCAR
namespace Vuforia
{

/// A Box3D represents an axis-aligned 3D box
class QCAR_API Box3D
class VUFORIA_API Box3D
{
public:

Expand All @@ -47,7 +49,7 @@ class QCAR_API Box3D
};


} // namespace QCAR
} // namespace Vuforia


#endif // _QCAR_BOX3D_H_
#endif // _VUFORIA_BOX3D_H_
Loading

0 comments on commit ce9e484

Please sign in to comment.