Skip to content

Commit d5a2689

Browse files
philip-lambphilip-lamb
committed
Update to artoolkitX v1.1.20 for multi-res template tracker.
1 parent 721ac52 commit d5a2689

File tree

7 files changed

+104
-21
lines changed

7 files changed

+104
-21
lines changed

‎Packages/artoolkitX-Unity/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# artoolkitX for Unity Release Notes
22
------------------------------------
33

4+
## Version 1.2.12
5+
### 2024-06-25
6+
7+
* Update artoolkitX to v1.1.20 with improved resolution/tracking distance in 2D tracker, especially for textures far from camera.
8+
49
## Version 1.2.11
510
### 2024-01-17
611

‎Packages/artoolkitX-Unity/Editor/Scripts/ARToolKitMenuEditor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class ARToolKitMenuEditor : MonoBehaviour {
4848
private const string SOURCE_URL = "https://github.com/artoolkitx/artoolkitx";
4949
private const string PLUGIN_SOURCE_URL = "https://github.com/artoolkitx/arunityx";
5050
private const string TOOLS_URL = "https://github.com/artoolkitx/artoolkitx/releases/latest";
51-
private const string VERSION = "artoolkitX for Unity Version 1.2.0";
51+
private const string VERSION = "artoolkitX for Unity Version 1.2.12";
5252
private const string VERSION_MENU = MENU_PATH_BASE + "/" + VERSION;
5353
private const string WELCOME_MESSAGE = "Welcome to " + VERSION + ".";
5454
private static bool showDownloadTools = false;

‎Packages/artoolkitX-Unity/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "org.artoolkitx.artoolkitx-unity",
3-
"version": "1.2.11",
3+
"version": "1.2.12",
44
"displayName": "artoolkitX-Unity",
55
"description": "The artoolkitX for Unity augmented reality toolkit",
66
"homepage": "https://www.artoolkitx.org/",

‎dev/artoolkitx

Submodule artoolkitx updated 44 files

‎dev/artoolkitx-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.18
1+
1.1.20

‎dev/packaging/download_unity.sh

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ done
6666

6767

6868
# If user didn't specify a version, use a default.
69-
UNITY_VERSION=${UNITY_VERSION:-2021.3.2f1}
70-
UNITY_DOWNLOAD_HASH=${UNITY_DOWNLOAD_HASH:-d6360bedb9a0}
69+
UNITY_VERSION=${UNITY_VERSION:-2022.3.20f1}
70+
UNITY_DOWNLOAD_HASH=${UNITY_DOWNLOAD_HASH:-61c2feb0970d}
7171

7272
mkdir -p "unity_installers" && cd "unity_installers"
7373
downloads=()
@@ -81,13 +81,21 @@ then
8181
#downloads+=( https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/TargetSupportInstaller/UnitySetup-Mac-Mono-Support-for-Editor-${UNITY_VERSION}.exe )
8282
if [[ -n $WITH_ANDROID ]]; then
8383
downloads+=(
84-
https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/TargetSupportInstaller/UnitySetup-Android-Support-for-Editor-${UNITY_VERSION}.ex
84+
https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/TargetSupportInstaller/UnitySetup-Android-Support-for-Editor-${UNITY_VERSION}.exe
8585
)
8686
fi
8787
elif [ "$OS" = "Darwin" ]
8888
then
89+
if [ "$ARCH" = "arm64" ]; then
90+
downloads+=(
91+
https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/MacEditorInstallerArm64/Unity.pkg
92+
)
93+
else
94+
downloads+=(
95+
https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/MacEditorInstaller/Unity.pkg
96+
)
97+
fi
8998
downloads+=(
90-
https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/MacEditorInstaller/Unity.pkg
9199
https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/MacEditorTargetInstaller/UnitySetup-Mac-IL2CPP-Support-for-Editor-${UNITY_VERSION}.pkg
92100
)
93101
#downloads+=( https://download.unity3d.com/download_unity/${UNITY_DOWNLOAD_HASH}/MacEditorTargetInstaller/UnitySetup-Windows-Mono-Support-for-Editor-${UNITY_VERSION}.pkg )
@@ -99,33 +107,41 @@ then
99107
fi
100108

101109
if [[ -n $WITH_ANDROID ]]; then
102-
# Android tools
103-
if [ "$UNITY_VERSION" = "2019.2.21f1" ]; then
110+
# Android tools. See https://docs.unity3d.com/Manual/android-sdksetup.html#supported-dependency-versions.
111+
if [[ "$UNITY_VERSION" =~ 2022\.3\..* ]]; then
104112
if [ "$OS" = "Windows" ]; then
105113
downloads+=(
114+
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_windows_hotspot_11.0.14.1_1.zip
106115
https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip
107-
https://dl.google.com/android/repository/build-tools_r28.0.3-windows.zip
108-
https://dl.google.com/android/repository/platform-tools_r28.0.1-windows.zip
109-
https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip
116+
https://dl.google.com/android/repository/210b77e4bc623bd4cdda4dae790048f227972bd2.build-tools_r32-windows.zip
117+
https://dl.google.com/android/repository/platform-tools_r32.0.0-windows.zip
118+
https://dl.google.com/android/repository/android-ndk-r23b-windows.zip
119+
https://dl.google.com/android/repository/commandlinetools-win-8092744_latest.zip
110120
)
121+
#
111122
elif [ "$OS" = "Darwin" ]; then
112123
downloads+=(
124+
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.14.1_1.tar.gz
113125
https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip
114-
https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip
115-
https://dl.google.com/android/repository/platform-tools_r28.0.1-macosx.zip
116-
https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip )
126+
https://dl.google.com/android/repository/5219cc671e844de73762e969ace287c29d2e14cd.build-tools_r32-macosx.zip
127+
https://dl.google.com/android/repository/platform-tools_r32.0.0-darwin.zip
128+
https://dl.google.com/android/repository/android-ndk-r23b-darwin.zip
129+
https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip
130+
)
117131
fi
118132
downloads+=(
119-
https://dl.google.com/android/repository/platform-28_r06.zip
133+
https://dl.google.com/android/repository/platform-31_r01.zip
134+
https://dl.google.com/android/repository/platform-32_r01.zip
120135
)
121-
elif [ "$UNITY_VERSION" = "2021.3.2f1" ]; then
136+
elif [[ "$UNITY_VERSION" =~ 2021\.3\..* ]]; then
122137
if [ "$OS" = "Windows" ]; then
123138
downloads+=(
124139
https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.zip
125140
https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip
126141
https://dl.google.com/android/repository/efbaa277338195608aa4e3dbd43927e97f60218c.build-tools_r30.0.2-windows.zip
127142
https://dl.google.com/android/repository/platform-tools_r30.0.4-windows.zip
128143
https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip
144+
https://dl.google.com/android/repository/commandlinetools-win-6609375_latest.zip
129145
)
130146
elif [ "$OS" = "Darwin" ]; then
131147
downloads+=(
@@ -134,12 +150,31 @@ if [[ -n $WITH_ANDROID ]]; then
134150
https://dl.google.com/android/repository/5a6ceea22103d8dec989aefcef309949c0c42f1d.build-tools_r30.0.2-macosx.zip
135151
https://dl.google.com/android/repository/fbad467867e935dce68a0296b00e6d1e76f15b15.platform-tools_r30.0.4-darwin.zip
136152
https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip
153+
https://dl.google.com/android/repository/commandlinetools-mac-6609375_latest.zip
137154
)
138155
fi
139156
downloads+=(
140157
https://dl.google.com/android/repository/platform-29_r05.zip
141158
https://dl.google.com/android/repository/android-platform-30.zip
142159
)
160+
elif [[ "$UNITY_VERSION" =~ 2019\.2\..* ]]; then
161+
if [ "$OS" = "Windows" ]; then
162+
downloads+=(
163+
https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip
164+
https://dl.google.com/android/repository/build-tools_r28.0.3-windows.zip
165+
https://dl.google.com/android/repository/platform-tools_r28.0.1-windows.zip
166+
https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip
167+
)
168+
elif [ "$OS" = "Darwin" ]; then
169+
downloads+=(
170+
https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip
171+
https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip
172+
https://dl.google.com/android/repository/platform-tools_r28.0.1-macosx.zip
173+
https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip )
174+
fi
175+
downloads+=(
176+
https://dl.google.com/android/repository/platform-28_r06.zip
177+
)
143178
else
144179
echo "Warning: No Android tools URLs defined for Unity $UNITY_VERSION"
145180
fi

