File tree
7 files changed
+53
-9
lines changed- Source
- Extras
- Package/Assets/artoolkitX-Unity/Scripts
- Editor
7 files changed
+53
-9
lines changedLines changed: 5 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
3 | 3 |
| |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
4 | 9 |
| |
5 | 10 |
| |
6 | 11 |
| |
|
Submodule artoolkitx updated 51 files
- .gitignore-2
- Examples/2d tracking example/Android/AR2DTracking_Proj/.gitignore-1
- Examples/2d tracking example/Android/AR2DTracking_Proj/.idea/modules.xml+12
- Examples/2d tracking example/Android/AR2DTracking_Proj/.idea/modules/AR2DTrackingExample/AR2DTracking_Proj.AR2DTrackingExample.iml+39
- Examples/2d tracking example/Android/AR2DTracking_Proj/.idea/modules/AR2DTrackingExample/AR2DTracking_Proj.AR2DTrackingExample.main.iml+75
- Examples/2d tracking example/Android/AR2DTracking_Proj/.idea/modules/AR2DTrackingExample/AR2DTracking_Proj.AR2DTrackingExample.unitTest.iml+62
- Examples/2d tracking example/Android/AR2DTracking_Proj/.idea/modules/AR2DTracking_Proj.iml+19
- Examples/2d tracking example/iOS/artoolkitX 2d Tracking Example.xcodeproj/xcshareddata/xcschemes/artoolkitX Square Tracking Example.xcscheme+1-1
- Examples/2d tracking example/macOS/artoolkitX 2d Tracking Example.xcodeproj/xcshareddata/xcschemes/artoolkitX 2d Tracking Example.xcscheme+1-1
- Examples/Square tracking example with OSG/Android/ARSquareTracking/.gitignore-1
- Examples/Square tracking example with OSG/Android/ARSquareTracking/.idea/modules.xml+12
- Examples/Square tracking example with OSG/Android/ARSquareTracking/.idea/modules/ARSquareTracking.iml+19
- Examples/Square tracking example with OSG/Android/ARSquareTracking/.idea/modules/ARSquareTrackingExample/ARSquareTracking.ARSquareTrackingExample.iml+39
- Examples/Square tracking example with OSG/Android/ARSquareTracking/.idea/modules/ARSquareTrackingExample/ARSquareTracking.ARSquareTrackingExample.main.iml+75
- Examples/Square tracking example with OSG/Android/ARSquareTracking/.idea/modules/ARSquareTrackingExample/ARSquareTracking.ARSquareTrackingExample.unitTest.iml+62
- Examples/Square tracking example with OSG/macOS/artoolkitX Square Tracking Example with OSG.xcodeproj/xcshareddata/xcschemes/artoolkitX Square Tracking Example with OSG.xcscheme+1-1
- Examples/Square tracking example/Android/ARSquareTracking/.gitignore-1
- Examples/Square tracking example/Android/ARSquareTracking/.idea/modules.xml+12
- Examples/Square tracking example/Android/ARSquareTracking/.idea/modules/ARSquareTracking.iml+19
- Examples/Square tracking example/Android/ARSquareTracking/.idea/modules/ARSquareTrackingExample/ARSquareTracking.ARSquareTrackingExample.iml+39
- Examples/Square tracking example/Android/ARSquareTracking/.idea/modules/ARSquareTrackingExample/ARSquareTracking.ARSquareTrackingExample.main.iml+75
- Examples/Square tracking example/Android/ARSquareTracking/.idea/modules/ARSquareTrackingExample/ARSquareTracking.ARSquareTrackingExample.unitTest.iml+62
- Examples/Square tracking example/iOS/artoolkitX Square Tracking Example.xcodeproj/xcshareddata/xcschemes/artoolkitX Square Tracking Example.xcscheme+1-1
- Examples/Square tracking example/macOS/artoolkitX Square Tracking Example.xcodeproj/xcshareddata/xcschemes/artoolkitX Square Tracking Example.xcscheme+1-1
- Release Notes.md+8
- Source/ARX/ARController.cpp+1-1
- Source/ARX/ARTracker2d.cpp+124-32
- Source/ARX/ARX_c.cpp+8
- Source/ARX/OCVT/PlanarTracker.cpp+7-6
- Source/ARX/OCVT/include/ARX/OCVT/PlanarTracker.h+3-1
- Source/ARX/include/ARX/ARTracker2d.h+14
- Source/ARX/include/ARX/ARX_c.h+1
- Source/ARXJ/ARXJProj/.idea/modules/arxj/ARXJProj.arxj.iml+46
- Source/ARXJ/ARXJProj/.idea/modules/arxj/ARXJProj.arxj.main.iml+88
- Source/ARXJ/ARXJProj/.idea/modules/arxj/ARXJProj.arxj.unitTest.iml+62
- Source/ARXJ/ARXJProj/ARXJ-ARXJProj.iml+8
- Source/ARXJ/ARXJProj/ARXJProj.iml+19
- Source/ARXJ/ARXJProj/arxj/ARXJProj-arxj.iml+8
- Source/CMakeLists.txt+1-1
- Source/build.sh+2-2
- Source/cmake/FindOpenCV.cmake+13-6
- Source/depends/android/include/jconfig.h+68-52
- Source/depends/android/include/jerror.h+329
- Source/depends/android/include/jmorecfg.h+167-227
- Source/depends/android/include/jpeglib.h+463-511
- Source/depends/android/include/jversion.h-14
- Source/depends/android/lib/.gitignore+46
- Source/depends/android/lib/arm64-v8a/libjpeg.a
- Source/depends/android/lib/armeabi-v7a/libjpeg.a
- Source/depends/android/lib/x86/libjpeg.a
- Source/depends/android/lib/x86_64/libjpeg.a
Lines changed: 26 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
375 | 375 |
| |
376 | 376 |
| |
377 | 377 |
| |
| 378 | + | |
378 | 379 |
| |
379 | 380 |
| |
| 381 | + | |
| 382 | + | |
| 383 | + | |
380 | 384 |
| |
381 | 385 |
| |
382 | 386 |
| |
| |||
775 | 779 |
| |
776 | 780 |
| |
777 | 781 |
| |
| 782 | + | |
778 | 783 |
| |
779 | 784 |
| |
780 | 785 |
| |
| |||
1300 | 1305 |
| |
1301 | 1306 |
| |
1302 | 1307 |
| |
| 1308 | + | |
| 1309 | + | |
| 1310 | + | |
| 1311 | + | |
| 1312 | + | |
| 1313 | + | |
| 1314 | + | |
| 1315 | + | |
| 1316 | + | |
| 1317 | + | |
| 1318 | + | |
| 1319 | + | |
| 1320 | + | |
| 1321 | + | |
| 1322 | + | |
| 1323 | + | |
| 1324 | + | |
| 1325 | + | |
| 1326 | + | |
| 1327 | + | |
| 1328 | + | |
1303 | 1329 |
| |
1304 | 1330 |
| |
1305 | 1331 |
| |
|
Lines changed: 6 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
67 | 67 |
| |
68 | 68 |
| |
69 | 69 |
| |
| 70 | + | |
| 71 | + | |
70 | 72 |
| |
71 | 73 |
| |
72 | 74 |
| |
| |||
92 | 94 |
| |
93 | 95 |
| |
94 | 96 |
| |
| 97 | + | |
| 98 | + | |
95 | 99 |
| |
96 | 100 |
| |
97 | 101 |
| |
| |||
299 | 303 |
| |
300 | 304 |
| |
301 | 305 |
| |
302 |
| - | |
303 |
| - | |
304 |
| - | |
305 |
| - | |
306 |
| - | |
307 |
| - | |
| 306 | + | |
| 307 | + | |
308 | 308 |
| |
309 | 309 |
| |
310 | 310 |
| |
|
Lines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
81 | 81 |
| |
82 | 82 |
| |
83 | 83 |
| |
| 84 | + | |
| 85 | + | |
84 | 86 |
| |
85 | 87 |
| |
86 | 88 |
| |
|
Lines changed: 12 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
73 | 73 |
| |
74 | 74 |
| |
75 | 75 |
| |
76 |
| - | |
| 76 | + | |
| 77 | + | |
77 | 78 |
| |
78 | 79 |
| |
79 | 80 |
| |
| |||
383 | 384 |
| |
384 | 385 |
| |
385 | 386 |
| |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
386 | 397 |
| |
387 | 398 |
| |
388 | 399 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 |
| - | |
| 1 | + |
0 commit comments