Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24324/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
PencilTool.java
Log Message:
Cleanup in Pencil.
Pre-initialize of tesselator by drawing a surface during init.
Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** PencilTool.java 10 Jan 2006 14:01:48 -0000 1.55
--- PencilTool.java 10 Jan 2006 14:35:37 -0000 1.56
***************
*** 477,576 ****
/**
- * Round to mm
- * @param value The value
- * @return The rounded value
- */
- protected double roundMM(double value) {
- return value;
- //return ((double) Math.round(value * 1000)) / 1000.0;
- }
-
-
- /**
- * Snaps the vertex
- * @param vertex The vertex to snap
- */
- protected void snap(Vertex vertex) {
- if (alignVertex != null) {
- if (Math.abs(alignVertex.getX() - vertex.getX()) < 0.3) {
- vertex.setX(alignVertex.getX());
- } else {
- vertex.setX(round(current.getX()));
- }
- if (Math.abs(alignVertex.getY() - vertex.getY()) < 0.3) {
- vertex.setY(alignVertex.getY());
- } else {
- vertex.setY(round(current.getY()));
- }
- if (Math.abs(alignVertex.getZ() - vertex.getZ()) < 0.3) {
- vertex.setZ(alignVertex.getZ());
- } else {
- vertex.setZ(round(current.getZ()));
- }
- } else {
- vertex.setX(round(current.getX()));
- vertex.setY(round(current.getY()));
- vertex.setZ(round(current.getZ()));
- }
- }
-
- /**
- * Snaps within a coordinate system
- * @param system The coordinate system
- * @param vertex The vertex to snap
- */
- protected void snapInSystem(CoordinateSystem system, Vertex vertex) {
- Vertex v = system.translate(vertex);
- double x = v.getX();
- double y = v.getY();
-
- Vertex a = null;
- Vertex b = null;
-
- if (alignVertex != null) {
- a = system.translate(alignVertex);
- }
- if (snapVertex != null) {
- b = system.translate(snapVertex);
- }
-
- double xl = 0.3;
- double yl = 0.3;
- double xd = 0.0;
- double yd = 0.0;
- if (a != null) {
- xd = Math.abs(a.getX() - v.getX());
- if (xd < xl) {
- x = a.getX();
- xl = xd;
- }
- yd = Math.abs(a.getY() - v.getY());
- if (yd < yl) {
- y = a.getY();
- yl = yd;
- }
- }
- if (b != null) {
- xd = Math.abs(b.getX() - v.getX());
- if (xd < xl) {
- x = b.getX();
- xl = xd;
- }
- yd = Math.abs(b.getY() - v.getY());
- if (yd < yl) {
- y = b.getY();
- yl = yd;
- }
- }
-
- v.setX(x);
- v.setY(y);
- v = system.unTranslate(v);
- vertex.setX(roundMM(v.getX()));
- vertex.setY(roundMM(v.getY()));
- vertex.setZ(roundMM(v.getZ()));
- }
-
- /**
* Set current vertex to an appropriate vertex
* @param event The MouseEvent
--- 477,480 ----
***************
*** 828,834 ****
v.scale((d / 1000) / v.length());
current = before.add(v);
! current.setX(roundMM(current.getX()));
! current.setY(roundMM(current.getY()));
! current.setZ(roundMM(current.getZ()));
Set edges = Project.getInstance().findEdge(current);
Iterator iter = edges.iterator();
--- 732,738 ----
v.scale((d / 1000) / v.length());
current = before.add(v);
! current.setX(current.getX());
! current.setY(current.getY());
! current.setZ(current.getZ());
Set edges = Project.getInstance().findEdge(current);
Iterator iter = edges.iterator();
|
