Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2ac3a93

Browse files
committed
not integrated no transform -> default transform MINF (and globaltrackinglost for depthsensing.cpp)
1 parent6da5d73 commit2ac3a93

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

‎FriedLiver/Source/DepthSensing/DepthSensing.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,7 @@ void StopScanningAndExit(bool aborted = false)
933933
numValidTransforms =PoseHelper::countNumValidTransforms(trajectory);numTransforms = (unsignedint)trajectory.size();
934934
if (numValidTransforms < (unsignedint)std::round(0.5f * numTransforms)) valid =false;// not enough valid transforms
935935
std::cout <<"#VALID TRANSFORMS =" << numValidTransforms << std::endl;
936-
//((SensorDataReader*)g_depthSensingRGBDSensor)->saveToFile(saveFile, trajectory); //overwrite the original file //TODO UNCOMMENT
937-
//((SensorDataReader*)g_depthSensingRGBDSensor)->saveToFile(util::removeExtensions(saveFile) + "_fried.sens", trajectory); //overwrite the original file
936+
((SensorDataReader*)g_depthSensingRGBDSensor)->saveToFile(saveFile, trajectory);//overwrite the original file //TODO UNCOMMENT
938937
//save ply
939938
std::cout <<"[marching cubes]";
940939
StopScanningAndExtractIsoSurfaceMC(util::removeExtensions(GlobalAppState::get().s_binaryDumpSensorFile) +".ply",true);//force overwrite and existing plys
@@ -1022,11 +1021,11 @@ void CALLBACK OnD3D11FrameRender(ID3D11Device* pd3dDevice, ID3D11DeviceContext*
10221021
// Reconstruction of current frame
10231022
///////////////////////////////////////
10241023
if (GlobalBundlingState::get().s_enableGlobalTimings) {GlobalAppState::get().WaitForGPU();cudaDeviceSynchronize(); t.start(); }
1025-
bool validTransform =true;
1024+
bool validTransform =true;bool bGlobalTrackingLost =false;
10261025
if (bGotDepth) {
10271026
mat4f transformation =mat4f::zero();
10281027
unsignedint frameIdx;
1029-
validTransform = g_depthSensingBundler->getCurrentIntegrationFrame(transformation, frameIdx);
1028+
validTransform = g_depthSensingBundler->getCurrentIntegrationFrame(transformation, frameIdx, bGlobalTrackingLost);
10301029
#ifdef RUN_MULTITHREADED
10311030
//allow bundler to process new frame
10321031
g_depthSensingBundler->confirmProcessedInputFrame();
@@ -1050,7 +1049,7 @@ void CALLBACK OnD3D11FrameRender(ID3D11Device* pd3dDevice, ID3D11DeviceContext*
10501049
g_depthSensingBundler->getTrajectoryManager()->addFrame(TrajectoryManager::TrajectoryFrame::Integrated, transformation, g_CudaImageManager->getCurrFrameNumber());
10511050
}
10521051
else {
1053-
g_depthSensingBundler->getTrajectoryManager()->addFrame(TrajectoryManager::TrajectoryFrame::NotIntegrated_NoTransform,mat4f::zero(), g_CudaImageManager->getCurrFrameNumber());
1052+
g_depthSensingBundler->getTrajectoryManager()->addFrame(TrajectoryManager::TrajectoryFrame::NotIntegrated_NoTransform,mat4f::zero(-std::numeric_limits<float>::infinity()), g_CudaImageManager->getCurrFrameNumber());
10541053
}
10551054

10561055

@@ -1064,7 +1063,7 @@ void CALLBACK OnD3D11FrameRender(ID3D11Device* pd3dDevice, ID3D11DeviceContext*
10641063
// Render with view of current frame
10651064
///////////////////////////////////////
10661065
if (GlobalBundlingState::get().s_enableGlobalTimings) { t.start(); }// just sync-ed //{ GlobalAppState::get().WaitForGPU(); cudaDeviceSynchronize(); t.start(); }
1067-
bool trackingLost = bGotDepth && !validTransform;
1066+
bool trackingLost = bGotDepth &&(!validTransform || bGlobalTrackingLost);//tracking lost when local frame has tracking lost or global frame has tracking lost
10681067
visualizeFrame(pd3dImmediateContext, pd3dDevice, g_transformWorld * g_lastRigidTransform, trackingLost);
10691068
if (GlobalBundlingState::get().s_enableGlobalTimings) {GlobalAppState::get().WaitForGPU();cudaDeviceSynchronize(); t.stop();TimingLog::getFrameTiming(true).timeVisualize = t.getElapsedTimeMS(); }
10701069

‎FriedLiver/Source/FriedLiver.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ int main(int argc, char** argv)
238238
if (!out.is_open())throwMLIB_EXCEPTION("unable to open log file" +util::removeExtensions(filename) +".friedliver.log");
239239
//std::streambuf *coutbuf = std::cout.rdbuf(); //save old buf
240240
std::cout.rdbuf(out.rdbuf());//redirect std::cout to out.txt!
241+
std::cout <<VAR_NAME(fileNameDescGlobalApp) <<" =" << fileNameDescGlobalApp << std::endl;//log the param file used
242+
std::cout <<VAR_NAME(fileNameDescGlobalBundling) <<" =" << fileNameDescGlobalBundling << std::endl;
243+
std::cout << std::endl;
241244
}
242245
GlobalAppState::getInstance().readMembers(parameterFileGlobalApp);
243246

‎FriedLiver/Source/TrajectoryManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TrajectoryManager::TrajectoryManager(unsigned int numMaxImage)
1111
m_frames.reserve(numMaxImage);
1212
m_framesSort.reserve(numMaxImage);
1313
for (unsignedint i =0; i < numMaxImage; i++) {
14-
m_frames.push_back(TrajectoryFrame{ TrajectoryFrame::NotIntegrated_NoTransform, (unsignedint)-1,mat4f::zero(), m_optmizedTransforms[i] });
14+
m_frames.push_back(TrajectoryFrame{ TrajectoryFrame::NotIntegrated_NoTransform, (unsignedint)-1,mat4f::zero(-std::numeric_limits<float>::infinity()), m_optmizedTransforms[i] });
1515
}
1616
m_numAddedFrames =0;
1717
m_numOptimizedFrames =0;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp