Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4700/src/net/sourceforge/bprocessor/model
Modified Files:
Surface.java
Log Message:
changed controlled extrude back to previus setting
Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** Surface.java 31 Oct 2007 15:46:28 -0000 1.199
--- Surface.java 6 Nov 2007 18:20:30 -0000 1.200
***************
*** 941,945 ****
Vertex normal = normal();
Plane p = new Plane(normal.getX(), normal.getY(), normal.getZ(), this.getFirstVertex());
! boolean makeNewTop = false;
List<Vertex> vertices = getVertices();
--- 941,945 ----
Vertex normal = normal();
Plane p = new Plane(normal.getX(), normal.getY(), normal.getZ(), this.getFirstVertex());
! boolean makeNewTop = true;
List<Vertex> vertices = getVertices();
***************
*** 996,1002 ****
v2dir.put(v[i], new Direction(vmap[i], tempNormal, min, max));
}
- makeNewTop = true;
} else {
// We just have to move the existing point
Collection<Edge> connected = v[i].getEdges();
connected.removeAll(this.getEdges());
--- 996,1002 ----
v2dir.put(v[i], new Direction(vmap[i], tempNormal, min, max));
}
} else {
// We just have to move the existing point
+ makeNewTop = false;
Collection<Edge> connected = v[i].getEdges();
connected.removeAll(this.getEdges());
***************
*** 1107,1111 ****
}
}
! //this.setEdges(lst);
for (int i = 0; i < n; i++) {
--- 1107,1111 ----
}
}
! this.setEdges(lst);
for (int i = 0; i < n; i++) {
***************
*** 1113,1158 ****
facemap[i] = (Surface)e2s.get(e[i]);
} else {
! if (sidemap[i] != null) {
! if (sidemap[(i + 1) % n] != null) {
! //New quadratic surface
! Edge b = e[i];
! Edge r = sidemap[i];
! Edge l = sidemap[(i + 1) % n];
! Edge t = topmap[i];
! List<Edge> newEdges = new LinkedList<Edge>();
! newEdges.add(r);
! newEdges.add(t);
! newEdges.add(l);
! newEdges.add(b);
! facemap[i] = new Surface(newEdges);
! e2s.put(b, facemap[i]);
! extrusion.add(facemap[i]);
! } else {
! //new triangular surface with the prev edge.
! Edge b = e[i];
! Edge r = sidemap[i];
! Edge t = topmap[i];
! List<Edge> newEdges = new LinkedList<Edge>();
! newEdges.add(b);
! newEdges.add(r);
! newEdges.add(t);
! facemap[i] = new Surface(newEdges);
! e2s.put(b, facemap[i]);
! extrusion.add(facemap[i]);
! }
} else {
! if (sidemap[(i + 1) % n] != null) {
! // new triangular surface with the next edge
! Edge b = e[i];
! Edge l = sidemap[(i + 1) % n];
! Edge t = topmap[i];
! List<Edge> newEdges = new LinkedList<Edge>();
! newEdges.add(t);
! newEdges.add(l);
! newEdges.add(b);
! facemap[i] = new Surface(newEdges);
! e2s.put(b, facemap[i]);
! extrusion.add(facemap[i]);
! }
}
}
--- 1113,1131 ----
facemap[i] = (Surface)e2s.get(e[i]);
} else {
! if (sidemap[i] == null || sidemap[(i + 1) % n] == null) {
! // We should not make a new surface
} else {
! Edge b = e[i];
! Edge r = sidemap[i];
! Edge l = sidemap[(i + 1) % n];
! Edge t = topmap[i];
! List<Edge> newEdges = new LinkedList<Edge>();
! newEdges.add(r);
! newEdges.add(t);
! newEdges.add(l);
! newEdges.add(b);
! facemap[i] = new Surface(newEdges);
! e2s.put(b, facemap[i]);
! extrusion.add(facemap[i]);
}
}
|
