浏览代码

commenting things to remove the compile errors in trunk

/for_vulkan_mem_test
Mohsen Kamalzadeh 3 年前
当前提交
72b7eb89
共有 9 个文件被更改,包括 37 次插入32 次删除
  1. 4
      com.unity.perception/Editor/GroundTruth/AddToConfigWindow.cs
  2. 4
      com.unity.perception/Editor/GroundTruth/IdLabelConfigEditor.cs
  3. 4
      com.unity.perception/Editor/GroundTruth/LabelConfigEditor.cs
  4. 8
      com.unity.perception/Editor/Randomization/VisualElements/AssetSource/AssetListElement.cs
  5. 10
      com.unity.perception/Editor/Randomization/VisualElements/Parameter/ParameterElement.cs
  6. 9
      com.unity.perception/Runtime/GroundTruth/Labelers/Visualization/Materials/OutlineMaterial.mat
  7. 25
      com.unity.perception/Runtime/GroundTruth/RenderPasses/CrossPipelinePasses/GroundTruthCrossPipelinePass.cs
  8. 3
      com.unity.perception/Runtime/GroundTruth/RenderPasses/CrossPipelinePasses/InstanceSegmentationCrossPipelinePass.cs
  9. 2
      com.unity.perception/Runtime/GroundTruth/RenderPasses/CrossPipelinePasses/SemanticSegmentationCrossPipelinePass.cs

4
com.unity.perception/Editor/GroundTruth/AddToConfigWindow.cs


public void RefreshLists()
{
CheckInclusionInConfigs(m_AllLabelConfigGuids, s_LabelValues.Count == 1? s_LabelValues.First() : null);
s_PresentConfigsListview.Refresh();
s_NonPresentConfigsListview.Refresh();
s_PresentConfigsListview.Rebuild();
s_NonPresentConfigsListview.Rebuild();
}
void OnEnable()
{

4
com.unity.perception/Editor/GroundTruth/IdLabelConfigEditor.cs


serializedObject.ApplyModifiedProperties();
RefreshAddedLabels();
m_LabelListView.Refresh();
m_LabelListView.Rebuild();
RefreshListViewHeight();
}
}

serializedObject.ApplyModifiedProperties();
RefreshAddedLabels();
m_LabelListView.Refresh();
m_LabelListView.Rebuild();
RefreshListViewHeight();
}
}

4
com.unity.perception/Editor/GroundTruth/LabelConfigEditor.cs


if (m_EditorHasUi && m_UiInitialized)
{
RefreshNonPresentLabels();
m_NonPresentLabelsListView.Refresh();
m_NonPresentLabelsListView.Rebuild();
m_LabelListView.Refresh();
m_LabelListView.Rebuild();
}
}

8
com.unity.perception/Editor/Randomization/VisualElements/AssetSource/AssetListElement.cs


m_Property.serializedObject.ApplyModifiedProperties();
listView.itemsSource = list;
listView.Refresh();
listView.Rebuild();
};
};

m_Property.arraySize++;
m_Property.serializedObject.ApplyModifiedProperties();
listView.itemsSource = list;
listView.Refresh();
listView.Rebuild();
listView.ScrollToItem(m_Property.arraySize);
};

m_Property.serializedObject.ApplyModifiedProperties();
listView.itemsSource = list;
listView.Refresh();
listView.Rebuild();
};
var clearOptionsButton = this.Q<Button>("clear-assets");

m_Property.serializedObject.ApplyModifiedProperties();
listView.itemsSource = list;
listView.Refresh();
listView.Rebuild();
};
}
}

10
com.unity.perception/Editor/Randomization/VisualElements/Parameter/ParameterElement.cs


m_SerializedProperty.serializedObject.ApplyModifiedProperties();
listView.itemsSource = categoricalParameter.probabilities;
listView.Refresh();
listView.Rebuild();
};
}

