Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2025-03-01 03:30:04 +00:00
Code Issues Projects Releases Wiki Activity

Updated default speed to 2x instead of 1.5x and fixed issue that kept resetting speed to 1x every time the emulator is started

Browse Source
This commit is contained in:
Brendan Robert 2018-03-19 00:55:37 -05:00
parent c9c91d2fe0
commit 356b1fad3e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Platform/Apple/tools/jace/src/main/java/jace/EmulatorUILogic.java
View File

@ -86,7 +86,7 @@ public class EmulatorUILogic implements Reconfigurable {
category = "General", category = "General",
name = "Speed Setting" name = "Speed Setting"
) )
public int speedSetting = 2; public int speedSetting = 3;
@ConfigurableField( @ConfigurableField(
category = "General", category = "General",
@ -560,5 +560,6 @@ public class EmulatorUILogic implements Reconfigurable {
@Override @Override
public void reconfigure() { public void reconfigure() {
LawlessLegends.getApplication().controller.setSpeed(speedSetting);
} }
} }

11
Platform/Apple/tools/jace/src/main/java/jace/JaceUIController.java
View File

@ -6,12 +6,10 @@
package jace; package jace;
import com.sun.glass.ui.Application; import com.sun.glass.ui.Application;
import jace.config.ConfigurableField;
import jace.core.Card; import jace.core.Card;
import jace.core.Computer; import jace.core.Computer;
import jace.core.Motherboard; import jace.core.Motherboard;
import jace.core.Utility; import jace.core.Utility;
import jace.lawless.LawlessComputer;
import jace.library.MediaCache; import jace.library.MediaCache;
import jace.library.MediaConsumer; import jace.library.MediaConsumer;
import jace.library.MediaConsumerParent; import jace.library.MediaConsumerParent;
@ -109,6 +107,7 @@ public class JaceUIController {
assert stackPane != null : "fx:id=\"stackPane\" was not injected: check your FXML file 'JaceUI.fxml'."; assert stackPane != null : "fx:id=\"stackPane\" was not injected: check your FXML file 'JaceUI.fxml'.";
assert notificationBox != null : "fx:id=\"notificationBox\" was not injected: check your FXML file 'JaceUI.fxml'."; assert notificationBox != null : "fx:id=\"notificationBox\" was not injected: check your FXML file 'JaceUI.fxml'.";
assert appleScreen != null : "fx:id=\"appleScreen\" was not injected: check your FXML file 'JaceUI.fxml'."; assert appleScreen != null : "fx:id=\"appleScreen\" was not injected: check your FXML file 'JaceUI.fxml'.";
speedSlider.setValue(1.0);
controlOverlay.setVisible(false); controlOverlay.setVisible(false);
menuButtonPane.setVisible(false); menuButtonPane.setVisible(false);
controlOverlay.setFocusTraversable(false); controlOverlay.setFocusTraversable(false);
@ -183,7 +182,7 @@ public class JaceUIController {
} }
} }
private double convertSpeedToRatio(Double setting) { protected double convertSpeedToRatio(Double setting) {
if (setting < 1.0) { if (setting < 1.0) {
return 0.5; return 0.5;
} else if (setting == 1.0) { } else if (setting == 1.0) {
@ -209,7 +208,6 @@ public class JaceUIController {
rootPane.setOnKeyReleased(keyboardHandler); rootPane.setOnKeyReleased(keyboardHandler);
rootPane.setFocusTraversable(true); rootPane.setFocusTraversable(true);
} }
speedSlider.setValue(1.0);
speedSlider.setMinorTickCount(0); speedSlider.setMinorTickCount(0);
speedSlider.setMajorTickUnit(1); speedSlider.setMajorTickUnit(1);
speedSlider.setLabelFormatter(new StringConverter<Double>() { speedSlider.setLabelFormatter(new StringConverter<Double>() {
@ -253,9 +251,12 @@ public class JaceUIController {
} }
} }
private void setSpeed(double speed) { protected void setSpeed(double speed) {
Emulator.logic.speedSetting = (int) speed; Emulator.logic.speedSetting = (int) speed;
double speedRatio = convertSpeedToRatio(speed); double speedRatio = convertSpeedToRatio(speed);
if (speedSlider.getValue() != speed) {
Platform.runLater(()->speedSlider.setValue(speed));
}
if (speedRatio > 100.0) { if (speedRatio > 100.0) {
Emulator.computer.getMotherboard().setMaxSpeed(true); Emulator.computer.getMotherboard().setMaxSpeed(true);
Motherboard.cpuPerClock = 3; Motherboard.cpuPerClock = 3;