[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.12, 1
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.12, 1.13 ModelBathModellor.java, 1.2, 1.3
|
From: rimestad <rim...@us...> - 2007-05-07 13:40:21
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14531/src/net/sourceforge/bprocessor/model/modellor Modified Files: TileModellor.java ModelBathModellor.java Log Message: small changes to tile and bath modellor Index: TileModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TileModellor.java 4 May 2007 11:52:58 -0000 1.12 --- TileModellor.java 7 May 2007 13:40:18 -0000 1.13 *************** *** 108,112 **** log.info("Modellor update on " + entity); space.clear(); - updateNet(startPoint); space.add(net); int sign = 1; --- 108,111 ---- *************** *** 177,181 **** } surface.copyall(net); ! Collection<Edge> edges = new ArrayList<Edge>(net.getEdges()); Collection<Edge> horEdges = new LinkedList<Edge>(); Collection<Edge> vertEdges = new LinkedList<Edge>(); --- 176,183 ---- } surface.copyall(net); ! Collection<Edge> edges = new ArrayList<Edge>(surface.getEdges()); ! for (Surface s : surface.getHoles()) { ! edges.addAll(s.getEdges()); ! } Collection<Edge> horEdges = new LinkedList<Edge>(); Collection<Edge> vertEdges = new LinkedList<Edge>(); *************** *** 183,186 **** --- 185,190 ---- Collection<Vertex> otherVerts = new LinkedList<Vertex>(); + long before = System.currentTimeMillis(); + // insert horizontal edges if (height > 0) { *************** *** 189,193 **** Vertex localHori = new Vertex(0, tileSize.getHeight() / 1000.0 + jointSize / 1000.0, 0); Vertex horizontalAdd = cs.unTranslate(localHori).minus(cs.center()); ! Edge slider = new Edge(cs.center().copy().minus(horizontalAdd), cs.unTranslate(new Vertex(maxX, 0, 0)).minus(horizontalAdd)); findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, --- 193,197 ---- Vertex localHori = new Vertex(0, tileSize.getHeight() / 1000.0 + jointSize / 1000.0, 0); Vertex horizontalAdd = cs.unTranslate(localHori).minus(cs.center()); ! Edge slider = new Edge(cs.unTranslate(new Vertex(minX, 0, 0)).minus(horizontalAdd), cs.unTranslate(new Vertex(maxX, 0, 0)).minus(horizontalAdd)); findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, *************** *** 196,205 **** Vertex localVertical = new Vertex(tileSize.getWidth() / 1000.0 + jointSize / 1000.0, 0, 0); Vertex verticalAdd = cs.unTranslate(localVertical).minus(cs.center()); ! slider = new Edge(cs.center().copy().minus(verticalAdd), cs.unTranslate(new Vertex(0, maxY, 0)).minus(verticalAdd)); findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, edges, vertEdges, otherVerts, verticalAdd); ! ! Collection<Vertex> extras = new LinkedList<Vertex>(); for (Edge e1 : vertEdges) { for (Edge e2 : horEdges) { --- 200,210 ---- Vertex localVertical = new Vertex(tileSize.getWidth() / 1000.0 + jointSize / 1000.0, 0, 0); Vertex verticalAdd = cs.unTranslate(localVertical).minus(cs.center()); ! slider = new Edge(cs.unTranslate(new Vertex(0, minY, 0)).minus(verticalAdd), cs.unTranslate(new Vertex(0, maxY, 0)).minus(verticalAdd)); findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, edges, vertEdges, otherVerts, verticalAdd); ! ! //insert edges and vertices into the model ! List<Vertex> extras = new LinkedList<Vertex>(); for (Edge e1 : vertEdges) { for (Edge e2 : horEdges) { *************** *** 227,236 **** v = net.insert(v); } SurfaceAnalysis sa = new SurfaceAnalysis(); ! Collection<CoordinateSystem> cons = sa.planeAnalysis(net); ! for (CoordinateSystem coors : cons) { ! net.add(coors); ! } ! sa.surfaceAnalysis(net); } --- 232,241 ---- v = net.insert(v); } + long time1 = System.currentTimeMillis(); + log.info("Edge insertsion time : " + (time1 - before)); SurfaceAnalysis sa = new SurfaceAnalysis(); ! sa.surfaceAnalysis(net, startPoint, net.getEdges()); ! long time2 = System.currentTimeMillis(); ! log.info("Surface analysis time : " + (time2 - time1)); } *************** *** 351,368 **** } a = attributes.get("Surface"); ! if (a != null && a.getValue() != null) { ! Surface chosen = null; ! for (Surface cur : space.getEnvelope()) { ! if (cur.getName().equalsIgnoreCase((String)a.getValue())) { ! chosen = cur; } - } - if (chosen != null) { - surface = chosen; - space.getOwner().remove(startPoint); - startPoint = surface.coordinateSystem(); - space.getOwner().add(startPoint); - startPoint.relate(surface); - updateNet = true; } } --- 356,376 ---- } a = attributes.get("Surface"); ! if (a != null) { ! if (a.getValue() instanceof String) { ! String txt = (String)a.getValue(); ! Surface chosen = null; ! for (Surface cur : space.getEnvelope()) { ! if (cur.getName().equalsIgnoreCase(txt)) { ! chosen = cur; ! } ! } ! if (chosen != null && chosen != surface) { ! surface = chosen; ! space.getOwner().remove(startPoint); ! startPoint = surface.coordinateSystem(); ! space.getOwner().insert(startPoint); ! startPoint.relate(surface); ! updateNet = true; } } } *************** *** 379,382 **** --- 387,391 ---- } update(this); + Project.getInstance().changed(this); } Index: ModelBathModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ModelBathModellor.java 16 Apr 2007 15:54:42 -0000 1.2 --- ModelBathModellor.java 7 May 2007 13:40:18 -0000 1.3 *************** *** 69,76 **** Collection<Surface> horizontal = new HashSet<Surface>(); Collection<Surface> surs = s.getEnvelope(); - if (surs.size() != 6) { - log.info("Have to be a square box with 6 sides 4 vertical and 2 horizontal"); - return; - } Vertex up = new Vertex(0, 0, 1); for (Surface sur : surs) { --- 69,72 ---- *************** *** 114,119 **** */ private void generate() { Surface making = makeFloor(); ! Space wallSystem = new Space("Vægsystem", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true); space.add(wallSystem); making.setBackDomain(wallSystem); --- 110,116 ---- */ private void generate() { + space.setUnion(true); Surface making = makeFloor(); ! Space wallSystem = new Space("Vægsystem", Space.CONSTRUCTION, Space.SPACE_LEVEL, true); space.add(wallSystem); making.setBackDomain(wallSystem); *************** *** 131,135 **** Geometry.holeAnalysis(room); ! Space badkabine = new Space("Badekabine", Space.FUNCTIONAL, Space.ELEMENT_LEVEL, true); space.add(badkabine); room.setBackDomain(badkabine); --- 128,132 ---- Geometry.holeAnalysis(room); ! Space badkabine = new Space("Bathcabin", Space.FUNCTIONAL, Space.SPACE_LEVEL, true); space.add(badkabine); room.setBackDomain(badkabine); *************** *** 142,146 **** space.addAll(sides); space.addAll(tops); ! Space ceiling = new Space("Ceiling", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true); space.add(ceiling); for (Surface s : tops) { --- 139,143 ---- space.addAll(sides); space.addAll(tops); ! Space ceiling = new Space("Ceiling", Space.CONSTRUCTION, Space.SPACE_LEVEL, true); space.add(ceiling); for (Surface s : tops) { *************** *** 150,153 **** --- 147,153 ---- sides.add(top.extrusion(ceilingThickness / 1000, sides)); space.addAll(sides); + + //find surfacesed parting wall and bath cabin + } } |
