Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions chunky/src/java/se/llbit/chunky/entity/Poseable.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ default void lookAt(Vector3 target) {
dir.sub(face);
dir.normalize();
double headYaw = getPose("head").y;
getPose().set("rotation", Json.of(FastMath.atan2(dir.x, dir.z) + Math.PI - headYaw));
double pitch = Math.asin(dir.y);
getPose().add("head", JsonUtil.vec3ToJson(new Vector3(pitch, headYaw, 0)));
getPose().set("head", JsonUtil.vec3ToJson(new Vector3(pitch, 0, 0)));
getPose().set("all", JsonUtil.vec3ToJson(new Vector3(0, FastMath.atan2(dir.x, dir.z) + Math.PI - headYaw, 0)));
}


Expand Down
4 changes: 4 additions & 0 deletions chunky/src/java/se/llbit/chunky/ui/RenderCanvasFx.java
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,10 @@ public void setRenderListener(RenderStatusListener renderListener) {

@Override public void sceneStatus(String status) {
Platform.runLater(() -> {
if (!getScene().getWindow().isFocused()) {
return;
}

Point2D offset = localToScene(0, 0);
tooltip.setText(status);
tooltip.show(this,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,13 @@ public class SceneChooserController implements Initializable {
new Tooltip("Open the directory where Chunky stores scene descriptions and renders."));
openSceneDirBtn.setOnAction(e -> controller.openDirectory(controller.getChunky().options.sceneDir));

DirectoryChooser sceneDirectoryChooser = new DirectoryChooser();
sceneDirectoryChooser.setTitle("Select directory for scene storage");
changeSceneDirBtn.setOnAction(e -> {
sceneDirectoryChooser.setInitialDirectory(controller.getChunky().options.sceneDir);
DirectoryChooser sceneDirectoryChooser = new DirectoryChooser();
sceneDirectoryChooser.setTitle("Select directory for scene storage");
File sceneDirectory = controller.getChunky().options.sceneDir;
if (sceneDirectory.isDirectory()) {
sceneDirectoryChooser.setInitialDirectory(sceneDirectory);
}
File directory = sceneDirectoryChooser.showDialog(changeSceneDirBtn.getScene().getWindow());
if(directory != null && directory.canWrite()) {
PersistentSettings.setSceneDirectory(directory);
Expand Down
2 changes: 1 addition & 1 deletion chunky/src/res/se/llbit/chunky/ui/Chunky.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Canvas fx:id="mapCanvas" />
<Canvas fx:id="mapOverlay" />
</StackPane>
<VBox maxWidth="500" minWidth="0" spacing="10.0">
<VBox maxWidth="500" minWidth="0" spacing="10.0" SplitPane.resizableWithParent="false">
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
</padding>
Expand Down