优化

main_step2.py

@@ -46,6 +46,7 @@ def make3d(pid):
                 #修改文件内容不参与贴图
                 libs.set_photo_join_type(config.workdir, pid, 'photo2', file.split("_")[0], mesh='0', texture='0')
     else:
+        pass
         #设置photo2参与贴图，因为有的时候贴图会黑
         directory = os.path.join(config.workdir, pid, 'photo2')
         for root, dirs, files in os.walk(directory):
@@ -112,9 +113,16 @@ def make3d(pid):
         if isExistPoint == True:
             cmdSmall = "-align"
         #{config.r1["init"]}
+        
+        if common.task_need_high_model(pid):
+            calulate_type = '-mvsHigh'
+        else:
+            calulate_type = '-mvs'
+        
+        
         cmd = f'{config.rcbin} -load "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}" {cmdSmall} \
             -set "sfmEnableCameraPrior=True" -align -set "sfmEnableCameraPrior=False" -align -setReconstructionRegion "{os.path.join(config.workdir, pid, f"{pid}.rcbox")}" \
-            -mvs -modelSelectMaximalConnectedComponent -modelInvertSelection -modelRemoveSelectedTriangles -closeHoles -clean -simplify {simplify_value} -smooth -unwrap -calculateTexture -renameModel {pid} -save "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}" -quit'
+            {calulate_type} -modelSelectMaximalConnectedComponent -modelInvertSelection -modelRemoveSelectedTriangles -closeHoles -clean -simplify {simplify_value} -smooth -unwrap -calculateTexture -renameModel {pid} -save "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}" -quit'
         print(cmd)
         cmd = shlex.split(cmd)
         res = subprocess.run(cmd)
@@ -129,10 +137,21 @@ def make3d(pid):
             print(f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())} pid: {pid} rcproj文件不存在')
             return
         
+        #复制文件
+        shutil.copy(os.path.join(config.workdir, pid, f'{pid}.rcproj'), os.path.join(config.workdir, pid, f'{pid}_screen.rcproj'))
+        time.sleep(2)
+        #打开工程文件
+        cmd = f'{config.rcbin} -load "{os.path.join(config.workdir, pid, f"{pid}_screen.rcproj")}"'
+        cmd = shlex.split(cmd)
+        res = subprocess.run(cmd)
         
         #创建指定文件夹
         if not os.path.exists(os.path.join(config.workdir, pid, "output")):
             os.makedirs(os.path.join(config.workdir, pid, "output"))
+            
+        #判断output目录下是否有文件，有的话删除
+        files = os.listdir(os.path.join(config.workdir, pid, "output"))    
+        
         #执行导出
         cmd = f'{config.rcbin} -load "{os.path.join(config.workdir, pid, f"{pid}.rcproj")}"\
         -exportModel "{pid}" "{os.path.join(config.workdir, pid, "output", f"{pid}.obj")}" "d:\\make2\\config\\ModelExportParams102.xml" -quit'
@@ -145,7 +164,7 @@ def make3d(pid):
     else: # new version
         #判断是否要进行高精模
         if common.task_need_high_model(pid):
-                calulate_type = 'calculateHighModel'
+            calulate_type = 'calculateHighModel'
         else:
             calulate_type = 'calculateNormalModel'