diff --git a/WebARKit/WebARKitManager.cpp b/WebARKit/WebARKitManager.cpp index 703b4da..099489f 100644 --- a/WebARKit/WebARKitManager.cpp +++ b/WebARKit/WebARKitManager.cpp @@ -111,7 +111,7 @@ cv::Mat WebARKitManager::getGLViewMatrix() { std::array WebARKitManager::getTransformationMatrix() { std::array transformationMatrix; - webarkit::arglCameraViewRHf(m_tracker->getPoseMatrix(), transformationMatrix, 1.0f); + webarkit::arglCameraViewRHf((float (*)[4])m_tracker->getPoseMatrix2(), (float*)transformationMatrix.data(), 1.0f); return transformationMatrix; } diff --git a/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.cpp b/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.cpp index 4667dcd..2d6ed35 100644 --- a/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.cpp +++ b/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.cpp @@ -183,6 +183,9 @@ class WebARKitTracker::WebARKitTrackerImpl { float* getPoseMatrix2() { return (float*)_patternTrackingInfo.trans; } + //float[3][4] getPoseMatrix3() { return _patternTrackingInfo.trans; } + //float (*getPoseMatrix3())[3][4] { return &_patternTrackingInfo.trans; } + cv::Mat getGLViewMatrix() { return _patternTrackingInfo.glViewMatrix; }; std::array getCameraProjectionMatrix() { return m_cameraProjectionMatrix; }; @@ -813,6 +816,9 @@ cv::Mat WebARKitTracker::getPoseMatrix() { return _trackerImpl->getPoseMatrix(); float* WebARKitTracker::getPoseMatrix2() { return _trackerImpl->getPoseMatrix2(); } +//float[3][4] WebARKitTracker::getPoseMatrix3() { return _trackerImpl->getPoseMatrix3(); } +//float (*WebARKitTracker::getPoseMatrix3())[3][4]) { return &_trackerImpl->getPoseMatrix3(); } + cv::Mat WebARKitTracker::getGLViewMatrix() { return _trackerImpl->getGLViewMatrix(); } std::array WebARKitTracker::getCameraProjectionMatrix() { diff --git a/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/include/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.h b/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/include/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.h index edd4c5e..6494877 100644 --- a/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/include/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.h +++ b/WebARKit/WebARKitTrackers/WebARKitOpticalTracking/include/WebARKitTrackers/WebARKitOpticalTracking/WebARKitTracker.h @@ -35,6 +35,8 @@ class WebARKitTracker { float* getPoseMatrix2(); + //float (*WebARKitTracker::getPoseMatrix3()[3][4]); + cv::Mat getGLViewMatrix(); std::array getCameraProjectionMatrix();