Skip to content

Commit f700510

Browse files
committed
Bugfix rendererinfo, parse shading language string correct to get version
1 parent d50cd8a commit f700510

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

graphics-by-opengl-j2se/src/main/java/com/nucleus/renderer/RendererInfo.java

+12-9
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,22 @@ public static class Version {
2727
public Version(String versionStr) {
2828
int offset = 0;
2929
int whitespace = 0;
30+
String result = null;
3031
while ((whitespace = versionStr.indexOf(" ", offset)) != -1) {
32+
result = versionStr.substring(offset, whitespace);
33+
if (result.contains(".")) {
34+
break;
35+
}
3136
offset = whitespace + 1;
3237
}
33-
versionStr = versionStr.substring(offset);
34-
int dotIndex = versionStr.indexOf(".");
35-
if (dotIndex < 0) {
36-
// No dot
37-
major = Integer.parseInt(versionStr);
38-
minor = 0;
39-
} else {
40-
major = Integer.parseInt(versionStr.substring(0, dotIndex));
41-
minor = Integer.parseInt(versionStr.substring(dotIndex + 1));
38+
if (whitespace == -1) {
39+
result = versionStr.substring(offset);
4240
}
41+
int dotIndex = result.indexOf(".");
42+
major = Integer.parseInt(result.substring(0, dotIndex));
43+
// Check for release number
44+
StringTokenizer st = new StringTokenizer(result.substring(dotIndex + 1));
45+
minor = Integer.parseInt(st.nextToken());
4346
}
4447
}
4548

0 commit comments

Comments
 (0)