浏览代码

minor change in names, privae/public fields, and syntax

/4.1
Shan Jiang 4 年前
当前提交
f36db955
共有 4 个文件被更改,包括 24 次插入26 次删除
  1. 16
      Assets/Scenes/ImageTracking/Multi Prefab - Image Tracking/DynamicPrefab.cs
  2. 12
      Assets/Scenes/ImageTracking/Multi Prefab - Image Tracking/Multi-Image Tracking.unity
  3. 18
      Assets/Scenes/ImageTracking/Multi Prefab - Image Tracking/MultiTrackedImageInfoManager.cs
  4. 4
      ProjectSettings/ProjectSettings.asset

16
Assets/Scenes/ImageTracking/Multi Prefab - Image Tracking/DynamicPrefab.cs


{
case State.ChangeToAlternativePrefab:
{
if (alternativePrefab == null)
if (!alternativePrefab)
{
SetError("No alternative prefab is given.");
break;

if (manager == null)
if (!manager)
{
SetError($"No {nameof(MultiTrackedImageInfoManager)} available.");
break;

if (library == null)
if (!library)
if (m_OriginalPrefab == null)
if (!m_OriginalPrefab)
m_OriginalPrefab = manager.GetPrefabForReferenceImage(library[0]);
manager.SetPrefabForReferenceImage(library[0], alternativePrefab);

case State.ChangeToOriginalPrefab:
{
if (m_OriginalPrefab == null)
if (!m_OriginalPrefab)
{
SetError("No original prefab is given.");
break;

if (manager == null)
if (!manager)
{
SetError($"No {nameof(MultiTrackedImageInfoManager)} available.");
break;

if (library == null)
if (!library)
{
SetError($"No image library available.");
break;

}
}
}
}
}

12
Assets/Scenes/ImageTracking/Multi Prefab - Image Tracking/Multi-Image Tracking.unity


m_Name:
m_EditorClassIdentifier:
m_PrefabsList:
- m_ImageGuid: f0340be5-710e-49ff-bc70-45f1315b9202
m_Prefab: {fileID: 6916502901855112170, guid: e22b43a8fcdab413bb4f52f5076f759e,
- imageGuid: f0340be5-710e-49ff-bc70-45f1315b9202
imagePrefab: {fileID: 6916502901855112170, guid: e22b43a8fcdab413bb4f52f5076f759e,
- m_ImageGuid: 2c29eeed-d95c-4111-b724-80f9ff10ce86
m_Prefab: {fileID: 2804028924010200506, guid: 379785de5e39005469c875710d3cc5a7,
- imageGuid: 2c29eeed-d95c-4111-b724-80f9ff10ce86
imagePrefab: {fileID: 2804028924010200506, guid: 379785de5e39005469c875710d3cc5a7,
- m_ImageGuid: aae75228-1973-4dc0-b7a2-53d1566ee402
m_Prefab: {fileID: 3279860958548870494, guid: 2584331523bd14e8898965d93034efdb,
- imageGuid: aae75228-1973-4dc0-b7a2-53d1566ee402
imagePrefab: {fileID: 3279860958548870494, guid: 2584331523bd14e8898965d93034efdb,
type: 3}
m_ImageLibrary: {fileID: 11400000, guid: c86e375d7e7430442a1104e88fa21f21, type: 2}
--- !u!114 &264295717

18
Assets/Scenes/ImageTracking/Multi Prefab - Image Tracking/MultiTrackedImageInfoManager.cs


struct NamedPrefab
{
// System.Guid isn't serializable, so we store the Guid as a string. At runtime, this is converted back to a System.Guid
[SerializeField]
string m_ImageGuid;
public string imageGuid => m_ImageGuid;
[SerializeField]
public GameObject m_Prefab;
public string imageGuid;
public GameObject imagePrefab;
m_ImageGuid = guid.ToString();
m_Prefab = prefab;
imageGuid = guid.ToString();
imagePrefab = prefab;
}
}

m_PrefabsDictionary = new Dictionary<Guid, GameObject>();
foreach (var entry in m_PrefabsList)
{
m_PrefabsDictionary.Add(Guid.Parse(entry.imageGuid), entry.m_Prefab);
m_PrefabsDictionary.Add(Guid.Parse(entry.imageGuid), entry.imagePrefab);
}
}

foreach (var trackedImage in eventArgs.added)
{
// Give the initial image a reasonable default scale
var minLocalScalar = Mathf.Min(trackedImage.size.x, trackedImage.size.y);
trackedImage.transform.localScale = new Vector3(minLocalScalar / 2, minLocalScalar / 2, minLocalScalar / 2);
var minLocalScalar = Mathf.Min(trackedImage.size.x, trackedImage.size.y) / 2;
trackedImage.transform.localScale = new Vector3(minLocalScalar, minLocalScalar, minLocalScalar);
AssignOrShowPrefab(trackedImage);
}

4
ProjectSettings/ProjectSettings.asset


16:9: 1
Others: 1
bundleVersion: 0.1
preloadedAssets: []
preloadedAssets:
- {fileID: 4800000, guid: e7c77f6eaab324a819efdc13b8125a39, type: 3}
- {fileID: -7479341934665344595, guid: e2f869774b12e400996eb546603602e3, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1

正在加载...
取消
保存