diff --git a/J3DEngine/J3DEngine.aps b/J3DEngine/J3DEngine.aps
index f37b48a..18fef30 100644
Binary files a/J3DEngine/J3DEngine.aps and b/J3DEngine/J3DEngine.aps differ
diff --git a/J3DEngine/J3DEngine.rc b/J3DEngine/J3DEngine.rc
index 3728058..c8f5b3c 100644
Binary files a/J3DEngine/J3DEngine.rc and b/J3DEngine/J3DEngine.rc differ
diff --git a/J3DEngine/transtest.cpp b/J3DEngine/transtest.cpp
index 00cc143..bb05f93 100644
--- a/J3DEngine/transtest.cpp
+++ b/J3DEngine/transtest.cpp
@@ -854,9 +854,9 @@ int main()
for (int i = 0; i < sz; ++i)Sleep(20);
-
+ ::system("cls");
std::cout << "\n-----------------------------------" << std::endl;
- std::cout << " 欢迎使用J3DEngine V1.8 " << std::endl;
+ std::cout << " 欢迎使用J3DEngine V1.9 " << std::endl;
std::cout << " 程序初始化成功 " << std::endl;
std::cout << " 请使用J3DGUI程序发起指令 " << std::endl;
std::cout << " @Basic All rights reserved " << std::endl;
@@ -865,7 +865,6 @@ int main()
Global::processState = 0;
Global::process = PROCESSWORKING;
-
while (int a = GetMessage(&msg, NULL, 0, 0))
{
if (a != -1)
diff --git a/J3DEngine/x64/Release/Global.obj b/J3DEngine/x64/Release/Global.obj
index d82f3e9..871e8c1 100644
Binary files a/J3DEngine/x64/Release/Global.obj and b/J3DEngine/x64/Release/Global.obj differ
diff --git a/J3DEngine/x64/Release/J3DEngine.res b/J3DEngine/x64/Release/J3DEngine.res
index 2cb4051..4e61106 100644
Binary files a/J3DEngine/x64/Release/J3DEngine.res and b/J3DEngine/x64/Release/J3DEngine.res differ
diff --git a/J3DEngine/x64/Release/transtest.obj b/J3DEngine/x64/Release/transtest.obj
index 8dbe256..d828e49 100644
Binary files a/J3DEngine/x64/Release/transtest.obj and b/J3DEngine/x64/Release/transtest.obj differ
diff --git a/J3DEngine/x64/Release/vc141.pdb b/J3DEngine/x64/Release/vc141.pdb
index d32ea5f..7d66aa3 100644
Binary files a/J3DEngine/x64/Release/vc141.pdb and b/J3DEngine/x64/Release/vc141.pdb differ
diff --git a/J3DGUI/J3DGUI.APS b/J3DGUI/J3DGUI.APS
index d60419f..c389b64 100644
Binary files a/J3DGUI/J3DGUI.APS and b/J3DGUI/J3DGUI.APS differ
diff --git a/J3DGUI/J3DGUI.rc b/J3DGUI/J3DGUI.rc
index 96eec46..5349dd7 100644
Binary files a/J3DGUI/J3DGUI.rc and b/J3DGUI/J3DGUI.rc differ
diff --git a/J3DGUI/QT3DReconstruction.cpp b/J3DGUI/QT3DReconstruction.cpp
index 76e8ded..9837514 100644
--- a/J3DGUI/QT3DReconstruction.cpp
+++ b/J3DGUI/QT3DReconstruction.cpp
@@ -346,8 +346,8 @@ bool QT3DReconstruction::openView(QString fileName)
J3DViewer = new VIEWER::Scene();
// create viewer
if (!J3DViewer->Init(1361, 661, _T("J3D Viewer"),
- OPT::strInputFileName.IsEmpty() ? NULL : MAKE_PATH_SAFE(OPT::strInputFileName).c_str(),
- OPT::strMeshFileName.IsEmpty() ? NULL : MAKE_PATH_SAFE(OPT::strMeshFileName).c_str()))
+ fileName.toStdString().c_str(),
+ NULL))
return false;
//if (viewer.IsOpen() && !OPT::strOutputFileName.IsEmpty()) {
// // export the scene
@@ -355,6 +355,7 @@ bool QT3DReconstruction::openView(QString fileName)
//}
//置子窗口
+ Sleep(1000);
delete this->ui.widget;
this->ui.widget = new mvsviewer(1, this->ui.centralWidget);
this->ui.widget->setObjectName(QString::fromUtf8("widget"));
@@ -375,8 +376,8 @@ bool QT3DReconstruction::openView(QString fileName)
bool QT3DReconstruction::InitializeViewer(size_t argc, LPCTSTR* argv)
{
// initialize log and console
- OPEN_LOG();
- OPEN_LOGCONSOLE();
+ //OPEN_LOG();
+ //OPEN_LOGCONSOLE();
// group of options allowed only on command line
boost::program_options::options_description generic("Generic options");
@@ -514,8 +515,8 @@ void QT3DReconstruction::FinalizeViewer()
if (OPT::bLogFile)
CLOSE_LOGFILE();
- CLOSE_LOGCONSOLE();
- CLOSE_LOG();
+ //CLOSE_LOGCONSOLE();
+ //CLOSE_LOG();
}
void QT3DReconstruction::on_action_fullauto_triggered()
diff --git a/J3DGUI/QT3DReconstruction.vcxproj b/J3DGUI/QT3DReconstruction.vcxproj
index 8f98b0a..8500591 100644
--- a/J3DGUI/QT3DReconstruction.vcxproj
+++ b/J3DGUI/QT3DReconstruction.vcxproj
@@ -145,7 +145,7 @@
MultiThreadedDLL
- Console
+ Windows
false
diff --git a/MVSEngine/J3DMVSEngine.rc b/MVSEngine/J3DMVSEngine.rc
index bacf8d5..46f68be 100644
Binary files a/MVSEngine/J3DMVSEngine.rc and b/MVSEngine/J3DMVSEngine.rc differ
diff --git a/MVSEngine/MVSEngine.vcxproj b/MVSEngine/MVSEngine.vcxproj
index 54dd356..913526c 100644
--- a/MVSEngine/MVSEngine.vcxproj
+++ b/MVSEngine/MVSEngine.vcxproj
@@ -167,7 +167,7 @@
_CONSOLE;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NDEBUG;_WIN32;_HAS_EXCEPTIONS=1;_USE_OPENMP;_USE_OPENGL;_USE_BOOST;_USE_EIGEN;_USE_NONFREE;_USE_FAST_FLOAT2INT;_USE_FAST_CBRT;_USE_SSE;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)
false
- E:\Work\JWL3D\libs;C:\openMVS\Boost\boost_1_67_0;C:\openMVS\Eigen;C:\openMVS\build\openCV;C:\openMVS\openCV\sources\include;C:\openMVS\openCV\sources\include\opencv;C:\openMVS\openCV\sources\modules;E:\OpenGL\glew-2.1.0\include;C:\Program Files (x86)\GLFW\include
+ C:\openMVS\src;C:\openMVS\Boost\boost_1_67_0;C:\openMVS\Eigen;C:\openMVS\build\openCV;C:\openMVS\openCV\sources\include;C:\openMVS\openCV\sources\include\opencv;C:\openMVS\openCV\sources\modules;E:\OpenGL\glew-2.1.0\include;C:\Program Files (x86)\GLFW\include
AnySuitable
/bigobj /Zm170 %(AdditionalOptions)
true
@@ -181,7 +181,7 @@
true
true
C:/openMVS/Boost/boost_1_67_0/lib64-msvc-14.1;C:/openMVS/Boost/boost_1_67_0/lib64-msvc-14.1/$(Configuration);C:\Program Files %28x86%29\CGAL\lib;%(AdditionalLibraryDirectories)
- C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_iostreams-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_program_options-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_system-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_serialization-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_regex-vc141-mt-x64-1_67.lib;C:\openMVS\build\openCV\lib\Release\opencv_world341.lib;C:\openMVS\build\openCV\lib\Release\opencv_img_hash341.lib;C:\openMVS\jpeg-9d\libjpeg.lib;C:\Program Files (x86)\Ceres\lib\ceres.lib;C:\openMVS\build\Google_Log\Release\glog.lib;C:\openMVS\build\Google_Flags\lib\Release\gflags_static.lib;shlwapi.lib;C:\openMVS\CGAL\auxiliary\gmp\lib\libmpfr-4.lib;C:\openMVS\CGAL\auxiliary\gmp\lib\libgmp-10.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;opengl32.lib;glu32.lib;E:\OpenGL\glew-2.1.0\lib\Release\x64\glew32.lib;C:\Program Files (x86)\GLFW\lib\glfw3.lib;%(AdditionalDependencies)
+ C:\openMVS\build\openMVS\lib\vc15\x64\Release\MVS.lib;C:\openMVS\build\openMVS\lib\vc15\x64\Release\Math.lib;C:\openMVS\build\openMVS\lib\vc15\x64\Release\IO.lib;C:\openMVS\build\openMVS\lib\vc15\x64\Release\Common.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_iostreams-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_program_options-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_system-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_serialization-vc141-mt-x64-1_67.lib;C:\openMVS\Boost\boost_1_67_0\lib64-msvc-14.1\libboost_regex-vc141-mt-x64-1_67.lib;C:\openMVS\build\openCV\lib\Release\opencv_world341.lib;C:\openMVS\build\openCV\lib\Release\opencv_img_hash341.lib;C:\openMVS\jpeg-9d\libjpeg.lib;C:\Program Files (x86)\Ceres\lib\ceres.lib;C:\openMVS\build\Google_Log\Release\glog.lib;C:\openMVS\build\Google_Flags\lib\Release\gflags_static.lib;shlwapi.lib;C:\openMVS\CGAL\auxiliary\gmp\lib\libmpfr-4.lib;C:\openMVS\CGAL\auxiliary\gmp\lib\libgmp-10.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;opengl32.lib;glu32.lib;E:\OpenGL\glew-2.1.0\lib\Release\x64\glew32.lib;C:\Program Files (x86)\GLFW\lib\glfw3.lib;%(AdditionalDependencies)
%(IgnoreSpecificDefaultLibraries)
%(AdditionalOptions) /machine:x64 /FORCE:MULTIPLE
diff --git a/MVSEngine/x64/Release/DensifyPointCloud.obj b/MVSEngine/x64/Release/DensifyPointCloud.obj
index 234c7b1..bcea175 100644
Binary files a/MVSEngine/x64/Release/DensifyPointCloud.obj and b/MVSEngine/x64/Release/DensifyPointCloud.obj differ
diff --git a/MVSEngine/x64/Release/J3DMVSEngine.Build.CppClean.log b/MVSEngine/x64/Release/J3DMVSEngine.Build.CppClean.log
index ba1f25c..7042962 100644
--- a/MVSEngine/x64/Release/J3DMVSEngine.Build.CppClean.log
+++ b/MVSEngine/x64/Release/J3DMVSEngine.Build.CppClean.log
@@ -1,20 +1,2 @@
e:\work\jwl3d\mvsengine\x64\release\vc141.pdb
-e:\work\jwl3d\mvsengine\x64\release\texturemesh.obj
-e:\work\jwl3d\mvsengine\x64\release\refinemesh.obj
-e:\work\jwl3d\mvsengine\x64\release\reconstructmesh.obj
-e:\work\jwl3d\mvsengine\x64\release\densifypointcloud.obj
-e:\work\jwl3d\x64\release\j3dmvsengine.lib
-e:\work\jwl3d\x64\release\j3dmvsengine.exp
-e:\work\jwl3d\x64\release\j3dmvsengine.dll
-e:\work\jwl3d\x64\release\j3dmvsengine.pdb
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.res
e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\cl.command.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\cl.read.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\cl.write.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\j3dmvsengine.write.1u.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\link.command.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\link.read.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\link.write.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\rc.command.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\rc.read.1.tlog
-e:\work\jwl3d\mvsengine\x64\release\j3dmvsengine.tlog\rc.write.1.tlog
diff --git a/MVSEngine/x64/Release/ReconstructMesh.obj b/MVSEngine/x64/Release/ReconstructMesh.obj
index 7a8af87..5ba2049 100644
Binary files a/MVSEngine/x64/Release/ReconstructMesh.obj and b/MVSEngine/x64/Release/ReconstructMesh.obj differ
diff --git a/MVSEngine/x64/Release/RefineMesh.obj b/MVSEngine/x64/Release/RefineMesh.obj
index cff0f8b..670a07d 100644
Binary files a/MVSEngine/x64/Release/RefineMesh.obj and b/MVSEngine/x64/Release/RefineMesh.obj differ
diff --git a/MVSEngine/x64/Release/TextureMesh.obj b/MVSEngine/x64/Release/TextureMesh.obj
index f8955c8..ab11772 100644
Binary files a/MVSEngine/x64/Release/TextureMesh.obj and b/MVSEngine/x64/Release/TextureMesh.obj differ
diff --git a/MVSEngine/x64/Release/vc141.pdb b/MVSEngine/x64/Release/vc141.pdb
index c126fcf..24ec731 100644
Binary files a/MVSEngine/x64/Release/vc141.pdb and b/MVSEngine/x64/Release/vc141.pdb differ
diff --git a/Viewer/Viewer.rc b/Viewer/Viewer.rc
index 142b4e3..b70c44a 100644
Binary files a/Viewer/Viewer.rc and b/Viewer/Viewer.rc differ