eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

use alternative regex in point and line shader autodetect, fixes #4725

Browse Source
This commit is contained in:
codeanticode
2016-11-02 20:52:03 -03:00
parent 25cb1eff35
commit 92d663efb0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PShader.java
+8 -2
View File
@@ -51,8 +51,12 @@ public class PShader implements PConstants {
static protected String pointShaderAttrRegexp =
"attribute *vec2 *offset";
static protected String pointShaderAttrRegexp2 =
"in *vec2 *offset;";
static protected String lineShaderAttrRegexp =
"attribute *vec4 *direction";
static protected String lineShaderAttrRegexp2 =
"in *vec4 *direction";
static protected String pointShaderDefRegexp =
"#define *PROCESSING_POINT_SHADER";
static protected String lineShaderDefRegexp =
@@ -1016,9 +1020,11 @@ public class PShader implements PConstants {
static protected int getShaderType(String[] source, int defaultType) {
for (int i = 0; i < source.length; i++) {
String line = source[i].trim();
if (PApplet.match(line, pointShaderAttrRegexp) != null)
if (PApplet.match(line, pointShaderAttrRegexp) != null ||
PApplet.match(line, pointShaderAttrRegexp2) != null)
return PShader.POINT;
else if (PApplet.match(line, lineShaderAttrRegexp) != null)
else if (PApplet.match(line, lineShaderAttrRegexp) != null ||
PApplet.match(line, lineShaderAttrRegexp2) != null)
return PShader.LINE;
else if (PApplet.match(line, pointShaderDefRegexp) != null)
return PShader.POINT;