Skip to content

Commit 8ba94c5

Browse files
authored
[src] Restore Sofa Collision component Data display (#220)
1 parent d022d30 commit 8ba94c5

2 files changed

Lines changed: 8 additions & 11 deletions

File tree

Core/Scripts/Core/Components/SofaComponentFactory.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ static public SofaBaseComponent CreateSofaCollisionPipeline(string nameId, strin
2525
}
2626
}
2727

28-
2928
SofaCollisionPipeline collisionPipe = null;
3029
if (collisionUnityObject == null)
3130
{
@@ -42,7 +41,7 @@ static public SofaBaseComponent CreateSofaCollisionPipeline(string nameId, strin
4241
SofaComponent sofaCompo = collisionUnityObject.AddComponent<SofaComponent>();
4342
sofaCompo.SetDAGNode(sofaNodeOwner);
4443
sofaCompo.SetPropagateName(false);
45-
sofaCompo.ShowData = false;
44+
sofaCompo.ShowData = true;
4645
sofaCompo.Create(sofaNodeOwner.m_sofaContext, nameId, "unset");
4746
sofaCompo.m_baseComponentType = sofaCompo.BaseTypeFromString(componentType);
4847

@@ -125,7 +124,7 @@ static public SofaBaseComponent CreateSofaComponent(string nameId, string compon
125124
{
126125

127126
if (componentType != "SofaCollisionModel" && componentType.IndexOf("SofaCollision") != -1)
128-
return CreateSofaCollisionPipeline(nameId, componentType, sofaNodeOwner, parent);
127+
return CreateSofaCollisionPipeline(nameId, componentType, sofaNodeOwner, parent);
129128

130129

131130
GameObject compoGO = new GameObject("SofaComponent - " + nameId);

Core/Scripts/Editor/Components/SofaBaseComponentEditor.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,24 @@ void OnEnable()
2828
public override void OnInspectorGUI()
2929
{
3030
SofaBaseComponent compo = (SofaBaseComponent)this.target;
31-
//if (compo.isAwake() == false)
32-
//return;
33-
31+
EditorGUILayout.LabelField("Sofa Component Information", EditorStyles.whiteLargeLabel);
3432
EditorGUI.BeginDisabledGroup(true);
35-
compo.UniqueNameId = EditorGUILayout.TextField("Unique Name Id", compo.UniqueNameId);
36-
EditorGUILayout.ObjectField("Sofa Context", compo.m_sofaContext, typeof(Object), true);
37-
EditorGUILayout.ObjectField("Sofa DAG Node", compo.m_ownerNode, typeof(Object), true);
33+
EditorGUILayout.TextField("Component Type", compo.m_componentType);
3834
EditorGUILayout.EnumPopup("BaseComponentType", compo.m_baseComponentType);
39-
compo.m_componentType = EditorGUILayout.TextField("Component Type", compo.m_componentType);
35+
EditorGUILayout.TextField("Unique Name Id", compo.UniqueNameId);
36+
EditorGUILayout.ObjectField("Sofa DAG Node", compo.m_ownerNode, typeof(Object), true);
4037
EditorGUI.EndDisabledGroup();
4138

4239
EditorGUILayout.Separator();
43-
40+
EditorGUILayout.LabelField("SofaUnity Parameters", EditorStyles.whiteLargeLabel);
4441
compo.m_log = EditorGUILayout.Toggle("Dump logs", compo.m_log);
4542

4643
EditorGUILayout.Separator();
4744
SofaDataArchiver dataArchiver = compo.m_dataArchiver;
4845
if (dataArchiver == null || !m_showData)
4946
return;
5047

48+
EditorGUILayout.LabelField("Sofa Data", EditorStyles.whiteLargeLabel);
5149
List<SofaData> m_unssuportedData = new List<SofaData>();
5250

5351
for (int i = 0; i < dataArchiver.m_names.Count; i++)

0 commit comments

Comments
 (0)