Skip to content

Commit bea8400

Browse files
author
Nanda Biradar
committed
ARCore Android SDK v1.40.0
1 parent a304f53 commit bea8400

File tree

40 files changed

+316
-89
lines changed

40 files changed

+316
-89
lines changed

LICENSE

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3716,6 +3716,30 @@ Developed at SunSoft, a Sun Microsystems, Inc. business.
37163716
Permission to use, copy, modify, and distribute this
37173717
software is freely granted, provided that this notice
37183718
is preserved.
3719+
3720+
------------------
3721+
3722+
MIT License
3723+
3724+
Copyright (c) 2018 Chad Retz
3725+
3726+
Permission is hereby granted, free of charge, to any person obtaining a copy
3727+
of this software and associated documentation files (the "Software"), to deal
3728+
in the Software without restriction, including without limitation the rights
3729+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
3730+
copies of the Software, and to permit persons to whom the Software is
3731+
furnished to do so, subject to the following conditions:
3732+
3733+
The above copyright notice and this permission notice shall be included in all
3734+
copies or substantial portions of the Software.
3735+
3736+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
3737+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
3738+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
3739+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
3740+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3741+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3742+
SOFTWARE.
37193743
*******************************************************************************
37203744
Protocol Buffers
37213745
*******************************************************************************
@@ -3748,11 +3772,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
37483772
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
37493773
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37503774

3775+
The above license applies to all files in this directory and
3776+
subdirectories, with exceptions noted below.
3777+
37513778
Code generated by the Protocol Buffer compiler is owned by the owner
37523779
of the input file used when generating it. This code is not
37533780
standalone and requires a support library to be linked with it. This
37543781
support library is itself covered by the above license.
37553782

3783+
===========================================================================
3784+
rust/utf8.rs
3785+
===========================================================================
3786+
Permission is hereby granted, free of charge, to any
3787+
person obtaining a copy of this software and associated
3788+
documentation files (the "Software"), to deal in the
3789+
Software without restriction, including without
3790+
limitation the rights to use, copy, modify, merge,
3791+
publish, distribute, sublicense, and/or sell copies of
3792+
the Software, and to permit persons to whom the Software
3793+
is furnished to do so, subject to the following
3794+
conditions:
3795+
3796+
The above copyright notice and this permission notice
3797+
shall be included in all copies or substantial portions
3798+
of the Software.
3799+
3800+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
3801+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
3802+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
3803+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
3804+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
3805+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
3806+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
3807+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
3808+
DEALINGS IN THE SOFTWARE.
3809+
37563810
*******************************************************************************
37573811
Protocol Buffers for Java
37583812
*******************************************************************************
@@ -4201,6 +4255,176 @@ Tink
42014255
See the License for the specific language governing permissions and
42024256
limitations under the License.
42034257

