bprocessor-commit Mailing List for B-processor (Page 110)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2006-08-15 13:25:50
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26389/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractPencil.java Log Message: Ensured that a vertex is hilited yellow when target for the AbstractPencil and dscendants. Index: AbstractPencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** AbstractPencil.java 15 Aug 2006 09:51:14 -0000 1.56 --- AbstractPencil.java 15 Aug 2006 13:25:44 -0000 1.57 *************** *** 175,178 **** --- 175,188 ---- (Intersection) glv.getView().getObjectAtPoint(e.getX(), e.getY(), unwanted, View.INTERSECTIONS, work); + if (intersection != null) { + Space space = Project.getInstance().getActiveSpace(); + Vertex v = intersection.vertex(); + Set vertices = space.findByLocation(v.getX(), v.getY(), v.getZ(), 0.0000001); + if (!vertices.isEmpty()) { + v = (Vertex) vertices.iterator().next(); + intersection = new Intersection(v, Intersection.VERTEX, v); + } + } + if (constrain) { if (lockingEdge != null) { |
|
From: Michael L. <he...@us...> - 2006-08-15 09:51:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9240/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractPencil.java Log Message: Changed drawing of target when using AbstractPencil tools Index: AbstractPencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** AbstractPencil.java 10 Aug 2006 13:08:01 -0000 1.55 --- AbstractPencil.java 15 Aug 2006 09:51:14 -0000 1.56 *************** *** 698,709 **** if (edge.getStrippled()) { target = current; ! targetColor = View.CONSTRUCTOR_COLOR; } else { ! target = intersection.object(); } break; case Intersection.SURFACE: ! target = intersection.object(); //plane = ((Surface) target).plane(); break; --- 698,713 ---- if (edge.getStrippled()) { target = current; ! targetColor = View.EDGE_ON_COLOR; } else { ! //target = intersection.object(); ! target = current; ! targetColor = View.EDGE_ON_COLOR; } break; case Intersection.SURFACE: ! //target = intersection.object(); ! target = current; ! targetColor = View.SURFACE_ON_COLOR; //plane = ((Surface) target).plane(); break; |
|
From: Michael L. <he...@us...> - 2006-08-15 09:51:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9240/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Changed drawing of target when using AbstractPencil tools Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** View.java 14 Aug 2006 14:06:43 -0000 1.138 --- View.java 15 Aug 2006 09:51:14 -0000 1.139 *************** *** 119,125 **** public static final float[] EDGE_MIDPOINT_COLOR = new float[] {0.1f, 0.8f, 0.8f}; ! /** Used for vertices on edge-intersections */ public static final float[] EDGE_INTERSECTION_COLOR = new float[] {0.8f, 0.1f, 0.8f}; /** Used for constructor objects */ public static final float [] CONSTRUCTOR_COLOR = new float[] {0.8f, 0.7f, 0.6f, 0.50f}; --- 119,133 ---- public static final float[] EDGE_MIDPOINT_COLOR = new float[] {0.1f, 0.8f, 0.8f}; ! /** Used for vertices on edge-intersections (edge/edge or edge/surface) */ public static final float[] EDGE_INTERSECTION_COLOR = new float[] {0.8f, 0.1f, 0.8f}; + /** Used for vertices on surface */ + public static final float[] SURFACE_ON_COLOR = new float[] {0.6f, 0.2f, 0.1f}; + + /** Used for vertices on edges */ + public static final float[] EDGE_ON_COLOR = new float[] {0.2f, 0.3f, 0.6f}; + + + /** Used for constructor objects */ public static final float [] CONSTRUCTOR_COLOR = new float[] {0.8f, 0.7f, 0.6f, 0.50f}; *************** *** 2333,2337 **** } else { if (edge != null) { ! { Vertex m = edge.getFrom().add(edge.getTo()); m.scale(0.5); --- 2341,2345 ---- } else { if (edge != null) { ! if (!edge.getStrippled()) { Vertex m = edge.getFrom().add(edge.getTo()); m.scale(0.5); |
|
From: Nordholt <nor...@us...> - 2006-08-15 08:35:06
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11897/src/net/sourceforge/bprocessor/facade Modified Files: FacadeMain.java Log Message: some work on the facade modellor Index: FacadeMain.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/FacadeMain.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FacadeMain.java 10 Aug 2006 14:21:44 -0000 1.1 --- FacadeMain.java 15 Aug 2006 08:35:01 -0000 1.2 *************** *** 7,10 **** --- 7,13 ---- package net.sourceforge.bprocessor.facade; + import net.sourceforge.bprocessor.facade.modellor.FacadeModellor; + import net.sourceforge.bprocessor.model.modellor.Modellor; + import org.apache.log4j.Logger; *************** *** 20,24 **** */ public FacadeMain () { ! log.info("bunk bunk"); } } --- 23,27 ---- */ public FacadeMain () { ! Modellor.registerModellor(new FacadeModellor()); } } |
|
From: Nordholt <nor...@us...> - 2006-08-15 08:35:06
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11897/src/net/sourceforge/bprocessor/facade/modellor Modified Files: FacadeModellor.java Log Message: some work on the facade modellor Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FacadeModellor.java 11 Aug 2006 11:44:37 -0000 1.1 --- FacadeModellor.java 15 Aug 2006 08:35:01 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- import java.util.List; import java.util.LinkedList; + import java.util.Iterator; import net.sourceforge.bprocessor.model.modellor.Modellor; *************** *** 14,17 **** --- 15,21 ---- import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Surface; + import net.sourceforge.bprocessor.model.Project; + import net.sourceforge.bprocessor.model.Vertex; + import net.sourceforge.bprocessor.model.Edge; import org.apache.log4j.Logger; *************** *** 48,53 **** private Surface front; - - /** The empty constructor */ public FacadeModellor() { --- 52,55 ---- *************** *** 61,64 **** --- 63,70 ---- this.space = s; this.name = "Facade Modellor"; + Iterator it = space.getEnvelope().iterator(); + if (it.hasNext()) { + front = (Surface)it.next(); + } } *************** *** 77,80 **** --- 83,106 ---- */ public void update(Object entity) { + if (this.front != null) { + List edges = this.front.getEdges(); + if (edges.size() == 4) { + Iterator it = edges.iterator(); + Edge vertEdge = null; + Edge horEdge = null; + while (it.hasNext() && + vertEdge == null && + horEdge == null) { + Edge e = (Edge)it.next(); + if (Math.abs(e.getDirection().dot(new Vertex(0, 0, 1))) < 0.0001) { + horEdge = e; + } else if (Math.abs(e.getDirection().dot(new Vertex(1, 0, 0))) < 0.0001 && + Math.abs(e.getDirection().dot(new Vertex(0, 1, 0))) < 0.0001) { + vertEdge = e; + } + } + + } + } } *************** *** 84,92 **** */ public void setAttributes(List attributes) { ! } /** ! * Return a list of the attributes in the object * @return the list of attributes for the object */ --- 110,135 ---- */ public void setAttributes(List attributes) { ! Iterator it = attributes.iterator(); ! while (it.hasNext()) { ! Attribute a = (Attribute)it.next(); ! if (a.getName().equals("Name")) { ! name = (String)a.getValue(); ! } else if (a.getName().equals("Front")) { ! front = (Surface)a.getValue(); ! } else if (a.getName().equals("V-posts")) { ! vertPosts = ((Double)a.getValue()).intValue(); ! } else if (a.getName().equals("H-posts")) { ! horPosts = ((Double)a.getValue()).intValue(); ! } else if (a.getName().equals("V-postwidth")) { ! vertPostWidth = ((Double)a.getValue()).doubleValue(); ! } else if (a.getName().equals("H-postwidth")) { ! horPostWidth = ((Double)a.getValue()).doubleValue(); ! } ! } ! Project.getInstance().changed(space); } /** ! * Retrn a list of the attributes in the object * @return the list of attributes for the object */ *************** *** 94,100 **** LinkedList attributes = new LinkedList(); attributes.add(new Attribute("Name", name)); ! Attribute a = new Attribute("V-posts", new Double(vertPosts)); ! a.setPrecision(1); ! attributes.add(a); attributes.add(new Attribute("H-posts", new Double(horPosts))); attributes.add(new Attribute("V-postwidth", new Double(vertPostWidth))); --- 137,142 ---- LinkedList attributes = new LinkedList(); attributes.add(new Attribute("Name", name)); ! attributes.add(new Attribute("Front", front, true)); ! attributes.add(new Attribute("V-posts", new Double(vertPosts))); attributes.add(new Attribute("H-posts", new Double(horPosts))); attributes.add(new Attribute("V-postwidth", new Double(vertPostWidth))); |
|
From: Nordholt <nor...@us...> - 2006-08-15 08:33:31
|
Update of /cvsroot/bprocessor/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11471 Modified Files: build.xml Log Message: also build the facade module Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** build.xml 11 Aug 2006 09:39:16 -0000 1.19 --- build.xml 15 Aug 2006 08:33:26 -0000 1.20 *************** *** 14,17 **** --- 14,18 ---- <property name="gui.dir" value="${basedir}/../gui"/> <property name="gl.dir" value="${basedir}/../gl"/> + <property name="facade.dir" value="${basedir}/../facade"/> <property name="release.dir" value="${basedir}/dist"/> *************** *** 26,29 **** --- 27,31 ---- <ant dir="${gui.dir}" target="clean"/> <ant dir="${gl.dir}" target="clean"/> + <ant dir="${facade.dir}" target="clean"/> </target> *************** *** 38,41 **** --- 40,44 ---- <ant dir="${gui.dir}" target="dist"/> <ant dir="${gl.dir}" target="dist"/> + <ant dir="${facade.dir}" target="dist"/> <copy todir="${release.dir}"> *************** *** 108,111 **** --- 111,119 ---- </fileset> </copy> + <copy todir="${release.dir}/plugin"> + <fileset dir="${facade.dir}/dist"> + <include name="**/*"/> + </fileset> + </copy> <chmod dir="${release.dir}" perm="ugo+rx" |
|
From: Michael L. <he...@us...> - 2006-08-14 14:06:46
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5378/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Changed drawing of constructor-planes Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** View.java 14 Aug 2006 11:17:50 -0000 1.137 --- View.java 14 Aug 2006 14:06:43 -0000 1.138 *************** *** 111,115 **** /** Used for clipping planes */ ! public static final float[] CLIP_PLANE_INTERIOR_COLOR = new float[] {0.9f, 0.9f, 0.9f, 0.3f}; /** Used for target objects */ --- 111,115 ---- /** Used for clipping planes */ ! public static final float[] CLIP_PLANE_INTERIOR_COLOR = new float[] {0.95f, 0.95f, 0.95f, 0.9f}; /** Used for target objects */ *************** *** 1162,1170 **** Vertex d = origin.minus(u).minus(v); ! gl.glEnable(GL.GL_POLYGON_STIPPLE); ! gl.glPolygonStipple(seethrough); ! if (colorize) { ! gl.glColor3fv(CONSTRUCTOR_COLOR); ! } gl.glBegin(GL.GL_QUADS); gl.glVertex3d(a.getX(), a.getY(), a.getZ()); --- 1162,1170 ---- Vertex d = origin.minus(u).minus(v); ! //(gl.glEnable(GL.GL_POLYGON_STIPPLE); ! //gl.glPolygonStipple(seethrough); ! gl.glColor4fv(CLIP_PLANE_INTERIOR_COLOR); ! gl.glEnable(GL.GL_POLYGON_OFFSET_FILL); ! gl.glPolygonOffset(0.5f, 0.5f); gl.glBegin(GL.GL_QUADS); gl.glVertex3d(a.getX(), a.getY(), a.getZ()); *************** *** 1173,1177 **** gl.glVertex3d(d.getX(), d.getY(), d.getZ()); gl.glEnd(); ! gl.glDisable(GL.GL_POLYGON_STIPPLE); } } else { --- 1173,1178 ---- gl.glVertex3d(d.getX(), d.getY(), d.getZ()); gl.glEnd(); ! gl.glDisable(GL.GL_POLYGON_OFFSET_FILL); ! //gl.glDisable(GL.GL_POLYGON_STIPPLE); } } else { |
|
From: Michael L. <he...@us...> - 2006-08-14 11:17:52
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4228/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Moved drawing of grid Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** View.java 11 Aug 2006 12:44:25 -0000 1.136 --- View.java 14 Aug 2006 11:17:50 -0000 1.137 *************** *** 864,867 **** --- 864,870 ---- } + + CoordinateSystem cs = Project.getInstance().getActiveCoordinateSystem(); + grid(cs); gl.glDisable(GL.GL_DEPTH_TEST); *************** *** 1064,1068 **** Collection cons = active.getConstructors(); Iterator iter = cons.iterator(); - CoordinateSystem cs = Project.getInstance().getActiveCoordinateSystem(); while (iter.hasNext()) { Object o = iter.next(); --- 1067,1070 ---- *************** *** 1075,1079 **** } } - grid(cs); } else { break; --- 1077,1080 ---- |
|
From: Michael L. <he...@us...> - 2006-08-14 08:42:08
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10394/src/net/sourceforge/bprocessor/gl/tool Modified Files: VectorMoveTool.java ControlledMoveTool.java Added Files: MoveTool.java Removed Files: AlternateMoveTool.java Log Message: Renamed refactored move-tool Index: ControlledMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ControlledMoveTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ControlledMoveTool.java 4 Aug 2006 11:48:11 -0000 1.1 --- ControlledMoveTool.java 14 Aug 2006 08:41:57 -0000 1.2 *************** *** 26,30 **** * ControlledMoveTool */ ! public class ControlledMoveTool extends AlternateMoveTool { /** Slidemap */ private Map slideMap; --- 26,30 ---- * ControlledMoveTool */ ! public class ControlledMoveTool extends MoveTool { /** Slidemap */ private Map slideMap; --- NEW FILE: MoveTool.java --- //--------------------------------------------------------------------------------- // $Id: MoveTool.java,v 1.65 2006/08/14 08:41:57 henryml Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.gl.tool; import java.awt.Cursor; import java.awt.event.MouseEvent; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.Set; import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.ClippingPlane; import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; /** * Move Tool */ public class MoveTool extends AbstractPencil { /** Entities */ protected Set entities = new HashSet(); /** Vertices */ protected Collection vertices; /** Affected */ private Set affected = new HashSet(); /** From */ private Vertex from; /** Last */ private Vertex last; /** To */ private Vertex to; /** active */ private boolean active; /** dragging flag */ private boolean dragging = false; /** * Constructor for MoveTool * @param glv The GLView * @param cursor The Cursor */ public MoveTool(GLView glv, Cursor cursor) { super(glv, cursor); } /** * Move the vertices * @param objects Collection of geometric objects * @param delta Vertex (vector) */ public void move(Collection objects, Vertex delta) { } /** * Updating after a move. */ protected void update() { Iterator iter = entities.iterator(); while (iter.hasNext()) { Object o = iter.next(); if (o instanceof ClippingPlane) { ClippingPlane plane = (ClippingPlane) o; plane.update(); } } if (vertices != null) { Project.getInstance().changed(vertices); } } /** * Update feedback */ protected void updateFeedback() { if (start == null) { if (!selection.isEmpty()) { if (current != null) { makeTarget(current); updateConstructors(); } } } else { if (current != null) { Edge edge = new Edge(from, to); edge.setStrippled(true); Collection feedback = new LinkedList(); feedback.add(edge); feedback(feedback); makeTarget(current); updateConstructors(); } } } /** * @param e MouseEvent * @return Success */ protected boolean prepare(MouseEvent e) { return true; } /** * @see net.sourceforge.bprocessor.gl.tool.AbstractTool#moved() */ protected void moved(MouseEvent e) { if (start == null) { if (selection.isEmpty()) { findTarget(e, View.HANDLES); glv.getView().makeTarget(target); } else { current = findIntersection(e); if (current != null) { current = current.copy(); updateFeedback(); } } } else { if (!active) { active = prepare(e); if (active) { excluded(affected); } } if (active) { current = findIntersection(e); if (current != null) { current = current.copy(); to = current.vertex(); move(vertices, to.minus(last)); update(); last = to; updateFeedback(); } } } } /** * @see net.sourceforge.bprocessor.gl.tool.AbstractTool#pressed() */ protected void pressed(MouseEvent e) { if (start == null) { if (selection.isEmpty()) { if (target != null) { entities = new HashSet(); entities.add(target); if (((Geometric) target).parent() instanceof Constructor) { Constructor constructor = (Constructor) ((Geometric) target).parent(); from = constructor.getOrigin(); last = ((Vertex) target).copy(); current = new Intersection(from, Intersection.VERTEX, from); } else { current = findIntersection(e).copy(); from = current.vertex(); last = from; } } } else { entities = new HashSet(); entities.addAll(selection); current = findIntersection(e).copy(); from = current.vertex(); last = from; } if (!entities.isEmpty()) { start = current; to = last; updateFeedback(); affected = getAffected(entities); vertices = collect(entities); } } else { Collection surfaces = Edge.surfaces(Vertex.edges(vertices)); Iterator iter = surfaces.iterator(); while (iter.hasNext()) { Surface current = (Surface) iter.next(); holeAnalysis(current); } Project.getInstance().checkpoint(); cleanUp(); moved(e); } } /** * @see net.sourceforge.bprocessor.gl.tool.AbstractTool#dragged() */ protected void dragged(MouseEvent e) { if (!dragging) { dragging = true; } moved(e); } /** * @see net.sourceforge.bprocessor.gl.tool.AbstractTool#released() */ protected void released(MouseEvent e) { if (dragging) { dragging = false; pressed(e); } } /** * @see net.sourceforge.bprocessor.gl.tool.AbstractPencil#cleanUp() */ public void cleanUp() { entities = new HashSet(); affected = new HashSet(); from = null; to = null; last = null; active = false; dragging = false; excluded(new LinkedList()); super.cleanUp(); } } Index: VectorMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/VectorMoveTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VectorMoveTool.java 4 Aug 2006 11:48:11 -0000 1.1 --- VectorMoveTool.java 14 Aug 2006 08:41:57 -0000 1.2 *************** *** 20,24 **** * VectorMoveTool */ ! public class VectorMoveTool extends AlternateMoveTool { /** --- 20,24 ---- * VectorMoveTool */ ! public class VectorMoveTool extends MoveTool { /** --- AlternateMoveTool.java DELETED --- |
|
From: Michael L. <he...@us...> - 2006-08-14 08:37:59
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8856/src/net/sourceforge/bprocessor/gl/tool Modified Files: ToolFactory.java Removed Files: VectorMoveStrategy.java MoveTool.java ControlledMoveStrategy.java Log Message: Removed old move-tool Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** ToolFactory.java 4 Aug 2006 11:48:11 -0000 1.57 --- ToolFactory.java 14 Aug 2006 08:37:56 -0000 1.58 *************** *** 22,30 **** import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; - import java.awt.event.MouseAdapter; - import java.awt.event.MouseEvent; - import java.awt.event.ActionListener; - import javax.swing.JPopupMenu; - import javax.swing.JMenuItem; import javax.swing.AbstractAction; import javax.swing.Action; --- 22,25 ---- *************** *** 67,79 **** private AbstractTool controlled; - /** move tool */ - private MoveTool move; - - /** The vector movetool strategy */ - private MoveTool vectorStrategy; - - /** The normal movetool strategy */ - private MoveTool controlledStrategy; - /** rotation tool */ private RotationTool rotation; --- 62,65 ---- *************** *** 204,211 **** alternate = new VectorMoveTool(glv, pencilcursor); controlled = new ControlledMoveTool(glv, pencilcursor); - controlledStrategy = new ControlledMoveStrategy(glv, pencilcursor); - vectorStrategy = new VectorMoveStrategy(glv, pencilcursor); - move = new MoveTool(glv, pencilcursor); - move.setStrategy(vectorStrategy); rotation = new RotationTool(glv, pencilcursor); extrusion = new ExtrudeTool(glv, pencilcursor); --- 190,193 ---- *************** *** 403,459 **** } } - - /** - * The listener for the move button - */ - class MoveButtonMouseListener extends MouseAdapter { - /** - * The button - */ - private JToggleButton button; - - /** - * Constructs the listener. - * @param button the button to listen on - */ - public MoveButtonMouseListener(JToggleButton button) { - super(); - this.button = button; - } - /** - * Invoked when the mouse is pressed - * @param e the mouse event - */ - public void mousePressed(MouseEvent e) { - if (e.getButton() == MouseEvent.BUTTON3) { - JPopupMenu pm = new JPopupMenu(); - MovePopupActionListener mpal = new MovePopupActionListener(); - JMenuItem mi = new JMenuItem("Vector"); - mi.addActionListener(mpal); - pm.add(mi); - mi = new JMenuItem("Controlled"); - mi.addActionListener(mpal); - pm.add(mi); - pm.show(button, 0, button.getHeight()); - } - } - - - /** - * listener for the move popup. - */ - class MovePopupActionListener implements ActionListener { - /** - * invoked when action performed - * @param actionEvent the event. - */ - public void actionPerformed(ActionEvent actionEvent) { - if (actionEvent.getActionCommand().equals("Vector")) { - move.setStrategy(vectorStrategy); - } else if (actionEvent.getActionCommand().equals("Controlled")) { - move.setStrategy(controlledStrategy); - } - } - } - } } --- 385,387 ---- --- MoveTool.java DELETED --- --- VectorMoveStrategy.java DELETED --- --- ControlledMoveStrategy.java DELETED --- |
|
From: Michael L. <he...@us...> - 2006-08-14 08:27:22
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5097/src/net/sourceforge/bprocessor/model Modified Files: CoordinateSystem.java Log Message: Start improvement of rotation of plane Index: CoordinateSystem.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CoordinateSystem.java 11 Aug 2006 13:36:20 -0000 1.24 --- CoordinateSystem.java 14 Aug 2006 08:27:16 -0000 1.25 *************** *** 106,109 **** --- 106,125 ---- /** + * Turn around some other vector + * @param changed The changed vector + */ + public void turn(Vertex changed) { + if (changed == i) { + normalize(j); + } + if (changed == j) { + normalize(i); + } + if (changed == n) { + normalize(i); + } + } + + /** * Constructor for CoordinateSystem that constructs a CoordinateSystem * from two edges. The edges are assumed to have a common Vertex. |
|
From: Michael L. <he...@us...> - 2006-08-11 13:36:22
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5788/src/net/sourceforge/bprocessor/model Modified Files: Vertex.java CoordinateSystem.java Log Message: Turning coordinatesystem using move-tool Index: Vertex.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Vertex.java 4 Aug 2006 11:48:04 -0000 1.41 --- Vertex.java 11 Aug 2006 13:36:20 -0000 1.42 *************** *** 130,133 **** --- 130,143 ---- return z; } + + /** + * + * @param other Vertex + */ + public void set(Vertex other) { + setX(other.getX()); + setY(other.getY()); + setZ(other.getZ()); + } /** Index: CoordinateSystem.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CoordinateSystem.java 11 Aug 2006 12:44:21 -0000 1.23 --- CoordinateSystem.java 11 Aug 2006 13:36:20 -0000 1.24 *************** *** 80,84 **** */ public void normalize() { ! j = n.cross(i); i.normalize(); j.normalize(); --- 80,103 ---- */ public void normalize() { ! normalize(i); ! } ! ! /** ! * Normalize keeping the Vertex ! * @param keep Vextor to keep ! */ ! public void normalize(Vertex keep) { ! if (keep == i) { ! n.set(i.cross(j)); ! j.set(n.cross(i)); ! } ! if (keep == j) { ! i.set(j.cross(n)); ! n.set(i.cross(j)); ! } ! if (keep == n) { ! j.set(n.cross(i)); ! i.set(j.cross(n)); ! } i.normalize(); j.normalize(); *************** *** 493,495 **** --- 512,571 ---- } } + + + /** + * @param distance Distance + * @return List of handles + */ + public List handles(double distance) { + List list = new LinkedList(); + list.add(new Tip(i, distance)); + list.add(new Tip(j, distance)); + if (!onlyPlane()) { + list.add(new Tip(n, distance)); + } + return list; + } + + /** + * Tip + */ + private class Tip extends Vertex { + /** */ + private static final long serialVersionUID = 1L; + + /** Vector this is the tip of */ + private Vertex vector; + + /** + * + * @param vector Vector + * @param distance Distance + */ + public Tip(Vertex vector, double distance) { + this.vector = vector; + Vertex v = vector.copy(); + v.scale(distance); + v = getOrigin().add(v); + setX(v.getX()); + setY(v.getY()); + setZ(v.getZ()); + } + + /** + * Update + */ + public void update() { + vector.set(this.minus(getOrigin())); + CoordinateSystem.this.normalize(vector); + } + + /** + * Parent + * @return This coordinate-system + */ + public Geometric parent() { + return CoordinateSystem.this; + } + } } |
|
From: Michael L. <he...@us...> - 2006-08-11 13:36:19
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5771/src/net/sourceforge/bprocessor/gl/tool Modified Files: AlternateMoveTool.java Log Message: Turning coordinatesystem using move-tool Index: AlternateMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AlternateMoveTool.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AlternateMoveTool.java 11 Aug 2006 09:04:07 -0000 1.5 --- AlternateMoveTool.java 11 Aug 2006 13:36:16 -0000 1.6 *************** *** 172,176 **** from = constructor.getOrigin(); last = ((Vertex) target).copy(); ! current = new Intersection(last, Intersection.VERTEX, last); } else { current = findIntersection(e).copy(); --- 172,176 ---- from = constructor.getOrigin(); last = ((Vertex) target).copy(); ! current = new Intersection(from, Intersection.VERTEX, from); } else { current = findIntersection(e).copy(); |
|
From: Michael L. <he...@us...> - 2006-08-11 12:44:30
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17187/src/net/sourceforge/bprocessor/gl/tool Modified Files: ConstructorTool.java Log Message: CoordinateSystem.normalize() normalizes the vectors in the coordinate-system Ð keeping the direction of the i vector Index: ConstructorTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ConstructorTool.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ConstructorTool.java 3 Aug 2006 14:35:28 -0000 1.9 --- ConstructorTool.java 11 Aug 2006 12:44:25 -0000 1.10 *************** *** 83,86 **** --- 83,87 ---- CoordinateSystem cs = new CoordinateSystem(i, j, k, p1); cs.onlyPlane(true); + cs.normalize(); Project.getInstance().getActiveSpace().add(cs); Project.getInstance().checkpoint(); |
|
From: Michael L. <he...@us...> - 2006-08-11 12:44:29
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17187/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: CoordinateSystem.normalize() normalizes the vectors in the coordinate-system Ð keeping the direction of the i vector Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** View.java 11 Aug 2006 08:23:26 -0000 1.135 --- View.java 11 Aug 2006 12:44:25 -0000 1.136 *************** *** 1912,1920 **** drawVertexHit(origin); popName(gl); ! if (current instanceof Line) { ! Line line = (Line) current; ! Vertex tip = line.tip(dist / 16); ! pushName(gl, tip); ! this.drawVectorTip(origin, tip); popName(gl); } --- 1912,1921 ---- drawVertexHit(origin); popName(gl); ! List handles = current.handles(dist / 16); ! Iterator iterator = handles.iterator(); ! while (iterator.hasNext()) { ! Vertex handle = (Vertex) iterator.next(); ! pushName(gl, handle); ! this.drawVectorTip(origin, handle); popName(gl); } |
|
From: Michael L. <he...@us...> - 2006-08-11 12:44:24
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17162/src/net/sourceforge/bprocessor/model Modified Files: Line.java CoordinateSystem.java Constructor.java Log Message: CoordinateSystem.normalize() normalizes the vectors in the coordinate-system Ð keeping the direction of the i vector Index: Constructor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Constructor.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Constructor.java 10 Aug 2006 13:07:57 -0000 1.8 --- Constructor.java 11 Aug 2006 12:44:21 -0000 1.9 *************** *** 7,10 **** --- 7,12 ---- package net.sourceforge.bprocessor.model; + import java.util.LinkedList; + import java.util.List; import java.util.Set; *************** *** 130,133 **** --- 132,143 ---- /** + * @param dist dist + * @return list of handles + */ + public List handles(double dist) { + return new LinkedList(); + } + + /** * Handle */ Index: CoordinateSystem.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** CoordinateSystem.java 8 Aug 2006 12:05:10 -0000 1.22 --- CoordinateSystem.java 11 Aug 2006 12:44:21 -0000 1.23 *************** *** 67,73 **** public CoordinateSystem(Vertex i, Vertex j, Vertex n, Vertex origin) { super(origin); ! i.normalize(); ! j.normalize(); ! n.normalize(); this.i = i; this.j = j; --- 67,73 ---- public CoordinateSystem(Vertex i, Vertex j, Vertex n, Vertex origin) { super(origin); ! //i.normalize(); ! //j.normalize(); ! //n.normalize(); this.i = i; this.j = j; *************** *** 77,80 **** --- 77,90 ---- /** + * normalize vectors + */ + public void normalize() { + j = n.cross(i); + i.normalize(); + j.normalize(); + n.normalize(); + } + + /** * Constructor for CoordinateSystem that constructs a CoordinateSystem * from two edges. The edges are assumed to have a common Vertex. Index: Line.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Line.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Line.java 11 Aug 2006 08:23:22 -0000 1.19 --- Line.java 11 Aug 2006 12:44:21 -0000 1.20 *************** *** 9,12 **** --- 9,13 ---- import java.util.ArrayList; import java.util.HashSet; + import java.util.LinkedList; import java.util.List; import java.util.Set; *************** *** 211,214 **** --- 212,225 ---- /** + * @param distance distance + * @return list of handles + */ + public List handles(double distance) { + List list = new LinkedList(); + list.add(tip(distance)); + return list; + } + + /** * Return an edge for this line * @param length The the length |
|
From: Nordholt <nor...@us...> - 2006-08-11 11:44:40
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26599 Added Files: FacadeModellor.java package.html Log Message: initial --- NEW FILE: package.html --- <body> Defines the package that contains the facade modellors. </body> --- NEW FILE: FacadeModellor.java --- //--------------------------------------------------------------------------------- // $Id: FacadeModellor.java,v 1.1 2006/08/11 11:44:37 nordholt Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.facade.modellor; import java.util.List; import java.util.LinkedList; import net.sourceforge.bprocessor.model.modellor.Modellor; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Surface; import org.apache.log4j.Logger; /** * The facade modellor models the elements for a facade space. */ public class FacadeModellor extends Modellor { /** Default */ private static final long serialVersionUID = 1L; /** The logger */ private static Logger log = Logger.getLogger(FacadeModellor.class); /** Name of the modellor */ private String name; /** Number of vertical posts */ private int vertPosts; /** Number of horizontal posts */ private int horPosts; /** Default vertical post width */ private double vertPostWidth; /** Default horizontal post width */ private double horPostWidth; /** The space this modellor is connected to */ private Space space; /** The front surface of the facade */ private Surface front; /** The empty constructor */ public FacadeModellor() { this.name = "Facade Modellor"; } /** The constructor for the modellor * @param s the space this modellor models for. */ public FacadeModellor(Space s) { this.space = s; this.name = "Facade Modellor"; } /** * Create a new instance of the modellor, based on a space * @param s The space the modellor should reside in * @return The created modellor object for the given space */ public Modellor newInstance(Space s) { return new FacadeModellor(s); } /** * The update method * @param entity Changed entity */ public void update(Object entity) { } /** * Set the attributes of the object to the values in the list * @param attributes The attributes to set */ public void setAttributes(List attributes) { } /** * Return a list of the attributes in the object * @return the list of attributes for the object */ public List getAttributes() { LinkedList attributes = new LinkedList(); attributes.add(new Attribute("Name", name)); Attribute a = new Attribute("V-posts", new Double(vertPosts)); a.setPrecision(1); attributes.add(a); attributes.add(new Attribute("H-posts", new Double(horPosts))); attributes.add(new Attribute("V-postwidth", new Double(vertPostWidth))); attributes.add(new Attribute("H-postwidth", new Double(horPostWidth))); return attributes; } /** * Get the name * @return The name */ public String getName() { return name; } /** * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName() */ public String getGeneralName() { return "Facade Modellor"; } /** Delete */ public void delete() { } } |
|
From: Nordholt <nor...@us...> - 2006-08-11 11:42:28
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25807/modellor Log Message: Directory /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor added to the repository |
|
From: Michael L. <he...@us...> - 2006-08-11 09:39:18
|
Update of /cvsroot/bprocessor/build In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10995 Modified Files: build.xml Log Message: New version number Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** build.xml 23 Jul 2006 09:17:52 -0000 1.18 --- build.xml 11 Aug 2006 09:39:16 -0000 1.19 *************** *** 3,7 **** <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M6"/> <property name="script.dir" value="${basedir}/bin"/> --- 3,7 ---- <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M6-b"/> <property name="script.dir" value="${basedir}/bin"/> |
|
From: Michael L. <he...@us...> - 2006-08-11 09:04:11
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29960/src/net/sourceforge/bprocessor/gl/tool Modified Files: AlternateMoveTool.java Log Message: Improved feedback in move Index: AlternateMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AlternateMoveTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AlternateMoveTool.java 11 Aug 2006 08:23:26 -0000 1.4 --- AlternateMoveTool.java 11 Aug 2006 09:04:07 -0000 1.5 *************** *** 17,23 **** --- 17,26 ---- import net.sourceforge.bprocessor.gl.GLView; + import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.model.ClippingPlane; + import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Surface; *************** *** 165,185 **** entities = new HashSet(); entities.add(target); } } else { entities = new HashSet(); entities.addAll(selection); } if (!entities.isEmpty()) { affected = getAffected(entities); ! vertices = collect(entities); ! current = findIntersection(e).copy(); ! ! if (current != null) { ! from = current.vertex(); ! to = from; ! last = from; ! start = current; ! updateFeedback(); ! } } } else { --- 168,195 ---- entities = new HashSet(); entities.add(target); + if (((Geometric) target).parent() instanceof Constructor) { + Constructor constructor = (Constructor) ((Geometric) target).parent(); + from = constructor.getOrigin(); + last = ((Vertex) target).copy(); + current = new Intersection(last, Intersection.VERTEX, last); + } else { + current = findIntersection(e).copy(); + from = current.vertex(); + last = from; + } } } else { entities = new HashSet(); entities.addAll(selection); + current = findIntersection(e).copy(); + from = current.vertex(); + last = from; } if (!entities.isEmpty()) { + start = current; + to = last; + updateFeedback(); affected = getAffected(entities); ! vertices = collect(entities); } } else { |
|
From: Michael L. <he...@us...> - 2006-08-11 08:23:30
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14298/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Moving the tips Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** View.java 10 Aug 2006 13:08:01 -0000 1.134 --- View.java 11 Aug 2006 08:23:26 -0000 1.135 *************** *** 1015,1019 **** dist = (c.getOrigin().minus(v)).length() * scale; } ! drawGeneralConstructor(c, dist, false, true); } } --- 1015,1019 ---- dist = (c.getOrigin().minus(v)).length() * scale; } ! drawGeneralConstructor(c, dist, false, OBJECTS); } } *************** *** 1072,1076 **** } if (target != c && !highligts.contains(c)) { ! drawGeneralConstructor(c, dist, true, true); } } --- 1072,1076 ---- } if (target != c && !highligts.contains(c)) { ! drawGeneralConstructor(c, dist, true, OBJECTS); } } *************** *** 1087,1091 **** dist = (c.getOrigin().distance(v)) * scale; } ! drawGeneralConstructor(c, dist, true, true); } } --- 1087,1091 ---- dist = (c.getOrigin().distance(v)) * scale; } ! drawGeneralConstructor(c, dist, true, OBJECTS); } } *************** *** 1096,1103 **** * @param dist The dist parameter * @param colorize Apply color ! * @param active Draw the constructor active if active */ private void drawGeneralConstructor(Constructor constructor, double dist, ! boolean colorize, boolean active) { if (constructor instanceof Point) { if (colorize) { --- 1096,1103 ---- * @param dist The dist parameter * @param colorize Apply color ! * @param mode mode */ private void drawGeneralConstructor(Constructor constructor, double dist, ! boolean colorize, int mode) { if (constructor instanceof Point) { if (colorize) { *************** *** 1118,1122 **** } else if (constructor instanceof CoordinateSystem) { CoordinateSystem system = (CoordinateSystem)constructor; ! drawCoordinateSystem(system, dist, colorize, active); } } --- 1118,1122 ---- } else if (constructor instanceof CoordinateSystem) { CoordinateSystem system = (CoordinateSystem)constructor; ! drawCoordinateSystem(system, dist, colorize, mode); } } *************** *** 1127,1136 **** * @param dist The distance to the center of the system * @param colorize Apply color ! * @param active Draw the constructor active if active */ private void drawCoordinateSystem(CoordinateSystem cs, double dist, ! boolean colorize, boolean active) { Vertex i = cs.getI(); Vertex j = cs.getJ(); if (cs.onlyPlane()) { if (colorize) { --- 1127,1137 ---- * @param dist The distance to the center of the system * @param colorize Apply color ! * @param mode mode */ private void drawCoordinateSystem(CoordinateSystem cs, double dist, ! boolean colorize, int mode) { Vertex i = cs.getI(); Vertex j = cs.getJ(); + boolean active = (mode == OBJECTS) || (mode == INTERSECTIONS); if (cs.onlyPlane()) { if (colorize) { *************** *** 1906,1912 **** } } else { ! pushName(gl, current); ! drawGeneralConstructor(current, dist, false, false); ! popName(gl); } } --- 1907,1927 ---- } } else { ! if (selectionMode == HANDLES) { ! Vertex origin = current.getOriginHandle(); ! pushName(gl, origin); ! drawVertexHit(origin); ! popName(gl); ! if (current instanceof Line) { ! Line line = (Line) current; ! Vertex tip = line.tip(dist / 16); ! pushName(gl, tip); ! this.drawVectorTip(origin, tip); ! popName(gl); ! } ! } else { ! pushName(gl, current); ! drawGeneralConstructor(current, dist, false, selectionMode); ! popName(gl); ! } } } |
|
From: Michael L. <he...@us...> - 2006-08-11 08:23:28
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14298/src/net/sourceforge/bprocessor/gl/tool Modified Files: AlternateMoveTool.java Log Message: Moving the tips Index: AlternateMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AlternateMoveTool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AlternateMoveTool.java 10 Aug 2006 13:08:01 -0000 1.3 --- AlternateMoveTool.java 11 Aug 2006 08:23:26 -0000 1.4 *************** *** 18,21 **** --- 18,22 ---- import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.view.View; + import net.sourceforge.bprocessor.model.ClippingPlane; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Project; *************** *** 70,73 **** --- 71,91 ---- /** + * Updating after a move. + */ + protected void update() { + Iterator iter = entities.iterator(); + while (iter.hasNext()) { + Object o = iter.next(); + if (o instanceof ClippingPlane) { + ClippingPlane plane = (ClippingPlane) o; + plane.update(); + } + } + if (vertices != null) { + Project.getInstance().changed(vertices); + } + } + + /** * Update feedback */ *************** *** 87,93 **** feedback.add(edge); feedback(feedback); - - Project.info("make current " + current); - makeTarget(current); updateConstructors(); --- 105,108 ---- *************** *** 111,115 **** if (start == null) { if (selection.isEmpty()) { ! findTarget(e, View.OBJECTS); glv.getView().makeTarget(target); } else { --- 126,130 ---- if (start == null) { if (selection.isEmpty()) { ! findTarget(e, View.HANDLES); glv.getView().makeTarget(target); } else { *************** *** 124,128 **** active = prepare(e); if (active) { - Project.info("excluding " + affected); excluded(affected); } --- 139,142 ---- *************** *** 134,137 **** --- 148,152 ---- to = current.vertex(); move(vertices, to.minus(last)); + update(); last = to; updateFeedback(); *************** *** 153,157 **** } else { entities = new HashSet(); - Project.info("adding selection " + selection); entities.addAll(selection); } --- 168,171 ---- |
|
From: Michael L. <he...@us...> - 2006-08-11 08:23:26
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14285/src/net/sourceforge/bprocessor/model Modified Files: Line.java Log Message: Moving the tips Index: Line.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Line.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Line.java 8 Aug 2006 12:05:10 -0000 1.18 --- Line.java 11 Aug 2006 08:23:22 -0000 1.19 *************** *** 255,259 **** --- 255,267 ---- return Line.this; } + + /** + * @return string + */ + public String toString() { + return ("tip{" + parent() + "}"); + } } + /** * Guide |
|
From: rimestad <rim...@us...> - 2006-08-10 15:37:44
|
Update of /cvsroot/bprocessor/facade In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12998 Modified Files: build.xml .classpath Log Message: No need to use two different compile directories in the ant and eclipse, so now it uses build in all modules. That ment making a xml directory for the jaxb generated persistence files when compiling and copying them to build before compiling the rest of the document, and including the xml directory in the eclipse .classpath Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/facade/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 10 Aug 2006 14:58:17 -0000 1.2 --- .classpath 10 Aug 2006 15:37:34 -0000 1.3 *************** *** 4,7 **** <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/log4j.jar"/> ! <classpathentry kind="output" path="bin"/> </classpath> --- 4,7 ---- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/log4j.jar"/> ! <classpathentry kind="output" path="build"/> </classpath> Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/facade/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 10 Aug 2006 14:04:25 -0000 1.1 --- build.xml 10 Aug 2006 15:37:34 -0000 1.2 *************** *** 101,109 **** <target name="jar" depends="compile"> <mkdir dir="${dist.dir}"/> - <copy todir="${build.dir}"> - <fileset dir="${gfx.dir}"> - <include name="**/*"/> - </fileset> - </copy> <jar jarfile="${dist.dir}/${name}.jar" basedir="${build.dir}" --- 101,104 ---- |
|
From: rimestad <rim...@us...> - 2006-08-10 15:37:39
|
Update of /cvsroot/bprocessor/facade/dist In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12998/dist Added Files: .cvsignore Log Message: No need to use two different compile directories in the ant and eclipse, so now it uses build in all modules. That ment making a xml directory for the jaxb generated persistence files when compiling and copying them to build before compiling the rest of the document, and including the xml directory in the eclipse .classpath --- NEW FILE: .cvsignore --- *.jar |
