Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature webarkit trackers and beyond -> PlanarTracker integration #16

Open
wants to merge 37 commits into
base: dev
Choose a base branch
from
Open

Feature webarkit trackers and beyond -> PlanarTracker integration #16

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
70eb898
restoring ARMulti
kalwalt May 14, 2020
0947a3a
video.c for javascript5 and similar
kalwalt May 14, 2020
c315ed5
removing other not necessary files
kalwalt May 15, 2020
6773be1
android.h is not necessary
kalwalt May 15, 2020
7946e7a
removing AR/gsub_es.h, gsub_es2.h, gsub_lite.h
kalwalt May 15, 2020
c390f77
removing Eden lib
kalwalt May 15, 2020
f04ec81
removing gsub.h and gsubConfig.h
kalwalt May 15, 2020
fcf13e2
Merge branch 'dev'
kalwalt Jan 17, 2022
683d401
Merge branch 'fix-webarkitLog'
kalwalt Apr 1, 2022
1462dd4
merge dev with auto_ptr fix
kalwalt Nov 12, 2022
0f4a704
removing dynamic throw's see #11
kalwalt Nov 28, 2022
6074362
adding try catch to avoid dynamic throw #11
kalwalt Nov 28, 2022
8f42e14
removing dymanic throw from image.h & .cpp see #11
kalwalt Nov 29, 2022
20c369f
Eigen 3.4.0 version
kalwalt Jun 30, 2022
0472a3d
added fatal log errors
kalwalt Nov 30, 2022
07baf8b
updated Readme
kalwalt Nov 30, 2022
0eb8bc1
removing config.h
kalwalt Nov 30, 2022
63d3f05
WebARKitTrackers from
kalwalt Apr 25, 2023
1de18a2
free() is not needed at all
kalwalt Apr 27, 2023
018c055
better processFrame functions
kalwalt May 1, 2023
5237407
move track method to WebARKitTracker class
kalwalt May 1, 2023
323b6df
simplified code: removing WebARKitAkazeTracker and
kalwalt May 1, 2023
3c33128
clang-formatting
kalwalt May 2, 2023
0029a16
default destructor
kalwalt May 4, 2023
210a7ed
implementing pImpl pattern - WebARKitTracker class
kalwalt May 4, 2023
03b8f4e
copy and move constructors
kalwalt May 4, 2023
c876779
New HarrisDetector and WebARKItFeatureDetector
kalwalt May 10, 2023
831fada
createFeatureMask method
kalwalt May 10, 2023
f98b9c0
adapted code from artoolkitx
kalwalt May 10, 2023
c9246e4
SelectTrackablesPoints, RunOpticalFlow and
kalwalt May 10, 2023
0abe7f4
other methods:
kalwalt May 10, 2023
0d02b23
ProcessFrameData_w and other functions
kalwalt May 10, 2023
045d4fe
new loadARParam, IsTrackableVisible
kalwalt May 12, 2023
63b56c4
some debug messages
kalwalt May 12, 2023
6c3d0c6
some cout's for debugging and provide
kalwalt May 13, 2023
4e3ce3a
fix for isssue with _maxNumberOfMarkersToTrack
kalwalt May 14, 2023
9769ce8
getTrackablePosePtr and termcrit as const
kalwalt May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions WebARKit/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ class WebARKitTracker::WebARKitTrackerImpl {
WebARKitTrackerImpl()
: corners(4), initialized(false), output(17, 0.0), _valid(false), numMatches(0)
{
_maxNumberOfMarkersToTrack = 1;
_featureDetectorW = WebARKitFeatureDetector();
_currentlyTrackedMarkers = 0;
//_maxNumberOfMarkersToTrack = 1;
_frameSizeX = 0;
_frameSizeY = 0;
_K = cv::Mat();
Expand All @@ -28,13 +26,14 @@ class WebARKitTracker::WebARKitTrackerImpl {
~WebARKitTrackerImpl() = default;

void initialize(webarkit::TRACKER_TYPE trackerType) {
SetFeatureDetector(trackerType);
//SetFeatureDetector(trackerType);
setDetectorType(trackerType);
}

void initialize_w(webarkit::TRACKER_TYPE trackerType, size_t xsize, size_t ysize) {
_frameSizeX = xsize;
_frameSizeY = ysize;
_maxNumberOfMarkersToTrack = 1;
kalwalt marked this conversation as resolved.
Show resolved Hide resolved
SetFeatureDetector(trackerType);
setDetectorType(trackerType);
_K = cv::Mat(3, 3, CV_64FC1);
Expand Down Expand Up @@ -406,8 +405,7 @@ class WebARKitTracker::WebARKitTrackerImpl {
return featureMask;
}

//bool CanDetectNewFeatures() { return (_currentlyTrackedMarkers < _maxNumberOfMarkersToTrack); }
bool CanDetectNewFeatures() { return true; }
bool CanDetectNewFeatures() { return (_currentlyTrackedMarkers < _maxNumberOfMarkersToTrack); }

bool CanMatchNewFeatures(int detectedFeaturesSize) { return (detectedFeaturesSize > minRequiredDetectedFeatures); }

Expand Down