Changeset 207

Timestamp:

12/31/09 06:32:55 (7 months ago)

Author:

jerome

Message:

Building area visibility

Location:

pTolemy3DViewer/branches/refactor-0.1.1/src/org/ptolemy3d

Files:

• plugin/CityGmlBuildingArea.java (modified) (2 diffs)
• plugin/CityGmlPlugin.java (modified) (1 diff)
• view/Camera.java (modified) (1 diff)

pTolemy3DViewer/branches/refactor-0.1.1/src/org/ptolemy3d/plugin/CityGmlBuildingArea.java

@@ -11 +11 @@
 import org.ptolemy3d.math.Math3D;
 import org.ptolemy3d.math.Vector3d;
+import org.ptolemy3d.scene.Landscape;
 import org.ptolemy3d.view.Camera;
 
@@ -74 +75 @@
         }
         
+        public boolean isVisible(Camera camera) {
+                if((lod1Triangles == null) && (lod2Triangles == null)) {
+                        return true; //Always visible if not initialized
+                }
+                return camera.isTileInView(
+                                getMinLon(), getMaxLon(),
+                                getMinLat(), getMaxLat(),
+                                getMaxAlt(), getMaxAlt(), getMaxAlt(), getMaxAlt());
+        }
+        
+        public double getMinLat() { return minLat; }
+        public double getMaxLat() { return maxLat; }
+
+        public double getMinLon() { return minLon; }
+        public double getMaxLon() { return maxLon; }
+
+        public double getMinAlt() { return minAlt; }
+        public double getMaxAlt() { return maxAlt; }
+
         /**
          * Convert all building surfaces into vertex that can be rendered by the

pTolemy3DViewer/branches/refactor-0.1.1/src/org/ptolemy3d/plugin/CityGmlPlugin.java

@@ -201 +201 @@
                 // altitude parameter.
                 for (CityGmlBuildingArea buildingArea : buildingAreas) {
+                        if (!buildingArea.isVisible(camera)) {
+                                continue;
+                        }
+                        
+                        double camAltitude = camera.getPosition().getAltitudeDD();
+                        
+                        // Decide if show LOD1 or LOD2 depending on the altitude
                         TriangleList cityTriangles = null;
-                        // Decide if show LOD1 or LOD2 depending on the altitude
-                        double camAltitude = camera.getPosition().getAltitudeDD();
                         if (camAltitude < altitude) {
                                 cityTriangles = buildingArea.getLod1Geometry();

pTolemy3DViewer/branches/refactor-0.1.1/src/org/ptolemy3d/view/Camera.java

@@ -516 +516 @@
         }
 
+        public boolean isTileInView(double leftLon, double rightLon, double upLat, double botLat,
+                        double upLeftHeight, double botLeftHeight, double botRightHeight, double upRightHeight) {
+                /*
+                 * FIXME At north pose for close view, the visibility goes wrong
+                 */
+                
+                // Tile corners
+                Math3D.setSphericalCoord(leftLon, upLat, Unit.EARTH_RADIUS + upLeftHeight, _point1_);
+                Math3D.setSphericalCoord(leftLon, botLat, Unit.EARTH_RADIUS + botLeftHeight, _point2_);
+                Math3D.setSphericalCoord(rightLon, botLat, Unit.EARTH_RADIUS + botRightHeight, _point3_);
+                Math3D.setSphericalCoord(rightLon, upLat, Unit.EARTH_RADIUS + upRightHeight, _point4_);
+
+                if (isCartesianPointInVisibleSide(_point1_) || isCartesianPointInVisibleSide(_point2_)
+                 || isCartesianPointInVisibleSide(_point3_) || isCartesianPointInVisibleSide(_point4_)) {
+                        return frustum.insideFrustum(_point1_, _point2_, _point3_, _point4_);
+                } else {
+                        return false;
+                }
+        }
+        
         public boolean realPointInView(double lon, double alt, double lat, int MAXANGLE) {
                 final Vector3d coord = new Vector3d();