Skip to content

Commit

Permalink
Merge branch 'kh/physics-update-mujoco' of
Browse files Browse the repository at this point in the history
[email protected]:CommonWealthRobotics/BowlerStudio.git into
kh/physics-update-mujoco
  • Loading branch information
madhephaestus committed Jun 1, 2024
2 parents c0311d8 + 254b52e commit b756e98
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import com.neuronrobotics.sdk.common.Log;
import eu.mihosoft.vrl.v3d.CSG;
import eu.mihosoft.vrl.v3d.Cylinder;
import eu.mihosoft.vrl.v3d.JavaFXInitializer;
import eu.mihosoft.vrl.v3d.parametrics.CSGDatabase;
import eu.mihosoft.vrl.v3d.parametrics.IParameterChanged;
import eu.mihosoft.vrl.v3d.parametrics.LengthParameter;
Expand Down Expand Up @@ -221,6 +222,7 @@ public class BowlerStudio3dEngine extends JFXPanel {
private TransformNR poseToMove=new TransformNR();

static {
//JavaFXInitializer.go();
BowlerStudio.runLater(() -> {
Thread.currentThread().setUncaughtExceptionHandler(new IssueReportingExceptionHandler());

Expand All @@ -233,7 +235,7 @@ public class BowlerStudio3dEngine extends JFXPanel {
public BowlerStudio3dEngine() {

System.err.println("Setting Scene ");
setSubScene(new SubScene(getRoot(), 1024, 1024, true, SceneAntialiasing.BALANCED));
setSubScene(new SubScene(getRoot(), 1024, 1024, true, SceneAntialiasing.DISABLED));

// Set up the Ui THread explosion handler

Expand Down Expand Up @@ -563,7 +565,7 @@ public MeshView addObject(CSG currentCsg, File source) {
}

MeshView current = getCsgMap().get(currentCsg);

current.setCullFace(javafx.scene.shape.CullFace.NONE);
// TriangleMesh mesh =(TriangleMesh) current.getMesh();
// mesh.vertexFormatProperty()
ContextMenu cm = new ContextMenu();
Expand Down Expand Up @@ -1297,6 +1299,7 @@ public SubScene getSubScene() {
public void setSubScene(SubScene scene) {
System.out.println("Setting UI scene");
this.scene = scene;

}

/**
Expand Down

0 comments on commit b756e98

Please sign in to comment.