Skip to content

Commit 93d29a9

Browse files
philip-lambphilip-lamb
committed
Merge branch 'master' into canonical
2 parents 06daf5d + 794fe86 commit 93d29a9

File tree

179 files changed

+60072
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+60072
-540
lines changed

‎.gitignore‎

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,69 @@
1+
#### OS-generated caches and resources
2+
.DS_Store
3+
.DS_Store?
4+
._*
5+
.Spotlight-V100
6+
.Trashes
7+
ehthumbs.db
8+
Thumbs.db
9+
10+
### git merge conflict files
11+
*.orig
12+
13+
#### Intermediate build products
14+
*.o
15+
16+
#### Intermediate Language products
17+
*.dex
18+
*.class
19+
20+
# Android Studio
21+
**/.gradle/
22+
**/.idea/caches
23+
**/.idea/deploymentTargetDropDown.xml
24+
**/.idea/libraries
25+
**/.idea/workspace.xml
26+
**/.idea/navEditor.xml
27+
**/.idea/assetWizardSettings.xml
28+
**/captures/
29+
**/.externalNativeBuild/
30+
**/.cxx/
31+
local.properties
32+
33+
# MonoDevelop/Xamarin Studio
34+
*.userprefs
35+
36+
# Visual Studio
37+
*.suo
38+
*.user
39+
*.userosscache
40+
*.sln.docstates
41+
.vscode/settings.json
42+
43+
# Xcode
44+
xcuserdata/
45+
*.mode1*
46+
*.pbxuser
47+
*.xccheckout
48+
*.xcscmblueprint
49+
50+
# Dependencies
151
depends/ios/include/ARX/
252
depends/ios/lib/libARX.a
53+
depends/ios/Frameworks/opencv2.framework
354
depends/macos/Frameworks/ARX.framework/
55+
depends/macos/Frameworks/opencv2.framework
56+
depends/android/artoolkitx
57+
artoolkitX.for.iOS.v*.dmg
58+
artoolkitX.for.macOS.v*.dmg
59+
60+
# Build files
461
Linux/build/
562
iOS/user-config.xcconfig
663
iOS/build/
764
macOS/user-config.xcconfig
865
macOS/build/
9-
xcuserdata/
10-
*.xcscmblueprint
66+
Android/app/build
67+
Android/build
68+
69+
# Other

‎Android/.idea/.gitignore‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/.idea/compiler.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/.idea/gradle.xml‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/.idea/jarRepositories.xml‎

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/.idea/misc.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/app/build.gradle‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
plugins {
2+
id 'com.android.application'
3+
}
4+
5+
android {
6+
compileSdkVersion 33
7+
defaultConfig {
8+
applicationId "org.artoolkitx.utilities.calibcameraandroid"
9+
minSdkVersion 24
10+
targetSdkVersion 33
11+
compileSdkVersion 33
12+
versionCode 1010000
13+
versionName "1.1"
14+
externalNativeBuild {
15+
cmake {
16+
arguments "-DANDROID_APP_PLATFORM=android-24", "-DANDROID_STL=c++_shared"
17+
// abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
18+
//abiFilters 'arm64-v8a'
19+
}
20+
}
21+
}
22+
buildTypes {
23+
release {
24+
minifyEnabled false
25+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
26+
}
27+
}
28+
applicationVariants.all { variant ->
29+
tasks["merge${variant.name.capitalize()}Assets"]
30+
.dependsOn("externalNativeBuild${variant.name.capitalize()}")
31+
}
32+
if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
33+
sourceSets.main {
34+
jniLibs.srcDir 'libs'
35+
}
36+
externalNativeBuild {
37+
cmake {
38+
path 'src/main/cpp/CMakeLists.txt'
39+
}
40+
}
41+
}
42+
namespace 'org.libsdl.app'
43+
lint {
44+
abortOnError false
45+
}
46+
}
47+
48+
dependencies {
49+
implementation fileTree(include: ['*.jar'], dir: 'libs')
50+
def appcompat_version = "1.6.1"
51+
implementation "androidx.appcompat:appcompat:$appcompat_version"
52+
def preference_version = "1.2.1"
53+
implementation "androidx.preference:preference:$preference_version"
54+
def constraintlayout_version = "2.1.4"
55+
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
56+
}

