Revision 15490
| import/ext3D/branches/ext3D_v1.1/lib3DMap/depman.xml | ||
|---|---|---|
| 4 | 4 |
<dependency> |
| 5 | 5 |
<group>org.openscenegraph</group> |
| 6 | 6 |
<artifact>openscenegraph</artifact> |
| 7 |
<version>SNAPSHOT</version>
|
|
| 7 |
<version>2.2.0</version>
|
|
| 8 | 8 |
<type>dynamic</type> |
| 9 | 9 |
<compiler>vs7</compiler> |
| 10 | 10 |
</dependency> |
| ... | ... | |
| 36 | 36 |
<dependency> |
| 37 | 37 |
<group>org.openscenegraph</group> |
| 38 | 38 |
<artifact>openscenegraph</artifact> |
| 39 |
<version>SNAPSHOT</version>
|
|
| 39 |
<version>2.2.0</version>
|
|
| 40 | 40 |
<type>dynamic</type> |
| 41 | 41 |
</dependency> |
| 42 | 42 |
<dependency> |
| ... | ... | |
| 57 | 57 |
<dependency> |
| 58 | 58 |
<group>org.openscenegraph</group> |
| 59 | 59 |
<artifact>openscenegraph</artifact> |
| 60 |
<version>SNAPSHOT</version>
|
|
| 60 |
<version>2.2.0</version>
|
|
| 61 | 61 |
<type>dynamic</type> |
| 62 | 62 |
<architecture>universal</architecture> |
| 63 | 63 |
</dependency> |
| import/ext3D/branches/ext3D_v1.1/lib3DMap/src/com/iver/ai2/gvsig3d/gui/Hud.java | ||
|---|---|---|
| 79 | 79 |
*/ |
| 80 | 80 |
private void init() {
|
| 81 | 81 |
|
| 82 |
if (getProjectionType() == PlanetType.SPHERICAL_MODE) {
|
|
| 82 |
if (getProjectionType() == PlanetType.GEOCENTRIC) {
|
|
| 83 | 83 |
// Setting up longitud and latitud string |
| 84 | 84 |
lonText = PluginServices.getText(this, "Ext3D.longitude"); |
| 85 | 85 |
latText = PluginServices.getText(this, "Ext3D.latitude"); |
| ... | ... | |
| 121 | 121 |
*/ |
| 122 | 122 |
public void updateHud() {
|
| 123 | 123 |
|
| 124 |
if (m_planet.getType() == Planet.PlanetType.SPHERICAL_MODE) {
|
|
| 124 |
if (m_planet.getType() == Planet.PlanetType.GEOCENTRIC) {
|
|
| 125 | 125 |
// Getting longitud and latitud informacion from planet |
| 126 | 126 |
lon = Hud.getSexagesinal(m_planet.getLongitude(), true); |
| 127 | 127 |
lat = Hud.getSexagesinal(m_planet.getLatitude(), false); |
| import/ext3D/branches/ext3D_v1.1/lib3DMap/src/com/iver/ai2/gvsig3d/gui/FeatureFactory.java | ||
|---|---|---|
| 595 | 595 |
String label = f.getString(); |
| 596 | 596 |
// double heigth = h; |
| 597 | 597 |
Vec3 pos = null; |
| 598 |
if (planetType == PlanetType.PLANE_MODE) {
|
|
| 598 |
if (planetType == PlanetType.PROJECTED) {
|
|
| 599 | 599 |
pos = new Vec3(f.getOrig().getX(), f.getOrig().getY(), |
| 600 | 600 |
heigth); |
| 601 | 601 |
} else {
|
| import/ext3D/branches/ext3D_v1.1/lib3DMap/src/com/iver/ai2/gvsig3d/map3d/layers/Layer3DProps.java | ||
|---|---|---|
| 194 | 194 |
// TODO: use full path of source or service, not just layer name |
| 195 | 195 |
|
| 196 | 196 |
String typeStr; |
| 197 |
if (planetType == PlanetType.SPHERICAL_MODE)
|
|
| 197 |
if (planetType == PlanetType.GEOCENTRIC)
|
|
| 198 | 198 |
typeStr = "Sph"; |
| 199 | 199 |
else |
| 200 | 200 |
typeStr = "Pla" + viewProj.getAbrev(); |
| import/ext3D/branches/ext3D_v1.1/lib3DMap/src/com/iver/ai2/gvsig3d/map3d/GraphicLayer3D.java | ||
|---|---|---|
| 60 | 60 |
|
| 61 | 61 |
// search for Gazetteer |
| 62 | 62 |
// There are two gazetteer modes SPHERICAL and PLANE mode |
| 63 |
if (planet.getType() == Planet.PlanetType.SPHERICAL_MODE) {
|
|
| 63 |
if (planet.getType() == Planet.PlanetType.GEOCENTRIC) {
|
|
| 64 | 64 |
// For spheriacl mode |
| 65 | 65 |
|
| 66 | 66 |
// Geodesical coordinates |
| ... | ... | |
| 74 | 74 |
|
| 75 | 75 |
posText = planet.convertLatLongHeightToXYZ(posT); |
| 76 | 76 |
|
| 77 |
} else if (planet.getType() == Planet.PlanetType.PLANE_MODE) {
|
|
| 77 |
} else if (planet.getType() == Planet.PlanetType.PROJECTED) {
|
|
| 78 | 78 |
|
| 79 | 79 |
// For plane mode |
| 80 | 80 |
posIni = new Vec3(p.getX(), p.getY(), 0); |
| import/ext3D/branches/ext3D_v1.1/lib3DMap/src/com/iver/ai2/gvsig3d/map3d/MapContext3D.java | ||
|---|---|---|
| 554 | 554 |
e.printStackTrace(); |
| 555 | 555 |
} |
| 556 | 556 |
if (layerExtent == null) { // hack for missing extents
|
| 557 |
if (m_planet.getType() == PlanetType.SPHERICAL_MODE)
|
|
| 557 |
if (m_planet.getType() == PlanetType.GEOCENTRIC)
|
|
| 558 | 558 |
layerExtent = new Rectangle2D.Double(-180.0, -90.0, 360.0, |
| 559 | 559 |
180.0); |
| 560 | 560 |
else |
| ... | ... | |
| 744 | 744 |
Vec3 center = new Vec3(); |
| 745 | 745 |
Vec3 up = new Vec3(); |
| 746 | 746 |
// Calculate positions for PLAIN MODE. |
| 747 |
if (planetType == PlanetType.PLANE_MODE) {
|
|
| 747 |
if (planetType == PlanetType.PROJECTED) {
|
|
| 748 | 748 |
|
| 749 | 749 |
double difx = (geoExtent.getMaxX() - geoExtent.getX()) / 1.2d; |
| 750 | 750 |
double dify = (geoExtent.getMaxY() - geoExtent.getY()) / 1.2d; |
| ... | ... | |
| 767 | 767 |
up.setZ(0.0); |
| 768 | 768 |
} else |
| 769 | 769 |
// Calculate positions for SPHERICAL MODE. |
| 770 |
if (planetType == PlanetType.SPHERICAL_MODE) {
|
|
| 770 |
if (planetType == PlanetType.PROJECTED) {
|
|
| 771 | 771 |
// EYE |
| 772 | 772 |
Vec3 aux = new Vec3(cenLat, cenLon, elevation); |
| 773 | 773 |
eye = m_planet.convertLatLongHeightToXYZ(aux); |
| import/ext3D/branches/ext3D_v1.1/lib3DMap/src/com/iver/ai2/gvsig3d/cacheservices/FLayerCacheService.java | ||
|---|---|---|
| 67 | 67 |
_loadFailed = true; |
| 68 | 68 |
|
| 69 | 69 |
int cacheType = CacheService.GLOBAL; |
| 70 |
if (planet.getType()==PlanetType.SPHERICAL_MODE)
|
|
| 70 |
if (planet.getType()==PlanetType.GEOCENTRIC)
|
|
| 71 | 71 |
cacheType += SPHERIC; |
| 72 | 72 |
else |
| 73 | 73 |
cacheType += PLANE; |
| import/ext3D/branches/ext3D_v1.1/lib3DMap/src/com/iver/ai2/gvsig3d/cacheservices/VectorCacheService.java | ||
|---|---|---|
| 110 | 110 |
_planetViewer.addSpecialNode(_layerNode); |
| 111 | 111 |
|
| 112 | 112 |
int cacheType = CacheService.GLOBAL; |
| 113 |
if (planet.getType() == PlanetType.SPHERICAL_MODE)
|
|
| 113 |
if (planet.getType() == PlanetType.GEOCENTRIC)
|
|
| 114 | 114 |
cacheType += SPHERIC; |
| 115 | 115 |
else |
| 116 | 116 |
cacheType += PLANE; |
| ... | ... | |
| 341 | 341 |
h = heigth; |
| 342 | 342 |
} |
| 343 | 343 |
|
| 344 |
if (this._planet.getType() == PlanetType.SPHERICAL_MODE) {
|
|
| 344 |
if (this._planet.getType() == PlanetType.GEOCENTRIC) {
|
|
| 345 | 345 |
// Transform to geodesical coordinates |
| 346 | 346 |
// posGeo = new Vec3(dataLine[1], dataLine[0], heigth); |
| 347 | 347 |
// posReal = new Vec3(dataLine[0], dataLine[1], dataLine[2]); |
| import/ext3D/branches/ext3D_v1.1/lib3DMap/depman-atifglrx.xml | ||
|---|---|---|
| 4 | 4 |
<dependency> |
| 5 | 5 |
<group>org.openscenegraph</group> |
| 6 | 6 |
<artifact>openscenegraph</artifact> |
| 7 |
<version>SNAPSHOT</version>
|
|
| 7 |
<version>2.2.0</version>
|
|
| 8 | 8 |
<type>dynamic</type> |
| 9 | 9 |
<compiler>vs7</compiler> |
| 10 | 10 |
</dependency> |
| ... | ... | |
| 36 | 36 |
<dependency> |
| 37 | 37 |
<group>org.openscenegraph</group> |
| 38 | 38 |
<artifact>openscenegraph</artifact> |
| 39 |
<version>SNAPSHOT</version>
|
|
| 39 |
<version>2.2.0</version>
|
|
| 40 | 40 |
<type>dynamic</type> |
| 41 | 41 |
</dependency> |
| 42 | 42 |
<dependency> |
| ... | ... | |
| 57 | 57 |
<dependency> |
| 58 | 58 |
<group>org.openscenegraph</group> |
| 59 | 59 |
<artifact>openscenegraph</artifact> |
| 60 |
<version>SNAPSHOT</version>
|
|
| 60 |
<version>2.2.0</version>
|
|
| 61 | 61 |
<type>dynamic</type> |
| 62 | 62 |
<architecture>universal</architecture> |
| 63 | 63 |
<compiler>gcc3</compiler> |
Also available in: Unified diff