bprocessor-commit Mailing List for B-processor (Page 82)
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: rimestad <rim...@us...> - 2007-01-02 17:47:10
|
Update of /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19952/src/net/sourceforge/bprocessor/gl/tool Modified Files: VectorMoveTool.java ControlledMoveTool.java Log Message: Changed the javadoc to use inheritdoc and not see Index: ControlledMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/ControlledMoveTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ControlledMoveTool.java 28 Nov 2006 10:53:11 -0000 1.6 --- ControlledMoveTool.java 2 Jan 2007 17:47:08 -0000 1.7 *************** *** 228,234 **** } ! /** ! * @see net.sourceforge.bprocessor.gl.tool.MoveTool#move(Collection, Vertex) ! */ public Vertex move(Collection objects, Vertex delta) { if (slideMap != null && slideMap.keySet().containsAll(vertices)) { --- 228,232 ---- } ! /** {@inheritDoc} */ public Vertex move(Collection objects, Vertex delta) { if (slideMap != null && slideMap.keySet().containsAll(vertices)) { *************** *** 272,278 **** } ! /** ! * @see net.sourceforge.bprocessor.gl.tool.AbstractPencil#cleanUp() ! */ public void cleanUp() { super.cleanUp(); --- 270,274 ---- } ! /** {@inheritDoc} */ public void cleanUp() { super.cleanUp(); Index: VectorMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/VectorMoveTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** VectorMoveTool.java 25 Sep 2006 14:07:18 -0000 1.7 --- VectorMoveTool.java 2 Jan 2007 17:47:08 -0000 1.8 *************** *** 30,36 **** } ! /** ! * @see net.sourceforge.bprocessor.gl.tool.MoveTool#move(Collection, Vertex) ! */ public Vertex move(Collection objects, Vertex delta) { if (objects != null) { --- 30,34 ---- } ! /** {@inheritDoc} */ public Vertex move(Collection objects, Vertex delta) { if (objects != null) { |
|
From: rimestad <rim...@us...> - 2007-01-02 17:45:46
|
Update of /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19138/src/net/sourceforge/bprocessor/gl/model Modified Files: GlObject.java Log Message: made changes to the way GLObjects are selected in View and made som minor changes to the tool and added the requirement of a getPlane function that returns a plane GlObject interface, maybe a special INTERSECTION type is need later Index: GlObject.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/model/GlObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GlObject.java 18 Dec 2006 14:48:04 -0000 1.2 --- GlObject.java 2 Jan 2007 17:45:40 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- import javax.media.opengl.GLAutoDrawable; import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Plane; import net.sourceforge.bprocessor.model.Vertex; *************** *** 30,32 **** --- 31,39 ---- */ public Vertex intersection(Edge e); + + /** + * Return the associated plane for the GlObject + * @return The plane + */ + public Plane getPlane(); } |
|
From: rimestad <rim...@us...> - 2007-01-02 17:45:45
|
Update of /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19138/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: made changes to the way GLObjects are selected in View and made som minor changes to the tool and added the requirement of a getPlane function that returns a plane GlObject interface, maybe a special INTERSECTION type is need later Index: View.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** View.java 19 Dec 2006 11:22:49 -0000 1.168 --- View.java 2 Jan 2007 17:45:39 -0000 1.169 *************** *** 77,96 **** /** The logger */ private static Logger log = Logger.getLogger(View.class); ! /** OBJECTS flag */ public static final int OBJECTS = 1; ! /** INTERSECTIONS flag */ public static final int INTERSECTIONS = 2; ! /** HANDLES flag */ [...2770 lines suppressed...] * Remove a constructor from the set of tempoary constructors --- 3304,3308 ---- tempConstructors.add(constructor); } ! /** * Remove a constructor from the set of tempoary constructors *************** *** 3327,3331 **** this.glObjects3D.addAll(glObjects); } ! /** * Add a single GLObject --- 3329,3333 ---- this.glObjects3D.addAll(glObjects); } ! /** * Add a single GLObject |
|
From: rimestad <rim...@us...> - 2007-01-02 17:45:45
|
Update of /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19138/src/net/sourceforge/bprocessor/gl/tool Modified Files: RotationTool.java Log Message: made changes to the way GLObjects are selected in View and made som minor changes to the tool and added the requirement of a getPlane function that returns a plane GlObject interface, maybe a special INTERSECTION type is need later Index: RotationTool.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** RotationTool.java 18 Dec 2006 14:48:04 -0000 1.23 --- RotationTool.java 2 Jan 2007 17:45:40 -0000 1.24 *************** *** 44,48 **** /** The logger */ private static Logger log = Logger.getLogger(RotationTool.class); ! /** The vertexes to rotate */ private Set vertices = new HashSet(); --- 44,48 ---- /** The logger */ private static Logger log = Logger.getLogger(RotationTool.class); ! /** The vertexes to rotate */ private Set vertices = new HashSet(); *************** *** 63,67 **** /** The set of object not to hit */ private Set nothits = new HashSet(); ! /** * The Constructor --- 63,67 ---- /** The set of object not to hit */ private Set nothits = new HashSet(); ! /** * The Constructor *************** *** 72,76 **** super(glv, cursor); } ! /** * Invoked when a mouse button has been pressed on a component. --- 72,76 ---- super(glv, cursor); } ! /** * Invoked when a mouse button has been pressed on a component. *************** *** 87,91 **** current = findIntersection(e); if (current != null) { - updateFeedback(); if (previous != null) { //find the angle to rotate --- 87,90 ---- *************** *** 99,105 **** rotate(angle); } ! previous = onto.projection(current.vertex()); } } } --- 98,105 ---- rotate(angle); } ! previous = to; } } + updateFeedback(); } *************** *** 109,115 **** */ protected void released(MouseEvent e) { ! } ! /** * Update the length field --- 109,115 ---- */ protected void released(MouseEvent e) { ! } ! /** * Update the length field *************** *** 123,127 **** } } ! /** * On Vertex --- 123,127 ---- } } ! /** * On Vertex *************** *** 130,134 **** process(null); } ! /** * Process click --- 130,134 ---- process(null); } ! /** * Process click *************** *** 145,157 **** p2 = p1.add(((Edge)current.object()).getDirection()); initDisk(); } else if (current.type() == Intersection.SURFACE) { p1 = current.vertex(); p2 = p1.add(((Surface)(current.object())).normal()); initDisk(); } else { p1 = current.vertex(); start = current; - active = true; totalAngle = 0; } } else if (p2 == null) { --- 145,159 ---- p2 = p1.add(((Edge)current.object()).getDirection()); initDisk(); + active = false; } else if (current.type() == Intersection.SURFACE) { p1 = current.vertex(); p2 = p1.add(((Surface)(current.object())).normal()); initDisk(); + active = false; } else { p1 = current.vertex(); start = current; totalAngle = 0; + active = true; } } else if (p2 == null) { *************** *** 159,163 **** start = null; initDisk(); ! active = true; } else if (from == null) { current = findIntersection(e); --- 161,165 ---- start = null; initDisk(); ! active = false; } else if (from == null) { current = findIntersection(e); *************** *** 165,178 **** previous = from; pro.setStart(from); - active = false; nothits = getAffected(vertices); } else { finish(); - active = false; } updateFeedback(); } } ! /** * Initialize the gldisk --- 167,178 ---- previous = from; pro.setStart(from); nothits = getAffected(vertices); } else { finish(); } updateFeedback(); } } ! /** * Initialize the gldisk *************** *** 182,185 **** --- 182,186 ---- v.normalize(); onto = new Plane(v.getX(), v.getY(), v.getZ(), p1); + log.info("Disk were: " + onto); pro = new GlProtractor(onto, p1); glv.getView().addGlObjects3D(pro); *************** *** 195,199 **** clear(); } ! /** * Escape --- 196,200 ---- clear(); } ! /** * Escape *************** *** 205,209 **** cleanUp(); } ! /** * Apply current tool with specified length value --- 206,210 ---- cleanUp(); } ! /** * Apply current tool with specified length value *************** *** 218,222 **** finish(); } ! /** * Update the feedback --- 219,223 ---- finish(); } ! /** * Update the feedback *************** *** 247,251 **** updateConstructors(); } ! /** * Remove tool specific things at tool change --- 248,252 ---- updateConstructors(); } ! /** * Remove tool specific things at tool change *************** *** 256,260 **** updateFeedback(); } ! /** * Remove all internal stuff --- 257,261 ---- updateFeedback(); } ! /** * Remove all internal stuff *************** *** 275,279 **** nothits.clear(); } ! /** * Do the rotation of the vertices --- 276,280 ---- nothits.clear(); } ! /** * Do the rotation of the vertices *************** *** 288,292 **** } } ! /** * A GlObject that draw a protactor on the gl --- 289,293 ---- } } ! /** * A GlObject that draw a protactor on the gl *************** *** 300,307 **** private Vertex start; /** The preset angles to intersect with */ ! private LinkedList edges; /** The magnification factor */ private double factor; ! /** * The construtor for the protractor --- 301,308 ---- private Vertex start; /** The preset angles to intersect with */ ! private LinkedList < Line > edges; /** The magnification factor */ private double factor; ! /** * The construtor for the protractor *************** *** 312,318 **** plane = p; this.origin = origin; ! edges = new LinkedList(); } ! /** * Setter for the start vertex --- 313,319 ---- plane = p; this.origin = origin; ! edges = new LinkedList < Line > (); } ! /** * Setter for the start vertex *************** *** 332,336 **** } } ! /** * @inheritDoc --- 333,337 ---- } } ! /** * @inheritDoc *************** *** 346,355 **** // translate Vertex z = plane.normal(); - z.normalize(); Vertex y = new Vertex(0, 1, 0); ! if (y.minus(z).length() < 0.00000001) { y = new Vertex(1, 0, 0); } ! // place the axis right if (start != null) { --- 347,355 ---- // translate Vertex z = plane.normal(); Vertex y = new Vertex(0, 1, 0); ! if (y.cross(z).length() < 0.00001) { y = new Vertex(1, 0, 0); } ! // place the axis right if (start != null) { *************** *** 358,370 **** } Vertex x = y.cross(z); y = z.cross(x); double[] m = new double[]{x.getX(), x.getY(), x.getZ(), 0, ! y.getX(), y.getY(), y.getZ(), 0, ! z.getX(), z.getY(), z.getZ(), 0, ! origin.getX(), origin.getY(), origin.getZ(), 1}; gl.glPushMatrix(); gl.glMultMatrixd(m, 0); //draw ! gl.glColor4fv(new float[] {0.5f, 0.5f, 0.5f, 0.6f}, 0); int sign = 1; --- 358,371 ---- } Vertex x = y.cross(z); + x.normalize(); y = z.cross(x); double[] m = new double[]{x.getX(), x.getY(), x.getZ(), 0, ! y.getX(), y.getY(), y.getZ(), 0, ! z.getX(), z.getY(), z.getZ(), 0, ! origin.getX(), origin.getY(), origin.getZ(), 1}; gl.glPushMatrix(); gl.glMultMatrixd(m, 0); //draw ! gl.glColor4fv(new float[] {0.5f, 0.5f, 0.5f, 0.6f}, 0); int sign = 1; *************** *** 378,388 **** //restore matrix gl.glPopMatrix(); ! //draw lines ! /*gl.glColor3d(0.2, 0.2, 0.2); ! gl.glLineWidth(0.1f); ! Iterator iter = edges.iterator(); while (iter.hasNext()) { ! Line l = (Line) iter.next(); Vertex from = l.getPointAt(-1.8 * factor); Vertex to = l.getPointAt(1.8 * factor); --- 379,389 ---- //restore matrix gl.glPopMatrix(); ! //draw lines ! gl.glColor3d(0.2, 0.2, 0.2); ! gl.glLineWidth(1.0f); ! Iterator < Line > iter = edges.iterator(); while (iter.hasNext()) { ! Line l = iter.next(); Vertex from = l.getPointAt(-1.8 * factor); Vertex to = l.getPointAt(1.8 * factor); *************** *** 391,395 **** gl.glVertex3d(to.getX(), to.getY(), to.getZ()); gl.glEnd(); ! }*/ } --- 392,396 ---- gl.glVertex3d(to.getX(), to.getY(), to.getZ()); gl.glEnd(); ! } } *************** *** 399,407 **** public Vertex intersection(Edge e) { Vertex i = plane.intersection(e); ! Iterator iter = edges.iterator(); double p1 = -2.5 * factor; double p2 = 2.5 * factor; while (iter.hasNext()) { ! Line l = (Line) iter.next(); Edge tmp = new Edge(l.getPointAt(p1), l.getPointAt(p2)); Edge con = e.intersection(tmp); --- 400,408 ---- public Vertex intersection(Edge e) { Vertex i = plane.intersection(e); ! Iterator<Line> iter = edges.iterator(); double p1 = -2.5 * factor; double p2 = 2.5 * factor; while (iter.hasNext()) { ! Line l = iter.next(); Edge tmp = new Edge(l.getPointAt(p1), l.getPointAt(p2)); Edge con = e.intersection(tmp); *************** *** 416,419 **** --- 417,427 ---- return i; } + + /** + * @inheritDoc + */ + public Plane getPlane() { + return plane; + } } } |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:34
|
Update of /cvsroot/bprocessor//tools/checkstyle In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11736/checkstyle Modified Files: checkstyle.xml Added Files: checkstyle-all-4.2.jar Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: checkstyle.xml =================================================================== RCS file: /cvsroot/bprocessor//tools/checkstyle/checkstyle.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** checkstyle.xml 7 Dec 2006 13:48:03 -0000 1.5 --- checkstyle.xml 2 Jan 2007 17:27:29 -0000 1.6 *************** *** 52,56 **** <property name="tokens" value="COMMA, SEMI"/> </module> ! <module name="WhitespaceAround"/> <!-- JavaDoc guidelines --> --- 52,65 ---- <property name="tokens" value="COMMA, SEMI"/> </module> ! <module name="WhitespaceAround"> ! <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, ! BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, ! DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, ! LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, ! LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, ! LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, ! NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, ! SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/> ! </module> <!-- JavaDoc guidelines --> --- NEW FILE: checkstyle-all-4.2.jar --- (This appears to be a binary file; contents omitted.) |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:22
|
Update of /cvsroot/bprocessor//bscript/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11717/src Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//bscript/src/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 11 Sep 2006 19:07:12 -0000 1.2 --- build.xml 2 Jan 2007 17:27:20 -0000 1.3 *************** *** 16,20 **** <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.2" source="1.3" includes="net/**"> <classpath refid="build.path"/> --- 16,20 ---- <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.5" source="1.5" includes="net/**"> <classpath refid="build.path"/> |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:22
|
Update of /cvsroot/bprocessor//bscript In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11717 Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//bscript/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 10 Oct 2006 13:49:35 -0000 1.5 --- build.xml 2 Jan 2007 17:27:20 -0000 1.6 *************** *** 66,70 **** <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" --- 66,70 ---- <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle-all-4.2.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:21
|
Update of /cvsroot/bprocessor//gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11691 Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//gui/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 26 Sep 2006 09:50:54 -0000 1.3 --- build.xml 2 Jan 2007 17:27:13 -0000 1.4 *************** *** 76,80 **** <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" --- 76,80 ---- <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle-all-4.2.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:19
|
Update of /cvsroot/bprocessor//kernel/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11702/src Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//kernel/src/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 28 Apr 2006 11:29:02 -0000 1.2 --- build.xml 2 Jan 2007 17:27:17 -0000 1.3 *************** *** 22,26 **** <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.2" source="1.3" includes="net/**"> <classpath refid="build.path"/> --- 22,26 ---- <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.5" source="1.5" includes="net/**"> <classpath refid="build.path"/> |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:19
|
Update of /cvsroot/bprocessor//kernel In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11702 Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//kernel/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 11 Sep 2006 20:39:03 -0000 1.5 --- build.xml 2 Jan 2007 17:27:17 -0000 1.6 *************** *** 65,69 **** <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" --- 65,69 ---- <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle-all-4.2.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:18
|
Update of /cvsroot/bprocessor//gl/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11640/src Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//gl/src/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 11 Sep 2006 20:38:59 -0000 1.3 --- build.xml 2 Jan 2007 17:27:07 -0000 1.4 *************** *** 15,19 **** <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.2" source="1.3" includes="net/**"> <classpath refid="build.path"/> --- 15,19 ---- <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.5" source="1.5" includes="net/**"> <classpath refid="build.path"/> |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:14
|
Update of /cvsroot/bprocessor//gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11640 Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//gl/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 11 Sep 2006 20:38:59 -0000 1.5 --- build.xml 2 Jan 2007 17:27:07 -0000 1.6 *************** *** 87,91 **** <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" --- 87,91 ---- <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle-all-4.2.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:12
|
Update of /cvsroot/bprocessor//model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11668 Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//model/build.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** build.xml 9 Oct 2006 08:49:20 -0000 1.17 --- build.xml 2 Jan 2007 17:27:10 -0000 1.18 *************** *** 125,129 **** <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" --- 125,129 ---- <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle-all-4.2.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" |
|
From: rimestad <rim...@us...> - 2007-01-02 17:27:12
|
Update of /cvsroot/bprocessor//facade In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11472 Modified Files: build.xml Log Message: Changed build to use 1.5 and use the new checkstyle, committed along with the new 4.2 checkstyle Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor//facade/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 20 Sep 2006 08:52:08 -0000 1.3 --- build.xml 2 Jan 2007 17:27:04 -0000 1.4 *************** *** 85,89 **** <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" --- 85,89 ---- <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" ! classpath="${tools.dir}/checkstyle/checkstyle-all-4.2.jar"/> <checkstyle config="${tools.dir}/checkstyle/checkstyle.xml" |
|
From: Nordholt <nor...@us...> - 2006-12-30 15:33:59
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24504/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java Log Message: single facade net-fields has en openable parameter wich doubles the framewidth of the corresponding windows. Double facade reimplemented to use nested facade modellors. Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NetFacadeModellor.java 21 Dec 2006 14:23:49 -0000 1.7 --- NetFacadeModellor.java 30 Dec 2006 15:33:57 -0000 1.8 *************** *** 20,23 **** --- 20,24 ---- import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Net; + import net.sourceforge.bprocessor.model.ParameterBlock; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; *************** *** 57,60 **** --- 58,64 ---- private boolean single = true; + /** Window spaces for the double facade */ + private Set < Space > windows = new HashSet < Space > (); + /** The logger */ private static Logger log = Logger.getLogger(NetFacadeModellor.class); *************** *** 106,110 **** NetFacadeModellor mod = new NetFacadeModellor(); mod.setSpace(s); ! Project.getInstance().addObserver(mod); s.setModellor(mod); Iterator it = s.getEnvelope().iterator(); --- 110,114 ---- NetFacadeModellor mod = new NetFacadeModellor(); mod.setSpace(s); ! Project.getInstance().scheduleObserver(mod); s.setModellor(mod); Iterator it = s.getEnvelope().iterator(); *************** *** 219,222 **** --- 223,231 ---- public void setFrameWidth(double frameWidth) { this.frameWidth = frameWidth; + Iterator it = net.getEdges().iterator(); + while (it.hasNext()) { + Edge e = (Edge)it.next(); + e.setParameters(new ParameterBlock()); + } } *************** *** 242,248 **** private void prepareNet(Net n) { Collection edges = n.getEdges(); ! Iterator it = edges.iterator(); ! while (it.hasNext()) { ! Edge e = (Edge)it.next(); Map env = e.getParameters().environment(); if (env.get("width") == null) { --- 251,257 ---- private void prepareNet(Net n) { Collection edges = n.getEdges(); ! Iterator itE = edges.iterator(); ! while (itE.hasNext()) { ! Edge e = (Edge)itE.next(); Map env = e.getParameters().environment(); if (env.get("width") == null) { *************** *** 250,255 **** } } } ! /** * Creates a facade from a net. --- 259,272 ---- } } + Iterator itS = n.getSurfaces().iterator(); + while (itS.hasNext()) { + Surface s = (Surface)itS.next(); + Map env = s.getParameters().environment(); + if (env.get("openable") == null) { + s.getParameters().put("openable", false); + } + } } ! /** * Creates a facade from a net. *************** *** 258,263 **** private void createDoubleFacade(Net net) { if (frame == null) { ! frame = new Space("Frame", Space.CONSTRUCTION, ! Space.ELEMENT_LEVEL, true); space.add(frame); } --- 275,282 ---- private void createDoubleFacade(Net net) { if (frame == null) { ! frame = new Space("Frame", ! Space.CONSTRUCTION, ! Space.ELEMENT_LEVEL, ! true); space.add(frame); } *************** *** 266,286 **** while (fields.hasNext()) { Surface field = (Surface)fields.next(); Surface fcopy = field.copyall(space); ! Iterator fEdges = fcopy.getEdges().iterator(); ! Map offsetMap = new HashMap(); ! while (fEdges.hasNext()) { ! Edge e = (Edge)fEdges.next(); ! Map env = e.getParameters().environment(); ! double width = ((Double)env.get("width")).doubleValue(); ! offsetMap.put(e, Double.valueOf(-width)); ! } ! Surface h = new Surface(Edge.placeOffset(fcopy.getEdges(), fcopy, offsetMap)); ! h = space.insert(h); ! Geometry.holeAnalysis(h); ! assignSame(front, fcopy, space, frame); ! Set sides = new HashSet(); ! extrudeIntoSpace(fcopy, depth, sides); ! sides = new HashSet(); ! Geometry.holeAnalysis(space.insert(extrudeIntoSpace(h, depth, sides))); } } --- 285,300 ---- while (fields.hasNext()) { Surface field = (Surface)fields.next(); + Space window = new Space("Window", + Space.CONSTRUCTION, + space.getLevel() + 1, + true); + space.add(window); Surface fcopy = field.copyall(space); ! assignSame(front, fcopy, space, window); ! windows.add(window); ! NetFacadeModellor winModellor = (NetFacadeModellor)newInstance(window); ! winModellor.setFront(fcopy); ! winModellor.setDepth(depth); ! winModellor.setFrameWidth(frameWidth); } } *************** *** 293,298 **** private void createSingleFacade(Net net) { if (frame == null) { ! frame = new Space("Frame", Space.CONSTRUCTION, ! Space.ELEMENT_LEVEL, true); space.add(frame); } --- 307,314 ---- private void createSingleFacade(Net net) { if (frame == null) { ! frame = new Space("Frame", ! Space.CONSTRUCTION, ! Space.ELEMENT_LEVEL, ! true); space.add(frame); } *************** *** 317,324 **** Map offsetMap = new HashMap(); Iterator fieldEdges = field.getEdges().iterator(); while (fieldEdges.hasNext()) { Edge e = (Edge)fieldEdges.next(); ! Map env = e.getParameters().environment(); ! double width = ((Double)env.get("width")).doubleValue(); if (outline.contains(e)) { offsetMap.put(e, Double.valueOf(-width)); --- 333,348 ---- Map offsetMap = new HashMap(); Iterator fieldEdges = field.getEdges().iterator(); + Map envF = field.getParameters().environment(); + boolean openable = false; + if (envF.get("openable") != null) { + openable = (Boolean)envF.get("openable"); + } while (fieldEdges.hasNext()) { Edge e = (Edge)fieldEdges.next(); ! Map envE = e.getParameters().environment(); ! double width = ((Double)envE.get("width")).doubleValue(); ! if (openable) { ! width *= 2; ! } if (outline.contains(e)) { offsetMap.put(e, Double.valueOf(-width)); |
|
From: Nordholt <nor...@us...> - 2006-12-30 15:31:28
|
Update of /cvsroot/bprocessor/facade/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23727/src Modified Files: build.xml Log Message: changed build target and source to 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/facade/src/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 10 Aug 2006 14:17:10 -0000 1.1 --- build.xml 30 Dec 2006 15:31:27 -0000 1.2 *************** *** 14,18 **** <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.2" source="1.3" includes="net/**"> <classpath refid="build.path"/> --- 14,18 ---- <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.5" source="1.5" includes="net/**"> <classpath refid="build.path"/> |
|
From: Nordholt <nor...@us...> - 2006-12-30 15:30:42
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23342/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: added method to schedule the addition of a new observer so there is no exception thrown when an observer is added in an update method. Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** Project.java 19 Dec 2006 13:20:32 -0000 1.103 --- Project.java 30 Dec 2006 15:30:35 -0000 1.104 *************** *** 44,47 **** --- 44,50 ---- private List observers; + /** The scheduled observers */ + private List scheduledObservers; + /** The Mesh */ private Space world; *************** *** 104,107 **** --- 107,113 ---- private Collection copyBuffer; + /** Flag set when updating */ + private boolean updating = false; + /** * Get the instance *************** *** 130,133 **** --- 136,140 ---- new double[]{0, 0, 1}, Camera.PERSPECTIVE); observers = new LinkedList(); + scheduledObservers = new LinkedList(); world = new Space("Project", Space.FUNCTIONAL, Space.PROJECT_LEVEL, true); world.setId(new Long(0)); *************** *** 200,203 **** --- 207,231 ---- /** + * Schedule adding an observer. Will be added at a safe time. + * @param observer The observer + */ + public void scheduleObserver(Observer observer) { + scheduledObservers.add(observer); + if (!updating) { + addSchedule(); + } + } + + /** + * Adds observers scheduled. + */ + private void addSchedule() { + Iterator it = scheduledObservers.iterator(); + while (it.hasNext()) { + addObserver((Observer)it.next()); + } + } + + /** * Remove observer * @param observer The observer *************** *** 213,220 **** --- 241,251 ---- public void changed(Object entity) { Iterator iter = observers.iterator(); + updating = true; while (iter.hasNext()) { Observer current = (Observer) iter.next(); current.update(entity); } + updating = false; + addSchedule(); makeDirty(); } |
|
From: Nordholt <nor...@us...> - 2006-12-30 15:29:46
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22899/src/net/sourceforge/bprocessor/model Modified Files: ParameterBlock.java Log Message: parameter blocks can also contain boolean parameters Index: ParameterBlock.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ParameterBlock.java 10 Oct 2006 13:49:38 -0000 1.3 --- ParameterBlock.java 30 Dec 2006 15:29:38 -0000 1.4 *************** *** 13,20 **** --- 13,25 ---- import java.util.List; + import org.apache.log4j.Logger; + /** * ParameterBlock */ public class ParameterBlock implements Parametric { + /** The logger */ + private static Logger log = Logger.getLogger(ParameterBlock.class); + /** Parameters */ private List parameters; *************** *** 54,57 **** --- 59,71 ---- /** + * Put + * @param key String + * @param value boolean + */ + public void put(String key, boolean value) { + parameters.add(new Attribute(key, value)); + } + + /** * Get as environment * @return HashMap *************** *** 64,68 **** String key = current.getName(); Object value = current.getValue(); ! if (value instanceof Double) { env.put(key, value); } --- 78,83 ---- String key = current.getName(); Object value = current.getValue(); ! if (value instanceof Double || ! value instanceof Boolean) { env.put(key, value); } |
|
From: Nordholt <nor...@us...> - 2006-12-29 15:18:05
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6663/src/net/sourceforge/bprocessor/model Modified Files: Edge.java Log Message: fixing offset directions calculation when two edges who share a vertex are parallel. Index: Edge.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** Edge.java 18 Dec 2006 18:17:39 -0000 1.67 --- Edge.java 29 Dec 2006 15:17:59 -0000 1.68 *************** *** 651,655 **** * in order to make an offset. The amount each edge should be offset is given in * an offset map, from an edge to a double value. The edges must all belong to ! * the same surface. * @param which the edges to offset * @param inner the surface the edges belong to --- 651,655 ---- * in order to make an offset. The amount each edge should be offset is given in * an offset map, from an edge to a double value. The edges must all belong to ! * the same surface. * @param which the edges to offset * @param inner the surface the edges belong to *************** *** 677,703 **** while (!done) { work = commonVertex(e1, e2); if (which.contains(e1) || which.contains(e2)) { Vertex dir1 = work.minus(e1.otherVertex(work)); Vertex dir2 = e2.otherVertex(work).minus(work); ! Vertex org1 = new Vertex(0, 0, 0); ! Vertex org2 = new Vertex(0, 0, 0);; ! if (which.contains(e1)) { ! org1 = dir1.cross(normal); ! org1.normalize(); ! org1.scale(((Double)offsetMap.get(e1)).doubleValue()); ! } ! if (which.contains(e2)) { ! org2 = dir2.cross(normal); ! org2.normalize(); ! org2.scale(((Double)offsetMap.get(e2)).doubleValue()); ! } ! org1 = org1.add(work); ! org2 = org2.add(work); ! Line l1 = new Line(org1, dir1); ! Line l2 = new Line(org2, dir2); ! Vertex mainDir = work.minus(l1.intersection(l2)); v2Dir.put(work, mainDir); - e1 = e2; if (edges2.hasNext()) { --- 677,716 ---- while (!done) { work = commonVertex(e1, e2); + Vertex mainDir; if (which.contains(e1) || which.contains(e2)) { Vertex dir1 = work.minus(e1.otherVertex(work)); Vertex dir2 = e2.otherVertex(work).minus(work); ! if (dir1.cross(dir2).length() > 0.00001) { ! Vertex org1 = new Vertex(0, 0, 0); ! Vertex org2 = new Vertex(0, 0, 0); ! if (which.contains(e1)) { ! org1 = dir1.cross(normal); ! org1.normalize(); ! org1.scale(((Double)offsetMap.get(e1)).doubleValue()); ! } ! if (which.contains(e2)) { ! org2 = dir2.cross(normal); ! org2.normalize(); ! org2.scale(((Double)offsetMap.get(e2)).doubleValue()); ! } ! org1 = org1.add(work); ! org2 = org2.add(work); ! Line l1 = new Line(org1, dir1); ! Line l2 = new Line(org2, dir2); ! mainDir = work.minus(l1.intersection(l2)); ! } else { ! //If the edges are parallel the offset must be the same ! mainDir = dir1.cross(normal); ! mainDir.normalize(); ! double scale; ! if (offsetMap.keySet().contains(e1)) { ! scale = ((Double)offsetMap.get(e1)).doubleValue(); ! } else { ! scale = ((Double)offsetMap.get(e2)).doubleValue(); ! } ! mainDir.scale(scale); ! } v2Dir.put(work, mainDir); e1 = e2; if (edges2.hasNext()) { |
|
From: Nordholt <nor...@us...> - 2006-12-29 13:33:44
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29045/src/net/sourceforge/bprocessor/gl/tool Modified Files: ToolFactory.java Log Message: added a focusOn button to the toolbar Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** ToolFactory.java 5 Dec 2006 09:07:25 -0000 1.69 --- ToolFactory.java 29 Dec 2006 13:33:42 -0000 1.70 *************** *** 13,16 **** --- 13,17 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; + import net.sourceforge.bprocessor.model.Surface; import java.net.URL; *************** *** 236,253 **** Action zoomAction = new ToolAction(glv, 0, "Biconzomeall.gif") { ! public void actionPerformed(ActionEvent agr0) { ! double aspect = glv.getView().getAspect(); ! if (Selection.primary().isEmpty()) { ! List list = new LinkedList(); ! list.add(Project.getInstance().getActiveSpace()); ! Project.getInstance().getCurrentCamera().zoomOn(list, aspect); ! } else { ! Project.getInstance().getCurrentCamera().zoomOn(Selection.primary(), aspect); ! } ! this.glv.repaint(); } ! }; ! Toolbar.getInstance().registerPushButtonAction(zoomAction, "Zoom All"); tb.addSeparator(10); --- 237,266 ---- Action zoomAction = new ToolAction(glv, 0, "Biconzomeall.gif") { ! public void actionPerformed(ActionEvent agr0) { ! double aspect = glv.getView().getAspect(); ! if (Selection.primary().isEmpty()) { ! List list = new LinkedList(); ! list.add(Project.getInstance().getActiveSpace()); ! Project.getInstance().getCurrentCamera().zoomOn(list, aspect); ! } else { ! Project.getInstance().getCurrentCamera().zoomOn(Selection.primary(), aspect); } ! this.glv.repaint(); ! } ! }; Toolbar.getInstance().registerPushButtonAction(zoomAction, "Zoom All"); + + Action focusAction = new ToolAction(glv, 0, "Biconzomeselect.gif") { + public void actionPerformed(ActionEvent agr0) { + if (Selection.primary().size() == 1) { + Object o = Selection.primary().iterator().next(); + if (o instanceof Surface) { + Camera.focusOn(Project.getInstance().getCurrentCamera(), (Surface)o); + this.glv.repaint(); + } + } + } + }; + Toolbar.getInstance().registerPushButtonAction(focusAction, "Focus on surface"); tb.addSeparator(10); |
|
From: Nordholt <nor...@us...> - 2006-12-29 13:32:58
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28626/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: refactored code to the camera Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PopupMenu.java 15 Nov 2006 10:28:18 -0000 1.18 --- PopupMenu.java 29 Dec 2006 13:32:57 -0000 1.19 *************** *** 65,69 **** public static JPopupMenu getSurfaceMenu(Collection c) { JPopupMenu jm = getEntiesMenu(c); - if (c.size() == 1) { Surface s = (Surface)c.iterator().next(); --- 65,68 ---- *************** *** 71,103 **** public void actionPerformed(ActionEvent arg0) { Surface s = (Surface)entity; ! Vertex n = (s.normal()); ! Camera current = Project.getInstance().getCurrentCamera(); ! Vertex cen = s.center(); ! double[] center = current.getCenter(); ! double[] cam = current.getCamera(); ! double[] dir = new double[]{cam[0] - center[0], cam[1] - center[1], cam[2] - center[2]}; ! Vertex r = new Vertex(dir); ! n = r.projectOnto(n); ! Iterator iter = s.getEdges().iterator(); ! Vertex roll = new Vertex(current.getRoll()); ! Vertex newroll = null; ! double angle = 2 * 3.14; ! while (iter.hasNext()) { ! Edge e = (Edge)iter.next(); ! Vertex d = e.getDirection(); ! double tmp = d.angle(roll); ! if (tmp < angle) { ! angle = tmp; ! newroll = d; ! } ! } ! newroll.normalize(); ! current.setRoll(new double[]{newroll.getX(), newroll.getY(), newroll.getZ()}); ! current.setCenter(new double[]{cen.getX(), cen.getY(), cen.getZ()}); ! current.setCamera(new double[]{cen.getX() + n.getX(), ! cen.getY() + n.getY(), cen.getZ() + n.getZ()}); ! Collection c = new LinkedList(); ! c.add(s); ! Project.getInstance().getCurrentCamera().zoomOn(c, 1.0); } }; --- 70,74 ---- public void actionPerformed(ActionEvent arg0) { Surface s = (Surface)entity; ! Camera.focusOn(Project.getInstance().getCurrentCamera(), s); } }; |
|
From: Nordholt <nor...@us...> - 2006-12-29 13:32:04
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28226/src/net/sourceforge/bprocessor/model Modified Files: Camera.java Log Message: added a static focusOn method in the camera Index: Camera.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Camera.java 18 Dec 2006 09:11:47 -0000 1.30 --- Camera.java 29 Dec 2006 13:31:55 -0000 1.31 *************** *** 11,14 **** --- 11,15 ---- import java.util.Iterator; import java.util.HashSet; + import java.util.LinkedList; import java.util.List; import java.util.Set; *************** *** 606,608 **** --- 607,645 ---- currentCamera.roll = new double[]{0, 1, 0}; } + + /** + * Static modification of the camera to focus on a given surface + * @param currentCamera The camera to change + * @param s The surface to focus on + */ + public static void focusOn(Camera currentCamera, Surface s) { + Vertex n = (s.normal()); + Vertex cen = s.center(); + double[] center = currentCamera.getCenter(); + double[] cam = currentCamera.getCamera(); + double[] dir = new double[]{cam[0] - center[0], cam[1] - center[1], cam[2] - center[2]}; + Vertex r = new Vertex(dir); + n = r.projectOnto(n); + Iterator iter = s.getEdges().iterator(); + Vertex roll = new Vertex(currentCamera.getRoll()); + Vertex newroll = null; + double angle = 2 * 3.14; + while (iter.hasNext()) { + Edge e = (Edge)iter.next(); + Vertex d = e.getDirection(); + double tmp = d.angle(roll); + if (tmp < angle) { + angle = tmp; + newroll = d; + } + } + newroll.normalize(); + currentCamera.setRoll(new double[]{newroll.getX(), newroll.getY(), newroll.getZ()}); + currentCamera.setCenter(new double[]{cen.getX(), cen.getY(), cen.getZ()}); + currentCamera.setCamera(new double[]{cen.getX() + n.getX(), + cen.getY() + n.getY(), cen.getZ() + n.getZ()}); + Collection < Surface > c = new LinkedList < Surface > (); + c.add(s); + currentCamera.zoomOn(c, 1.0); + } } |
|
From: Nordholt <nor...@us...> - 2006-12-29 13:31:28
|
Update of /cvsroot/bprocessor/model/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28190/src Modified Files: build.xml Log Message: changed to 1.5 Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/model/src/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 28 Apr 2006 11:29:09 -0000 1.6 --- build.xml 29 Dec 2006 13:31:20 -0000 1.7 *************** *** 15,19 **** <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.2" source="1.3" includes="net/**"> <classpath refid="build.path"/> --- 15,19 ---- <target name="compile" depends="dep"> <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes" ! debug="yes" target="1.5" source="1.5" includes="net/**"> <classpath refid="build.path"/> |
|
From: Nordholt <nor...@us...> - 2006-12-21 14:23:57
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8833/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java Log Message: added a width attribute to the edges of the b-net for a facade. This makes it possible to define seperate widths for each post of the facade. Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NetFacadeModellor.java 18 Dec 2006 18:20:19 -0000 1.6 --- NetFacadeModellor.java 21 Dec 2006 14:23:49 -0000 1.7 *************** *** 7,10 **** --- 7,11 ---- package net.sourceforge.bprocessor.facade.modellor; + import java.util.Collection; import java.util.HashMap; import java.util.HashSet; *************** *** 226,230 **** space.clear(); frame = null; ! space.add(net); if (single) { createSingleFacade(net); --- 227,232 ---- space.clear(); frame = null; ! space.add(net); ! prepareNet(net); if (single) { createSingleFacade(net); *************** *** 235,238 **** --- 237,256 ---- /** + * Adds extra parameters to the b-net + * @param n the net + */ + private void prepareNet(Net n) { + Collection edges = n.getEdges(); + Iterator it = edges.iterator(); + while (it.hasNext()) { + Edge e = (Edge)it.next(); + Map env = e.getParameters().environment(); + if (env.get("width") == null) { + e.getParameters().put("width", frameWidth); + } + } + } + + /** * Creates a facade from a net. * @param net the net *************** *** 253,257 **** while (fEdges.hasNext()) { Edge e = (Edge)fEdges.next(); ! offsetMap.put(e, Double.valueOf(-frameWidth)); } Surface h = new Surface(Edge.placeOffset(fcopy.getEdges(), fcopy, offsetMap)); --- 271,277 ---- while (fEdges.hasNext()) { Edge e = (Edge)fEdges.next(); ! Map env = e.getParameters().environment(); ! double width = ((Double)env.get("width")).doubleValue(); ! offsetMap.put(e, Double.valueOf(-width)); } Surface h = new Surface(Edge.placeOffset(fcopy.getEdges(), fcopy, offsetMap)); *************** *** 299,306 **** while (fieldEdges.hasNext()) { Edge e = (Edge)fieldEdges.next(); if (outline.contains(e)) { ! offsetMap.put(e, Double.valueOf(-frameWidth)); } else { ! offsetMap.put(e, Double.valueOf(-frameWidth / 2)); } } --- 319,328 ---- while (fieldEdges.hasNext()) { Edge e = (Edge)fieldEdges.next(); + Map env = e.getParameters().environment(); + double width = ((Double)env.get("width")).doubleValue(); if (outline.contains(e)) { ! offsetMap.put(e, Double.valueOf(-width)); } else { ! offsetMap.put(e, Double.valueOf(-width / 2)); } } |
|
From: Nordholt <nor...@us...> - 2006-12-21 14:22:30
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8412/src/net/sourceforge/bprocessor/gui/attrview Modified Files: GenericPanel.java Log Message: adding parameterblocks in the attributes view to entities Index: GenericPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** GenericPanel.java 17 Dec 2006 20:24:12 -0000 1.29 --- GenericPanel.java 21 Dec 2006 14:22:28 -0000 1.30 *************** *** 71,74 **** --- 71,78 ---- attributes = param.getAttributes(); generateContent(attributes, content); + if (param instanceof Entity) { + Entity paramEnt = (Entity)param; + generateContent(paramEnt.getParameters().getAttributes(), content); + } Box title = Box.createVerticalBox(); Box header = Box.createHorizontalBox(); |