4258+
*******************************************************************************
4259+
java_annotations
4260+
*******************************************************************************
4261+
4262+
Apache License
4263+
Version 2.0, January 2004
4264+
http://www.apache.org/licenses/
4265+
4266+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
4267+
4268+
1. Definitions.
4269+
4270+
"License" shall mean the terms and conditions for use, reproduction, and
4271+
distribution as defined by Sections 1 through 9 of this document.
4272+
4273+
"Licensor" shall mean the copyright owner or entity authorized by the copyright
4274+
owner that is granting the License.
4275+
4276+
"Legal Entity" shall mean the union of the acting entity and all other entities
4277+
that control, are controlled by, or are under common control with that entity.
4278+
For the purposes of this definition, "control" means (i) the power, direct or
4279+
indirect, to cause the direction or management of such entity, whether by
4280+
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
4281+
outstanding shares, or (iii) beneficial ownership of such entity.
4282+
4283+
"You" (or "Your") shall mean an individual or Legal Entity exercising
4284+
permissions granted by this License.
4285+
4286+
"Source" form shall mean the preferred form for making modifications, including
4287+
but not limited to software source code, documentation source, and configuration
4288+
files.
4289+
4290+
"Object" form shall mean any form resulting from mechanical transformation or
4291+
translation of a Source form, including but not limited to compiled object code,
4292+
generated documentation, and conversions to other media types.
4293+
4294+
"Work" shall mean the work of authorship, whether in Source or Object form, made
4295+
available under the License, as indicated by a copyright notice that is included
4296+
in or attached to the work (an example is provided in the Appendix below).
4297+
4298+
"Derivative Works" shall mean any work, whether in Source or Object form, that
4299+
is based on (or derived from) the Work and for which the editorial revisions,
4300+
annotations, elaborations, or other modifications represent, as a whole, an
4301+
original work of authorship. For the purposes of this License, Derivative Works
4302+
shall not include works that remain separable from, or merely link (or bind by
4303+
name) to the interfaces of, the Work and Derivative Works thereof.
4304+
4305+
"Contribution" shall mean any work of authorship, including the original version
4306+
of the Work and any modifications or additions to that Work or Derivative Works
4307+
thereof, that is intentionally submitted to Licensor for inclusion in the Work
4308+
by the copyright owner or by an individual or Legal Entity authorized to submit
4309+
on behalf of the copyright owner. For the purposes of this definition,
4310+
"submitted" means any form of electronic, verbal, or written communication sent
4311+
to the Licensor or its representatives, including but not limited to
4312+
communication on electronic mailing lists, source code control systems, and
4313+
issue tracking systems that are managed by, or on behalf of, the Licensor for
4314+
the purpose of discussing and improving the Work, but excluding communication
4315+
that is conspicuously marked or otherwise designated in writing by the copyright
4316+
owner as "Not a Contribution."
4317+
4318+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
4319+
of whom a Contribution has been received by Licensor and subsequently
4320+
incorporated within the Work.
4321+
4322+
2. Grant of Copyright License.
4323+
4324+
Subject to the terms and conditions of this License, each Contributor hereby
4325+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
4326+
irrevocable copyright license to reproduce, prepare Derivative Works of,
4327+
publicly display, publicly perform, sublicense, and distribute the Work and such
4328+
Derivative Works in Source or Object form.
4329+
4330+
3. Grant of Patent License.
4331+
4332+
Subject to the terms and conditions of this License, each Contributor hereby
4333+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
4334+
irrevocable (except as stated in this section) patent license to make, have
4335+
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
4336+
such license applies only to those patent claims licensable by such Contributor
4337+
that are necessarily infringed by their Contribution(s) alone or by combination
4338+
of their Contribution(s) with the Work to which such Contribution(s) was
4339+
submitted. If You institute patent litigation against any entity (including a
4340+
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
4341+
Contribution incorporated within the Work constitutes direct or contributory
4342+
patent infringement, then any patent licenses granted to You under this License
4343+
for that Work shall terminate as of the date such litigation is filed.
4344+
4345+
4. Redistribution.
4346+
4347+
You may reproduce and distribute copies of the Work or Derivative Works thereof
4348+
in any medium, with or without modifications, and in Source or Object form,
4349+
provided that You meet the following conditions:
4350+
4351+
You must give any other recipients of the Work or Derivative Works a copy of
4352+
this License; and
4353+
You must cause any modified files to carry prominent notices stating that You
4354+
changed the files; and
4355+
You must retain, in the Source form of any Derivative Works that You distribute,
4356+
all copyright, patent, trademark, and attribution notices from the Source form
4357+
of the Work, excluding those notices that do not pertain to any part of the
4358+
Derivative Works; and
4359+
If the Work includes a "NOTICE" text file as part of its distribution, then any
4360+
Derivative Works that You distribute must include a readable copy of the
4361+
attribution notices contained within such NOTICE file, excluding those notices
4362+
that do not pertain to any part of the Derivative Works, in at least one of the
4363+
following places: within a NOTICE text file distributed as part of the
4364+
Derivative Works; within the Source form or documentation, if provided along
4365+
with the Derivative Works; or, within a display generated by the Derivative
4366+
Works, if and wherever such third-party notices normally appear. The contents of
4367+
the NOTICE file are for informational purposes only and do not modify the
4368+
License. You may add Your own attribution notices within Derivative Works that
4369+
You distribute, alongside or as an addendum to the NOTICE text from the Work,
4370+
provided that such additional attribution notices cannot be construed as
4371+
modifying the License.
4372+
You may add Your own copyright statement to Your modifications and may provide
4373+
additional or different license terms and conditions for use, reproduction, or
4374+
distribution of Your modifications, or for any such Derivative Works as a whole,
4375+
provided Your use, reproduction, and distribution of the Work otherwise complies
4376+
with the conditions stated in this License.
4377+
4378+
5. Submission of Contributions.
4379+
4380+
Unless You explicitly state otherwise, any Contribution intentionally submitted
4381+
for inclusion in the Work by You to the Licensor shall be under the terms and
4382+
conditions of this License, without any additional terms or conditions.
4383+
Notwithstanding the above, nothing herein shall supersede or modify the terms of
4384+
any separate license agreement you may have executed with Licensor regarding
4385+
such Contributions.
4386+
4387+
6. Trademarks.
4388+
4389+
This License does not grant permission to use the trade names, trademarks,
4390+
service marks, or product names of the Licensor, except as required for
4391+
reasonable and customary use in describing the origin of the Work and
4392+
reproducing the content of the NOTICE file.
4393+
4394+
7. Disclaimer of Warranty.
4395+
4396+
Unless required by applicable law or agreed to in writing, Licensor provides the
4397+
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
4398+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
4399+
including, without limitation, any warranties or conditions of TITLE,
4400+
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
4401+
solely responsible for determining the appropriateness of using or
4402+
redistributing the Work and assume any risks associated with Your exercise of
4403+
permissions under this License.
4404+
4405+
8. Limitation of Liability.
4406+
4407+
In no event and under no legal theory, whether in tort (including negligence),
4408+
contract, or otherwise, unless required by applicable law (such as deliberate
4409+
and grossly negligent acts) or agreed to in writing, shall any Contributor be
4410+
liable to You for damages, including any direct, indirect, special, incidental,
4411+
or consequential damages of any character arising as a result of this License or
4412+
out of the use or inability to use the Work (including but not limited to
4413+
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
4414+
any and all other commercial damages or losses), even if such Contributor has
4415+
been advised of the possibility of such damages.
4416+
4417+
9. Accepting Warranty or Additional Liability.
4418+
4419+
While redistributing the Work or Derivative Works thereof, You may choose to
4420+
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
4421+
other liability obligations and/or rights consistent with this License. However,
4422+
in accepting such obligations, You may act only on Your own behalf and on Your
4423+
sole responsibility, not on behalf of any other Contributor, and only if You
4424+
agree to indemnify, defend, and hold each Contributor harmless for any liability
4425+
incurred by, or claims asserted against, such Contributor by reason of your
4426+
accepting any such warranty or additional liability.
4427+
42044428
*******************************************************************************
42054429
libexecinfo
42064430
*******************************************************************************

libraries/include/arcore_c_api.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,7 @@ AR_DEFINE_ENUM(ArFocusMode){/// Focus is fixed.
13441344
/// configuration.
13451345
///
13461346
/// Attempting to use @c ::ArSession_configure to configure a @c
1347-
/// ::ArImageStabilizationMode mode on a device that that isn't supported, @c
1347+
/// ::ArImageStabilizationMode mode on a device that isn't supported, @c
13481348
/// ::ArSession_configure will return #AR_ERROR_UNSUPPORTED_CONFIGURATION.
13491349
///
13501350
/// The default value is #AR_IMAGE_STABILIZATION_MODE_OFF. Use
@@ -6572,13 +6572,13 @@ void ArHitResult_getDistance(const ArSession *session,
65726572
/// @ingroup ArHitResult
65736573
/// Returns the pose of the intersection between a ray and detected real-world
65746574
/// geometry. The position is the location in space where the ray intersected
6575-
/// the geometry. The orientation is a best effort to face the user's device,
6575+
/// the geometry. The orientation is a best effort to face the ray origin,
65766576
/// and its exact definition differs depending on the Trackable that was hit.
65776577
///
65786578
/// @c ::ArPlane : X+ is perpendicular to the cast ray and parallel to the
65796579
/// plane, Y+ points along the plane normal (up, for @c
65806580
/// #AR_PLANE_HORIZONTAL_UPWARD_FACING planes), and Z+ is parallel to the plane,
6581-
/// pointing roughly toward the user's device.
6581+
/// pointing roughly toward the ray origin.
65826582
///
65836583
/// @c ::ArPoint :
65846584
/// Attempt to estimate the normal of the surface centered around the hit test.
@@ -6588,11 +6588,11 @@ void ArHitResult_getDistance(const ArSession *session,
65886588
/// @c #AR_POINT_ORIENTATION_ESTIMATED_SURFACE_NORMAL, then X+ is perpendicular
65896589
/// to the cast ray and parallel to the physical surface centered around the hit
65906590
/// test, Y+ points along the estimated surface normal, and Z+ points roughly
6591-
/// toward the user's device. If
6591+
/// toward the ray origin. If
65926592
/// @c ::ArPoint_getOrientationMode returns
65936593
/// @c #AR_POINT_ORIENTATION_INITIALIZED_TO_IDENTITY, then X+ is perpendicular
6594-
/// to the cast ray and points right from the perspective of the user's device,
6595-
/// Y+ points up, and Z+ points roughly toward the user's device.
6594+
/// to the cast ray and points right from the perspective of the ray origin,
6595+
/// Y+ points up, and Z+ points roughly toward the ray origin.
65966596
///
65976597
/// If you wish to retain the location of this pose beyond the duration of a
65986598
/// single frame, create an anchor using @c ::ArHitResult_acquireNewAnchor to

samples/augmented_faces_java/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
apply plugin: 'com.android.application'
1717

1818
android {
19-
compileSdkVersion 33
19+
compileSdkVersion 34
2020
defaultConfig {
2121
applicationId "com.google.ar.core.examples.java.augmentedfaces"
2222

2323
// AR Optional apps must declare minSdkVersion >= 14.
2424
// AR Required apps must declare minSdkVersion >= 24.
2525
minSdkVersion 24
26-
targetSdkVersion 33
26+
targetSdkVersion 34
2727
versionCode 1
2828
versionName '1.0'
2929
}
@@ -41,7 +41,7 @@ android {
4141

4242
dependencies {
4343
// ARCore (Google Play Services for AR) library.
44-
implementation 'com.google.ar:core:1.39.0'
44+
implementation 'com.google.ar:core:1.40.0'
4545

4646
// Obj - a simple Wavefront OBJ file loader
4747
// https://github.com/javagl/Obj

samples/augmented_faces_java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
mavenCentral()
2222
}
2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:7.0.4'
24+
classpath 'com.android.tools.build:gradle:7.1.2'
2525
// NOTE: Do not place your application dependencies here; they belong
2626
// in the individual module build.gradle files
2727
}

samples/augmented_image_c/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ def arcore_libpath = "${buildDir}/arcore-native"
2525
configurations { natives }
2626

2727
android {
28-
compileSdkVersion 33
28+
compileSdkVersion 34
2929
defaultConfig {
3030
applicationId "com.google.ar.core.examples.c.augmentedimage"
3131

3232
// "AR Optional" apps must declare minSdkVersion >= 14.
3333
// "AR Required" apps must declare minSdkVersion >= 24.
3434
minSdkVersion 24
35-
targetSdkVersion 33
35+
targetSdkVersion 34
3636
versionCode 1
3737
versionName '1.0'
3838

@@ -68,8 +68,8 @@ android {
6868

6969
dependencies {
7070
// ARCore (Google Play Services for AR) library.
71-
implementation 'com.google.ar:core:1.39.0'
72-
natives 'com.google.ar:core:1.39.0'
71+
implementation 'com.google.ar:core:1.40.0'
72+
natives 'com.google.ar:core:1.40.0'
7373

7474
implementation 'androidx.appcompat:appcompat:1.1.0'
7575
implementation 'com.google.android.material:material:1.1.0'

samples/augmented_image_c/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
mavenCentral()
2222
}
2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:7.0.4'
24+
classpath 'com.android.tools.build:gradle:7.1.2'
2525
// NOTE: Do not place your application dependencies here; they belong
2626
// in the individual module build.gradle files
2727
}

samples/augmented_image_java/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
apply plugin: 'com.android.application'
1717

1818
android {
19-
compileSdkVersion 33
19+
compileSdkVersion 34
2020
defaultConfig {
2121
applicationId "com.google.ar.core.examples.java.augmentedimage"
2222

2323
// "AR Optional" apps must declare minSdkVersion >= 14.
2424
// "AR Required" apps must declare minSdkVersion >= 24.
2525
minSdkVersion 24
26-
targetSdkVersion 33
26+
targetSdkVersion 34
2727
versionCode 1
2828
versionName '1.0'
2929
}
@@ -41,7 +41,7 @@ android {
4141

4242
dependencies {
4343
// ARCore (Google Play Services for AR) library.
44-
implementation 'com.google.ar:core:1.39.0'
44+
implementation 'com.google.ar:core:1.40.0'
4545

4646
// Obj - a simple Wavefront OBJ file loader
4747
// https://github.com/javagl/Obj

samples/augmented_image_java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
mavenCentral()
2222
}
2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:7.0.4'
24+
classpath 'com.android.tools.build:gradle:7.1.2'
2525
// NOTE: Do not place your application dependencies here; they belong
2626
// in the individual module build.gradle files
2727
}

0 commit comments

Comments
 (0)