Skip to content

Parse canvasConfig width and height if present #1840

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

Closed
Peregrine05 wants to merge 1 commit into from
Closed

Parse canvasConfig width and height if present #1840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions chunky/src/java/se/llbit/chunky/ui/controller/SceneChooserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,18 @@ private void parseScene(File sceneFile) {
try (JsonParser parser = new JsonParser(new FileInputStream(new File(sceneFile.getParentFile(), sceneFile.getName())))) {
JsonObject scene = parser.parse().object();

int width = scene.get("width").intValue(400);
int height = scene.get("height").intValue(400);
int width;
int height;

if (scene.get("canvasConfig").isObject()) {
JsonObject canvasConfig = scene.get("canvasConfig").asObject();
width = canvasConfig.get("width").intValue(400);
height = canvasConfig.get("height").intValue(400);
} else {
width = scene.get("width").intValue(400);
height = scene.get("height").intValue(400);
}

dimensions = String.format("%sx%s", width, height);

chunkSize = scene.get("chunkList").array().size();
Expand Down