‎Android/app/proguard-rules.pro‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in [sdk]/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}

‎Android/app/src/main/AndroidManifest.xml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:installLocation="auto">
4+
5+
<uses-permission android:name="android.permission.CAMERA" />
6+
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
8+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
9+
10+
<uses-feature android:name="android.hardware.camera.any" />
11+
<uses-feature android:name="android.hardware.camera"
12+
android:required="true" />
13+
<uses-feature android:name="android.hardware.camera2"
14+
android:required="true"/>
15+
<uses-feature android:name="android.hardware.camera.autofocus"
16+
android:required="false" />
17+
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
18+
19+
<!-- Touchscreen support -->
20+
<uses-feature
21+
android:name="android.hardware.touchscreen"
22+
android:required="false" />
23+
24+
<!-- Game controller support -->
25+
<uses-feature
26+
android:name="android.hardware.bluetooth"
27+
android:required="false" />
28+
<uses-feature
29+
android:name="android.hardware.gamepad"
30+
android:required="false" />
31+
<uses-feature
32+
android:name="android.hardware.usb.host"
33+
android:required="false" />
34+
35+
<!-- External mouse input events -->
36+
<uses-feature
37+
android:name="android.hardware.type.pc"
38+
android:required="false" />
39+
40+
<!-- Audio recording support -->
41+
<!-- if you want to capture audio, uncomment this. -->
42+
<!-- <uses-feature
43+
android:name="android.hardware.microphone"
44+
android:required="false" /> -->
45+
46+
<!-- Allow access to Bluetooth devices -->
47+
<!-- Currently this is just for Steam Controller support and requires setting SDL_HINT_JOYSTICK_HIDAPI_STEAM -->
48+
<!-- <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" /> -->
49+
<!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> -->
50+
51+
<!-- Allow access to the vibrator -->
52+
<uses-permission android:name="android.permission.VIBRATE" />
53+
54+
<!-- if you want to capture audio, uncomment this. -->
55+
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
56+
57+
<application android:label="@string/app_name"
58+
android:icon="@mipmap/ic_launcher"
59+
android:allowBackup="true"
60+
android:theme="@style/AppTheme"
61+
android:hardwareAccelerated="true" >
62+
63+
<!-- Example of setting SDL hints from AndroidManifest.xml:
64+
<meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0"/>
65+
-->
66+
67+
<activity android:name="org.artoolkitx.utilities.cameracalibration.CameraCalibrationActivity"
68+
android:label="@string/app_name"
69+
android:alwaysRetainTaskState="true"
70+
android:launchMode="singleInstance"
71+
android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
72+
android:preferMinimalPostProcessing="true"
73+
android:screenOrientation="portrait"
74+
android:exported="true"
75+
>
76+
<intent-filter>
77+
<action android:name="android.intent.action.MAIN" />
78+
<category android:name="android.intent.category.LAUNCHER" />
79+
</intent-filter>
80+
<!-- Let Android know that we can handle some USB devices and should receive this event -->
81+
<intent-filter>
82+
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
83+
</intent-filter>
84+
<!-- Drop file event -->
85+
<!--
86+
<intent-filter>
87+
<action android:name="android.intent.action.VIEW" />
88+
<category android:name="android.intent.category.DEFAULT" />
89+
<data android:mimeType="*/*" />
90+
</intent-filter>
91+
-->
92+
</activity>
93+
<activity
94+
android:name="org.artoolkitx.utilities.cameracalibration.CameraCalibrationSettingsActivity"
95+
android:label="@string/settings_activity_name"
96+
android:parentActivityName="org.artoolkitx.utilities.cameracalibration.CameraCalibrationActivity"
97+
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
98+
</activity>
99+
</application>
100+
101+
</manifest>

0 commit comments

Comments
 (0)