V1.90 Release with GUI render control button

SoulBasic · Oct 30, 2020 · 48051ec · 48051ec
1 parent a000d45
commit 48051ec
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 30 deletions.
diff --git a/J3DEngine/J3DEngine.aps b/J3DEngine/J3DEngine.aps
diff --git a/J3DEngine/J3DEngine.rc b/J3DEngine/J3DEngine.rc
diff --git 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
diff --git a/J3DEngine/x64/Release/J3DEngine.res b/J3DEngine/x64/Release/J3DEngine.res
diff --git a/J3DEngine/x64/Release/transtest.obj b/J3DEngine/x64/Release/transtest.obj
diff --git a/J3DEngine/x64/Release/vc141.pdb b/J3DEngine/x64/Release/vc141.pdb
diff --git a/J3DGUI/J3DGUI.APS b/J3DGUI/J3DGUI.APS
diff --git a/J3DGUI/J3DGUI.rc b/J3DGUI/J3DGUI.rc
diff --git a/J3DGUI/QT3DReconstruction.cpp b/J3DGUI/QT3DReconstruction.cpp
@@ -346,15 +346,16 @@ 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
 	//	viewer.Export(MAKE_PATH_SAFE(OPT::strOutputFileName), OPT::strExportType.IsEmpty()?LPCTSTR(NULL):OPT::strExportType.c_str(), OPT::bLosslessTexture);
 	//}
 
 	//置子窗口
+	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
@@ -145,7 +145,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>

diff --git a/MVSEngine/J3DMVSEngine.rc b/MVSEngine/J3DMVSEngine.rc
diff --git a/MVSEngine/MVSEngine.vcxproj b/MVSEngine/MVSEngine.vcxproj
@@ -167,7 +167,7 @@
       </SDLCheck>
       <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
       <ConformanceMode>false</ConformanceMode>
-      <AdditionalIncludeDirectories>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</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>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</AdditionalIncludeDirectories>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalOptions>/bigobj /Zm170 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -181,7 +181,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>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)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>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)</AdditionalDependencies>
+      <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)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <AdditionalOptions>%(AdditionalOptions) /machine:x64 /FORCE:MULTIPLE</AdditionalOptions>
     </Link>

diff --git a/MVSEngine/x64/Release/DensifyPointCloud.obj b/MVSEngine/x64/Release/DensifyPointCloud.obj
diff --git 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
diff --git a/MVSEngine/x64/Release/RefineMesh.obj b/MVSEngine/x64/Release/RefineMesh.obj
diff --git a/MVSEngine/x64/Release/TextureMesh.obj b/MVSEngine/x64/Release/TextureMesh.obj
diff --git a/MVSEngine/x64/Release/vc141.pdb b/MVSEngine/x64/Release/vc141.pdb
diff --git a/Viewer/Viewer.rc b/Viewer/Viewer.rc