Skip to content

Commit

Permalink
Merge pull request #287 from scenerygraphics/linux-jdk-renderer
Browse files Browse the repository at this point in the history
Update scenery version, add JVM version check for linux
  • Loading branch information
kephale committed Sep 4, 2020
2 parents 16b6901 + c8a256b commit d8102d3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>deploy-to-scijava</releaseProfiles>

<scenery.version>0797d5d2</scenery.version>
<scenery.version>b5c63ad</scenery.version>

<kotlin.version>1.4.0</kotlin.version>
<kotlinx-coroutines-core.version>1.3.9</kotlinx-coroutines-core.version>
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/sc/iview/SciView.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
import org.joml.Quaternionf;
import org.joml.Vector2f;
import org.joml.Vector3f;
import org.lwjgl.system.Platform;
import org.scijava.Context;
import org.scijava.display.Display;
import org.scijava.display.DisplayService;
Expand Down Expand Up @@ -436,6 +437,23 @@ public void reset() {
getLogger().info("imagej-launcher not found, not touching renderer preferences.");
}

// TODO: check for jdk 8 v. jdk 11 on linux and choose renderer accordingly
if( Platform.get() == Platform.LINUX ) {
String version = System.getProperty("java.version");
if( version.startsWith("1.") ) {
version = version.substring(2, 3);
} else {
int dot = version.indexOf(".");
if (dot != -1) {
version = version.substring(0, dot);
}
}

// If Linux and JDK 8, then use OpenGLRenderer
if( version.equals("8") )
System.setProperty("scenery.Renderer", "OpenGLRenderer");
}

int x, y;

try {
Expand Down

0 comments on commit d8102d3

Please sign in to comment.