Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9416/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java
Log Message:
Remove the Mesh Ð has been replaced by Space.
The world is a Space with type = Functional and name "Void"
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** View.java 13 Mar 2006 12:06:51 -0000 1.72
--- View.java 25 Mar 2006 18:10:04 -0000 1.73
***************
*** 15,19 ****
import net.sourceforge.bprocessor.model.CoordinateSystem;
- import net.sourceforge.bprocessor.model.Mesh;
import net.sourceforge.bprocessor.model.Plane;
import net.sourceforge.bprocessor.model.Camera;
--- 15,18 ----
***************
*** 894,902 ****
}
drawConstructionEdges(gld, edges);
! Mesh interior = active.getInterior();
! if (interior != null) {
! drawGeneralEdges(gld, interior.getEdges());
!
! }
} else {
Collection edges = Project.getInstance().getEdges();
--- 893,897 ----
}
drawConstructionEdges(gld, edges);
! drawGeneralEdges(gld, active.getEdges());
} else {
Collection edges = Project.getInstance().getEdges();
***************
*** 948,955 ****
*/
public void drawSpaceSurfaces(GLDrawable gld, Space space, int side) {
! Mesh interior = space.getInterior();
! if (interior != null) {
! drawSurfaces(gld, interior.getSurfaces(), side);
! }
}
--- 943,947 ----
*/
public void drawSpaceSurfaces(GLDrawable gld, Space space, int side) {
! drawSurfaces(gld, space.getSurfaces(), side);
}
***************
*** 964,971 ****
while (iter.hasNext()) {
Space current = (Space) iter.next();
! Mesh interior = current.getInterior();
! if (interior != null) {
! drawSurfaces(gld, interior.getSurfaces(), side);
! }
}
}
--- 956,960 ----
while (iter.hasNext()) {
Space current = (Space) iter.next();
! drawSurfaces(gld, current.getSurfaces(), side);
}
}
***************
*** 1373,1383 ****
}
}
! if (space.getInterior() != null) {
! Collection surfs = space.getInterior().getSurfaces();
! Iterator surfsIt = surfs.iterator();
! while (surfsIt.hasNext()) {
! Surface current = (Surface) surfsIt.next();
! es.addAll(current.getEdges());
! }
}
Iterator it = es.iterator();
--- 1362,1370 ----
}
}
! Collection surfs = space.getSurfaces();
! Iterator surfsIt = surfs.iterator();
! while (surfsIt.hasNext()) {
! Surface current = (Surface) surfsIt.next();
! es.addAll(current.getEdges());
}
Iterator it = es.iterator();
***************
*** 1415,1422 ****
if (space != null) {
Set ss = new HashSet();
! if (space.getInterior() != null) {
! Collection surfs = space.getInterior().getSurfaces();
! ss.addAll(surfs);
! }
Iterator it = ss.iterator();
while (it.hasNext()) {
--- 1402,1407 ----
if (space != null) {
Set ss = new HashSet();
! Collection surfs = space.getSurfaces();
! ss.addAll(surfs);
Iterator it = ss.iterator();
while (it.hasNext()) {
***************
*** 1618,1622 ****
return false;
}
! if (front.getInterior() != null || back.getInterior() != null) {
return false;
}
--- 1603,1607 ----
return false;
}
! if (!front.getSurfaces().isEmpty() || !back.getSurfaces().isEmpty()) {
return false;
}
***************
*** 1673,1695 ****
}
- /**
- * Draw the spaces by running the modellor
- * @param gld The GLDrawable
- */
- private void drawSpaces(GLDrawable gld) {
- Collection spaces = Project.getInstance().getSpaces();
-
- Iterator spaceIter = spaces.iterator();
- while (spaceIter.hasNext()) {
- Space space = (Space) spaceIter.next();
- Mesh interior = space.getInterior();
- if (interior != null) {
- gl.glColor3fv(CONSTRUCTOR_COLOR);
- drawSurfaces(gld, interior.getSurfaces(), BOTH);
- drawEdges(gld, interior.getEdges());
- }
- }
- }
-
/**
* Getter for activeEdge
--- 1658,1661 ----
|