m_SerializedProperty.serializedObject.ApplyModifiedProperties();
listView.itemsSource = categoricalParameter.probabilities;
listView.Refresh();
listView.Rebuild();
listView.ScrollToItem(probabilitiesProperty.arraySize);
};

m_SerializedProperty.serializedObject.ApplyModifiedProperties();
listView.itemsSource = categoricalParameter.probabilities;
listView.Refresh();
listView.Rebuild();
};
else
addFolderButton.style.display = new StyleEnum<DisplayStyle>(DisplayStyle.None);

optionsProperty.arraySize = 0;
m_SerializedProperty.serializedObject.ApplyModifiedProperties();
listView.itemsSource = categoricalParameter.probabilities;
listView.Refresh();
listView.Rebuild();
};
var scrollView = listView.Q<ScrollView>();

m_SerializedProperty.serializedObject.ApplyModifiedProperties();
listView.itemsSource = categoricalParameter.probabilities;
listView.Refresh();
listView.Rebuild();
});
m_PropertiesContainer.Add(template);

9
com.unity.perception/Runtime/GroundTruth/Labelers/Visualization/Materials/OutlineMaterial.mat


m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6

m_PrefabAsset: {fileID: 0}
m_Name: OutlineMaterial
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
m_ShaderKeywords:
m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:

m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
- _BlendOp: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5

- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0.6256573, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0, g: 0.6256573, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

25
com.unity.perception/Runtime/GroundTruth/RenderPasses/CrossPipelinePasses/GroundTruthCrossPipelinePass.cs


using UnityEngine;
using UnityEngine.Experimental.Rendering;
using UnityEngine.Rendering;
using UnityEngine.Rendering.RendererUtils;
namespace UnityEngine.Perception.GroundTruth
{

renderContext.ExecuteCommandBuffer(cmd);
cmd.Clear();
if (rendererList.stateBlock == null)
renderContext.DrawRenderers(
rendererList.cullingResult, ref rendererList.drawSettings, ref rendererList.filteringSettings);
else
{
var renderStateBlock = rendererList.stateBlock.Value;
renderContext.DrawRenderers(
rendererList.cullingResult,
ref rendererList.drawSettings,
ref rendererList.filteringSettings,
ref renderStateBlock);
}
// if (rendererList.stateBlock == null)
// renderContext.DrawRenderers(
// rendererList.cullingResult, ref rendererList.drawSettings, ref rendererList.filteringSettings);
// else
// {
// var renderStateBlock = rendererList.stateBlock.Value;
// renderContext.DrawRenderers(
// rendererList.cullingResult,
// ref rendererList.drawSettings,
// ref rendererList.filteringSettings,
// ref renderStateBlock);
// }
}
public abstract void SetupMaterialProperties(

3
com.unity.perception/Runtime/GroundTruth/RenderPasses/CrossPipelinePasses/InstanceSegmentationCrossPipelinePass.cs


using UnityEngine;
using UnityEngine.Experimental.Rendering;
using UnityEngine.Rendering;
using UnityEngine.Rendering.RendererUtils;
namespace UnityEngine.Perception.GroundTruth
{

var result = CreateRendererListDesc(
camera, cullingResult, "FirstPass", 0, m_OverrideMaterial, m_LayerMask);
DrawRendererList(renderContext, cmd, RendererList.Create(result));
//DrawRendererList(renderContext, cmd, RendererList.Create(result));
}
}

2
com.unity.perception/Runtime/GroundTruth/RenderPasses/CrossPipelinePasses/SemanticSegmentationCrossPipelinePass.cs


s_LastFrameExecuted = Time.frameCount;
var renderList = CreateRendererListDesc(camera, cullingResult, "FirstPass", 0, m_OverrideMaterial, -1);
cmd.ClearRenderTarget(true, true, m_LabelConfig.skyColor);
DrawRendererList(renderContext, cmd, RendererList.Create(renderList));
//DrawRendererList(renderContext, cmd, RendererList.Create(renderList));
}
public override void SetupMaterialProperties(

正在加载...
取消
保存