Skip to content

Commit 6d99459

Browse files
committed
Add an update to settings to move the server into another tab
1 parent 45aeac5 commit 6d99459

File tree

5 files changed

+233
-173
lines changed

5 files changed

+233
-173
lines changed

src/main/java/com/commonwealthrobotics/MainController.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
import eu.mihosoft.vrl.v3d.Bounds;
5151
import eu.mihosoft.vrl.v3d.CSG;
5252
import eu.mihosoft.vrl.v3d.Cube;
53+
import eu.mihosoft.vrl.v3d.Debug3dProvider;
54+
import eu.mihosoft.vrl.v3d.IDebug3dProvider;
5355
import javafx.event.ActionEvent;
5456
import javafx.fxml.FXML;
5557
import javafx.scene.DepthTest;
@@ -916,6 +918,18 @@ void initialize() {
916918

917919
try {
918920
engine = new BowlerStudio3dEngine("CAD window");
921+
Debug3dProvider.setProvider(new IDebug3dProvider() {
922+
923+
@Override
924+
public void clearScreen() {
925+
engine.clearUserNode();
926+
}
927+
928+
@Override
929+
public void addObject(Object o) {
930+
engine.addObject(o, ap.get().getSelf());
931+
}
932+
});
919933
engine.rebuild(true);
920934
paneOverlay2D = new Pane();
921935
paneOverlay2D.setStyle("-fx-background-color: TRANSPARENT;");

src/main/java/com/commonwealthrobotics/SettingsManager.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ public class SettingsManager implements ICSGClientEvent {
121121
private String myVersionFileString;
122122
private String bindir;
123123

124+
@FXML
125+
void onTest(ActionEvent event) {
126+
new Thread(()->{
127+
com.neuronrobotics.sdk.common.Log.debug("Starting test");
128+
}).start();
129+
}
124130
@FXML
125131
void onPinVersion(ActionEvent event) {
126132
Log.debug("onPinVersion");

src/main/java/com/commonwealthrobotics/WorkplaneManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ private TransformNR getFaceNormalAngles(TriangleMesh mesh, int faceIndex) {
596596
Point3D p3 = new Point3D(points.get(p3Index), points.get(p3Index + 1), points.get(p3Index + 2));
597597

598598
try {
599-
Polygon p = Polygon.fromConcavePoints(Arrays.asList(toV(p1),toV(p2),toV(p3))).get(0);
599+
Polygon p = Polygon.fromVector3d(Arrays.asList(toV(p1),toV(p2),toV(p3))).get(0);
600600
return TransformFactory.csgToNR(PolygonUtil.calculateNormalTransform(p));
601601

602602
} catch (Exception e) {

0 commit comments

Comments
 (0)