bprocessor-commit Mailing List for B-processor (Page 145)
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...> - 2005-12-22 10:36:08
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5817/src/net/sourceforge/bprocessor/gl/tool Modified Files: ExtrudeTool.java Log Message: lengthfield bug in extrudetool Index: ExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExtrudeTool.java 21 Dec 2005 15:41:35 -0000 1.4 --- ExtrudeTool.java 22 Dec 2005 10:36:01 -0000 1.5 *************** *** 151,154 **** --- 151,157 ---- if (extrudeSurface != null) { sides = new HashSet(); + if (direction > 0) { + length = -length; + } top = extrudeSurface.extrude(length, sides); holeAnalysis(top); |
|
From: Michael L. <he...@us...> - 2005-12-22 10:35:10
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5668/src/net/sourceforge/bprocessor/model Modified Files: Surface.java Project.java Log Message: Some notification bugs Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Surface.java 21 Dec 2005 15:41:55 -0000 1.61 --- Surface.java 22 Dec 2005 10:35:01 -0000 1.62 *************** *** 533,536 **** --- 533,538 ---- } } + Project.getInstance().update(this); + Project.getInstance().update(hole); } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Project.java 19 Dec 2005 07:50:06 -0000 1.11 --- Project.java 22 Dec 2005 10:35:01 -0000 1.12 *************** *** 116,125 **** if (back == c) { surface.setBackDomain(null); ! DatabaseFacade.getInstance().update(surface); } else { Space front = surface.getFrontDomain(); if (front == c) { surface.setFrontDomain(null); ! DatabaseFacade.getInstance().update(surface); } } --- 116,125 ---- if (back == c) { surface.setBackDomain(null); ! update(surface); } else { Space front = surface.getFrontDomain(); if (front == c) { surface.setFrontDomain(null); ! update(surface); } } *************** *** 157,161 **** Notification n = new Notification(Notification.CONSTRUCTION_SPACE_MODIFIED, domain.getId()); Notifier.getInstance().sendNotification(n); - System.out.println("send notification"); } else if (domain instanceof FunctionalSpace) { DatabaseFacade.getInstance().update((FunctionalSpace)domain); --- 157,160 ---- *************** *** 347,351 **** if (back != null) { if (back.removeSurface(s)) { ! DatabaseFacade.getInstance().update(back); } s.setBackDomain(null); --- 346,350 ---- if (back != null) { if (back.removeSurface(s)) { ! update(back); } s.setBackDomain(null); *************** *** 354,358 **** if (front != null) { if (front.removeSurface(s)) { ! DatabaseFacade.getInstance().update(front); } s.setFrontDomain(null); --- 353,357 ---- if (front != null) { if (front.removeSurface(s)) { ! update(front); } s.setFrontDomain(null); |
|
From: Michael L. <he...@us...> - 2005-12-21 15:42:04
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24383/src/net/sourceforge/bprocessor/model Modified Files: Surface.java Log Message: Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Surface.java 20 Dec 2005 15:07:52 -0000 1.60 --- Surface.java 21 Dec 2005 15:41:55 -0000 1.61 *************** *** 380,386 **** * Extrude this surface * @param delta How much to extrude along the normal * @return The top in the extruded surface */ ! public Surface extrude(double delta) { Vertex normal = normal(); normal.scale(delta / normal.length()); --- 380,387 ---- * Extrude this surface * @param delta How much to extrude along the normal + * @param sides Will contain the sides that are created * @return The top in the extruded surface */ ! public Surface extrude(double delta, Set sides) { Vertex normal = normal(); normal.scale(delta / normal.length()); *************** *** 442,446 **** facemap[i] = new Surface(newEdges); Project.getInstance().intern(facemap[i]); ! } --- 443,447 ---- facemap[i] = new Surface(newEdges); Project.getInstance().intern(facemap[i]); ! sides.add(facemap[i]); } |
|
From: Michael L. <he...@us...> - 2005-12-21 15:41:43
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24285/src/net/sourceforge/bprocessor/gl/tool Modified Files: ExtrudeTool.java Log Message: Index: ExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ExtrudeTool.java 19 Dec 2005 07:51:29 -0000 1.3 --- ExtrudeTool.java 21 Dec 2005 15:41:35 -0000 1.4 *************** *** 9,13 **** --- 9,15 ---- import java.awt.Cursor; + import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; + import java.util.HashSet; import java.util.Iterator; import java.util.Set; *************** *** 28,32 **** /** The dragSurface */ ! private Surface dragSurface; /** The extrudeSurface */ --- 30,38 ---- /** The dragSurface */ ! private Surface top; ! ! /** The sides */ ! ! private Set sides; /** The extrudeSurface */ *************** *** 37,40 **** --- 43,49 ---- private Plane dragplane; + /** The length typed in for length of the extrusion*/ + private String number; + /** The previous x-coordinate */ private double prevX; *************** *** 72,79 **** --- 81,95 ---- protected void pressed(MouseEvent e) { t = 0.0; + upperLimit = 0.0; + lowerLimit = 0.0; + extrudeSurface = null; + top = null; + sides = null; prevX = e.getX(); prevY = e.getY(); + number = new String(); super.pressed(e); if (target instanceof Surface) { + sides = new HashSet(); extrudeSurface = (Surface) target; View view = glv.getView(); *************** *** 94,102 **** */ private void move(double delta) { ! if (dragSurface != null) { ! Vertex normal = dragSurface.normal(); normal.scale(1 / normal.length()); normal.scale(delta / (normal.length() * normal.length())); ! dragSurface.move(normal.getX(), normal.getY(), normal.getZ()); } } --- 110,118 ---- */ private void move(double delta) { ! if (top != null) { ! Vertex normal = top.normal(); normal.scale(1 / normal.length()); normal.scale(delta / (normal.length() * normal.length())); ! top.move(normal.getX(), normal.getY(), normal.getZ()); } } *************** *** 116,119 **** --- 132,157 ---- move(delta); t = to; + glv.setLength(Math.abs(t)); + } + + /** + * Apply extrusion + * @param length The length + */ + private void apply(double length) { + if (top != null) { + deleteSurface(top); + Iterator iter = sides.iterator(); + while (iter.hasNext()) { + Surface current = (Surface) iter.next(); + deleteSurface(current); + } + sides = null; + } + if (extrudeSurface != null) { + sides = new HashSet(); + top = extrudeSurface.extrude(length, sides); + holeAnalysis(top); + } } *************** *** 135,144 **** Set surfaces = Project.getInstance().getSurfaces(); Iterator iter = surfaces.iterator(); ! Vertex normal = dragSurface.normal(); Vertex origin = extrudeSurface.getFirstVertex(); normal.scale(1 / normal.length()); while (iter.hasNext()) { Surface current = (Surface) iter.next(); ! if (current != extrudeSurface && current != dragSurface) { Vertex n = current.normal(); Vertex cross = normal.cross(n); --- 173,182 ---- Set surfaces = Project.getInstance().getSurfaces(); Iterator iter = surfaces.iterator(); ! Vertex normal = top.normal(); Vertex origin = extrudeSurface.getFirstVertex(); normal.scale(1 / normal.length()); while (iter.hasNext()) { Surface current = (Surface) iter.next(); ! if (current != extrudeSurface && current != top) { Vertex n = current.normal(); Vertex cross = normal.cross(n); *************** *** 174,181 **** if (extrudeSurface != null) { Vertex normal; ! if (dragSurface == null) { normal = extrudeSurface.normal(); } else { ! normal = dragSurface.normal(); } normal.scale(1 / normal.length()); --- 212,219 ---- if (extrudeSurface != null) { Vertex normal; ! if (top == null) { normal = extrudeSurface.normal(); } else { ! normal = top.normal(); } normal.scale(1 / normal.length()); *************** *** 187,193 **** double x = e.getX(); double y = e.getY(); ! if (dragSurface == null) { if (x * x + y * y > 16) { ! dragSurface = extrudeSurface.extrude(normDotDelta); t = -normDotDelta; if (t > 0) { --- 225,231 ---- double x = e.getX(); double y = e.getY(); ! if (top == null) { if (x * x + y * y > 16) { ! top = extrudeSurface.extrude(normDotDelta, sides); t = -normDotDelta; if (t > 0) { *************** *** 210,217 **** protected void released(MouseEvent e) { super.released(e); ! holeAnalysis(dragSurface); ! dragplane = null; ! dragSurface = null; } } --- 248,322 ---- protected void released(MouseEvent e) { super.released(e); ! if (Math.abs(t) < 0.0000001) { ! deleteSurface(top); ! top = null; ! Iterator iter = sides.iterator(); ! while (iter.hasNext()) { ! Surface current = (Surface) iter.next(); ! deleteSurface(current); ! } ! sides = null; ! } else { ! holeAnalysis(top); ! } } + /** + * Invoked when a key has been pressed. + * @param e The KeyEvent + */ + public void keyPressed(KeyEvent e) { + /*a length can only be typed in if some surface is selected + for extrusion, and if the "number"-variable has been initialised + */ + super.keyPressed(e); + if (extrudeSurface != null && number != null) { + if (e.getKeyCode() == KeyEvent.VK_1) { + number += "1"; + } else if (e.getKeyCode() == KeyEvent.VK_2) { + number += "2"; + } else if (e.getKeyCode() == KeyEvent.VK_3) { + number += "3"; + } else if (e.getKeyCode() == KeyEvent.VK_4) { + number += "4"; + } else if (e.getKeyCode() == KeyEvent.VK_5) { + number += "5"; + } else if (e.getKeyCode() == KeyEvent.VK_6) { + number += "6"; + } else if (e.getKeyCode() == KeyEvent.VK_7) { + number += "7"; + } else if (e.getKeyCode() == KeyEvent.VK_8) { + number += "8"; + } else if (e.getKeyCode() == KeyEvent.VK_9) { + number += "9"; + } else if (e.getKeyCode() == KeyEvent.VK_0) { + number += "0"; + } else if (e.getKeyCode() == KeyEvent.VK_ENTER) { + if (!number.equals("")) { + double length = glv.getLength(); + apply(length); + glv.repaint(); + } + } else if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) { + int length = number.length(); + if (length > 0) { + number = number.substring(0, length - 1); + } + } + } + + if (number.equals("") || number.equals("-")) { + glv.setLength(0); + } else { + try { + double d = Double.parseDouble(number); + glv.setLength(d / 1000); + } catch (NumberFormatException exp) { + System.out.println(exp); + } + } + super.keyPressed(e); + } + + } |
|
From: Michael L. <he...@us...> - 2005-12-21 14:37:27
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11918/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java PencilTool.java Log Message: Constructionline-issues Index: PencilTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** PencilTool.java 20 Dec 2005 22:01:36 -0000 1.51 --- PencilTool.java 21 Dec 2005 14:37:17 -0000 1.52 *************** *** 120,133 **** if (selection.size() > 1) { Edge e1 = (Edge) selection.get(0); ! for (int i = 1; (i < selection.size()) && intersection == null; i++) { Edge e2 = (Edge) selection.get(i); ! Edge intersect = e1.intersection(e2); ! ! if (intersect != null) { ! if (intersect.getLength() < 0.0000001) { ! intersection = intersect.getFrom(); ! splitE1 = e1; ! splitE2 = e2; } } --- 120,136 ---- if (selection.size() > 1) { Edge e1 = (Edge) selection.get(0); ! Vertex v1 = e1.getTo().minus(e1.getFrom()); for (int i = 1; (i < selection.size()) && intersection == null; i++) { Edge e2 = (Edge) selection.get(i); ! Vertex v2 = e2.getTo().minus(e2.getFrom()); ! Vertex cross = v1.cross(v2); ! if (!cross.isZero()) { ! Edge intersect = e1.intersection(e2); ! if (intersect != null) { ! if (intersect.getLength() < 0.0000001) { ! intersection = intersect.getFrom(); ! splitE1 = e1; ! splitE2 = e2; ! } } } *************** *** 391,396 **** if (from == to) { Surface surface = new Surface(edges); - holeAnalysis(surface); intern(surface); } else { Geometry.insert(edges); --- 394,399 ---- if (from == to) { Surface surface = new Surface(edges); intern(surface); + holeAnalysis(surface); } else { Geometry.insert(edges); Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** AbstractTool.java 20 Dec 2005 15:43:36 -0000 1.42 --- AbstractTool.java 21 Dec 2005 14:37:17 -0000 1.43 *************** *** 501,531 **** */ protected void deleteSurface(Surface surface) { ! List edges = surface.getEdges(); ! Iterator it = edges.iterator(); ! Edge edge = null; ! //checking if this is a hole in some surface an thus must removed before deleted ! //consider method that does not have to get all surfaces. ! Set surfaces = Project.getInstance().getSurfaces(); ! Iterator surfIt = surfaces.iterator(); ! while (surfIt.hasNext()) { ! Surface surf = (Surface)surfIt.next(); ! Set inners = surf.getHoles(); ! if (inners != null) { ! Iterator innerIt = inners.iterator(); ! while (innerIt.hasNext()) { ! Surface innerSurf = (Surface)innerIt.next(); ! if (innerSurf == surface) { ! surf.removeHole(surface); ! Project.getInstance().update(surf); ! } ! } ! } } removeSurface(surface); ! glv.repaint(); while (it.hasNext()) { ! edge = (Edge)it.next(); deleteEdge(edge); } } --- 501,516 ---- */ protected void deleteSurface(Surface surface) { ! if (surface.getExterior() != null) { ! Surface exterior = surface.getExterior(); ! exterior.removeHole(surface); } removeSurface(surface); ! List edges = surface.getEdges(); ! Iterator it = edges.iterator(); while (it.hasNext()) { ! Edge edge = (Edge)it.next(); deleteEdge(edge); } + glv.repaint(); } |
|
From: Michael L. <he...@us...> - 2005-12-21 14:37:03
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11755/src/net/sourceforge/bprocessor/model Modified Files: Edge.java Log Message: Minor fixes Index: Edge.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Edge.java 19 Dec 2005 19:37:53 -0000 1.24 --- Edge.java 21 Dec 2005 14:36:36 -0000 1.25 *************** *** 290,294 **** */ public String toString() { ! return "Edge[E" + id + " {V" + from.getId() + " -> V" + to.getId() + "}]"; } --- 290,294 ---- */ public String toString() { ! return getName() + "[" + from.getName() + " -> " + to.getName() + "]"; } |
|
From: Michael L. <he...@us...> - 2005-12-20 22:02:19
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14147/src/net/sourceforge/bprocessor/gl/tool Modified Files: PencilTool.java Log Message: Minor adjustments Index: PencilTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** PencilTool.java 19 Dec 2005 07:51:30 -0000 1.50 --- PencilTool.java 20 Dec 2005 22:01:36 -0000 1.51 *************** *** 114,117 **** --- 114,118 ---- View view = glv.getView(); List selection = view.getObjectAtPoint(x, y); + Vertex intersection = null; if (selection.isEmpty()) { target = null; *************** *** 119,135 **** if (selection.size() > 1) { Edge e1 = (Edge) selection.get(0); ! Edge e2 = (Edge) selection.get(1); ! Edge intersect = e1.intersection(e2); ! if (intersect == null) { ! target = e1; ! } else { ! if (intersect.getLength() > 0.0000001) { ! target = e1; ! } else { ! target = intersect.getFrom(); ! splitE1 = e1; ! splitE2 = e2; } } } else { target = selection.get(0); --- 120,141 ---- if (selection.size() > 1) { Edge e1 = (Edge) selection.get(0); ! ! for (int i = 1; (i < selection.size()) && intersection == null; i++) { ! Edge e2 = (Edge) selection.get(i); ! Edge intersect = e1.intersection(e2); ! ! if (intersect != null) { ! if (intersect.getLength() < 0.0000001) { ! intersection = intersect.getFrom(); ! splitE1 = e1; ! splitE2 = e2; ! } } } + if (intersection != null) { + target = intersection; + } else { + target = e1; + } } else { target = selection.get(0); |
|
From: Michael L. <he...@us...> - 2005-12-20 22:01:47
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14147/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Minor adjustments Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** View.java 20 Dec 2005 13:55:52 -0000 1.35 --- View.java 20 Dec 2005 22:01:36 -0000 1.36 *************** *** 245,253 **** protected boolean doDrawEdges = true; ! /** The transparency of surfaces */ protected static byte[] transparency = new byte[128]; ! /** The transparency of highlight */ protected static byte[] highlight = new byte[128]; /** The list of clipping planes */ --- 245,256 ---- protected boolean doDrawEdges = true; ! /** The raster of selected surfaces */ protected static byte[] transparency = new byte[128]; ! /** The raster of highlighted surfaces */ protected static byte[] highlight = new byte[128]; + + /** The raster of transparent surfaces */ + protected static byte[] seethrough = new byte[128]; /** The list of clipping planes */ *************** *** 275,278 **** --- 278,282 ---- setTransparency(100); setHighlight(); + setSeethrough(); }; *************** *** 324,327 **** --- 328,353 ---- } } + + /** + * Set the seethrough pattern + */ + public static void setSeethrough() { + byte b1 = (byte) 0x80; + byte b2 = (byte) 0x08; + byte b3 = (byte) 0x00; + for (int i = 0; i < seethrough.length; i++) { + int d = ((int)(i / 4)) % 4; + + if (d == 0) { + seethrough[i] = b1; + } else if (d == 1) { + seethrough[i] = b3; + } else if (d == 2) { + seethrough[i] = b2; + } else if (d == 3) { + seethrough[i] = b3; + } + } + } /** *************** *** 1362,1366 **** Surface s = (Surface)it.next(); if (!selection.contains(s)) { ! if (isVisible(s)) { if (side == FRONT) { Space back = s.getFrontDomain(); --- 1388,1397 ---- Surface s = (Surface)it.next(); if (!selection.contains(s)) { ! boolean visible = isVisible(s); ! if (!visible) { ! gl.glEnable(GL.GL_POLYGON_STIPPLE); ! gl.glPolygonStipple(seethrough); ! gl.glColor3fv(GRID_COLOR); ! } else { if (side == FRONT) { Space back = s.getFrontDomain(); *************** *** 1371,1375 **** gl.glColor3fv(getSpaceColor(front)); } ! drawSurface(s); } } --- 1402,1409 ---- gl.glColor3fv(getSpaceColor(front)); } ! } ! drawSurface(s); ! if (!visible) { ! gl.glDisable(GL.GL_POLYGON_STIPPLE); } } *************** *** 2027,2031 **** if (picking > 0) { int[] viewport = new int[] {0, 0, (int)width, (int)height}; ! glu.gluPickMatrix(x, viewport[3] - y, 10, 10, viewport); } --- 2061,2065 ---- if (picking > 0) { int[] viewport = new int[] {0, 0, (int)width, (int)height}; ! glu.gluPickMatrix(x, viewport[3] - y, 6, 6, viewport); } |
|
From: Michael L. <he...@us...> - 2005-12-20 22:01:47
|
Update of /cvsroot/bprocessor/gl/src/gfx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14147/src/gfx Modified Files: Bcursordrag.gif Log Message: Minor adjustments Index: Bcursordrag.gif =================================================================== RCS file: /cvsroot/bprocessor/gl/src/gfx/Bcursordrag.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs8IHDEu and /tmp/cvsWYV04e differ |
|
From: Michael L. <he...@us...> - 2005-12-20 18:23:20
|
Update of /cvsroot/bprocessor/build/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27190/doc Added Files: Installing.pdf Installing.doc Removed Files: Installation guide.doc Log Message: New version number M3 --- Installation guide.doc DELETED --- --- NEW FILE: Installing.pdf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Installing.doc --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2005-12-20 18:23:15
|
Update of /cvsroot/bprocessor/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27190 Modified Files: build.xml Log Message: New version number M3 Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 22 Nov 2005 16:18:04 -0000 1.9 --- build.xml 20 Dec 2005 18:23:06 -0000 1.10 *************** *** 3,7 **** <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M2a"/> <property name="script.dir" value="${basedir}/bin"/> --- 3,7 ---- <target name="init"> <property name="project" value="bprocessor"/> ! <property name="version" value="M3"/> <property name="script.dir" value="${basedir}/bin"/> |
|
From: rimestad <rim...@us...> - 2005-12-20 15:43:48
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20521/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java ToolFactory.java Log Message: added the new icons and made separators for the toolbar, and enabled the new splash, it may need a transparent panel/frame Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ToolFactory.java 19 Dec 2005 07:51:30 -0000 1.21 --- ToolFactory.java 20 Dec 2005 15:43:36 -0000 1.22 *************** *** 92,95 **** --- 92,96 ---- Toolbar tb = Toolbar.getInstance(); + tb.addSeparator(); JButton but = tb.registerAction(new SelectAction(glv)); but.setToolTipText("Select"); *************** *** 102,105 **** --- 103,109 ---- but = tb.registerAction(new ClipAction(glv)); but.setToolTipText("Clipping"); + but = tb.registerAction(new TapeMeasureAction(glv)); + but.setToolTipText("Tape Measure"); + tb.addSeparator(); but = tb.registerAction(new RotationAction(glv)); but.setToolTipText("Rotation"); *************** *** 108,114 **** but = tb.registerAction(new CameraWalkAction(glv)); but.setToolTipText("Walk mode"); - but = tb.registerAction(new TapeMeasureAction(glv)); - but.setToolTipText("Tape Measure"); - --- 112,115 ---- *************** *** 118,123 **** extrusion = new ExtrudeTool(glv, pencilcursor); clipplane = new ClipplaneTool(glv, pencilcursor); - rotation = new CameraTool(glv, rotationCursor); tapeMeasure = new TapeMeasureTool(glv, pencilcursor); fly = new CameraFlyTool(glv, flyCursor); walk = new CameraWalkTool(glv, walkCursor); --- 119,124 ---- extrusion = new ExtrudeTool(glv, pencilcursor); clipplane = new ClipplaneTool(glv, pencilcursor); tapeMeasure = new TapeMeasureTool(glv, pencilcursor); + rotation = new CameraTool(glv, rotationCursor); fly = new CameraFlyTool(glv, flyCursor); walk = new CameraWalkTool(glv, walkCursor); *************** *** 416,420 **** this.glv = glv; ClassLoader cl = Thread.currentThread().getContextClassLoader(); ! URL url = cl.getResource("selecticon.png"); ImageIcon im = new ImageIcon(url); putValue(Action.SMALL_ICON, im); --- 417,421 ---- this.glv = glv; ClassLoader cl = Thread.currentThread().getContextClassLoader(); ! URL url = cl.getResource("Biconclipplane.gif"); ImageIcon im = new ImageIcon(url); putValue(Action.SMALL_ICON, im); *************** *** 446,450 **** this.glv = glv; ClassLoader cl = Thread.currentThread().getContextClassLoader(); ! URL url = cl.getResource("selecticon.png"); ImageIcon im = new ImageIcon(url); putValue(Action.SMALL_ICON, im); --- 447,451 ---- this.glv = glv; ClassLoader cl = Thread.currentThread().getContextClassLoader(); ! URL url = cl.getResource("Bicontapemes.gif"); ImageIcon im = new ImageIcon(url); putValue(Action.SMALL_ICON, im); Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** AbstractTool.java 20 Dec 2005 13:55:51 -0000 1.41 --- AbstractTool.java 20 Dec 2005 15:43:36 -0000 1.42 *************** *** 92,96 **** this.cursor = cursor; ClassLoader cl = Thread.currentThread().getContextClassLoader(); ! URL url = cl.getResource("Bicondrag.gif"); Image dragImage = Toolkit.getDefaultToolkit().getImage(url); dragCursor = --- 92,96 ---- this.cursor = cursor; ClassLoader cl = Thread.currentThread().getContextClassLoader(); ! URL url = cl.getResource("Bcursordrag.gif"); Image dragImage = Toolkit.getDefaultToolkit().getImage(url); dragCursor = |
|
From: rimestad <rim...@us...> - 2005-12-20 15:43:47
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20488/src/net/sourceforge/bprocessor/gui Modified Files: Toolbar.java GUI.java Log Message: added the new icons and made separators for the toolbar, and enabled the new splash, it may need a transparent panel/frame Index: Toolbar.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/Toolbar.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Toolbar.java 5 Aug 2005 10:45:13 -0000 1.2 --- Toolbar.java 20 Dec 2005 15:43:31 -0000 1.3 *************** *** 54,56 **** --- 54,63 ---- return toolBar.add(action); } + + /** + * Add a separator to the toolbar + */ + public void addSeparator() { + toolBar.addSeparator(); + } } Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GUI.java 20 Dec 2005 12:23:41 -0000 1.17 --- GUI.java 20 Dec 2005 15:43:31 -0000 1.18 *************** *** 338,342 **** */ public void start() { ! plash = new SplashWindow("splash.png", null); setSize(800, 600); } --- 338,342 ---- */ public void start() { ! plash = new SplashWindow("splash3_24bit.png", null); setSize(800, 600); } |
|
From: Michael L. <he...@us...> - 2005-12-20 15:08:00
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12515/src/net/sourceforge/bprocessor/model Modified Files: Surface.java Log Message: Space assignment Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Surface.java 20 Dec 2005 13:54:53 -0000 1.59 --- Surface.java 20 Dec 2005 15:07:52 -0000 1.60 *************** *** 457,466 **** --- 457,492 ---- // FIXME should return the sides instead of assigning // spaces here. + boolean flip = false; + + if (exterior != null) { + Vertex n0 = normal(); + n0.scale(1 / n0.length()); + Vertex n1 = exterior.normal(); + n1.scale(1 / n1.length()); + Vertex o = n0.add(n1); + if (o.isZero()) { + flip = true; + } + } for (int i = 0; i < n; i++) { if (delta < 0) { facemap[i].setBackDomain(getBackDomain()); + if (exterior != null) { + if (flip) { + facemap[i].setFrontDomain(exterior.getFrontDomain()); + } else { + facemap[i].setFrontDomain(exterior.getBackDomain()); + } + } } else { facemap[i].setFrontDomain(getFrontDomain()); + if (exterior != null) { + if (flip) { + facemap[i].setBackDomain(exterior.getBackDomain()); + } else { + facemap[i].setBackDomain(exterior.getFrontDomain()); + } + } } } |
|
From: rimestad <rim...@us...> - 2005-12-20 14:34:43
|
Update of /cvsroot/bprocessor/gui/src/gfx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6383/src/gfx Added Files: splash3_24bit.png Log Message: new splash --- NEW FILE: splash3_24bit.png --- (This appears to be a binary file; contents omitted.) |
|
From: rimestad <rim...@us...> - 2005-12-20 14:24:15
|
Update of /cvsroot/bprocessor/gl/src/gfx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4359/src/gfx Added Files: Biconclipplane.gif Bicontapemes.gif Bcursordrag.gif Log Message: two new icons and a drag cursor --- NEW FILE: Biconclipplane.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Bicontapemes.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Bcursordrag.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2005-12-20 13:56:13
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29639/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java MoveTool.java ExtrusionTool.java Log Message: Changed Surface.isInner to Surface.exterior pointing to the exterior Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** MoveTool.java 19 Dec 2005 07:51:29 -0000 1.20 --- MoveTool.java 20 Dec 2005 13:55:51 -0000 1.21 *************** *** 89,94 **** Surface surface = (Surface) o; vertices.addAll(surface.getVertices()); ! if (surface.getInnerSurfaces() != null) { ! Iterator iter = surface.getInnerSurfaces().iterator(); while (iter.hasNext()) { Surface current = (Surface) iter.next(); --- 89,94 ---- Surface surface = (Surface) o; vertices.addAll(surface.getVertices()); ! if (surface.getHoles() != null) { ! Iterator iter = surface.getHoles().iterator(); while (iter.hasNext()) { Surface current = (Surface) iter.next(); *************** *** 159,163 **** } else if (o instanceof Surface) { Surface sel = (Surface)o; ! inner = sel.getIsInner(); temp = sel.plane(); } else if (o instanceof ClippingPlane) { --- 159,163 ---- } else if (o instanceof Surface) { Surface sel = (Surface)o; ! inner = sel.isInner(); temp = sel.plane(); } else if (o instanceof ClippingPlane) { Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ExtrusionTool.java 19 Dec 2005 07:51:29 -0000 1.35 --- ExtrusionTool.java 20 Dec 2005 13:55:51 -0000 1.36 *************** *** 615,619 **** extrudedSurfaces = extensions; ! Set innerSurfaces = selectedSurface.getInnerSurfaces(); innerExSurfs = new HashSet(); if (innerSurfaces != null) { --- 615,619 ---- extrudedSurfaces = extensions; ! Set innerSurfaces = selectedSurface.getHoles(); innerExSurfs = new HashSet(); if (innerSurfaces != null) { *************** *** 631,635 **** innerExSurfs.add(extensions); top.addHole(newInnerSurf); - newInnerSurf.setIsInner(true); } } --- 631,634 ---- Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** AbstractTool.java 19 Dec 2005 07:51:30 -0000 1.40 --- AbstractTool.java 20 Dec 2005 13:55:51 -0000 1.41 *************** *** 510,514 **** while (surfIt.hasNext()) { Surface surf = (Surface)surfIt.next(); ! Set inners = surf.getInnerSurfaces(); if (inners != null) { Iterator innerIt = inners.iterator(); --- 510,514 ---- while (surfIt.hasNext()) { Surface surf = (Surface)surfIt.next(); ! Set inners = surf.getHoles(); if (inners != null) { Iterator innerIt = inners.iterator(); |
|
From: Michael L. <he...@us...> - 2005-12-20 13:56:10
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29639/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Changed Surface.isInner to Surface.exterior pointing to the exterior Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** View.java 20 Dec 2005 12:24:09 -0000 1.34 --- View.java 20 Dec 2005 13:55:52 -0000 1.35 *************** *** 827,831 **** gl.glEnable(GL.GL_LIGHTING); gl.glEnable(GL.GL_POLYGON_OFFSET_FILL); ! gl.glPolygonOffset(1.0f, 1.0f); gl.glEnable(GL.GL_CULL_FACE); --- 827,831 ---- gl.glEnable(GL.GL_LIGHTING); gl.glEnable(GL.GL_POLYGON_OFFSET_FILL); ! gl.glPolygonOffset(0.5f, 0.5f); gl.glEnable(GL.GL_CULL_FACE); *************** *** 1176,1180 **** drawContour(s, tess); //drawing the inner conturs ! Set innerSurfaces = s.getInnerSurfaces(); if (innerSurfaces != null) { Iterator innerIt = innerSurfaces.iterator(); --- 1176,1180 ---- drawContour(s, tess); //drawing the inner conturs ! Set innerSurfaces = s.getHoles(); if (innerSurfaces != null) { Iterator innerIt = innerSurfaces.iterator(); |
|
From: Michael L. <he...@us...> - 2005-12-20 13:55:06
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29378/src/net/sourceforge/bprocessor/model Modified Files: Surface.java Log Message: Changed Surface.isInner to Surface.exterior pointing to the exterior Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Surface.java 20 Dec 2005 12:23:14 -0000 1.58 --- Surface.java 20 Dec 2005 13:54:53 -0000 1.59 *************** *** 35,43 **** private List edges; ! /** The inner surfaces of this surface (for holes) */ ! private Set innerSurfaces; ! ! /** Tells if this is an inner surface */ ! private boolean isInner; /** The domain in front of the surface */ --- 35,40 ---- private List edges; ! /** The holdes of this surface */ ! private Set holes; /** The domain in front of the surface */ *************** *** 47,50 **** --- 44,50 ---- private Space backDomain; + /** The exterior surface if this is a hole */ + private Surface exterior; + /** Surface is clockwise */ *************** *** 319,324 **** /** ! * Get the inner surfaces ! * @return The inner surfaces * @hibernate.set * lazy="false" --- 319,324 ---- /** ! * Get the hole surfaces ! * @return The hole surfaces * @hibernate.set * lazy="false" *************** *** 328,341 **** * class="net.sourceforge.bprocessor.model.Surface" */ ! public Set getInnerSurfaces() { ! return innerSurfaces; } /** ! * Set the inner surfaces ! * @param is The inner surfaces */ ! public void setInnerSurfaces(Set is) { ! this.innerSurfaces = is; } --- 328,341 ---- * class="net.sourceforge.bprocessor.model.Surface" */ ! public Set getHoles() { ! return holes; } /** ! * Set the hole surfaces ! * @param holes The hole surfaces */ ! public void setHoles(Set holes) { ! this.holes = holes; } *************** *** 477,507 **** /** * Adds a hole surface to this surface. ! * @param inner the hole to add. */ ! public void addHole(Surface inner) { ! if (innerSurfaces == null) { ! innerSurfaces = new HashSet(); } ! innerSurfaces.add(inner); ! inner.setIsInner(true); Vertex normal = normal(); ! Vertex other = inner.normal(); double dot = normal.dot(other); Space front = getFrontDomain(); Space back = getBackDomain(); if (dot > 0) { ! if (inner.getFrontDomain() == null) { ! inner.setFrontDomain(front); } ! if (inner.getBackDomain() == null) { ! inner.setBackDomain(back); } } else { ! if (inner.getFrontDomain() == null) { ! inner.setFrontDomain(back); } ! if (inner.getBackDomain() == null) { ! inner.setBackDomain(front); } } --- 477,507 ---- /** * Adds a hole surface to this surface. ! * @param hole the hole to add. */ ! public void addHole(Surface hole) { ! if (holes == null) { ! holes = new HashSet(); } ! holes.add(hole); ! hole.setExterior(this); Vertex normal = normal(); ! Vertex other = hole.normal(); double dot = normal.dot(other); Space front = getFrontDomain(); Space back = getBackDomain(); if (dot > 0) { ! if (hole.getFrontDomain() == null) { ! hole.setFrontDomain(front); } ! if (hole.getBackDomain() == null) { ! hole.setBackDomain(back); } } else { ! if (hole.getFrontDomain() == null) { ! hole.setFrontDomain(back); } ! if (hole.getBackDomain() == null) { ! hole.setBackDomain(front); } } *************** *** 510,521 **** /** * Removes a hole from this surface ! * @param inner the hole to remove */ ! public void removeHole(Surface inner) { ! innerSurfaces.remove(inner); } /** ! * Move this Surface and all inner surfaces a distance (dx, dy, dz) * @param dx The x distance * @param dy The y distance --- 510,522 ---- /** * Removes a hole from this surface ! * @param hole the hole to remove */ ! public void removeHole(Surface hole) { ! holes.remove(hole); ! hole.setExterior(null); } /** ! * Move this Surface and all holes a distance (dx, dy, dz) * @param dx The x distance * @param dy The y distance *************** *** 536,541 **** } { ! if (getInnerSurfaces() != null) { ! Iterator iter = getInnerSurfaces().iterator(); while (iter.hasNext()) { Surface surface = (Surface) iter.next(); --- 537,542 ---- } { ! if (getHoles() != null) { ! Iterator iter = getHoles().iterator(); while (iter.hasNext()) { Surface surface = (Surface) iter.next(); *************** *** 545,554 **** } ! if (this.isInner) { Set surfaces = Project.getInstance().getSurfaces(); Iterator surfIt = surfaces.iterator(); while (surfIt.hasNext()) { Surface surf = (Surface)surfIt.next(); ! Set inners = surf.getInnerSurfaces(); if (inners != null) { Iterator innerIt = inners.iterator(); --- 546,555 ---- } ! if (this.isInner()) { Set surfaces = Project.getInstance().getSurfaces(); Iterator surfIt = surfaces.iterator(); while (surfIt.hasNext()) { Surface surf = (Surface)surfIt.next(); ! Set inners = surf.getHoles(); if (inners != null) { Iterator innerIt = inners.iterator(); *************** *** 572,577 **** } { ! if (getInnerSurfaces() != null) { ! Iterator iter = getInnerSurfaces().iterator(); while (iter.hasNext()) { Surface surface = (Surface) iter.next(); --- 573,578 ---- } { ! if (getHoles() != null) { ! Iterator iter = getHoles().iterator(); while (iter.hasNext()) { Surface surface = (Surface) iter.next(); *************** *** 622,640 **** } ! /** ! * Get the whether this is an inner surface. ! * @return wheter or not this is an inner surface ! * @hibernate.property */ ! public boolean getIsInner() { ! return isInner; } /** ! * Set this surface to be an inner surface. ! * @param isInner whether or not this is an inner surface. */ ! public void setIsInner(boolean isInner) { ! this.isInner = isInner; } --- 623,648 ---- } ! /** ! * Get the exterior ! * @return The exterior surface */ ! public Surface getExterior() { ! return exterior; } /** ! * Set the exterior ! * @param exterior The exterior surface */ ! public void setExterior(Surface exterior) { ! this.exterior = exterior; ! } ! ! /** ! * Is this an inner surface ! * @return True if inner surface ! */ ! public boolean isInner() { ! return (exterior != null); } |
|
From: Michael L. <he...@us...> - 2005-12-20 13:55:05
|
Update of /cvsroot/bprocessor/model/src/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29378/src/etc Modified Files: bprocessor.xsd Log Message: Changed Surface.isInner to Surface.exterior pointing to the exterior Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bprocessor.xsd 29 Nov 2005 19:04:38 -0000 1.6 --- bprocessor.xsd 20 Dec 2005 13:54:53 -0000 1.7 *************** *** 76,80 **** <xsd:element name="backdomainref" type="xsd:long" maxOccurs="1" minOccurs="0"/> <xsd:element name="frontdomainref" type="xsd:long" maxOccurs="1" minOccurs="0"/> ! <xsd:element name="isinner" type="xsd:boolean"/> </xsd:sequence> </xsd:complexType> --- 76,80 ---- <xsd:element name="backdomainref" type="xsd:long" maxOccurs="1" minOccurs="0"/> <xsd:element name="frontdomainref" type="xsd:long" maxOccurs="1" minOccurs="0"/> ! <xsd:element name="exteriorref" type="xsd:long" maxOccurs="1" minOccurs="0"/> </xsd:sequence> </xsd:complexType> *************** *** 97,101 **** <xsd:element name="y" type="xsd:double"/> <xsd:element name="z" type="xsd:double"/> - <xsd:element name="w" type="xsd:double"/> </xsd:sequence> </xsd:complexType> --- 97,100 ---- |
|
From: Michael L. <he...@us...> - 2005-12-20 13:55:05
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29378/src/net/sourceforge/bprocessor/model/xml Modified Files: PersistenceManager.java Log Message: Changed Surface.isInner to Surface.exterior pointing to the exterior Index: PersistenceManager.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/xml/PersistenceManager.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PersistenceManager.java 19 Dec 2005 07:50:06 -0000 1.15 --- PersistenceManager.java 20 Dec 2005 13:54:53 -0000 1.16 *************** *** 179,183 **** sm.setConstructor(s.isConstructor()); ! sm.setIsInner(s.isIsinner()); Project.getInstance().intern(sm); --- 179,183 ---- sm.setConstructor(s.isConstructor()); ! //sm.setIsInner(s.isIsinner()); Project.getInstance().intern(sm); *************** *** 353,357 **** isr.add(is); } ! sm.setInnerSurfaces(isr); } Long bid = (Long)(mapper.get(new Long(s.getBackdomainref()))); --- 353,357 ---- isr.add(is); } ! sm.setHoles(isr); } Long bid = (Long)(mapper.get(new Long(s.getBackdomainref()))); *************** *** 363,366 **** --- 363,370 ---- sm.setFrontDomain((Space) Project.getInstance().findDomainById(fid)); } + Long eid = (Long)(mapper.get(new Long(s.getExteriorref()))); + if (eid != null) { + sm.setExterior(Project.getInstance().findSurfaceById(eid)); + } Project.getInstance().update(sm); } *************** *** 564,568 **** sx.setName(s.getName()); sx.setConstructor(s.getConstructor()); ! sx.setIsinner(s.getIsInner()); Map sm = (Map)mapper.get(KEY_SURFACE); sm.put(s.getId(), new Long(sx.getId())); --- 568,572 ---- sx.setName(s.getName()); sx.setConstructor(s.getConstructor()); ! //sx.setIsinner(s.getIsInner()); Map sm = (Map)mapper.get(KEY_SURFACE); sm.put(s.getId(), new Long(sx.getId())); *************** *** 731,735 **** } ! Set isData = s.getInnerSurfaces(); if (isData != null) { it = isData.iterator(); --- 735,739 ---- } ! Set isData = s.getHoles(); if (isData != null) { it = isData.iterator(); *************** *** 753,756 **** --- 757,766 ---- } + { + Map m = (Map)mapper.get(KEY_SURFACE); + if (s.getExterior() != null) { + sx.setExteriorref(((Long) m.get(s.getExterior().getId())).longValue()); + } + } } } |
|
From: Michael L. <he...@us...> - 2005-12-20 12:24:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7155/src/net/sourceforge/bprocessor/gl Modified Files: GLView.java Log Message: Fixed small issues Index: GLView.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/GLView.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** GLView.java 12 Dec 2005 14:46:22 -0000 1.29 --- GLView.java 20 Dec 2005 12:24:10 -0000 1.30 *************** *** 176,180 **** */ public void repaint() { ! glc.display(); } --- 176,180 ---- */ public void repaint() { ! repaint(false); } *************** *** 187,191 **** glc.display(); } else { ! repaint(); } } --- 187,191 ---- glc.display(); } else { ! glc.repaint(); } } |
|
From: Michael L. <he...@us...> - 2005-12-20 12:24:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7155/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Fixed small issues Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** View.java 19 Dec 2005 07:51:30 -0000 1.33 --- View.java 20 Dec 2005 12:24:09 -0000 1.34 *************** *** 92,95 **** --- 92,98 ---- /** Used for clipping planes */ public static final float[] CLIP_PLANE_COLOR = new float[] {1.0f, 0.65f, 0.0f, 0.3f}; + + /** 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 */ *************** *** 100,104 **** /** Front color for surfaces */ ! protected static float[] frontCcolor = new float[] {0.96f, 0.87f, 0.70f}; /** NONE color for surfaces */ --- 103,107 ---- /** Front color for surfaces */ ! protected static float[] frontColor = new float[] {0.96f, 0.87f, 0.70f}; /** NONE color for surfaces */ *************** *** 106,110 **** /** Back color for surfaces */ ! protected static float[] backColor = new float[] {0.94f, 0.97f, 1.00f}; /** Select mode for selecting edges */ --- 109,113 ---- /** Back color for surfaces */ ! protected static float[] backColor = new float[] {0.40f, 0.58f, 0.93f}; /** Select mode for selecting edges */ *************** *** 828,832 **** gl.glCullFace(GL.GL_BACK); ! gl.glColor3fv(frontCcolor); drawSurfaces(gld, FRONT); --- 831,835 ---- gl.glCullFace(GL.GL_BACK); ! gl.glColor3fv(frontColor); drawSurfaces(gld, FRONT); *************** *** 1023,1033 **** } if (selectMode == CLIPPLANES || selectMode == ALL) { ! Iterator it = clippingPlanes.iterator(); ! while (it.hasNext()) { ! ClippingPlane cp = (ClippingPlane)it.next(); ! gl.glDisable(GL.GL_CLIP_PLANE0 + cp.getNumber()); ! pushName(gl, cp); ! drawClipplaneFrame(cp); ! popName(gl); } } --- 1026,1044 ---- } if (selectMode == CLIPPLANES || selectMode == ALL) { ! { ! Iterator it = clippingPlanes.iterator(); ! while (it.hasNext()) { ! ClippingPlane cp = (ClippingPlane)it.next(); ! gl.glDisable(GL.GL_CLIP_PLANE0 + cp.getNumber()); ! } ! } ! { ! Iterator it = clippingPlanes.iterator(); ! while (it.hasNext()) { ! ClippingPlane cp = (ClippingPlane)it.next(); ! pushName(gl, cp); ! drawClipplaneFrame(cp); ! popName(gl); ! } } } *************** *** 1068,1072 **** Collection corners = clipplane.getCorners(); { ! gl.glColor4fv(CLIP_PLANE_COLOR); gl.glBegin(GL.GL_QUADS); gl.glNormal3d(d[0], d[1], d[2]); --- 1079,1083 ---- Collection corners = clipplane.getCorners(); { ! gl.glColor4fv(CLIP_PLANE_INTERIOR_COLOR); gl.glBegin(GL.GL_QUADS); gl.glNormal3d(d[0], d[1], d[2]); *************** *** 1327,1335 **** // TODO check if the space space has a color if (space.isConstructionSpace()) { ! // We are looking at a constructionspace ! return frontCcolor; } if (space.isFunctionalSpace()) { ! // We are looking at a constructionspace return backColor; } --- 1338,1346 ---- // TODO check if the space space has a color if (space.isConstructionSpace()) { ! // We are looking at a construction space ! return frontColor; } if (space.isFunctionalSpace()) { ! // We are looking at a functional space return backColor; } *************** *** 2020,2023 **** --- 2031,2035 ---- double aspect = width / height; + double[] eye = camera.getCamera(); double[] center = camera.getCenter(); |
|
From: Michael L. <he...@us...> - 2005-12-20 12:23:55
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6992/src/net/sourceforge/bprocessor/gui/treeview Modified Files: SpacesTreeView.java Log Message: Fixed small issues Index: SpacesTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpacesTreeView.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SpacesTreeView.java 12 Dec 2005 10:06:21 -0000 1.11 --- SpacesTreeView.java 20 Dec 2005 12:23:41 -0000 1.12 *************** *** 60,65 **** if (log.isDebugEnabled()) { log.debug(n); - } else { - log.info(n); } --- 60,63 ---- |
|
From: Michael L. <he...@us...> - 2005-12-20 12:23:51
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6992/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: Fixed small issues Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GUI.java 13 Dec 2005 11:55:17 -0000 1.16 --- GUI.java 20 Dec 2005 12:23:41 -0000 1.17 *************** *** 307,313 **** JTabbedPane tp = new JTabbedPane(JTabbedPane.TOP); tp.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT); - tp.addTab("Views", new JScrollPane (null)); tp.addTab("Spaces", new JScrollPane (new SpacesTreeView())); tp.addTab("Surfaces", new JScrollPane (new SurfacesTreeView())); tp.setPreferredSize(new Dimension(170, 340)); splitPaneTopDown.setMinimumSize(new Dimension(170, 340)); --- 307,313 ---- JTabbedPane tp = new JTabbedPane(JTabbedPane.TOP); tp.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT); tp.addTab("Spaces", new JScrollPane (new SpacesTreeView())); tp.addTab("Surfaces", new JScrollPane (new SurfacesTreeView())); + tp.addTab("Views", new JScrollPane (null)); tp.setPreferredSize(new Dimension(170, 340)); splitPaneTopDown.setMinimumSize(new Dimension(170, 340)); |