‎dev/packaging/install_unity.sh

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ done
7070

7171

7272
# If user didn't specify a version, use a default.
73-
UNITY_VERSION=${UNITY_VERSION:-2021.3.2f1}
73+
UNITY_VERSION=${UNITY_VERSION:-2022.3.20f1}
7474

7575
cd "unity_installers"
7676

@@ -95,9 +95,46 @@ then
9595
fi
9696

9797
if [[ -n $WITH_ANDROID ]]; then
98-
if [ "$UNITY_VERSION" = "2021.3.2f1" ]; then
98+
if [[ "$UNITY_VERSION" =~ 2022\.3\..* ]]; then
9999
if [ "$OS" = "Windows" ]; then
100-
sdkInstallRoot=$(${WINPATH} -u C:\\Program\ Files\\Unity\\Editor\\Data\\PlaybackEngines\\AndroidPlayer)
100+
sdkInstallRoot=$(${WINPATH} -u C:\\Program\ Files\\Unity\ ${UNITY_VERSION}\\Editor\\Data\\PlaybackEngines\\AndroidPlayer)
101+
# JDK
102+
unzip "OpenJDK11U-jdk_x64_windows_hotspot_11.0.14.1_1.zip" -d "${sdkInstallRoot}"
103+
mv "${sdkInstallRoot}/jdk-11.0.14.1+1" "${sdkInstallRoot}/OpenJDK"
104+
# SDK
105+
unzip -q "sdk-tools-windows-4333796.zip" -d "${sdkInstallRoot}/SDK"
106+
unzip -q "210b77e4bc623bd4cdda4dae790048f227972bd2.build-tools_r32-windows.zip" -d "${sdkInstallRoot}/SDK/build-tools"
107+
mv "${sdkInstallRoot}/SDK/build-tools/android-12" "${sdkInstallRoot}/SDK/build-tools/32.0.0"
108+
unzip -q "platform-tools_r32.0.0-windows.zip" -d "${sdkInstallRoot}/SDK"
109+
unzip -q "android-ndk-r23b-windows.zip" -d "${sdkInstallRoot}"
110+
mv "${sdkInstallRoot}/android-ndk-r23b" "${sdkInstallRoot}/NDK"
111+
mkdir "${sdkInstallRoot}/SDK/cmdline-tools"
112+
unzip -q "commandlinetools-win-8092744_latest.zip" -d "${sdkInstallRoot}/SDK/cmdline-tools"
113+
mv "${sdkInstallRoot}/SDK/cmdline-tools/cmdline-tools" "${sdkInstallRoot}/SDK/cmdline-tools/6.0"
114+
elif [ "$OS" = "Darwin" ]; then
115+
sdkInstallRoot='/Applications/Unity/Editor/PlaybackEngines/AndroidPlayer'
116+
# JDK. Mac package layout differs.
117+
tar xzf "OpenJDK11U-jdk_x64_mac_hotspot_11.0.14.1_1.tar.gz" -C "${sdkInstallRoot}"
118+
mv "${sdkInstallRoot}/jdk-11.0.14.1+1/Contents/Home" "${sdkInstallRoot}/OpenJDK"
119+
rm -rf "${sdkInstallRoot}/jdk-11.0.14.1+1"
120+
# SDK
121+
unzip -q "sdk-tools-darwin-4333796.zip" -d "${sdkInstallRoot}/SDK"
122+
unzip -q "5219cc671e844de73762e969ace287c29d2e14cd.build-tools_r32-macosx.zip" -d "${sdkInstallRoot}/SDK/build-tools"
123+
mv "${sdkInstallRoot}/SDK/build-tools/android-12" "${sdkInstallRoot}/SDK/build-tools/32.0.0"
124+
unzip -q "platform-tools_r32.0.0-darwin.zip" -d "${sdkInstallRoot}/SDK"
125+
unzip -q "android-ndk-r23b-darwin.zip" -d "${sdkInstallRoot}"
126+
mv "${sdkInstallRoot}/android-ndk-r23b" "${sdkInstallRoot}/NDK"
127+
mkdir "${sdkInstallRoot}/SDK/cmdline-tools"
128+
unzip -q "commandlinetools-mac-8092744_latest.zip" -d "${sdkInstallRoot}/SDK/cmdline-tools"
129+
mv "${sdkInstallRoot}/SDK/cmdline-tools/cmdline-tools" "${sdkInstallRoot}/SDK/cmdline-tools/6.0"
130+
fi
131+
unzip -q "platform-31_r01.zip" -d "${sdkInstallRoot}/SDK/platforms"
132+
mv "${sdkInstallRoot}/SDK/platforms/android-12" "${sdkInstallRoot}/SDK/platforms/android-31"
133+
unzip -q "platform-32_r01.zip" -d "${sdkInstallRoot}/SDK/platforms"
134+
mv "${sdkInstallRoot}/SDK/platforms/android-12" "${sdkInstallRoot}/SDK/platforms/android-32"
135+
elif [[ "$UNITY_VERSION" =~ 2021\.3\..* ]]; then
136+
if [ "$OS" = "Windows" ]; then
137+
sdkInstallRoot=$(${WINPATH} -u C:\\Program\ Files\\Unity\ ${UNITY_VERSION}\\Editor\\Data\\PlaybackEngines\\AndroidPlayer)
101138
unzip "OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.zip" -d "${sdkInstallRoot}"
102139
mv "${sdkInstallRoot}/jdk8u292-b10" "${sdkInstallRoot}/OpenJDK"
103140
unzip "sdk-tools-windows-4333796.zip" -d "${sdkInstallRoot}/SDK"
@@ -106,6 +143,9 @@ if [[ -n $WITH_ANDROID ]]; then
106143
unzip "platform-tools_r30.0.4-windows.zip" -d "${sdkInstallRoot}/SDK"
107144
unzip "android-ndk-r21d-windows-x86_64.zip" -d "${sdkInstallRoot}"
108145
mv "${sdkInstallRoot}/android-ndk-r21d" "${sdkInstallRoot}/NDK"
146+
mkdir "${sdkInstallRoot}/SDK/cmdline-tools"
147+
unzip -q "commandlinetools-win-6609375_latest.zip" -d "${sdkInstallRoot}/SDK/cmdline-tools"
148+
mv "${sdkInstallRoot}/SDK/cmdline-tools/tools" "${sdkInstallRoot}/SDK/cmdline-tools/2.1"
109149
elif [ "$OS" = "Darwin" ]; then
110150
sdkInstallRoot='/Applications/Unity/Editor/PlaybackEngines/AndroidPlayer'
111151
tar xzf "OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz" -C "${sdkInstallRoot}"
@@ -116,6 +156,9 @@ if [[ -n $WITH_ANDROID ]]; then
116156
unzip "fbad467867e935dce68a0296b00e6d1e76f15b15.platform-tools_r30.0.4-darwin.zip" -d "${sdkInstallRoot}/SDK"
117157
unzip "android-ndk-r21d-darwin-x86_64.zip" -d "${sdkInstallRoot}"
118158
mv "${sdkInstallRoot}/android-ndk-r21d" "${sdkInstallRoot}/NDK"
159+
mkdir "${sdkInstallRoot}/SDK/cmdline-tools"
160+
unzip -q "commandlinetools-mac-6609375_latest.zip" -d "${sdkInstallRoot}/SDK/cmdline-tools"
161+
mv "${sdkInstallRoot}/SDK/cmdline-tools/tools" "${sdkInstallRoot}/SDK/cmdline-tools/2.1"
119162
fi
120163
unzip "platform-29_r05.zip" -d "${sdkInstallRoot}/SDK/platforms"
121164
mv "${sdkInstallRoot}/SDK/platforms/android-10" "${sdkInstallRoot}/SDK/platforms/android-29"

0 commit comments

Comments
 (0)