sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix OGL version parsing

Browse Source
This commit is contained in:
shadowislord 2014-11-20 19:40:31 -05:00
parent e1910fdff2
commit de0027eee3
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java
View File

@ -142,7 +142,7 @@ public class OGLESShaderRenderer implements Renderer {
return caps; return caps;
} }
private int extractVersion(String prefixStr, String versionStr) { private static int extractVersion(String prefixStr, String versionStr) {
if (versionStr != null) { if (versionStr != null) {
int spaceIdx = versionStr.indexOf(" ", prefixStr.length()); int spaceIdx = versionStr.indexOf(" ", prefixStr.length());
if (spaceIdx >= 1) { if (spaceIdx >= 1) {
@ -150,10 +150,37 @@ public class OGLESShaderRenderer implements Renderer {
} else { } else {
versionStr = versionStr.substring(prefixStr.length()).trim(); versionStr = versionStr.substring(prefixStr.length()).trim();
} }
//some device have ":" at the end of the version.
versionStr = versionStr.replaceAll("\\:", ""); // Find a character which is not a period or digit.
float version = Float.parseFloat(versionStr); for (int i = 0; i < versionStr.length(); i++) {
return (int) (version * 100); char c = versionStr.charAt(i);
if (c != '.' && (c < '0' || c > '9')) {
versionStr = versionStr.substring(0, i);
break;
}
}
// Pivot on first point.
int firstPoint = versionStr.indexOf(".");
// Remove everything after second point.
int secondPoint = versionStr.indexOf(".", firstPoint + 1);
if (secondPoint != -1) {
versionStr = versionStr.substring(0, secondPoint);
}
String majorVerStr = versionStr.substring(0, firstPoint);
String minorVerStr = versionStr.substring(firstPoint + 1);
if (minorVerStr.endsWith("0") && minorVerStr.length() > 1) {
minorVerStr = minorVerStr.substring(0, minorVerStr.length() - 1);
}
int majorVer = Integer.parseInt(majorVerStr);
int minorVer = Integer.parseInt(minorVerStr);
return majorVer * 100 + minorVer * 10;
} else { } else {
return -1; return -1;
} }

11
jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java
View File

@ -164,8 +164,15 @@ public class LwjglRenderer implements Renderer {
} else { } else {
versionStr = versionStr.substring(prefixStr.length()).trim(); versionStr = versionStr.substring(prefixStr.length()).trim();
} }
// Some device have ":" at the end of the version.
versionStr = versionStr.replaceAll("\\:", ""); // Find a character which is not a period or digit.
for (int i = 0; i < versionStr.length(); i++) {
char c = versionStr.charAt(i);
if (c != '.' && (c < '0' || c > '9')) {
versionStr = versionStr.substring(0, i);
break;
}
}
// Pivot on first point. // Pivot on first point.
int firstPoint = versionStr.indexOf("."); int firstPoint = versionStr.indexOf(".");