propane 3.1.0.pre-java → 3.2.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (104) hide show
  1. checksums.yaml +4 -4
  2. data/.mvn/wrapper/maven-wrapper.properties +1 -0
  3. data/CHANGELOG.md +1 -5
  4. data/README.md +23 -12
  5. data/Rakefile +23 -12
  6. data/lib/propane/helpers/version_error.rb +6 -0
  7. data/lib/propane/runner.rb +12 -0
  8. data/lib/propane/version.rb +1 -1
  9. data/library/slider/slider.rb +1 -1
  10. data/mvnw +234 -0
  11. data/mvnw.cmd +145 -0
  12. data/pom.xml +28 -27
  13. data/propane.gemspec +2 -2
  14. data/src/main/java/japplemenubar/JAppleMenuBar.java +41 -47
  15. data/src/main/java/monkstone/ColorUtil.java +1 -1
  16. data/src/main/java/monkstone/MathToolModule.java +12 -11
  17. data/src/main/java/monkstone/PropaneLibrary.java +9 -10
  18. data/src/main/java/monkstone/core/LibraryProxy.java +124 -113
  19. data/src/main/java/monkstone/fastmath/Deglut.java +86 -89
  20. data/src/main/java/monkstone/filechooser/Chooser.java +7 -13
  21. data/src/main/java/monkstone/noise/SimplexNoise.java +0 -1
  22. data/src/main/java/monkstone/slider/CustomHorizontalSlider.java +4 -4
  23. data/src/main/java/monkstone/slider/CustomVerticalSlider.java +1 -1
  24. data/src/main/java/monkstone/slider/SimpleHorizontalSlider.java +9 -9
  25. data/src/main/java/monkstone/slider/SimpleSlider.java +0 -9
  26. data/src/main/java/monkstone/slider/SimpleVerticalSlider.java +11 -13
  27. data/src/main/java/monkstone/slider/Slider.java +1 -1
  28. data/src/main/java/monkstone/slider/SliderBar.java +1 -1
  29. data/src/main/java/monkstone/slider/SliderGroup.java +1 -1
  30. data/src/main/java/monkstone/slider/WheelHandler.java +8 -9
  31. data/src/main/java/monkstone/vecmath/AppRender.java +2 -2
  32. data/src/main/java/monkstone/vecmath/ShapeRender.java +2 -2
  33. data/src/main/java/monkstone/vecmath/package-info.java +2 -2
  34. data/src/main/java/monkstone/vecmath/vec2/Vec2.java +2 -2
  35. data/src/main/java/monkstone/vecmath/vec3/Vec3.java +1 -1
  36. data/src/main/java/monkstone/videoevent/VideoInterface.java +11 -5
  37. data/src/main/java/monkstone/videoevent/package-info.java +2 -2
  38. data/src/main/java/processing/awt/PGraphicsJava2D.java +1742 -2243
  39. data/src/main/java/processing/awt/PShapeJava2D.java +268 -270
  40. data/src/main/java/processing/awt/PSurfaceAWT.java +821 -920
  41. data/src/main/java/processing/core/DesktopHandler.java +94 -0
  42. data/src/main/java/processing/core/PApplet.java +14170 -14082
  43. data/src/main/java/processing/core/PConstants.java +447 -473
  44. data/src/main/java/processing/core/PFont.java +867 -873
  45. data/src/main/java/processing/core/PGraphics.java +7193 -7428
  46. data/src/main/java/processing/core/PImage.java +3051 -3117
  47. data/src/main/java/processing/core/PMatrix.java +159 -172
  48. data/src/main/java/processing/core/PMatrix2D.java +403 -444
  49. data/src/main/java/processing/core/PMatrix3D.java +735 -749
  50. data/src/main/java/processing/core/PShape.java +2651 -2793
  51. data/src/main/java/processing/core/PShapeOBJ.java +415 -422
  52. data/src/main/java/processing/core/PShapeSVG.java +1466 -1475
  53. data/src/main/java/processing/core/PStyle.java +37 -40
  54. data/src/main/java/processing/core/PSurface.java +98 -103
  55. data/src/main/java/processing/core/PSurfaceNone.java +208 -236
  56. data/src/main/java/processing/core/PVector.java +961 -990
  57. data/src/main/java/processing/data/DoubleDict.java +709 -753
  58. data/src/main/java/processing/data/DoubleList.java +695 -748
  59. data/src/main/java/processing/data/FloatDict.java +702 -746
  60. data/src/main/java/processing/data/FloatList.java +697 -751
  61. data/src/main/java/processing/data/IntDict.java +673 -718
  62. data/src/main/java/processing/data/IntList.java +633 -699
  63. data/src/main/java/processing/data/JSONArray.java +873 -931
  64. data/src/main/java/processing/data/JSONObject.java +1165 -1262
  65. data/src/main/java/processing/data/JSONTokener.java +341 -351
  66. data/src/main/java/processing/data/LongDict.java +662 -707
  67. data/src/main/java/processing/data/LongList.java +634 -700
  68. data/src/main/java/processing/data/Sort.java +41 -37
  69. data/src/main/java/processing/data/StringDict.java +486 -522
  70. data/src/main/java/processing/data/StringList.java +580 -624
  71. data/src/main/java/processing/data/Table.java +3508 -3686
  72. data/src/main/java/processing/data/TableRow.java +183 -182
  73. data/src/main/java/processing/data/XML.java +883 -957
  74. data/src/main/java/processing/event/Event.java +66 -87
  75. data/src/main/java/processing/event/KeyEvent.java +41 -48
  76. data/src/main/java/processing/event/MouseEvent.java +93 -103
  77. data/src/main/java/processing/event/TouchEvent.java +6 -10
  78. data/src/main/java/processing/javafx/PGraphicsFX2D.java +5 -69
  79. data/src/main/java/processing/javafx/PSurfaceFX.java +2 -7
  80. data/src/main/java/processing/opengl/FontTexture.java +270 -290
  81. data/src/main/java/processing/opengl/FrameBuffer.java +363 -375
  82. data/src/main/java/processing/opengl/LinePath.java +500 -543
  83. data/src/main/java/processing/opengl/LineStroker.java +582 -593
  84. data/src/main/java/processing/opengl/PGL.java +2881 -2904
  85. data/src/main/java/processing/opengl/PGraphics2D.java +315 -408
  86. data/src/main/java/processing/opengl/PGraphics3D.java +72 -107
  87. data/src/main/java/processing/opengl/PGraphicsOpenGL.java +12043 -12230
  88. data/src/main/java/processing/opengl/PJOGL.java +1681 -1745
  89. data/src/main/java/processing/opengl/PShader.java +1257 -1260
  90. data/src/main/java/processing/opengl/PShapeOpenGL.java +4599 -4662
  91. data/src/main/java/processing/opengl/PSurfaceJOGL.java +1030 -1047
  92. data/src/main/java/processing/opengl/Texture.java +1397 -1462
  93. data/src/main/java/processing/opengl/VertexBuffer.java +55 -57
  94. data/src/main/resources/icon/icon-1024.png +0 -0
  95. data/src/main/resources/icon/icon-128.png +0 -0
  96. data/src/main/resources/icon/icon-16.png +0 -0
  97. data/src/main/resources/icon/icon-256.png +0 -0
  98. data/src/main/resources/icon/icon-32.png +0 -0
  99. data/src/main/resources/icon/icon-48.png +0 -0
  100. data/src/main/resources/icon/icon-512.png +0 -0
  101. data/src/main/resources/icon/icon-64.png +0 -0
  102. data/vendors/Rakefile +1 -1
  103. metadata +12 -8
  104. data/src/main/java/processing/core/ThinkDifferent.java +0 -70
