浏览代码

Fix merge conflict

/pyrception-integration
leopoldo-zugasti 3 年前
当前提交
7a0508f5
共有 2 个文件被更改,包括 10 次插入2 次删除
  1. 4
      com.unity.perception/Editor/Visualizer/VisualizerInstaller.cs
  2. 8
      com.unity.perception/Editor/Pyrception.meta

4
com.unity.perception/Editor/Visualizer/VisualizerInstaller.cs


//==============================INSTALL VISUALIZER IN PYTHON FOR UNITY======================================
EditorUtility.DisplayProgressBar("Setting up the Visualizer", "Installing Visualizer (This may take a few minutes - this only happens once)", 2.5f / steps);
EditorUtility.DisplayProgressBar("Setting up the Visualizer", "Installing Visualizer (This may take a few minutes)", 2f / steps);
#if UNITY_EDITOR_WIN
ExecuteCmd($"\"{packagesPath}\"\\pip3.bat install --upgrade --no-warn-script-location unity-cv-datasetvisualizer", ref exitCode, ref output, waitForExit: -1);
#elif UNITY_EDITOR_OSX

Process[] after;
const int maxAttempts = 5;
const int maxAttempts = 10;
//Poll for new processes until the visualizer process is launched
EditorUtility.DisplayProgressBar("Opening Visualizer", "Finding Visualizer instance", 2f / 4);

8
com.unity.perception/Editor/Pyrception.meta


fileFormatVersion: 2
guid: 586f94aeebe844666bdf7cfa6bdc9cb1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存