Skip to content
This repository was archived by the owner on Jul 20, 2023. It is now read-only.

Commit 4d8d95c

Browse files
azdtazdt
committed
Merge branch 'develop'
2 parents c343dee + 9be7098 commit 4d8d95c

File tree

162 files changed

+4237
-1586
lines changed

Some content is hidden

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

162 files changed

+4237
-1586
lines changed

‎.gitignore‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,30 @@
4242
*.app
4343

4444
#others
45-
45+
*.*pre1
4646
*.rej
4747
*.stash
4848
*.rc
4949
*.res
5050
*.exp
5151
*.ilk
5252
*.pdb
53+
*.autosave
5354

5455
# Visual Studio files
5556
.vs*
5657
x64*
5758

58-
*.txt
59+
# generated documentation
60+
doc/
61+
5962
*.log
6063
*.tlog
6164
*.TMP
6265
*.tmp
6366

6467

68+
build/
69+
interfaces/SolARModuleOpencv_traits.h.bak
70+
interfaces/SolAROpticalFlowPyrLKOpencv.h.bak
71+
interfaces/SolARPoseFinderFrom2D2DOpencv.h.bak

‎CMakeLists.txt‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
cmake_minimum_required(VERSION 3.7.2)
22

33
##################################################
4-
set (VERSION_NUMBER "0.5.0")
4+
set (VERSION_NUMBER "0.6.0")
55
project("SolARModuleOpenCV")
66
set (SOURCES
77
src/SolARModuleOpencv.cpp
88
src/SolARKeypointDetectorOpencv.cpp
9+
src/SolARKeypointDetectorRegionOpencv.cpp
910
src/SolARImageLoaderOpencv.cpp
1011
src/SolARImageConvertorOpencv.cpp
12+
src/SolARImageConvertorUnity.cpp
1113
src/SolARImageViewerOpencv.cpp
1214
src/SolARCameraOpencv.cpp
1315
src/SolAROpenCVHelper.cpp
1416
src/SolARCameraCalibrationOpencv.cpp
1517
src/SolARMarker2DNaturalImageOpencv.cpp
1618
src/SolARContoursExtractorOpencv.cpp
1719
src/SolARPerspectiveControllerOpencv.cpp
20+
src/SolARProjectOpencv.cpp
21+
src/SolARUnprojectplanarPointsOpencv.cpp
1822
src/SolARMarker2DSquaredBinaryOpencv.cpp
1923
src/SolARContoursFilterBinaryMarkerOpencv.cpp
2024
src/SolARDescriptorsExtractorSBPatternOpencv.cpp
@@ -26,14 +30,17 @@ set (SOURCES
2630
src/SolARGeometricMatchesFilterOpencv.cpp
2731
src/SolAR2DOverlayOpencv.cpp
2832
src/SolARHomographyEstimationOpencv.cpp
33+
src/SolARPoseEstimationPlanarPointsOpencv.cpp
2934
src/SolARPoseEstimationPnpEPFL.cpp
3035
src/SolARPoseEstimationPnpOpencv.cpp
36+
src/SolARPoseEstimationSACPnpOpencv.cpp
3137
src/SolARDescriptorsExtractorAKAZE2Opencv.cpp
3238
src/AKAZE2/akaze.cpp
3339
src/AKAZE2/AKAZEFeatures.cpp
3440
src/AKAZE2/fed.cpp
3541
src/AKAZE2/nldiffusion_functions.cpp
3642
src/SolARSVDTriangulationOpencv.cpp
43+
src/SolAROpticalFlowPyrLKOpencv.cpp
3744
src/SolARFundamentalMatrixEstimationOpencv.cpp
3845
src/SolARSVDFundamentalMatrixDecomposerOpencv.cpp
3946
src/SolARImageFilterBinaryOpencv.cpp
@@ -48,20 +55,25 @@ set (SOURCES
4855
src/SolARHomographyMatrixDecomposerOpencv.cpp
4956
src/SolARPoseFinderFrom2D2DOpencv.cpp
5057
src/SolARMatchesOverlayOpencv.cpp
58+
src/SolARUndistortPointsOpencv.cpp
5159
)
5260

5361
set (HEADERS
5462
interfaces/SolARCameraOpencv.h
5563
interfaces/SolARImageConvertorOpencv.h
64+
interfaces/SolARImageConvertorUnity.h
5665
interfaces/SolARImageLoaderOpencv.h
5766
interfaces/SolARImageViewerOpencv.h
5867
interfaces/SolARKeypointDetectorOpencv.h
68+
interfaces/SolARKeypointDetectorRegionOpencv.h
5969
interfaces/SolAROpenCVHelper.h
6070
interfaces/SolAROpencvAPI.h
6171
interfaces/SolARCameraCalibrationOpencv.h
6272
interfaces/SolARMarker2DNaturalImageOpencv.h
6373
interfaces/SolARContoursExtractorOpencv.h
6474
interfaces/SolARPerspectiveControllerOpencv.h
75+
interfaces/SolARProjectOpencv.h
76+
interfaces/SolARUnprojectPlanarPointsOpencv.h
6577
interfaces/SolARMarker2DSquaredBinaryOpencv.h
6678
interfaces/SolARContoursFilterBinaryMarkerOpencv.h
6779
interfaces/SolARDescriptorsExtractorSBPatternOpencv.h
@@ -74,11 +86,14 @@ set (HEADERS
7486
interfaces/SolARDescriptorMatcherRadiusOpencv.h
7587
interfaces/SolARFundamentalMatrixEstimationOpencv.h
7688
interfaces/SolARSVDFundamentalMatrixDecomposerOpencv.h
89+
interfaces/SolARPoseEstimationPlanarPointsOpencv.h
7790
interfaces/SolARPoseEstimationPnpEPFL.h
7891
interfaces/SolARPoseEstimationPnpOpencv.h
92+
interfaces/SolARPoseEstimationSACPnpOpencv.h
7993
interfaces/SolARGeometricMatchesFilterOpencv.h
8094
interfaces/SolAR2DOverlayOpencv.h
8195
interfaces/SolARSVDTriangulationOpencv.h
96+
interfaces/SolAROpticalFlowPyrLKOpencv.h
8297
src/AKAZE2/AKAZEConfig.h
8398
src/AKAZE2/AKAZEFeatures.h
8499
src/AKAZE2/fed.h
@@ -98,6 +113,7 @@ set (HEADERS
98113
interfaces/SolARHomographyMatrixDecomposerOpencv.h
99114
interfaces/SolARPoseFinderFrom2D2DOpencv.h
100115
interfaces/SolARMatchesOverlayOpencv.h
116+
interfaces/SolARUndistortPointsOpencv.h
101117
)
102118

103119
install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/xpcf_SolARModuleOpenCV_registry.xml" DESTINATION $ENV{BCOMDEVROOT}/.xpcf/SolAR/ )

‎SolARModuleOpenCV.pro‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ CONFIG -= qt
44

55
## global defintions : target lib name, version
66
TARGET = SolARModuleOpenCV
7-
INSTALLSUBDIR = bcomBuild
87
FRAMEWORK = $$TARGET
9-
VERSION=0.5.0
8+
VERSION=0.6.0
109

1110
DEFINES += MYVERSION=$${VERSION}
1211
DEFINES += TEMPLATE_LIBRARY
13-
CONFIG += Cpp11
14-
CONFIG += c++11
12+
CONFIG += c++1z
1513

1614

1715
CONFIG(debug,debug|release) {
@@ -25,10 +23,9 @@ CONFIG(release,debug|release) {
2523
}
2624

2725

28-
PROJECTDEPLOYDIR = $$(BCOMDEVROOT)/$${INSTALLSUBDIR}/$${FRAMEWORK}/$${VERSION}
29-
DEPENDENCIESCONFIG = shared
26+
DEPENDENCIESCONFIG = shared recurse
3027

31-
include ($$(BCOMDEVROOT)/builddefs/qmake/templatelibconfig.pri)
28+
include (../builddefs/qmake/templatelibconfig.pri)
3229

3330
## DEFINES FOR MSVC/INTEL C++ compilers
3431
msvc {
@@ -44,15 +41,19 @@ INCLUDEPATH += interfaces/
4441

4542
HEADERS += interfaces/SolARCameraOpencv.h \
4643
interfaces/SolARImageConvertorOpencv.h \
44+
interfaces/SolARImageConvertorUnity.h \
4745
interfaces/SolARImageLoaderOpencv.h \
4846
interfaces/SolARImageViewerOpencv.h \
4947
interfaces/SolARKeypointDetectorOpencv.h \
48+
interfaces/SolARKeypointDetectorRegionOpencv.h \
5049
interfaces/SolAROpenCVHelper.h \
5150
interfaces/SolAROpencvAPI.h \
5251
interfaces/SolARCameraCalibrationOpencv.h \
5352
interfaces/SolARMarker2DNaturalImageOpencv.h \
5453
interfaces/SolARContoursExtractorOpencv.h \
5554
interfaces/SolARPerspectiveControllerOpencv.h \
55+
interfaces/SolARProjectOpencv.h \
56+
interfaces/SolARUnprojectPlanarPointsOpencv.h \
5657
interfaces/SolARMarker2DSquaredBinaryOpencv.h \
5758
interfaces/SolARContoursFilterBinaryMarkerOpencv.h \
5859
interfaces/SolARDescriptorsExtractorSBPatternOpencv.h \
@@ -65,11 +66,14 @@ HEADERS += interfaces/SolARCameraOpencv.h \
6566
interfaces/SolARDescriptorMatcherRadiusOpencv.h \
6667
interfaces/SolARFundamentalMatrixEstimationOpencv.h \
6768
interfaces/SolARSVDFundamentalMatrixDecomposerOpencv.h\
69+
interfaces/SolARPoseEstimationPlanarPointsOpencv.h \
6870
interfaces/SolARPoseEstimationPnpEPFL.h \
6971
interfaces/SolARPoseEstimationPnpOpencv.h \
72+
interfaces/SolARPoseEstimationSACPnpOpencv.h \
7073
interfaces/SolARGeometricMatchesFilterOpencv.h \
7174
interfaces/SolAR2DOverlayOpencv.h \
7275
interfaces/SolARSVDTriangulationOpencv.h \
76+
interfaces/SolAROpticalFlowPyrLKOpencv.h \
7377
src/AKAZE2/AKAZEConfig.h \
7478
src/AKAZE2/AKAZEFeatures.h \
7579
src/AKAZE2/fed.h \
@@ -88,19 +92,24 @@ HEADERS += interfaces/SolARCameraOpencv.h \
8892
interfaces/SolAR3DOverlayBoxOpencv.h \
8993
interfaces/SolARHomographyMatrixDecomposerOpencv.h \
9094
interfaces/SolARPoseFinderFrom2D2DOpencv.h \
91-
interfaces/SolARMatchesOverlayOpencv.h
95+
interfaces/SolARMatchesOverlayOpencv.h \
96+
interfaces/SolARUndistortPointsOpencv.h
9297

9398
SOURCES += src/SolARModuleOpencv.cpp \
9499
src/SolARKeypointDetectorOpencv.cpp \
100+
src/SolARKeypointDetectorRegionOpencv.cpp \
95101
src/SolARImageLoaderOpencv.cpp \
96102
src/SolARImageConvertorOpencv.cpp \
103+
src/SolARImageConvertorUnity.cpp \
97104
src/SolARImageViewerOpencv.cpp \
98105
src/SolARCameraOpencv.cpp \
99106
src/SolAROpenCVHelper.cpp \
100107
src/SolARCameraCalibrationOpencv.cpp \
101108
src/SolARMarker2DNaturalImageOpencv.cpp \
102109
src/SolARContoursExtractorOpencv.cpp \
103110
src/SolARPerspectiveControllerOpencv.cpp \
111+
src/SolARProjectOpencv.cpp \
112+
src/SolARUnprojectplanarPointsOpencv.cpp \
104113
src/SolARMarker2DSquaredBinaryOpencv.cpp \
105114
src/SolARContoursFilterBinaryMarkerOpencv.cpp \
106115
src/SolARDescriptorsExtractorSBPatternOpencv.cpp \
@@ -112,14 +121,17 @@ SOURCES += src/SolARModuleOpencv.cpp \
112121
src/SolARGeometricMatchesFilterOpencv.cpp \
113122
src/SolAR2DOverlayOpencv.cpp \
114123
src/SolARHomographyEstimationOpencv.cpp \
124+
src/SolARPoseEstimationPlanarPointsOpencv.cpp \
115125
src/SolARPoseEstimationPnpEPFL.cpp \
116126
src/SolARPoseEstimationPnpOpencv.cpp \
127+
src/SolARPoseEstimationSACPnpOpencv.cpp \
117128
src/SolARDescriptorsExtractorAKAZE2Opencv.cpp \
118129
src/AKAZE2/akaze.cpp \
119130
src/AKAZE2/AKAZEFeatures.cpp \
120131
src/AKAZE2/fed.cpp \
121132
src/AKAZE2/nldiffusion_functions.cpp \
122133
src/SolARSVDTriangulationOpencv.cpp \
134+
src/SolAROpticalFlowPyrLKOpencv.cpp \
123135
src/SolARFundamentalMatrixEstimationOpencv.cpp \
124136
src/SolARSVDFundamentalMatrixDecomposerOpencv.cpp \
125137
src/SolARImageFilterBinaryOpencv.cpp \
@@ -133,10 +145,13 @@ SOURCES += src/SolARModuleOpencv.cpp \
133145
src/SolAR3DOverlayBoxOpencv.cpp \
134146
src/SolARHomographyMatrixDecomposerOpencv.cpp \
135147
src/SolARPoseFinderFrom2D2DOpencv.cpp \
136-
src/SolARMatchesOverlayOpencv.cpp
148+
src/SolARMatchesOverlayOpencv.cpp \
149+
src/SolARUndistortPointsOpencv.cpp
137150

138151
unix {
139152
QMAKE_CXXFLAGS += -Wignored-qualifiers
153+
QMAKE_LINK=clang++
154+
QMAKE_CXX = clang++
140155
}
141156

142157
macx {
@@ -152,13 +167,13 @@ win32 {
152167

153168
DEFINES += WIN64 UNICODE _UNICODE
154169
QMAKE_COMPILER_DEFINES += _WIN64
155-
QMAKE_CXXFLAGS += -wd4250 -wd4251 -wd4244 -wd4275
170+
QMAKE_CXXFLAGS += -wd4250 -wd4251 -wd4244 -wd4275 /Od
156171
}
157172

158173
header_files.path = $${PROJECTDEPLOYDIR}/interfaces
159174
header_files.files = $$files($${PWD}/interfaces/*.h*)
160175

161-
xpcf_xml_files.path = $$(BCOMDEVROOT)/.xpcf/SolAR
176+
xpcf_xml_files.path = $$(HOME)/.xpcf/SolAR
162177
xpcf_xml_files.files=$$files($${PWD}/xpcf*.xml)
163178

164179
INSTALLS += header_files

‎SolARPoseEstimationEpnpEPFL.h‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)