Slash always on top

CommonWealthRobotics · Sep 18, 2024 · afb4bd3 · afb4bd3
1 parent dc78869
commit afb4bd3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/BowlerStudio b/BowlerStudio
diff --git a/src/main/java/com/commonwealthrobotics/Main.java b/src/main/java/com/commonwealthrobotics/Main.java
@@ -82,6 +82,7 @@ public void start(Stage newStage) throws Exception {
 		newStage.setMinHeight(600);
 		SplashManager.renderSplashFrame(1, "Main Window Show");
 		newStage.show();
+		SplashManager.renderSplashFrame(1, "Initializing");
 	}
 	public static void main(String [] args) {
 		String relative = FileSystemView.getFileSystemView().getDefaultDirectory().getPath();

diff --git a/src/main/java/com/commonwealthrobotics/MainController.java b/src/main/java/com/commonwealthrobotics/MainController.java
@@ -244,7 +244,7 @@ public class MainController implements ICaDoodleStateUpdate, ICameraChangeListen
 	private boolean resetArmed;
 	private long timeOfClick;
 	private MeshView ground;
-	private int initIndex=0;
+	private int lastFrame=0;
 
 	@FXML
 	void onAllign(ActionEvent event) {
@@ -754,8 +754,11 @@ private void setUpNavigationCube() {
 	@Override
 	public void onUpdate(List<CSG> currentState, ICaDoodleOpperation source, CaDoodleFile f) {
 		if(SplashManager.isVisableSplash()) {
-			SplashManager.renderSplashFrame(20+initIndex, "Initialize Model");
-			initIndex++;
+			int frame = (int) (100*f.getPercentInitialized());
+			if(frame-lastFrame>30) {
+				lastFrame=frame;
+				SplashManager.renderSplashFrame(frame, "Initialize Model");
+			}
 		}
 		setCadoodleFile(f);
 		//System.out.println("Displaying result of " + source.getType());

diff --git a/src/main/java/com/commonwealthrobotics/controls/SelectionSession.java b/src/main/java/com/commonwealthrobotics/controls/SelectionSession.java
@@ -18,6 +18,7 @@
 import com.neuronrobotics.bowlerkernel.Bezier3d.Manipulation;
 import com.neuronrobotics.bowlerstudio.BowlerKernel;
 import com.neuronrobotics.bowlerstudio.BowlerStudio;
+import com.neuronrobotics.bowlerstudio.SplashManager;
 import com.neuronrobotics.bowlerstudio.physics.TransformFactory;
 import com.neuronrobotics.bowlerstudio.scripting.CaDoodleLoader;
 import com.neuronrobotics.bowlerstudio.scripting.cadoodle.*;
@@ -520,8 +521,9 @@ public void selectAll() {
 	}
 
 	public void setKeyBindingFocus() {
-		if (engine != null)
-			BowlerStudio.runLater(() -> engine.getSubScene().requestFocus());
+		if(!SplashManager.isVisableSplash())
+			if (engine != null)
+				BowlerStudio.runLater(() -> engine.getSubScene().requestFocus());
 	}
 
 	public void setToSolid() {