Revision 22416
trunk/libraries/lib3DMap/src/org/gvsig/gvsig3d/map3d/MapContext3D.java | ||
---|---|---|
254 | 254 |
ArrayList textureLayers = new ArrayList(); |
255 | 255 |
ArrayList elevationLayers = new ArrayList(); |
256 | 256 |
ArrayList vectorLayers = new ArrayList(); |
257 |
ArrayList OSGLayers = new ArrayList(); |
|
257 | 258 |
m_layerLists.add(textureLayers); |
258 | 259 |
m_layerLists.add(elevationLayers); |
259 | 260 |
m_layerLists.add(vectorLayers); |
261 |
m_layerLists.add(OSGLayers); |
|
260 | 262 |
|
261 | 263 |
// extentAux = new Rectangle2D.Double(-180.0, 90.0, 180.0, -90.0); |
262 | 264 |
} |
263 | 265 |
|
264 | 266 |
public MapContext3D(FLayers fLayers, ViewPort vp) { |
265 | 267 |
super(fLayers, vp); |
266 |
|
|
267 | 268 |
ArrayList textureLayers = new ArrayList(); |
268 | 269 |
ArrayList elevationLayers = new ArrayList(); |
269 | 270 |
ArrayList vectorLayers = new ArrayList(); |
271 |
ArrayList OSGLayers = new ArrayList(); |
|
270 | 272 |
m_layerLists.add(textureLayers); |
271 | 273 |
m_layerLists.add(elevationLayers); |
272 | 274 |
m_layerLists.add(vectorLayers); |
275 |
m_layerLists.add(OSGLayers); |
|
273 | 276 |
|
274 | 277 |
// extentAux = new Rectangle2D.Double(-180.0, 90.0, 180.0, -90.0); |
275 | 278 |
} |
... | ... | |
772 | 775 |
} |
773 | 776 |
|
774 | 777 |
private void refreshLayerOrder() { |
775 |
int typeOrder[] = new int[3];
|
|
778 |
int typeOrder[] = new int[4];
|
|
776 | 779 |
typeOrder[Layer3DProps.layer3DImage] = 0; |
777 | 780 |
typeOrder[Layer3DProps.layer3DElevation] = 0; |
778 | 781 |
typeOrder[Layer3DProps.layer3DVector] = 0; |
782 |
typeOrder[Layer3DProps.layer3DOSG] = 0; |
|
779 | 783 |
|
780 | 784 |
SingleLayerIterator lyrIterator = new SingleLayerIterator(layers); |
781 | 785 |
while (lyrIterator.hasNext()) { |
... | ... | |
792 | 796 |
private int addLayerByType(FLayer layer) { |
793 | 797 |
int resultOrder = -1; |
794 | 798 |
|
795 |
int typeOrder[] = new int[3];
|
|
799 |
int typeOrder[] = new int[4];
|
|
796 | 800 |
typeOrder[Layer3DProps.layer3DImage] = 0; |
797 | 801 |
typeOrder[Layer3DProps.layer3DElevation] = 0; |
798 | 802 |
typeOrder[Layer3DProps.layer3DVector] = 0; |
803 |
typeOrder[Layer3DProps.layer3DOSG] = 0; |
|
799 | 804 |
|
800 | 805 |
SingleLayerIterator lyrIterator = new SingleLayerIterator(layers); |
801 | 806 |
while (lyrIterator.hasNext()) { |
... | ... | |
1059 | 1064 |
|
1060 | 1065 |
private void PrintDebugLayers() { |
1061 | 1066 |
System.out.println("==========================="); |
1062 |
for (int iList = 0; iList < 3; iList++) {
|
|
1067 |
for (int iList = 0; iList < 4; iList++) {
|
|
1063 | 1068 |
ArrayList layerList = (ArrayList) m_layerLists.get(iList); |
1064 | 1069 |
System.out.println("===== List " + iList + "====="); |
1065 | 1070 |
for (int iLayer = 0; iLayer < layerList.size(); iLayer++) { |
Also available in: Unified diff