Skip to content

Some small typos and code layout fixes #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madhephaestus merged 2 commits into from
Feb 12, 2026
+29 −28
Merged

Some small typos and code layout fixes #475

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab6be01
Fix some small typos and extra spacing
rondlh Feb 12, 2026
0cea7f9
Merge branch 'development' of https://github.com/rondlh/BowlerStudio …
rondlh Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
* MoleculeSampleApp.
*/
public class BowlerStudio3dEngine implements ICameraChangeListener, IMobileBaseUI {

private volatile boolean focusing = false;
private volatile boolean abortFocus = false;
private int NUMBER_OF_INTERPOLATION_STEPS = 30;
Expand Down Expand Up @@ -363,7 +364,7 @@ public void rebuild(boolean b) {
// Stop[] stops = null;
// com.neuronrobotics.sdk.common.Log.info("Rebuilding gradient " + name);
// getSubScene().setFill(new LinearGradient(125, 0, 225, 0, false, CycleMethod.NO_CYCLE, stops));

group = new Group(getSubScene());
Scene s = new Scene(group);
// handleKeyboard(s);
Expand Down Expand Up @@ -461,12 +462,13 @@ public Group getControlsBox(ImageView homeIcon, ImageView generateIcon, ImageVie
export.setOnAction(event -> {
if (!getCsgMap().isEmpty()) {
exportAll(false);

BowlerStudio.runLater(() -> {
export.setDisable(true);
});
} else {
} else
com.neuronrobotics.sdk.common.Log.debug("Nothing to export!");
}

});

final Tooltip tooltip = new Tooltip();
Expand Down Expand Up @@ -496,9 +498,9 @@ private void exportAll(boolean makePrintBed) {
public void run() {
setName("Exporting the CAD objects");
ArrayList<CSG> csgs = new ArrayList<CSG>(getCsgMap().keySet());
if (makePrintBed) {
// if (makePrintBed) {
// }

}
com.neuronrobotics.sdk.common.Log.debug("Exporting " + csgs.size() + " parts");
File baseDirForFiles = FileSelectionFactory.GetDirectory(getDefaultStlDir());
try {
Expand Down Expand Up @@ -663,7 +665,6 @@ public void run() {
*/
@Deprecated
public MeshView addObject(CSG currentCsg, File source) {

return addObject(currentCsg, source, currentCsg.getColor().getOpacity(), CSGDatabase.getInstance());
}

Expand Down Expand Up @@ -711,21 +712,21 @@ public MeshView addObject(CSG currentCsg, File source, double opacity, CSGDataba
// mesh.vertexFormatProperty()
ContextMenu cm = new ContextMenu();
Menu infomenu = new Menu("Info...");
infomenu.getItems().add(new MenuItem("Name= " + currentCsg.getName()));
infomenu.getItems().add(new MenuItem("Name = " + currentCsg.getName()));
infomenu.getItems().add(new MenuItem("Mass = " + (currentCsg.getMassKG(0.001) * 1000) + " grams "));
infomenu.getItems().add(new MenuItem("Total X= " + currentCsg.getTotalX()));
infomenu.getItems().add(new MenuItem("Total Y= " + currentCsg.getTotalY()));
infomenu.getItems().add(new MenuItem("Total Z= " + currentCsg.getTotalZ()));
infomenu.getItems().add(new MenuItem("Total X = " + currentCsg.getTotalX()));
infomenu.getItems().add(new MenuItem("Total Y = " + currentCsg.getTotalY()));
infomenu.getItems().add(new MenuItem("Total Z = " + currentCsg.getTotalZ()));

infomenu.getItems().add(new MenuItem("Maximums: "));
infomenu.getItems().add(new MenuItem("Max X= " + currentCsg.getMaxX()));
infomenu.getItems().add(new MenuItem("Max Y= " + currentCsg.getMaxY()));
infomenu.getItems().add(new MenuItem("Max Z= " + currentCsg.getMaxZ()));
infomenu.getItems().add(new MenuItem("Max X = " + currentCsg.getMaxX()));
infomenu.getItems().add(new MenuItem("Max Y = " + currentCsg.getMaxY()));
infomenu.getItems().add(new MenuItem("Max Z = " + currentCsg.getMaxZ()));

infomenu.getItems().add(new MenuItem("Minums: "));
infomenu.getItems().add(new MenuItem("Min X= " + currentCsg.getMinX()));
infomenu.getItems().add(new MenuItem("Min Y= " + currentCsg.getMinY()));
infomenu.getItems().add(new MenuItem("Min Z= " + currentCsg.getMinZ()));
infomenu.getItems().add(new MenuItem("Minimums: "));
infomenu.getItems().add(new MenuItem("Min X = " + currentCsg.getMinX()));
infomenu.getItems().add(new MenuItem("Min Y = " + currentCsg.getMinY()));
infomenu.getItems().add(new MenuItem("Min Z = " + currentCsg.getMinZ()));

cm.getItems().add(infomenu);

Expand Down Expand Up @@ -1111,15 +1112,15 @@ public Group createTexturedWorkplane(double xSizeMM, double ySizeMM) {
//final float TILE_SIZE_MM = 25.4f;
//final int TILE_BIG_GRID_PX = 256;
//final int TILE_SMALL_GRID_PX = 16; // 1/16th inch

// Build square textured tile in half inche
//final float TILE_SIZE_MM = 12.7f;
//final int TILE_BIG_GRID_PX = 254;
//final int TILE_SMALL_GRID_PX = 127;

// Upscale work plane texture
final int wpUpscale = 4;

// Work plane noise in percentage [0-100%]
int wpNoise = 25;

Expand Down Expand Up @@ -1147,7 +1148,7 @@ public Group createTexturedWorkplane(double xSizeMM, double ySizeMM) {
int r = (wpColor >> 16) & 0xFF;
int g = (wpColor >> 8) & 0xFF;
int b = wpColor & 0xFF;
for (int i = 0; i < src.length; i++) {
for (int i = 0; i < src.length; i++) {
int n = 100 + rnd.nextInt(wpNoise + 1) - (wpNoise / 2);
src[i] = 0xFF000000 |
(Math.min(255, (r * n) / 100) << 16) |
Expand Down Expand Up @@ -1200,7 +1201,7 @@ public Group createTexturedWorkplane(double xSizeMM, double ySizeMM) {

// Set work plane texture
material.setDiffuseMap(tile);

// Control work plane transparency
Color transWhite = new Color(1, 1, 1, 0.35);
material.setDiffuseColor(transWhite); // Work plane color
Expand Down Expand Up @@ -1374,7 +1375,7 @@ private void buildCamera(boolean addHand) {
// Flip the camera upside down
camera.setRotationAxis(Rotate.Z_AXIS);
camera.setRotate(180);

camera.setDepthTest(DepthTest.ENABLE);
setVirtualcam(new VirtualCameraMobileBase(camera, handGroup, this, name));
VirtualCameraFactory.setFactory(new IVirtualCameraFactory() {
Expand Down Expand Up @@ -1446,7 +1447,7 @@ public void run() {
Affine yRuler = new Affine();
yRuler.appendScale(scale, scale, scale);
yRuler.appendRotation(90, 0, 0, 0, 0, 0, 1);
Affine yRulerZoffset = new Affine();
Affine yRulerZoffset = new Affine();
yRulerZoffset.setTz(0.01); // Raise yRuler up a bit

Affine zRuler = new Affine();
Expand Down Expand Up @@ -1499,7 +1500,7 @@ public void run() {

world.getChildren().addAll(lookGroup, cameraGroup, userGroup, axisGroup, customWorkplaneGroup, controlHandleGroup, ambientLight);

// Use ambient illumination for workplane and axes, ruler is black so no need to illuminate
// Use ambient illumination for workplanes and axes, ruler is black so no need to illuminate
ambientLight.getScope().addAll(customWorkplaneGroup, axisGroup);
});

Expand Down Expand Up @@ -1700,7 +1701,7 @@ public void handle(MouseEvent me) {
@Override
public void handle(MouseEvent me) {
resetMouseTime();

Node node = (Node) me.getSource();
double mouseY = me.getY(); // Y position relative to the node itself
double nodeHeight = node.getBoundsInLocal().getHeight();
Expand Down Expand Up @@ -2186,10 +2187,10 @@ public void focusOrientation(TransformNR orient, TransformNR trans, double zoom)
// Wait until possible previous focus aborts
new Thread(() -> {
while (focusing) {
try {
try {
Thread.sleep(8);
} catch (InterruptedException e) {
focusing = false;
focusing = false;
}
}

Expand Down Expand Up @@ -2231,7 +2232,7 @@ private void runSyncFocus(TransformNR orient, TransformNR trans, double zoom) {

interpolationSteps = Math.min(interpolationSteps, NUMBER_OF_INTERPOLATION_STEPS);
final int steps = interpolationSteps;

try {
for (int i = 0; (i < steps) && !abortFocus; i++) {
// com.neuronrobotics.sdk.common.Log.error("\tFocus to \n\t\taz:" + aztmp + "
Expand Down