Update of /cvsroot/jrman/drafts/src/org/jrman/parser
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16144/src/org/jrman/parser
Modified Files:
Parser.java
Log Message:
Started working on SubdivisionMeshes.
Started migration to Java 5.
Index: Parser.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Parser.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** Parser.java 25 Dec 2006 07:50:37 -0000 1.109
--- Parser.java 26 Feb 2007 15:25:14 -0000 1.110
***************
*** 89,92 ****
--- 89,93 ----
import org.jrman.primitive.Primitive;
import org.jrman.primitive.Sphere;
+ import org.jrman.primitive.SubdivisionMesh;
import org.jrman.primitive.Torus;
import org.jrman.render.Renderer;
***************
*** 173,176 ****
--- 174,179 ----
private int curveCount;
+
+ private int subdivMeshesCount;
public static class State {
***************
*** 1515,1518 ****
--- 1518,1563 ----
}
+ public void addSubdivisionMesh(final String scheme,
+ final int[] nvertices,
+ final int[] vertices,
+ final String[] tags,
+ final int[] nargs,
+ final int[] intargs,
+ final float[] floatargs,
+ final ParameterList parameters) {
+ if (inAreaLightSource)
+ return;
+ if (!inObject) {
+ renderer.addPrimitive(new SubdivisionMesh(scheme,
+ nvertices,
+ vertices,
+ tags,
+ nargs,
+ intargs,
+ floatargs,
+ parameters,
+ getAttributes()));
+ subdivMeshesCount++;
+ } else {
+ final Transform transform = currentAttributes.getTransform();
+ currentObjectInstanceList
+ .addPrimitiveCreator(new ObjectInstanceList.PrimitiveCreator() {
+ public Primitive create(Attributes attributes) {
+ subdivMeshesCount++;
+ return new SubdivisionMesh(scheme,
+ nvertices,
+ vertices,
+ tags,
+ nargs,
+ intargs,
+ floatargs,
+ parameters,
+ createAttributes(transform,
+ attributes));
+ }
+ });
+ }
+ }
+
public void addDelayedReadArchive(String filename, float xmin, float xmax,
float ymin, float ymax, float zmin, float zmax) {
***************
*** 1601,1603 ****
--- 1646,1652 ----
}
+ public int getSubdivMeshesCount() {
+ return subdivMeshesCount;
+ }
+
}
|
