Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28147/src/net/sourceforge/bprocessor/facade/modellor
Modified Files:
FacadeModellor.java
Log Message:
connects surfaces to constructors. This means the posts will be moved when the constructors are moved.
Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FacadeModellor.java 8 Sep 2006 06:42:32 -0000 1.11
--- FacadeModellor.java 8 Sep 2006 13:32:57 -0000 1.12
***************
*** 394,398 ****
lengthV += (vertPostWidth / 2);
offset.scale(lengthV / offset.length());
! Line l = new Line(cross.add(offset), vertDir.copy(), horEdge, true, true);
lengthV += (intervalV + (vertPostWidth / 2));
vertCons.add(l);
--- 394,398 ----
lengthV += (vertPostWidth / 2);
offset.scale(lengthV / offset.length());
! Constructor l = new Line(cross.add(offset), vertDir.copy(), horEdge, true, true);
lengthV += (intervalV + (vertPostWidth / 2));
vertCons.add(l);
***************
*** 406,410 ****
lengthH += (horPostWidth / 2);
offset.scale(lengthH / offset.length());
! Line l = new Line(cross.add(offset), horDir.copy(), vertEdge, true, true);
lengthH += (intervalH + (horPostWidth / 2));
horCons.add(l);
--- 406,410 ----
lengthH += (horPostWidth / 2);
offset.scale(lengthH / offset.length());
! Constructor l = new Line(cross.add(offset), horDir.copy(), vertEdge, true, true);
lengthH += (intervalH + (horPostWidth / 2));
horCons.add(l);
***************
*** 447,450 ****
--- 447,452 ----
horizontalRun(oldV, currentV);
oldV = new Line(vL.getOrigin().add(horDir), vL.getDirection());
+ vL.connect(currentV);
+ vL.connect(oldV);
}
horizontalRun(oldV, rightBound);
***************
*** 468,471 ****
--- 470,475 ----
createHole(oldV, currentV, oldH, currentH);
oldH = new Line(hL.getOrigin().add(vertDir), hL.getDirection());
+ hL.connect(currentH);
+ hL.connect(oldH);
}
createHole(oldV, currentV, oldH, bottomBound);
***************
*** 531,578 ****
wf.setModellor(wm);
windowModellors.add(wm);
- /*
- Vertex sn = s.normal();
- Vertex fn = front.normal();
- Space wf = new Space("Windowframe", Space.CONSTRUCTION, true);
- space.add(wf);
- windowElements.add(wf);
- if (sn.dot(fn) > 0) {
- if (front.getFrontDomain() == space) {
- s.setFrontDomain(wf);
- } else {
- s.setBackDomain(wf);
- }
- } else {
- if (front.getBackDomain() == space) {
- s.setFrontDomain(wf);
- } else {
- s.setBackDomain(wf);
- }
- }
- //TODO Change magic number -0.1
- List l = e1.offset(edges, s, -0.1);
- Iterator it = l.iterator();
- while (it.hasNext()) {
- Edge e = (Edge)it.next();
- space.add(e);
- }
- Surface offset = new Surface(l);
- space.add(offset);
- windows.add(offset);
- Geometry.holeAnalysis(offset);
- Set sidesOff = new HashSet();
- Surface exOff = extrudeIntoSpace(offset, depth, sidesOff);
-
- windows.add(exOff);
- space.add(exOff);
- Iterator sidesIt = sidesOff.iterator();
- while (sidesIt.hasNext()) {
- Surface surf = (Surface)sidesIt.next();
- windows.add(surf);
- space.add(surf);
- }
-
- Geometry.holeAnalysis(exOff);
- */
}
Set sides = new HashSet();
--- 535,538 ----
***************
*** 582,590 ****
Iterator it = sides.iterator();
while (it.hasNext()) {
! space.add((Surface)it.next());
}
Geometry.holeAnalysis(t);
}
/**
* Removes the windows of the facade.
--- 542,562 ----
Iterator it = sides.iterator();
while (it.hasNext()) {
! Surface side = (Surface)it.next();
! if (side.contains(e1)) {
! top.connect(side);
! } else if (side.contains(e2)) {
! right.connect(side);
! } else if (side.contains(e3)) {
! bottom.connect(side);
! } else if (side.contains(e4)) {
! left.connect(side);
! }
! space.add(side);
}
Geometry.holeAnalysis(t);
}
+
+
/**
* Removes the windows of the facade.
|
