Skip to content

Commit c3b0c0f

Browse files
committed
faster difference
1 parent 98e184c commit c3b0c0f

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioMenu.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,8 @@ public void onLogin(String arg0) {
16241624
int i = currentIndex + 1;
16251625

16261626
double percent = ((double) i) / ((double) finalIndex) * 100;
1627-
String x = intermediateShape.getName() + " " + type.trim() + " " + String.format("%.1f", percent)
1627+
String name =intermediateShape==null?"": intermediateShape.getName();
1628+
String x = name + " " + type.trim() + " " + String.format("%.1f", percent)
16281629
+ "% finished : " + i + " of " + finalIndex;
16291630
if (showCSGProgress.isSelected()) {
16301631
System.out.println(x);

src/main/java/com/neuronrobotics/bowlerstudio/threed/Axis.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,17 @@ public Axis(int i,boolean isVis) {
9191

9292
Affine xp = new Affine();
9393
xp.setTx(i / 2);
94-
Font font = new Font("Arial", 5);
94+
95+
Font font = new Font(Font.getDefault().getName(), 5);
9596

9697

9798

98-
xText = CSG.unionAll(TextExtrude.text((double)strokWidth,"X",font)).movex(i).moveToCenterY();
99+
xText = CSG.unionAll(TextExtrude.text((double)strokWidth,"x",font)).rotz(90).movex(i).moveToCenterY();
99100
//xText.getTransforms().add(xp);
100101

101102
Affine yp = new Affine();
102103
yp.setTy(i / 2);
103-
yText = CSG.unionAll(TextExtrude.text((double)strokWidth,"Y",font)).rotz(90).toYMin().movey(i).moveToCenterX();
104+
yText = CSG.unionAll(TextExtrude.text((double)strokWidth,"y",font)).rotz(90).mirrory().toYMin().movey(i).moveToCenterX();
104105
//yText.getTransforms().add(yp);
105106

106107
// zp.setTz(i/2);
@@ -109,7 +110,7 @@ public Axis(int i,boolean isVis) {
109110
zTextAffine.setTx(i / 2);
110111
zTextAffine.appendRotation(-90, 0, 0, 0, 1, 0, 0);
111112
zTextAffine.appendRotation(180, 0, 0, 0, 0, 0, 1);
112-
zText = CSG.unionAll(TextExtrude.text((double)strokWidth,"Z",font)).rotx(90).rotz(90).movez(i).moveToCenterY();
113+
zText = CSG.unionAll(TextExtrude.text((double)strokWidth,"z",font)).rotx(90).rotz(90).mirrory().movez(i).moveToCenterY();
113114
//zText.getTransforms().add(zTextAffine);
114115
// zText.smoothProperty().set(false);
115116
xAxis = new Cube(i, strokWidth, strokWidth).toCSG().toXMin();

src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,8 @@ public void run() {
11411141
xp.appendScale(scale, scale, scale);
11421142
xp.appendRotation(180, 0, 0, 0, 1, 0, 0);
11431143
grid = createGridMesh(1000, 1000, 20);
1144-
1144+
boolean selected = showRuler != null ? showRuler.isSelected() : true;
1145+
Axis axis = new Axis(b?selected:false);
11451146
BowlerStudio.runLater(() -> {
11461147
Node rulerImage = MakeRuler.createRuler(true);// new ImageView(ruler);
11471148
Node yrulerImage = MakeRuler.createRuler(false);// new ImageView(ruler);
@@ -1166,12 +1167,8 @@ public void run() {
11661167
ground = new Group();
11671168
ground.getTransforms().add(groundPlacment);
11681169
focusGroup.getChildren().add(getVirtualcam().getCameraFrame());
1169-
1170-
boolean selected = showRuler != null ? showRuler.isSelected() : true;
1171-
if (!b)
1172-
selected = false;
11731170
if (b) {
1174-
children.addAll(new Axis(selected), ground);
1171+
children.addAll(axis, ground);
11751172
showAxis();
11761173
}
11771174
axisGroup.getChildren().addAll(focusGroup, userGroup);

0 commit comments

Comments
 (0)