Skip to content

Commit 97d753c

Browse files
authored
Feature/alex behaviors (#1123)
* alex behaviors * fix null exception collision
1 parent 9d0cd8a commit 97d753c

File tree

15 files changed

+20
-17
lines changed

15 files changed

+20
-17
lines changed

ihmc-high-level-behaviors/src/libgdx/java/us/ihmc/rdx/behaviorTree/scene/RDXBehaviorTreeScene.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,15 @@ private void renderImGuiWidgets()
102102
ImGui.separator();
103103
ImGui.text("Add virtual:");
104104
ImGui.indent();
105-
if (ImGuiTools.textWithUnderlineOnHover("Mustard") && ImGui.isMouseClicked(ImGuiMouseButton.Left))
105+
for (IsaacROSFoundationPoseObject objectType : IsaacROSFoundationPoseObject.values())
106106
{
107-
beingPlaced = (RDXBehaviorTreeSceneObject) createObject(IsaacROSFoundationPoseObject.MUSTARD);
108-
objects.add(beingPlaced);
109-
objectsModifiable.modify();
110-
needToInitializePlacementHeight = true;
107+
if (ImGuiTools.textWithUnderlineOnHover(objectType.titleCaseName) && ImGui.isMouseClicked(ImGuiMouseButton.Left))
108+
{
109+
beingPlaced = (RDXBehaviorTreeSceneObject) createObject(objectType);
110+
objects.add(beingPlaced);
111+
objectsModifiable.modify();
112+
needToInitializePlacementHeight = true;
113+
}
111114
}
112115
ImGui.unindent();
113116
ImGui.separator();

ihmc-high-level-behaviors/src/libgdx/java/us/ihmc/rdx/behaviorTree/scene/RDXBehaviorTreeSceneObject.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ public RDXBehaviorTreeSceneObject(long id, CRDTInfo crdtInfo, IsaacROSFoundation
3535
gizmo.createAndSetupDefault(baseUI.getPrimary3DPanel());
3636
gizmo.getPoseGizmo().setGizmoFrame(referenceFrame);
3737

38-
String modelName = "";
39-
if (objectType.equals(IsaacROSFoundationPoseObject.MUSTARD))
40-
modelName = "environmentObjects/mustard/mustard.glb";
41-
38+
String modelName = "environmentObjects/" + objectType.meshName + "/" + objectType.meshName + ".glb";
4239
model = RDXModelLoader.load(modelName);
4340
modelInstance = new RDXModelInstance(model);
4441
}

0 commit comments

Comments
 (0)