@@ -7,463 +7,456 @@ import java.util.HashMap;
7
7
  import java.util.Map;
8
8
 
9
9
  /**
10
- * This class is not part of the Processing API and should not be used
11
- * directly. Instead, use loadShape() and methods like it, which will make
12
- * use of this class. Using this class directly will cause your code to break
13
- * when combined with future versions of Processing.
10
+ * This class is not part of the Processing API and should not be used directly.
11
+ * Instead, use loadShape() and methods like it, which will make use of this
12
+ * class. Using this class directly will cause your code to break when combined
13
+ * with future versions of Processing.
14
14
  * <p>
15
15
  * OBJ loading implemented using code from Saito's OBJLoader library:
16
- * http://code.google.com/p/saitoobjloader/
17
- * and OBJReader from Ahmet Kizilay
16
+ * http://code.google.com/p/saitoobjloader/ and OBJReader from Ahmet Kizilay
18
17
  * http://www.openprocessing.org/visuals/?visualID=191
19
18
  *
20
19
  */
21
20
  public class PShapeOBJ extends PShape {
22
21
 
23
- /**
24
- * Initializes a new OBJ Object with the given filename.
25
- */
26
- public PShapeOBJ(PApplet parent, String filename) {
27
- this(parent, parent.createReader(filename), getBasePath(parent, filename));
28
- }
29
-
30
- public PShapeOBJ(PApplet parent, BufferedReader reader) {
31
- this(parent, reader, "");
32
- }
33
-
34
- public PShapeOBJ(PApplet parent, BufferedReader reader, String basePath) {
35
- ArrayList<OBJFace> faces = new ArrayList<OBJFace>();
36
- ArrayList<OBJMaterial> materials = new ArrayList<OBJMaterial>();
37
- ArrayList<PVector> coords = new ArrayList<PVector>();
38
- ArrayList<PVector> normals = new ArrayList<PVector>();
39
- ArrayList<PVector> texcoords = new ArrayList<PVector>();
40
- parseOBJ(parent, basePath, reader,
41
- faces, materials, coords, normals, texcoords);
42
-
43
- // The OBJ geometry is stored with each face in a separate child shape.
44
- parent = null;
45
- family = GROUP;
46
- addChildren(faces, materials, coords, normals, texcoords);
47
- }
48
-
49
-
50
- protected PShapeOBJ(OBJFace face, OBJMaterial mtl,
51
- ArrayList<PVector> coords,
52
- ArrayList<PVector> normals,
53
- ArrayList<PVector> texcoords) {
54
- family = GEOMETRY;
55
- if (face.vertIdx.size() == 3) {
56
- kind = TRIANGLES;
57
- } else if (face.vertIdx.size() == 4) {
58
- kind = QUADS;
59
- } else {
60
- kind = POLYGON;
22
+ /**
23
+ * Initializes a new OBJ Object with the given filename.
24
+ */
25
+ public PShapeOBJ(PApplet parent, String filename) {
26
+ this(parent, parent.createReader(filename), getBasePath(parent, filename));
61
27
  }
62
28
 
63
- stroke = false;
64
- fill = true;
65
-
66
- // Setting material properties for the new face
67
- fillColor = rgbaValue(mtl.kd);
68
- ambientColor = rgbaValue(mtl.ka);
69
- specularColor = rgbaValue(mtl.ks);
70
- shininess = mtl.ns;
71
- if (mtl.kdMap != null) {
72
- // If current material is textured, then tinting the texture using the
73
- // diffuse color.
74
- tintColor = rgbaValue(mtl.kd, mtl.d);
29
+ public PShapeOBJ(PApplet parent, BufferedReader reader) {
30
+ this(parent, reader, "");
75
31
  }
76
32
 
77
- vertexCount = face.vertIdx.size();
78
- vertices = new float[vertexCount][12];
79
- for (int j = 0; j < face.vertIdx.size(); j++){
80
- int vertIdx, normIdx, texIdx;
81
- PVector vert, norms, tex;
82
-
83
- vert = norms = tex = null;
84
-
85
- vertIdx = face.vertIdx.get(j).intValue() - 1;
86
- vert = coords.get(vertIdx);
33
+ public PShapeOBJ(PApplet parent, BufferedReader reader, String basePath) {
34
+ ArrayList<OBJFace> faces = new ArrayList<OBJFace>();
35
+ ArrayList<OBJMaterial> materials = new ArrayList<OBJMaterial>();
36
+ ArrayList<PVector> coords = new ArrayList<PVector>();
37
+ ArrayList<PVector> normals = new ArrayList<PVector>();
38
+ ArrayList<PVector> texcoords = new ArrayList<PVector>();
39
+ parseOBJ(parent, basePath, reader,
40
+ faces, materials, coords, normals, texcoords);
41
+
42
+ // The OBJ geometry is stored with each face in a separate child shape.
43
+ parent = null;
44
+ family = GROUP;
45
+ addChildren(faces, materials, coords, normals, texcoords);
46
+ }
87
47
 
88
- if (j < face.normIdx.size()) {
89
- normIdx = face.normIdx.get(j).intValue() - 1;
90
- if (-1 < normIdx) {
91
- norms = normals.get(normIdx);
48
+ protected PShapeOBJ(OBJFace face, OBJMaterial mtl,
49
+ ArrayList<PVector> coords,
50
+ ArrayList<PVector> normals,
51
+ ArrayList<PVector> texcoords) {
52
+ family = GEOMETRY;
53
+ if (face.vertIdx.size() == 3) {
54
+ kind = TRIANGLES;
55
+ } else if (face.vertIdx.size() == 4) {
56
+ kind = QUADS;
57
+ } else {
58
+ kind = POLYGON;
92
59
  }
93
- }
94
60
 
95
- if (j < face.texIdx.size()) {
96
- texIdx = face.texIdx.get(j).intValue() - 1;
97
- if (-1 < texIdx) {
98
- tex = texcoords.get(texIdx);
99
- }
100
- }
101
-
102
- vertices[j][X] = vert.x;
103
- vertices[j][Y] = vert.y;
104
- vertices[j][Z] = vert.z;
105
-
106
- vertices[j][PGraphics.R] = mtl.kd.x;
107
- vertices[j][PGraphics.G] = mtl.kd.y;
108
- vertices[j][PGraphics.B] = mtl.kd.z;
109
- vertices[j][PGraphics.A] = 1;
110
-
111
- if (norms != null) {
112
- vertices[j][PGraphics.NX] = norms.x;
113
- vertices[j][PGraphics.NY] = norms.y;
114
- vertices[j][PGraphics.NZ] = norms.z;
115
- }
116
-
117
- if (tex != null) {
118
- vertices[j][PGraphics.U] = tex.x;
119
- vertices[j][PGraphics.V] = tex.y;
120
- }
121
-
122
- if (mtl != null && mtl.kdMap != null) {
123
- image = mtl.kdMap;
124
- }
125
- }
126
- }
127
-
128
-
129
- protected void addChildren(ArrayList<OBJFace> faces,
130
- ArrayList<OBJMaterial> materials,
131
- ArrayList<PVector> coords,
132
- ArrayList<PVector> normals,
133
- ArrayList<PVector> texcoords) {
134
- int mtlIdxCur = -1;
135
- OBJMaterial mtl = null;
136
- for (int i = 0; i < faces.size(); i++) {
137
- OBJFace face = faces.get(i);
138
-
139
- // Getting current material.
140
- if (mtlIdxCur != face.matIdx || face.matIdx == -1) {
141
- // To make sure that at least we get the default material
142
- mtlIdxCur = PApplet.max(0, face.matIdx);
143
- mtl = materials.get(mtlIdxCur);
144
- }
145
-
146
- // Creating child shape for current face.
147
- PShape child = new PShapeOBJ(face, mtl, coords, normals, texcoords);
148
- addChild(child);
149
- }
150
- }
151
-
152
-
153
- static protected void parseOBJ(PApplet parent, String path,
154
- BufferedReader reader,
155
- ArrayList<OBJFace> faces,
156
- ArrayList<OBJMaterial> materials,
157
- ArrayList<PVector> coords,
158
- ArrayList<PVector> normals,
159
- ArrayList<PVector> texcoords) {
160
- Map<String, Integer> mtlTable = new HashMap<String, Integer>();
161
- int mtlIdxCur = -1;
162
- boolean readv, readvn, readvt;
163
- try {
164
-
165
- readv = readvn = readvt = false;
166
- String line;
167
- String gname = "object";
168
- while ((line = reader.readLine()) != null) {
169
- // Parse the line.
170
- line = line.trim();
171
- if (line.equals("") || line.indexOf('#') == 0) {
172
- // Empty line of comment, ignore line
173
- continue;
61
+ stroke = false;
62
+ fill = true;
63
+
64
+ // Setting material properties for the new face
65
+ fillColor = rgbaValue(mtl.kd);
66
+ ambientColor = rgbaValue(mtl.ka);
67
+ specularColor = rgbaValue(mtl.ks);
68
+ shininess = mtl.ns;
69
+ if (mtl.kdMap != null) {
70
+ // If current material is textured, then tinting the texture using the
71
+ // diffuse color.
72
+ tintColor = rgbaValue(mtl.kd, mtl.d);
174
73
  }
175
74
 
176
- // The below patch/hack comes from Carlos Tomas Marti and is a
177
- // fix for single backslashes in Rhino obj files
178
-
179
- // BEGINNING OF RHINO OBJ FILES HACK
180
- // Statements can be broken in multiple lines using '\' at the
181
- // end of a line.
182
- // In regular expressions, the backslash is also an escape
183
- // character.
184
- // The regular expression \\ matches a single backslash. This
185
- // regular expression as a Java string, becomes "\\\\".
186
- // That's right: 4 backslashes to match a single one.
187
- while (line.contains("\\")) {
188
- line = line.split("\\\\")[0];
189
- final String s = reader.readLine();
190
- if (s != null)
191
- line += s;
192
- }
193
- // END OF RHINO OBJ FILES HACK
194
-
195
- String[] parts = line.split("\\s+");
196
- // if not a blank line, process the line.
197
- if (parts.length > 0) {
198
- if (parts[0].equals("v")) {
199
- // vertex
200
- PVector tempv = new PVector(Float.valueOf(parts[1]).floatValue(),
201
- Float.valueOf(parts[2]).floatValue(),
202
- Float.valueOf(parts[3]).floatValue());
203
- coords.add(tempv);
204
- readv = true;
205
- } else if (parts[0].equals("vn")) {
206
- // normal
207
- PVector tempn = new PVector(Float.valueOf(parts[1]).floatValue(),
208
- Float.valueOf(parts[2]).floatValue(),
209
- Float.valueOf(parts[3]).floatValue());
210
- normals.add(tempn);
211
- readvn = true;
212
- } else if (parts[0].equals("vt")) {
213
- // uv, inverting v to take into account Processing's inverted Y axis
214
- // with respect to OpenGL.
215
- PVector tempv = new PVector(Float.valueOf(parts[1]).floatValue(),
216
- 1 - Float.valueOf(parts[2]).
217
- floatValue());
218
- texcoords.add(tempv);
219
- readvt = true;
220
- } else if (parts[0].equals("o")) {
221
- // Object name is ignored, for now.
222
- } else if (parts[0].equals("mtllib")) {
223
- if (parts[1] != null) {
224
- String fn = parts[1];
225
- if (fn.indexOf(File.separator) == -1 && !path.equals("")) {
226
- // Relative file name, adding the base path.
227
- fn = path + File.separator + fn;
228
- }
229
- BufferedReader mreader = parent.createReader(fn);
230
- if (mreader != null) {
231
- parseMTL(parent, fn, path, mreader, materials, mtlTable);
232
- mreader.close();
233
- }
234
- }
235
- } else if (parts[0].equals("g")) {
236
- gname = 1 < parts.length ? parts[1] : "";
237
- } else if (parts[0].equals("usemtl")) {
238
- // Getting index of current active material (will be applied on
239
- // all subsequent faces).
240
- if (parts[1] != null) {
241
- String mtlname = parts[1];
242
- if (mtlTable.containsKey(mtlname)) {
243
- Integer tempInt = mtlTable.get(mtlname);
244
- mtlIdxCur = tempInt.intValue();
245
- } else {
246
- mtlIdxCur = -1;
247
- }
248
- }
249
- } else if (parts[0].equals("f")) {
250
- // Face setting
251
- OBJFace face = new OBJFace();
252
- face.matIdx = mtlIdxCur;
253
- face.name = gname;
254
-
255
- for (int i = 1; i < parts.length; i++) {
256
- String seg = parts[i];
257
-
258
- if (seg.indexOf("/") > 0) {
259
- String[] forder = seg.split("/");
260
-
261
- if (forder.length > 2) {
262
- // Getting vertex and texture and normal indexes.
263
- if (forder[0].length() > 0 && readv) {
264
- face.vertIdx.add(Integer.valueOf(forder[0]));
265
- }
266
-
267
- if (forder[1].length() > 0 && readvt) {
268
- face.texIdx.add(Integer.valueOf(forder[1]));
269
- }
270
-
271
- if (forder[2].length() > 0 && readvn) {
272
- face.normIdx.add(Integer.valueOf(forder[2]));
273
- }
274
- } else if (forder.length > 1) {
275
- // Getting vertex and texture/normal indexes.
276
- if (forder[0].length() > 0 && readv) {
277
- face.vertIdx.add(Integer.valueOf(forder[0]));
278
- }
279
-
280
- if (forder[1].length() > 0) {
281
- if (readvt) {
282
- face.texIdx.add(Integer.valueOf(forder[1]));
283
- } else if (readvn) {
284
- face.normIdx.add(Integer.valueOf(forder[1]));
285
- }
75
+ vertexCount = face.vertIdx.size();
76
+ vertices = new float[vertexCount][12];
77
+ for (int j = 0; j < face.vertIdx.size(); j++) {
78
+ int vertIdx, normIdx, texIdx;
79
+ PVector vert, norms, tex;
80
+
81
+ vert = norms = tex = null;
286
82
 
287
- }
83
+ vertIdx = face.vertIdx.get(j).intValue() - 1;
84
+ vert = coords.get(vertIdx);
288
85
 
289
- } else if (forder.length > 0) {
290
- // Getting vertex index only.
291
- if (forder[0].length() > 0 && readv) {
292
- face.vertIdx.add(Integer.valueOf(forder[0]));
293
- }
86
+ if (j < face.normIdx.size()) {
87
+ normIdx = face.normIdx.get(j).intValue() - 1;
88
+ if (-1 < normIdx) {
89
+ norms = normals.get(normIdx);
294
90
  }
295
- } else {
296
- // Getting vertex index only.
297
- if (seg.length() > 0 && readv) {
298
- face.vertIdx.add(Integer.valueOf(seg));
91
+ }
92
+
93
+ if (j < face.texIdx.size()) {
94
+ texIdx = face.texIdx.get(j).intValue() - 1;
95
+ if (-1 < texIdx) {
96
+ tex = texcoords.get(texIdx);
299
97
  }
300
- }
301
98
  }
302
99
 
303
- faces.add(face);
304
- }
100
+ vertices[j][X] = vert.x;
101
+ vertices[j][Y] = vert.y;
102
+ vertices[j][Z] = vert.z;
103
+
104
+ vertices[j][PGraphics.R] = mtl.kd.x;
105
+ vertices[j][PGraphics.G] = mtl.kd.y;
106
+ vertices[j][PGraphics.B] = mtl.kd.z;
107
+ vertices[j][PGraphics.A] = 1;
108
+
109
+ if (norms != null) {
110
+ vertices[j][PGraphics.NX] = norms.x;
111
+ vertices[j][PGraphics.NY] = norms.y;
112
+ vertices[j][PGraphics.NZ] = norms.z;
113
+ }
114
+
115
+ if (tex != null) {
116
+ vertices[j][PGraphics.U] = tex.x;
117
+ vertices[j][PGraphics.V] = tex.y;
118
+ }
119
+
120
+ if (mtl != null && mtl.kdMap != null) {
121
+ image = mtl.kdMap;
122
+ }
305
123
  }
306
- }
124
+ }
307
125
 
308
- if (materials.size() == 0) {
309
- // No materials definition so far. Adding one default material.
310
- OBJMaterial defMtl = new OBJMaterial();
311
- materials.add(defMtl);
312
- }
126
+ protected void addChildren(ArrayList<OBJFace> faces,
127
+ ArrayList<OBJMaterial> materials,
128
+ ArrayList<PVector> coords,
129
+ ArrayList<PVector> normals,
130
+ ArrayList<PVector> texcoords) {
131
+ int mtlIdxCur = -1;
132
+ OBJMaterial mtl = null;
133
+ for (int i = 0; i < faces.size(); i++) {
134
+ OBJFace face = faces.get(i);
135
+
136
+ // Getting current material.
137
+ if (mtlIdxCur != face.matIdx || face.matIdx == -1) {
138
+ // To make sure that at least we get the default material
139
+ mtlIdxCur = PApplet.max(0, face.matIdx);
140
+ mtl = materials.get(mtlIdxCur);
141
+ }
313
142
 
314
- } catch (Exception e) {
315
- e.printStackTrace();
143
+ // Creating child shape for current face.
144
+ PShape child = new PShapeOBJ(face, mtl, coords, normals, texcoords);
145
+ addChild(child);
146
+ }
316
147
  }
317
- }
318
-
319
-
320
- static protected void parseMTL(PApplet parent, String mtlfn, String path,
321
- BufferedReader reader,
322
- ArrayList<OBJMaterial> materials,
323
- Map<String, Integer> materialsHash) {
324
- try {
325
- String line;
326
- OBJMaterial currentMtl = null;
327
- while ((line = reader.readLine()) != null) {
328
- // Parse the line
329
- line = line.trim();
330
- String parts[] = line.split("\\s+");
331
- if (parts.length > 0) {
332
- // Extract the material data.
333
- if (parts[0].equals("newmtl")) {
334
- // Starting new material.
335
- String mtlname = parts[1];
336
- currentMtl = addMaterial(mtlname, materials, materialsHash);
337
- } else {
338
- if (currentMtl == null) {
339
- currentMtl = addMaterial("material" + materials.size(),
340
- materials, materialsHash);
148
+
149
+ static protected void parseOBJ(PApplet parent, String path,
150
+ BufferedReader reader,
151
+ ArrayList<OBJFace> faces,
152
+ ArrayList<OBJMaterial> materials,
153
+ ArrayList<PVector> coords,
154
+ ArrayList<PVector> normals,
155
+ ArrayList<PVector> texcoords) {
156
+ Map<String, Integer> mtlTable = new HashMap<String, Integer>();
157
+ int mtlIdxCur = -1;
158
+ boolean readv, readvn, readvt;
159
+ try {
160
+
161
+ readv = readvn = readvt = false;
162
+ String line;
163
+ String gname = "object";
164
+ while ((line = reader.readLine()) != null) {
165
+ // Parse the line.
166
+ line = line.trim();
167
+ if (line.equals("") || line.indexOf('#') == 0) {
168
+ // Empty line of comment, ignore line
169
+ continue;
170
+ }
171
+
172
+ // The below patch/hack comes from Carlos Tomas Marti and is a
173
+ // fix for single backslashes in Rhino obj files
174
+ // BEGINNING OF RHINO OBJ FILES HACK
175
+ // Statements can be broken in multiple lines using '\' at the
176
+ // end of a line.
177
+ // In regular expressions, the backslash is also an escape
178
+ // character.
179
+ // The regular expression \\ matches a single backslash. This
180
+ // regular expression as a Java string, becomes "\\\\".
181
+ // That's right: 4 backslashes to match a single one.
182
+ while (line.contains("\\")) {
183
+ line = line.split("\\\\")[0];
184
+ final String s = reader.readLine();
185
+ if (s != null) {
186
+ line += s;
187
+ }
188
+ }
189
+ // END OF RHINO OBJ FILES HACK
190
+
191
+ String[] parts = line.split("\\s+");
192
+ // if not a blank line, process the line.
193
+ if (parts.length > 0) {
194
+ if (parts[0].equals("v")) {
195
+ // vertex
196
+ PVector tempv = new PVector(Float.valueOf(parts[1]).floatValue(),
197
+ Float.valueOf(parts[2]).floatValue(),
198
+ Float.valueOf(parts[3]).floatValue());
199
+ coords.add(tempv);
200
+ readv = true;
201
+ } else if (parts[0].equals("vn")) {
202
+ // normal
203
+ PVector tempn = new PVector(Float.valueOf(parts[1]).floatValue(),
204
+ Float.valueOf(parts[2]).floatValue(),
205
+ Float.valueOf(parts[3]).floatValue());
206
+ normals.add(tempn);
207
+ readvn = true;
208
+ } else if (parts[0].equals("vt")) {
209
+ // uv, inverting v to take into account Processing's inverted Y axis
210
+ // with respect to OpenGL.
211
+ PVector tempv = new PVector(Float.valueOf(parts[1]).floatValue(),
212
+ 1 - Float.valueOf(parts[2]).
213
+ floatValue());
214
+ texcoords.add(tempv);
215
+ readvt = true;
216
+ } else if (parts[0].equals("o")) {
217
+ // Object name is ignored, for now.
218
+ } else if (parts[0].equals("mtllib")) {
219
+ if (parts[1] != null) {
220
+ String fn = parts[1];
221
+ if (fn.indexOf(File.separator) == -1 && !path.equals("")) {
222
+ // Relative file name, adding the base path.
223
+ fn = path + File.separator + fn;
224
+ }
225
+ BufferedReader mreader = parent.createReader(fn);
226
+ if (mreader != null) {
227
+ parseMTL(parent, fn, path, mreader, materials, mtlTable);
228
+ mreader.close();
229
+ }
230
+ }
231
+ } else if (parts[0].equals("g")) {
232
+ gname = 1 < parts.length ? parts[1] : "";
233
+ } else if (parts[0].equals("usemtl")) {
234
+ // Getting index of current active material (will be applied on
235
+ // all subsequent faces).
236
+ if (parts[1] != null) {
237
+ String mtlname = parts[1];
238
+ if (mtlTable.containsKey(mtlname)) {
239
+ Integer tempInt = mtlTable.get(mtlname);
240
+ mtlIdxCur = tempInt.intValue();
241
+ } else {
242
+ mtlIdxCur = -1;
243
+ }
244
+ }
245
+ } else if (parts[0].equals("f")) {
246
+ // Face setting
247
+ OBJFace face = new OBJFace();
248
+ face.matIdx = mtlIdxCur;
249
+ face.name = gname;
250
+
251
+ for (int i = 1; i < parts.length; i++) {
252
+ String seg = parts[i];
253
+
254
+ if (seg.indexOf("/") > 0) {
255
+ String[] forder = seg.split("/");
256
+
257
+ if (forder.length > 2) {
258
+ // Getting vertex and texture and normal indexes.
259
+ if (forder[0].length() > 0 && readv) {
260
+ face.vertIdx.add(Integer.valueOf(forder[0]));
261
+ }
262
+
263
+ if (forder[1].length() > 0 && readvt) {
264
+ face.texIdx.add(Integer.valueOf(forder[1]));
265
+ }
266
+
267
+ if (forder[2].length() > 0 && readvn) {
268
+ face.normIdx.add(Integer.valueOf(forder[2]));
269
+ }
270
+ } else if (forder.length > 1) {
271
+ // Getting vertex and texture/normal indexes.
272
+ if (forder[0].length() > 0 && readv) {
273
+ face.vertIdx.add(Integer.valueOf(forder[0]));
274
+ }
275
+
276
+ if (forder[1].length() > 0) {
277
+ if (readvt) {
278
+ face.texIdx.add(Integer.valueOf(forder[1]));
279
+ } else if (readvn) {
280
+ face.normIdx.add(Integer.valueOf(forder[1]));
281
+ }
282
+
283
+ }
284
+
285
+ } else if (forder.length > 0) {
286
+ // Getting vertex index only.
287
+ if (forder[0].length() > 0 && readv) {
288
+ face.vertIdx.add(Integer.valueOf(forder[0]));
289
+ }
290
+ }
291
+ } else {
292
+ // Getting vertex index only.
293
+ if (seg.length() > 0 && readv) {
294
+ face.vertIdx.add(Integer.valueOf(seg));
295
+ }
296
+ }
297
+ }
298
+
299
+ faces.add(face);
300
+ }
301
+ }
341
302
  }
342
- if (parts[0].equals("map_Kd") && parts.length > 1) {
343
- // Loading texture map.
344
- String texname = parts[1];
345
- if (texname.indexOf(File.separator) == -1 && !path.equals("")) {
346
- // Relative file name, adding the base path.
347
- texname = path + File.separator + texname;
348
- }
349
-
350
- File file = new File(parent.dataPath(texname));
351
- if (file.exists()) {
352
- currentMtl.kdMap = parent.loadImage(texname);
353
- } else {
354
- System.err.println("The texture map \"" + texname + "\" " +
355
- "in the materials definition file \"" + mtlfn + "\" " +
356
- "is missing or inaccessible, make sure " +
357
- "the URL is valid or that the file has been " +
358
- "added to your sketch and is readable.");
359
- }
360
- } else if (parts[0].equals("Ka") && parts.length > 3) {
361
- // The ambient color of the material
362
- currentMtl.ka.x = Float.valueOf(parts[1]).floatValue();
363
- currentMtl.ka.y = Float.valueOf(parts[2]).floatValue();
364
- currentMtl.ka.z = Float.valueOf(parts[3]).floatValue();
365
- } else if (parts[0].equals("Kd") && parts.length > 3) {
366
- // The diffuse color of the material
367
- currentMtl.kd.x = Float.valueOf(parts[1]).floatValue();
368
- currentMtl.kd.y = Float.valueOf(parts[2]).floatValue();
369
- currentMtl.kd.z = Float.valueOf(parts[3]).floatValue();
370
- } else if (parts[0].equals("Ks") && parts.length > 3) {
371
- // The specular color weighted by the specular coefficient
372
- currentMtl.ks.x = Float.valueOf(parts[1]).floatValue();
373
- currentMtl.ks.y = Float.valueOf(parts[2]).floatValue();
374
- currentMtl.ks.z = Float.valueOf(parts[3]).floatValue();
375
- } else if ((parts[0].equals("d") ||
376
- parts[0].equals("Tr")) && parts.length > 1) {
377
- // Reading the alpha transparency.
378
- currentMtl.d = Float.valueOf(parts[1]).floatValue();
379
- } else if (parts[0].equals("Ns") && parts.length > 1) {
380
- // The specular component of the Phong shading model
381
- currentMtl.ns = Float.valueOf(parts[1]).floatValue();
303
+
304
+ if (materials.size() == 0) {
305
+ // No materials definition so far. Adding one default material.
306
+ OBJMaterial defMtl = new OBJMaterial();
307
+ materials.add(defMtl);
308
+ }
309
+
310
+ } catch (Exception e) {
311
+ e.printStackTrace();
312
+ }
313
+ }
314
+
315
+ static protected void parseMTL(PApplet parent, String mtlfn, String path,
316
+ BufferedReader reader,
317
+ ArrayList<OBJMaterial> materials,
318
+ Map<String, Integer> materialsHash) {
319
+ try {
320
+ String line;
321
+ OBJMaterial currentMtl = null;
322
+ while ((line = reader.readLine()) != null) {
323
+ // Parse the line
324
+ line = line.trim();
325
+ String parts[] = line.split("\\s+");
326
+ if (parts.length > 0) {
327
+ // Extract the material data.
328
+ if (parts[0].equals("newmtl")) {
329
+ // Starting new material.
330
+ String mtlname = parts[1];
331
+ currentMtl = addMaterial(mtlname, materials, materialsHash);
332
+ } else {
333
+ if (currentMtl == null) {
334
+ currentMtl = addMaterial("material" + materials.size(),
335
+ materials, materialsHash);
336
+ }
337
+ if (parts[0].equals("map_Kd") && parts.length > 1) {
338
+ // Loading texture map.
339
+ String texname = parts[1];
340
+ if (texname.indexOf(File.separator) == -1 && !path.equals("")) {
341
+ // Relative file name, adding the base path.
342
+ texname = path + File.separator + texname;
343
+ }
344
+
345
+ File file = new File(parent.dataPath(texname));
346
+ if (file.exists()) {
347
+ currentMtl.kdMap = parent.loadImage(texname);
348
+ } else {
349
+ System.err.println("The texture map \"" + texname + "\" "
350
+ + "in the materials definition file \"" + mtlfn + "\" "
351
+ + "is missing or inaccessible, make sure "
352
+ + "the URL is valid or that the file has been "
353
+ + "added to your sketch and is readable.");
354
+ }
355
+ } else if (parts[0].equals("Ka") && parts.length > 3) {
356
+ // The ambient color of the material
357
+ currentMtl.ka.x = Float.valueOf(parts[1]).floatValue();
358
+ currentMtl.ka.y = Float.valueOf(parts[2]).floatValue();
359
+ currentMtl.ka.z = Float.valueOf(parts[3]).floatValue();
360
+ } else if (parts[0].equals("Kd") && parts.length > 3) {
361
+ // The diffuse color of the material
362
+ currentMtl.kd.x = Float.valueOf(parts[1]).floatValue();
363
+ currentMtl.kd.y = Float.valueOf(parts[2]).floatValue();
364
+ currentMtl.kd.z = Float.valueOf(parts[3]).floatValue();
365
+ } else if (parts[0].equals("Ks") && parts.length > 3) {
366
+ // The specular color weighted by the specular coefficient
367
+ currentMtl.ks.x = Float.valueOf(parts[1]).floatValue();
368
+ currentMtl.ks.y = Float.valueOf(parts[2]).floatValue();
369
+ currentMtl.ks.z = Float.valueOf(parts[3]).floatValue();
370
+ } else if ((parts[0].equals("d")
371
+ || parts[0].equals("Tr")) && parts.length > 1) {
372
+ // Reading the alpha transparency.
373
+ currentMtl.d = Float.valueOf(parts[1]).floatValue();
374
+ } else if (parts[0].equals("Ns") && parts.length > 1) {
375
+ // The specular component of the Phong shading model
376
+ currentMtl.ns = Float.valueOf(parts[1]).floatValue();
377
+ }
378
+ }
379
+ }
382
380
  }
383
- }
381
+ } catch (Exception e) {
382
+ e.printStackTrace();
384
383
  }
385
- }
386
- } catch (Exception e) {
387
- e.printStackTrace();
388
384
  }
389
- }
390
-
391
- protected static OBJMaterial addMaterial(String mtlname,
392
- ArrayList<OBJMaterial> materials,
393
- Map<String, Integer> materialsHash) {
394
- OBJMaterial currentMtl = new OBJMaterial(mtlname);
395
- materialsHash.put(mtlname, Integer.valueOf(materials.size()));
396
- materials.add(currentMtl);
397
- return currentMtl;
398
- }
399
-
400
- protected static int rgbaValue(PVector color) {
401
- return 0xFF000000 | ((int)(color.x * 255) << 16) |
402
- ((int)(color.y * 255) << 8) |
403
- (int)(color.z * 255);
404
- }
405
-
406
-
407
- protected static int rgbaValue(PVector color, float alpha) {
408
- return ((int)(alpha * 255) << 24) |
409
- ((int)(color.x * 255) << 16) |
410
- ((int)(color.y * 255) << 8) |
411
- (int)(color.z * 255);
412
- }
413
-
414
-
415
- // Stores a face from an OBJ file
416
- static protected class OBJFace {
417
- ArrayList<Integer> vertIdx;
418
- ArrayList<Integer> texIdx;
419
- ArrayList<Integer> normIdx;
420
- int matIdx;
421
- String name;
422
-
423
- OBJFace() {
424
- vertIdx = new ArrayList<Integer>();
425
- texIdx = new ArrayList<Integer>();
426
- normIdx = new ArrayList<Integer>();
427
- matIdx = -1;
428
- name = "";
385
+
386
+ protected static OBJMaterial addMaterial(String mtlname,
387
+ ArrayList<OBJMaterial> materials,
388
+ Map<String, Integer> materialsHash) {
389
+ OBJMaterial currentMtl = new OBJMaterial(mtlname);
390
+ materialsHash.put(mtlname, Integer.valueOf(materials.size()));
391
+ materials.add(currentMtl);
392
+ return currentMtl;
429
393
  }
430
- }
431
394
 
395
+ protected static int rgbaValue(PVector color) {
396
+ return 0xFF000000 | ((int) (color.x * 255) << 16)
397
+ | ((int) (color.y * 255) << 8)
398
+ | (int) (color.z * 255);
399
+ }
432
400
 
433
- static protected String getBasePath(PApplet parent, String filename) {
434
- // Obtaining the path
435
- File file = new File(parent.dataPath(filename));
436
- if (!file.exists()) {
437
- file = parent.sketchFile(filename);
401
+ protected static int rgbaValue(PVector color, float alpha) {
402
+ return ((int) (alpha * 255) << 24)
403
+ | ((int) (color.x * 255) << 16)
404
+ | ((int) (color.y * 255) << 8)
405
+ | (int) (color.z * 255);
438
406
  }
439
- String absolutePath = file.getAbsolutePath();
440
- return absolutePath.substring(0,
441
- absolutePath.lastIndexOf(File.separator));
442
- }
443
-
444
-
445
- // Stores a material defined in an MTL file.
446
- static protected class OBJMaterial {
447
- String name;
448
- PVector ka;
449
- PVector kd;
450
- PVector ks;
451
- float d;
452
- float ns;
453
- PImage kdMap;
454
-
455
- OBJMaterial() {
456
- this("default");
407
+
408
+ // Stores a face from an OBJ file
409
+ static protected class OBJFace {
410
+
411
+ ArrayList<Integer> vertIdx;
412
+ ArrayList<Integer> texIdx;
413
+ ArrayList<Integer> normIdx;
414
+ int matIdx;
415
+ String name;
416
+
417
+ OBJFace() {
418
+ vertIdx = new ArrayList<Integer>();
419
+ texIdx = new ArrayList<Integer>();
420
+ normIdx = new ArrayList<Integer>();
421
+ matIdx = -1;
422
+ name = "";
423
+ }
457
424
  }
458
425
 
459
- OBJMaterial(String name) {
460
- this.name = name;
461
- ka = new PVector(0.5f, 0.5f, 0.5f);
462
- kd = new PVector(0.5f, 0.5f, 0.5f);
463
- ks = new PVector(0.5f, 0.5f, 0.5f);
464
- d = 1.0f;
465
- ns = 0.0f;
466
- kdMap = null;
426
+ static protected String getBasePath(PApplet parent, String filename) {
427
+ // Obtaining the path
428
+ File file = new File(parent.dataPath(filename));
429
+ if (!file.exists()) {
430
+ file = parent.sketchFile(filename);
431
+ }
432
+ String absolutePath = file.getAbsolutePath();
433
+ return absolutePath.substring(0,
434
+ absolutePath.lastIndexOf(File.separator));
435
+ }
436
+
437
+ // Stores a material defined in an MTL file.
438
+ static protected class OBJMaterial {
439
+
440
+ String name;
441
+ PVector ka;
442
+ PVector kd;
443
+ PVector ks;
444
+ float d;
445
+ float ns;
446
+ PImage kdMap;
447
+
448
+ OBJMaterial() {
449
+ this("default");
450
+ }
451
+
452
+ OBJMaterial(String name) {
453
+ this.name = name;
454
+ ka = new PVector(0.5f, 0.5f, 0.5f);
455
+ kd = new PVector(0.5f, 0.5f, 0.5f);
456
+ ks = new PVector(0.5f, 0.5f, 0.5f);
457
+ d = 1.0f;
458
+ ns = 0.0f;
459
+ kdMap = null;
460
+ }
467
461
  }
468
- }
469
462
  }