Revision 553

View differences:

2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86_64/buildNumber.properties
1
#Mon May 25 09:05:28 CEST 2015
2
buildNumber=3
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86_64/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.parent.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
		<fileSet>
36
			<directory>target/org.gvsig.view3d.app.common</directory>
37
			<outputDirectory>.</outputDirectory>
38
			<excludes>
39
				<exclude>package.info</exclude>
40
			</excludes>
41
		</fileSet>
42
	</fileSets>
43

  
44

  
45

  
46

  
47
	<dependencySets>
48
		<dependencySet>
49
			<useProjectArtifact>false</useProjectArtifact>
50
			<useTransitiveDependencies>false</useTransitiveDependencies>
51
			<outputDirectory>lib</outputDirectory>
52
			<includes>
53
				<include>org.gvsig:org.gvsig.view3d.app.common</include>
54
				<include>org.jogamp.jogl:jogl-all</include>
55
				<include>org.jogamp.gluegen:gluegen-rt</include>
56
			</includes>
57
		</dependencySet>
58
	</dependencySets>
59

  
60
</assembly>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86_64/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2
	<modelVersion>4.0.0</modelVersion>
3
	<parent>
4
		<groupId>org.gvsig</groupId>
5
		<artifactId>org.gvsig.view3d.app</artifactId>
6
		<version>1.0.0</version>
7
	</parent>
8
	<artifactId>org.gvsig.view3d.app.lin.x86_64</artifactId>
9
	<name>org.gvsig.view3d.app.lin.x86_64</name>
10

  
11
	<dependencyManagement>
12
		<dependencies>
13
			<dependency>
14
				<groupId>org.jogamp.jogl</groupId>
15
				<artifactId>jogl-all</artifactId>
16
				<version>2.2.1</version>
17
				<classifier>natives-linux-amd64</classifier>
18
				<scope>runtime</scope>
19
			</dependency>
20
			<dependency>
21
				<groupId>org.jogamp.gluegen</groupId>
22
				<artifactId>gluegen-rt</artifactId>
23
				<version>2.2.1</version>
24
				<classifier>natives-linux-amd64</classifier>
25
				<scope>runtime</scope>
26
			</dependency>
27
		</dependencies>
28
	</dependencyManagement>
29

  
30
	<dependencies>
31
		<dependency>
32
			<groupId>org.gvsig</groupId>
33
			<artifactId>org.gvsig.view3d.app.common</artifactId>
34
		</dependency>
35
		<dependency>
36
			<groupId>org.jogamp.jogl</groupId>
37
			<artifactId>jogl-all</artifactId>
38
			<classifier>natives-linux-amd64</classifier>
39
		</dependency>
40
		<dependency>
41
			<groupId>org.jogamp.gluegen</groupId>
42
			<artifactId>gluegen-rt</artifactId>
43
			<classifier>natives-linux-amd64</classifier>
44
		</dependency>
45
	</dependencies>
46

  
47
	<build>
48
		<plugins>
49
			<plugin>
50
				<groupId>org.apache.maven.plugins</groupId>
51
				<artifactId>maven-dependency-plugin</artifactId>
52
				<executions>
53
					<execution>
54
						<id>unpack</id>
55
						<phase>process-sources</phase>
56
						<goals>
57
							<goal>unpack</goal>
58
						</goals>
59
						<configuration>
60
							<artifactItems>
61
								<artifactItem>
62
									<groupId>org.gvsig</groupId>
63
									<artifactId>org.gvsig.view3d.app.common</artifactId>
64
									<type>zip</type>
65
									<overWrite>true</overWrite>
66
									<outputDirectory>target</outputDirectory>
67
								</artifactItem>
68
							</artifactItems>
69
						</configuration>
70
					</execution>
71
				</executions>
72
			</plugin>
73
		</plugins>
74
	</build>
75

  
76
	<!-- The profiles only configure the automatic deploy of gvSIG plugin in 
77
		the gvSIG configured in HOME/.gvsig-devel.properties -->
78
	<profiles>
79

  
80
		<profile>
81
			<id>gvsig-plugin-install-view3d-linux-x86_64</id>
82
			<activation>
83
				<os>
84
					<family>unix</family>
85
					<name>linux</name>
86
					<arch>x86_64</arch>
87
				</os>
88
			</activation>
89
			<properties>
90
				<gvsig.install.plugin>true</gvsig.install.plugin>
91
			</properties>
92
		</profile>
93

  
94
		<profile>
95
			<id>gvsig-plugin-install-view3d-linux-amd64</id>
96
			<activation>
97
				<os>
98
					<family>unix</family>
99
					<name>linux</name>
100
					<arch>amd64</arch>
101
				</os>
102
			</activation>
103
			<properties>
104
				<gvsig.install.plugin>true</gvsig.install.plugin>
105
			</properties>
106
		</profile>
107

  
108
	</profiles>
109
</project>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/src/main/resources-plugin/install/install.xml
1
<project name="org.gvsig.view3d.app" default="main" basedir=".">
2
  <target name="main" depends="copy_files"/>
3

  
4
  <target name="copy_files">
5
    <copy todir="${gvsig_dir}">
6
      <fileset dir="./files" includes="*.dll"/>
7
    </copy>
8
  </target>
9

  
10
</project>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.parent.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
		<fileSet>
36
			<directory>target/org.gvsig.view3d.app.common</directory>
37
			<outputDirectory>.</outputDirectory>
38
			<excludes>
39
				<exclude>package.info</exclude>
40
			</excludes>
41
		</fileSet>
42
    <fileSet>
43
      <directory>target/native/gluegen</directory>
44
      <outputDirectory>./install/files</outputDirectory>
45
    </fileSet>
46
    <fileSet>
47
      <directory>target/native/jogl</directory>
48
      <outputDirectory>./install/files</outputDirectory>
49
    </fileSet>
50
	</fileSets>
51

  
52

  
53
	<dependencySets>
54
		<dependencySet>
55
			<useProjectArtifact>false</useProjectArtifact>
56
			<useTransitiveDependencies>false</useTransitiveDependencies>
57
			<outputDirectory>lib</outputDirectory>
58
			<includes>
59
				<include>org.gvsig:org.gvsig.view3d.app.common</include>
60
				<include>org.jogamp.jogl:jogl-all</include>
61
				<include>org.jogamp.gluegen:gluegen-rt</include>
62
			</includes>
63
		</dependencySet>
64
	</dependencySets>
65

  
66
</assembly>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2
	<modelVersion>4.0.0</modelVersion>
3
	<parent>
4
		<groupId>org.gvsig</groupId>
5
		<artifactId>org.gvsig.view3d.app</artifactId>
6
		<version>1.0.0</version>
7
	</parent>
8
	<artifactId>org.gvsig.view3d.app.win.x86</artifactId>
9
	<name>org.gvsig.view3d.app.win.x86</name>
10
  
11
	<dependencyManagement>
12
		<dependencies>
13
			<dependency>
14
				<groupId>org.jogamp.jogl</groupId>
15
				<artifactId>jogl-all</artifactId>
16
				<version>2.2.1</version>
17
				<classifier>natives-windows-i586</classifier>
18
				<scope>runtime</scope>
19
			</dependency>
20
			<dependency>
21
				<groupId>org.jogamp.gluegen</groupId>
22
				<artifactId>gluegen-rt</artifactId>
23
				<version>2.2.1</version>
24
				<classifier>natives-windows-i586</classifier>
25
				<scope>runtime</scope>
26
			</dependency>
27
		</dependencies>
28
	</dependencyManagement>
29

  
30
	<dependencies>
31
		<dependency>
32
			<groupId>org.gvsig</groupId>
33
			<artifactId>org.gvsig.view3d.app.common</artifactId>
34
		</dependency>
35
		<dependency>
36
			<groupId>org.jogamp.jogl</groupId>
37
			<artifactId>jogl-all</artifactId>
38
			<classifier>natives-windows-i586</classifier>
39
		</dependency>
40
		<dependency>
41
			<groupId>org.jogamp.gluegen</groupId>
42
			<artifactId>gluegen-rt</artifactId>
43
			<classifier>natives-windows-i586</classifier>
44
		</dependency>
45
	</dependencies>
46
	
47
	<build>
48
        <plugins>
49
            <plugin>
50
                <groupId>org.apache.maven.plugins</groupId>
51
                <artifactId>maven-dependency-plugin</artifactId>
52
                <executions>
53
                    <execution>
54
                        <id>unpack</id>
55
                        <phase>process-sources</phase>
56
                        <goals>
57
                            <goal>unpack</goal>
58
                        </goals>
59
                        <configuration>
60
                            <artifactItems>
61
                                <artifactItem>
62
                                    <groupId>org.gvsig</groupId>
63
                                    <artifactId>org.gvsig.view3d.app.common</artifactId>
64
                                    <type>zip</type>
65
                                    <overWrite>true</overWrite>
66
                                    <outputDirectory>target</outputDirectory>
67
                                </artifactItem>
68
                                <artifactItem>
69
                                    <groupId>org.jogamp.gluegen</groupId>
70
                                    <artifactId>gluegen-rt</artifactId>
71
                                    <classifier>natives-windows-i586</classifier>
72
                                    <type>jar</type>
73
                                    <overWrite>true</overWrite>
74
                                    <outputDirectory>target/native/gluegen</outputDirectory>
75
                                </artifactItem>
76
                                <artifactItem>
77
                                    <groupId>org.jogamp.jogl</groupId>
78
                                    <artifactId>jogl-all</artifactId>
79
                                    <classifier>natives-windows-i586</classifier>
80
                                    <type>jar</type>
81
                                    <overWrite>true</overWrite>
82
                                    <outputDirectory>target/native/jogl</outputDirectory>
83
                                </artifactItem>
84
                            </artifactItems>
85
                        </configuration>
86
                    </execution>
87
                </executions>
88
            </plugin>
89
        </plugins>
90
    </build>
91

  
92
	<!-- The profiles only configure the automatic deploy of gvSIG plugin in 
93
		the gvSIG configured in HOME/.gvsig-devel.properties -->
94
	<profiles>
95

  
96
		<profile>
97
			<id>gvsig-plugin-install-view3d-windows-x86</id>
98
			<activation>
99
				<os>
100
					<family>windows</family>
101
					<arch>x86</arch>
102
				</os>
103
			</activation>
104
			<properties>
105
				<gvsig.install.plugin>true</gvsig.install.plugin>
106
			</properties>
107
		</profile>
108

  
109
		<profile>
110
			<id>gvsig-plugin-install-view3d-windows-i586</id>
111
			<activation>
112
				<os>
113
					<family>windows</family>
114
					<arch>i586</arch>
115
				</os>
116
			</activation>
117
			<properties>
118
				<gvsig.install.plugin>true</gvsig.install.plugin>
119
			</properties>
120
		</profile>
121

  
122
	</profiles>
123

  
124
</project>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/buildNumber.properties
1
#Mon May 25 09:05:29 CEST 2015
2
buildNumber=3
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86/buildNumber.properties
1
#Mon May 25 09:05:27 CEST 2015
2
buildNumber=3
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.parent.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
		<fileSet>
36
			<directory>target/org.gvsig.view3d.app.common</directory>
37
			<outputDirectory>.</outputDirectory>
38
			<excludes>
39
				<exclude>package.info</exclude>
40
			</excludes>
41
		</fileSet>
42
	</fileSets>
43

  
44

  
45
	<dependencySets>
46
		<dependencySet>
47
			<useProjectArtifact>false</useProjectArtifact>
48
			<useTransitiveDependencies>false</useTransitiveDependencies>
49
			<outputDirectory>lib</outputDirectory>
50
			<includes>
51
				<include>org.gvsig:org.gvsig.view3d.app.common</include>
52
				<include>org.jogamp.jogl:jogl-all</include>
53
				<include>org.jogamp.gluegen:gluegen-rt</include>
54
			</includes>
55
		</dependencySet>
56
	</dependencySets>
57

  
58
</assembly>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2
  <modelVersion>4.0.0</modelVersion>
3
  <parent>
4
    <groupId>org.gvsig</groupId>
5
    <artifactId>org.gvsig.view3d.app</artifactId>
6
    <version>1.0.0</version>
7
  </parent>
8
  <artifactId>org.gvsig.view3d.app.lin.x86</artifactId>
9
  <name>org.gvsig.view3d.app.lin.x86</name>
10
  
11
  <dependencyManagement>
12
    <dependencies>
13
        <dependency>
14
            <groupId>org.jogamp.jogl</groupId>
15
            <artifactId>jogl-all</artifactId>
16
            <version>2.2.1</version>
17
            <classifier>natives-linux-i586</classifier>
18
            <scope>runtime</scope>
19
        </dependency>
20
        <dependency>
21
            <groupId>org.jogamp.gluegen</groupId>
22
            <artifactId>gluegen-rt</artifactId>
23
            <version>2.2.1</version>
24
            <classifier>natives-linux-i586</classifier>
25
            <scope>runtime</scope>
26
        </dependency>
27
    </dependencies>
28
  </dependencyManagement>
29
  
30
  <dependencies>
31
    <dependency>
32
        <groupId>org.jogamp.jogl</groupId>
33
        <artifactId>jogl-all</artifactId>
34
        <classifier>natives-linux-i586</classifier>
35
    </dependency>
36
    <dependency>
37
        <groupId>org.jogamp.gluegen</groupId>
38
        <artifactId>gluegen-rt</artifactId>
39
        <classifier>natives-linux-i586</classifier>
40
    </dependency>
41
    <dependency>
42
        <groupId>org.gvsig</groupId>
43
        <artifactId>org.gvsig.view3d.app.common</artifactId>
44
    </dependency>
45
  </dependencies>
46
  
47
  <build>
48
        <plugins>
49
            <plugin>
50
                <groupId>org.apache.maven.plugins</groupId>
51
                <artifactId>maven-dependency-plugin</artifactId>
52
                <executions>
53
                    <execution>
54
                        <id>unpack</id>
55
                        <phase>process-sources</phase>
56
                        <goals>
57
                            <goal>unpack</goal>
58
                        </goals>
59
                        <configuration>
60
                            <artifactItems>
61
                                <artifactItem>
62
                                    <groupId>org.gvsig</groupId>
63
                                    <artifactId>org.gvsig.view3d.app.common</artifactId>
64
                                    <type>zip</type>
65
                                    <overWrite>true</overWrite>
66
                                    <outputDirectory>target</outputDirectory>
67
                                </artifactItem>
68
                            </artifactItems>
69
                        </configuration>
70
                    </execution>
71
                </executions>
72
            </plugin>
73
        </plugins>
74
    </build>
75
  
76
  <!-- 
77
  The profiles only configure the automatic deploy of gvSIG plugin in the gvSIG
78
  configured in HOME/.gvsig-devel.properties
79
  -->
80
  <profiles>
81
  
82
    <profile>
83
      <id>gvsig-plugin-install-view3d-linux-x86</id>
84
      <activation>
85
         <os>
86
             <family>unix</family>
87
             <name>linux</name>
88
             <arch>x86</arch>
89
         </os>
90
      </activation>
91
        <properties>
92
          <gvsig.install.plugin>true</gvsig.install.plugin>
93
        </properties>
94
    </profile>
95

  
96
    <profile>
97
      <id>gvsig-plugin-install-view3d-linux-i586</id>
98
      <activation>
99
         <os>
100
             <family>unix</family>
101
             <name>linux</name>
102
             <arch>i586</arch>
103
         </os>
104
      </activation>
105
      <properties>
106
         <gvsig.install.plugin>true</gvsig.install.plugin>
107
      </properties>
108
    </profile>
109

  
110
  </profiles>
111
</project>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/pom.xml
1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2
	<modelVersion>4.0.0</modelVersion>
3
	<parent>
4
		<groupId>org.gvsig</groupId>
5
		<artifactId>org.gvsig.view3d</artifactId>
6
		<version>1.0.0</version>
7
	</parent>
8
	<artifactId>org.gvsig.view3d.app</artifactId>
9
	<packaging>pom</packaging>
10
	<name>org.gvsig.view3d.app</name>
11

  
12
	<properties>
13
    <gvsig.package.info.code>org.gvsig.view3d.app</gvsig.package.info.code>
14
	  <gvsig.install.plugin>false</gvsig.install.plugin>
15
    <gvsig.package.info.state>testing</gvsig.package.info.state>
16
    <gvsig.package.info.official>true</gvsig.package.info.official>
17
    <gvsig.package.info.name>3D View</gvsig.package.info.name>
18
    <gvsig.package.info.categories>3D</gvsig.package.info.categories>
19
    <gvsig.package.info.description>3D View: allows user to create 3D views from 2D views</gvsig.package.info.description>
20
    <gvsig.package.info.dependencies>required: org.gvsig.app.mainplugin -ge 2.2.0</gvsig.package.info.dependencies>
21
    <gvsig.package.info.javaVM>j1_6</gvsig.package.info.javaVM>
22
    <svn.tags.folder>https://devel.gvsig.org/svn/gvsig-3d/2.1/tags/</svn.tags.folder>
23
    <gvsig.package.info.poolURL>https://devel.gvsig.org/download/projects/gvsig-3d/pool/</gvsig.package.info.poolURL>
24
	</properties>
25

  
26
	<modules>
27
		<module>org.gvsig.view3d.app.common</module>
28
		<module>org.gvsig.view3d.app.lin.x86</module>
29
		<module>org.gvsig.view3d.app.lin.x86_64</module>
30
		<module>org.gvsig.view3d.app.win.x86</module>
31
		<module>org.gvsig.view3d.app.win.x86_64</module>
32
	</modules>
33
</project>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/resources-plugin/i18n/text.properties
1
3D = 3D
2
auto_synchronize_layers=Sincronizado autom\u00E1tico de capas
3
auto_synchronize_view_ports=Sincronizado autom\u00E1tico de enfoques
4
are_you_sure_remove_cache_XquestionX= Se eliminar\u00E1n todos los archivos. \u00BFEst\u00E1 usted seguro?
5
components= Componentes
6
elevation= Elevaci\u00F3n
7
elevation_field= Campo elevaci\u00F3n
8
flat_vertical_exaggeration= Exageraci\u00F3n vertical visor plano
9
flat_view_3d= Vista 3D plana
10
full_screen_mode_view_3d= Modo pantalla completa
11
level_details= Niveles de detalle
12
loading_mode= Modo de carga
13
raster_image= Imagen raster
14
rasterized_vectorial= Vectorial rasterizada
15
show_blue_marbel_layer= Mostrar capa Blue Marbel
16
show_atmosphere= Mostrar atm\u00F3sfera
17
show_default_elevation= Mostrar elevaci\u00F3n por defecto
18
show_minimap= Mostrar minimapa
19
show_nasa_landsat_layer= Mostar capa NASA Landsat
20
show_north_indicator= Mostrar indicador del norte
21
show_scale = Mostrar scala
22
show_stars_background= Mostrar fondo de estrellas
23
synchronize_view_3d= Sincronizar visores
24
synchronize_viewport_3d= Sincronizar encuadres
25
spherical_vertical_exaggeration= Exageraci\u00F3n vertical visor esf\u00E9rico
26
spherical_view_3d=  Vista 3D esf\u00E9rica
27
tile_configuration= Configuraci\u00F3n de tiles
28
view_3d = Visor 3D
29
view_port_animation= Animaci\u00F3n sincronizaci\u00F3n enfoques
30
zero_level_resolution= Resoluci\u00F3n nivel cero
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/resources-plugin/i18n/text_en.properties
1
3D= 3D
2
auto_synchronize_layers= Auto synchronize layers
3
auto_synchronize_view_ports=Auto synchronize viewport
4
are_you_sure_remove_cache_XquestionX= All files will be removed. Are you sure?
5
components= Components
6
elevation= Elevation
7
elevation_field= Elvation field
8
flat_vertical_exaggeration= Flat vertical exaggeration
9
flat_view_3d= Flat 3D view
10
full_screen_mode_view_3d= Full screen mode
11
level_details= Level of details
12
loading_mode= Loading mode
13
raster_image= Raster image
14
rasterized_vectorial= Rasterized vectorial
15
show_atmosphere= Show atmosphere
16
show_blue_marbel_layer= Show Blue Marbel layer
17
show_default_elevation= Show default elevation
18
show_minimap= Show minimap
19
show_nasa_landsat_layer= Show NASA Landsat
20
show_north_indicator= Show north indicator
21
show_scale = Show scale
22
show_stars_background= Show stars background
23
synchronize_view_3d= Synchronize view
24
synchronize_viewport_3d= Synchronize viewport
25
spherical_vertical_exaggeration= Spherical vertical exaggeration
26
spherical_view_3d= Spherical 3D view 
27
tile_configuration= Tile configuration
28
view_3d= 3D View
29
view_port_animation= View port animation
30
zero_level_resolution= Zero level resolution
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/resources-plugin/config.xml
1
<?xml version="1.0" encoding="ISO-8859-1"?>
2
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
3
	gvSIG Association. This program is free software; you can redistribute it 
4
	and/or modify it under the terms of the GNU General Public License as published 
5
	by the Free Software Foundation; either version 3 of the License, or (at 
6
	your option) any later version. This program is distributed in the hope that 
7
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
8
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
9
	Public License for more details. You should have received a copy of the GNU 
10
	General Public License along with this program; if not, write to the Free 
11
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
12
	USA. For any additional information, do not hesitate to contact us at info 
13
	AT gvsig.com, or visit our website www.gvsig.com. -->
14
<plugin-config>
15
	<depends plugin-name="org.gvsig.app.mainplugin" />
16
  <depends plugin-name="org.gvsig.raster.mainplugin" />
17
  <depends plugin-name="org.gvsig.raster.tools.app.basic" optional="true"/>
18
	<resourceBundle name="text" />
19
	<libraries library-dir="lib" />
20
	<extensions>
21
		<extension
22
			class-name="org.gvsig.view3d.app.mainplugin.View3DExtension"
23
			description="" active="true" priority="1">
24

  
25
			<action name="spherical-view-3d" label="spherical_view_3d"
26
				tooltip="spherical_view_3d" position="650400100" action-command="spherical-view-3d"
27
				icon="spherical-view-3d" accelerator="" />
28
        
29
      <action name="flat-view-3d" label="flat_view_3d"
30
        tooltip="flat_view_3d" position="650400200" action-command="flat-view-3d"
31
        icon="flat-view-3d" accelerator="" />
32

  
33

  
34
      <menu text="View/view_3d/flat_view_3d" name="flat-view-3d" />
35
			<menu text="View/view_3d/spherical_view_3d" name="spherical-view-3d" />
36
			
37
			<tool-bar name="view-3d" position="650400000">
38
				<action-tool name="spherical-view-3d" />
39
        <action-tool name="flat-view-3d" />
40
			</tool-bar>
41

  
42
		</extension>
43
    <extension
44
      class-name="org.gvsig.view3d.app.mainplugin.SynchronizeView3DExtension"
45
      description="" active="true" priority="1">
46

  
47
      <action name="synchronize-view-3d" label="synchronize_view_3d"
48
        tooltip="synchronize_view_3d" position="650400300" action-command="synchronize-view-3d"
49
        icon="synchronize-view-3d" accelerator="" />
50
        
51
      <menu text="View/view_3d/synchronize_view_3d" name="synchronize-view-3d" />
52
      
53
      <tool-bar name="view-3d" position="650400000">
54
        <action-tool name="synchronize-view-3d" />
55
      </tool-bar>
56

  
57
    </extension>
58
    
59
    <extension
60
      class-name="org.gvsig.view3d.app.mainplugin.SynchronizeViewPort3DExtension"
61
      description="" active="true" priority="1">
62

  
63
      <action name="synchronize-viewport-3d" label="synchronize_viewport_3d"
64
        tooltip="synchronize_viewport_3d" position="650400400" action-command="synchronize-viewport-3d"
65
        icon="synchronize-viewport-3d" accelerator="" />
66
        
67
      <menu text="View/view_3d/synchronize_viewport_3d" name="synchronize-viewport-3d" />
68
      
69
      <tool-bar name="view-3d" position="650400000">
70
        <action-tool name="synchronize-viewport-3d" />
71
      </tool-bar>
72

  
73
    </extension>
74
    
75
    <extension
76
      class-name="org.gvsig.view3d.app.mainplugin.FullScreenView3DExtension"
77
      description="" active="true" priority="1">
78

  
79
      <action name="full-screen-view-3d" label="full_screen_mode_view_3d"
80
        tooltip="full_screen_mode_view_3d" position="650400500" action-command="full-screen-view-3d"
81
        icon="full-screen-view-3d" accelerator="" />
82
        
83
      <menu text="View/view_3d/full_screen_mode_view_3d" name="full-screen-view-3d" />
84
      
85
      <tool-bar name="view-3d" position="650400000">
86
        <action-tool name="full-screen-view-3d" />
87
      </tool-bar>
88

  
89
    </extension>
90
	</extensions>
91
</plugin-config>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/resources-plugin/plugin-persistence.def
1
<?xml version="1.0"?>
2
<!--
3
Definitions of plugin persistence org.gvsig.geometry.
4
 -->
5
<definitions>
6
  <version>1.0.0</version>
7
  <classes>
8
    <class name="org.gvsig.view3d.app">
9
      <description>Persistence for the view3d plugin</description>
10
      <fields>
11
  
12
        <field name="defultViewWidth" type="Integer" defaultValue="800" classOfValue="" mandatory="true">
13
          <description></description>
14
        </field>
15
      
16
        <field name="defultViewHeight" type="Integer" defaultValue="600" classOfValue="" mandatory="true">
17
          <description></description>
18
        </field>
19
        
20
        <field name="atmosphereVisibility" type="Boolean" defaultValue="true" classOfValue="" mandatory="true">
21
          <description></description>
22
        </field>
23
        
24
        <field name="northIndicatorVisibility" type="Boolean" defaultValue="true" classOfValue="" mandatory="true">
25
          <description></description>
26
        </field>
27
        
28
        <field name="minimapVisibility" type="Boolean" defaultValue="true" classOfValue="" mandatory="true">
29
          <description></description>
30
        </field>
31
        
32
        <field name="starsBackgroundVisibility" type="Boolean" defaultValue="true" classOfValue="" mandatory="true">
33
          <description></description>
34
        </field>
35
        
36
        <field name="scaleVisibility" type="Boolean" defaultValue="true" classOfValue="" mandatory="true">
37
          <description></description>
38
        </field>
39
        
40
        <field name="viewportAnimation" type="Boolean" defaultValue="true" classOfValue="" mandatory="true">
41
          <description></description>
42
        </field>
43
        
44
        <field name="cachePath" type="String" defaultValue="" classOfValue="" mandatory="false">
45
          <description></description>
46
        </field>
47

  
48
      </fields>
49
    </class>
50
  </classes>
51
</definitions>
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/assembly/gvsig-plugin-package.xml
1
<!-- gvSIG. Desktop Geographic Information System. Copyright (C) 2007-2013 
2
	gvSIG Association. This program is free software; you can redistribute it 
3
	and/or modify it under the terms of the GNU General Public License as published 
4
	by the Free Software Foundation; either version 3 of the License, or (at 
5
	your option) any later version. This program is distributed in the hope that 
6
	it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
7
	of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 
8
	Public License for more details. You should have received a copy of the GNU 
9
	General Public License along with this program; if not, write to the Free 
10
	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
11
	USA. For any additional information, do not hesitate to contact us at info 
12
	AT gvsig.com, or visit our website www.gvsig.com. -->
13
<assembly>
14
	<id>gvsig-plugin-package</id>
15
	<formats>
16
		<format>zip</format>
17
	</formats>
18
	<baseDirectory>${project.artifactId}</baseDirectory>
19
	<includeBaseDirectory>true</includeBaseDirectory>
20
	<files>
21
		<file>
22
			<source>target/${project.artifactId}-${project.version}.jar</source>
23
			<outputDirectory>lib</outputDirectory>
24
		</file>
25
		<file>
26
			<source>target/package.info</source>
27
		</file>
28
	</files>
29

  
30
	<fileSets>
31
		<fileSet>
32
			<directory>src/main/resources-plugin</directory>
33
			<outputDirectory>.</outputDirectory>
34
		</fileSet>
35
	</fileSets>
36

  
37

  
38
	<dependencySets>
39
		<dependencySet>
40
			<useProjectArtifact>false</useProjectArtifact>
41
			<useTransitiveDependencies>false</useTransitiveDependencies>
42
			<outputDirectory>lib</outputDirectory>
43
			<includes>
44
			    <include>org.gvsig:org.gvsig.view3d.lib.api</include>
45
                <include>org.gvsig:org.gvsig.view3d.lib.impl</include>
46
				<include>org.gvsig:org.gvsig.view3d.swing.api</include>
47
				<include>org.gvsig:org.gvsig.view3d.swing.impl</include>
48
				<include>gov.nasa:worldwind</include>
49
				<include>org.jogamp.gluegen:gluegen-rt</include>
50
				<include>org.jogamp.jogl:jogl-all</include>
51
			</includes>
52
		</dependencySet>
53
	</dependencySets>
54

  
55
</assembly>
56

  
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/java/org/gvsig/view3d/app/properties/LayerProperties3DThemeManagerPage.java
1
package org.gvsig.view3d.app.properties;
2

  
3
import java.awt.BorderLayout;
4

  
5
import org.gvsig.app.project.documents.view.legend.gui.AbstractThemeManagerPage;
6
import org.gvsig.fmap.mapcontext.layers.FLayer;
7
import org.gvsig.tools.ToolsLocator;
8
import org.gvsig.tools.i18n.I18nManager;
9
import org.gvsig.view3d.lib.api.View3DLocator;
10
import org.gvsig.view3d.lib.api.View3DManager;
11
import org.gvsig.view3d.lib.api.properties.LayerProperties3D;
12
import org.gvsig.view3d.lib.api.properties.VectorialLayerProperties3D;
13
import org.gvsig.view3d.swing.api.View3DSwingLocator;
14
import org.gvsig.view3d.swing.api.View3DSwingManager;
15
import org.gvsig.view3d.swing.api.properties.LayerProperties3DPanel;
16

  
17
public class LayerProperties3DThemeManagerPage extends AbstractThemeManagerPage {
18

  
19
    private static final long serialVersionUID = 6180306542845960820L;
20

  
21
    private LayerProperties3DPanel propertiesPanel;
22

  
23
    public LayerProperties3DThemeManagerPage() {
24
        super();
25
        initialize();
26
    }
27

  
28
    @Override
29
    public void acceptAction() {
30
        applyAction();
31
    }
32

  
33
    @Override
34
    public void applyAction() {
35

  
36
        I18nManager i18nManager = ToolsLocator.getI18nManager();
37

  
38
        View3DManager manager = View3DLocator.getManager();
39
        LayerProperties3D layerProperties =
40
            manager.getLayerProperties(propertiesPanel.getLayer());
41

  
42
        if (layerProperties instanceof VectorialLayerProperties3D) {
43

  
44
            layerProperties.setMinLevel(propertiesPanel.getMinLevel());
45
            layerProperties.setMaxLevel(propertiesPanel.getMaxLevel());
46
            layerProperties.setLevelZeroResolutionMultiplier(propertiesPanel
47
                .getResolutionMultiplier());
48
            layerProperties.setTileWidth(propertiesPanel.getTileWidth());
49
            layerProperties.setTileHeight(propertiesPanel.getTileHeight());
50

  
51
            if (propertiesPanel.getLoadMode().equalsIgnoreCase(
52
                i18nManager.getTranslation("elevation"))) {
53

  
54
                layerProperties.setElevation(true);
55

  
56
                if (layerProperties instanceof VectorialLayerProperties3D) {
57
                    VectorialLayerProperties3D vectorialProperties =
58
                        (VectorialLayerProperties3D) layerProperties;
59
                    vectorialProperties.setElevationField(propertiesPanel
60
                        .getElevationField());
61
                }
62
                layerProperties.setElevationUnits(propertiesPanel
63
                    .getElevationUnits());
64
                layerProperties
65
                    .setNoDataValue(propertiesPanel.getNoDataValue());
66

  
67
            } else {
68
                if (layerProperties instanceof VectorialLayerProperties3D) {
69
                    VectorialLayerProperties3D vectorialProperties =
70
                        (VectorialLayerProperties3D) layerProperties;
71
                    vectorialProperties.setRasterized(true);
72
                }
73
            }
74
        }
75

  
76
        manager.setLayerProperties(propertiesPanel.getLayer(), layerProperties);
77
    }
78

  
79
    @Override
80
    public void cancelAction() {
81
    }
82

  
83
    @Override
84
    public String getName() {
85
        I18nManager i18nManager = ToolsLocator.getI18nManager();
86
        return i18nManager.getTranslation("3D");
87
    }
88

  
89
    @Override
90
    public int getPriority() {
91
        return 10;
92
    }
93

  
94
    private void initialize() {
95
        this.setLayout(new BorderLayout());
96
    }
97

  
98
    @Override
99
    public void setModel(FLayer layer) {
100

  
101
        View3DSwingManager swingManager = View3DSwingLocator.getManager();
102
        this.propertiesPanel = swingManager.createLayerProperties3DPanel(layer);
103
        this.add(propertiesPanel.asJComponent(), BorderLayout.CENTER);
104

  
105
    }
106

  
107
}
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/java/org/gvsig/view3d/app/properties/ViewProperties3DPage.java
1
package org.gvsig.view3d.app.properties;
2

  
3
import java.awt.BorderLayout;
4

  
5
import javax.swing.JComponent;
6
import javax.swing.JPanel;
7

  
8
import org.gvsig.app.project.documents.view.ViewDocument;
9
import org.gvsig.propertypage.PropertiesPage;
10
import org.gvsig.tools.ToolsLocator;
11
import org.gvsig.tools.i18n.I18nManager;
12
import org.gvsig.view3d.swing.api.View3DSwingLocator;
13
import org.gvsig.view3d.swing.api.View3DSwingManager;
14
import org.gvsig.view3d.swing.api.properties.MapControlProperties3D;
15
import org.gvsig.view3d.swing.api.properties.ViewProperties3DPanel;
16

  
17
public class ViewProperties3DPage implements PropertiesPage {
18

  
19
    private ViewDocument viewDocument;
20
    private JPanel panel;
21
    private ViewProperties3DPanel properties3DPanel;
22

  
23
    public ViewProperties3DPage(ViewDocument viewDocument) {
24
        this.viewDocument = viewDocument;
25

  
26
        initialize();
27
    }
28

  
29
    private void initialize() {
30

  
31
        View3DSwingManager swingManager = View3DSwingLocator.getManager();
32
        MapControlProperties3D mapControl3DProperties =
33
            swingManager.getMapControl3DProperties(viewDocument);
34

  
35
        this.properties3DPanel =
36
            swingManager.createViewProperties3DPanel(mapControl3DProperties);
37
        
38
        panel = new JPanel(new BorderLayout());
39
        panel.add(properties3DPanel.asJComponent(), BorderLayout.CENTER);
40
    }
41

  
42
    public JComponent asJComponent() {
43
        return this.panel;
44
    }
45

  
46
    public String getTitle() {
47
        I18nManager i18nManager = ToolsLocator.getI18nManager();
48
        return i18nManager.getTranslation("3D");
49
    }
50

  
51
    public int getPriority() {
52
        return 10;
53
    }
54

  
55
    public boolean whenAccept() {
56
        whenApply();
57
        return true;
58
    }
59

  
60
    public boolean whenApply() {
61
        
62
        double sphereVerticalExaggeration =
63
            this.properties3DPanel.getSphereVerticalExaggeration();
64
        double flatVerticalExaggeration =
65
            this.properties3DPanel.getFlatVerticalExaggeration();
66
        boolean autoLayerSynchronize =
67
            this.properties3DPanel.getAutoLayerSynchronize();
68
        boolean autoViewPortSynchronize =
69
            this.properties3DPanel.getAutoViewPortSynchronize();
70
        boolean showBlueMarble = this.properties3DPanel.getShowBlueMarble();
71
        boolean showNasaLandsat = this.properties3DPanel.getShowNasaLandsat();
72
        boolean showDefaultElevation =
73
            this.properties3DPanel.getShowDefaultElevation();
74
        
75
        View3DSwingManager swingManager = View3DSwingLocator.getManager();
76
        MapControlProperties3D mapControl3DProperties =
77
            swingManager.getMapControl3DProperties(viewDocument);
78
        
79
        mapControl3DProperties
80
            .setSphereVerticalExaggeration(sphereVerticalExaggeration);
81
        mapControl3DProperties
82
            .setFlatVerticalExaggeration(flatVerticalExaggeration);
83
        mapControl3DProperties.setAutoLayerSynchronize(autoLayerSynchronize);
84
        mapControl3DProperties.setAutoViewPortSynchronize(autoViewPortSynchronize);
85
        mapControl3DProperties.setBlueMarbleLayerVisibility(showBlueMarble);
86
        mapControl3DProperties.setNasaLandsatVisibility(showNasaLandsat);
87
        mapControl3DProperties
88
            .setDefaultElevationVisibility(showDefaultElevation);
89
        
90
        swingManager.setMapControlProperties3D(viewDocument, mapControl3DProperties);
91
        
92
        return true;
93
    }
94

  
95
    public boolean whenCancel() {
96
        return true;
97
    }
98

  
99
}
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/java/org/gvsig/view3d/app/properties/General3DPreferencePage.java
1
package org.gvsig.view3d.app.properties;
2

  
3
import java.awt.BorderLayout;
4
import java.io.File;
5

  
6
import javax.swing.ImageIcon;
7
import javax.swing.JPanel;
8

  
9
import org.gvsig.andami.IconThemeHelper;
10
import org.gvsig.andami.PluginServices;
11
import org.gvsig.andami.PluginsLocator;
12
import org.gvsig.andami.PluginsManager;
13
import org.gvsig.andami.preferences.AbstractPreferencePage;
14
import org.gvsig.andami.preferences.StoreException;
15
import org.gvsig.tools.ToolsLocator;
16
import org.gvsig.tools.dynobject.DynObject;
17
import org.gvsig.tools.i18n.I18nManager;
18
import org.gvsig.view3d.swing.api.View3DSwingLocator;
19
import org.gvsig.view3d.swing.api.View3DSwingManager;
20
import org.gvsig.view3d.swing.api.properties.GeneralProperties3D;
21
import org.gvsig.view3d.swing.api.properties.GeneralProperties3DPanel;
22

  
23
public class General3DPreferencePage extends AbstractPreferencePage {
24

  
25
    private static final long serialVersionUID = -3384416698766077019L;
26

  
27
    public static final String ID = General3DPreferencePage.class.getName();
28

  
29
    private GeneralProperties3DPanel propertiesPanel;
30
    private DynObject pluginProperties;
31
    private PluginServices plugin;
32

  
33
    public General3DPreferencePage() {
34
        initComponents();
35
    }
36

  
37
    private void initComponents() {
38
        PluginsManager pluginManager = PluginsLocator.getManager();
39
        this.plugin = pluginManager.getPlugin(this);
40
        this.pluginProperties = this.plugin.getPluginProperties();
41

  
42
        initializeValues();
43

  
44
        View3DSwingManager swingManager = View3DSwingLocator.getManager();
45
        GeneralProperties3D generalProperties3D =
46
            swingManager.getGeneral3DProperties();
47

  
48
        propertiesPanel =
49
            swingManager.createGeneralProperties3DPanel(generalProperties3D);
50

  
51
        this.setLayout(new BorderLayout());
52
        this.add(propertiesPanel.asJComponent(), BorderLayout.NORTH);
53
    }
54

  
55
    public String getID() {
56
        return ID;
57
    }
58

  
59
    public String getTitle() {
60
        I18nManager i18nManager = ToolsLocator.getI18nManager();
61
        return i18nManager.getTranslation("3D");
62
    }
63

  
64
    public JPanel getPanel() {
65
        return this;
66
    }
67

  
68
    public void initializeValues() {
69
        
70
        View3DSwingManager swingManager = View3DSwingLocator.getManager();
71
        GeneralProperties3D generalProperties3D =
72
            swingManager.getGeneral3DProperties();
73

  
74
        int width =
75
            (Integer) this.pluginProperties.getDynValue("defultViewWidth");
76
        int height =
77
            (Integer) this.pluginProperties.getDynValue("defultViewHeight");
78
        boolean atmosphereVisibility =
79
            (Boolean) this.pluginProperties.getDynValue("atmosphereVisibility");
80
        boolean northIndicatorVisibility =
81
            (Boolean) this.pluginProperties
82
                .getDynValue("northIndicatorVisibility");
83
        boolean minimapVisibility =
84
            (Boolean) this.pluginProperties.getDynValue("minimapVisibility");
85
        boolean starsBackgroundVisibility =
86
            (Boolean) this.pluginProperties
87
                .getDynValue("starsBackgroundVisibility");
88
        boolean scaleVisibility =
89
            (Boolean) this.pluginProperties.getDynValue("scaleVisibility");
90
        boolean viewportAnimation =
91
            (Boolean) this.pluginProperties.getDynValue("viewportAnimation");
92
        String cachePath =
93
            (String) this.pluginProperties.getDynValue("cachePath");
94

  
95
        generalProperties3D.setDefaultViewWidth(width);
96
        generalProperties3D.setDefaultViewHeight(height);
97
        generalProperties3D.setAtmosphereVisibility(atmosphereVisibility);
98
        generalProperties3D.setMinimapVisibility(minimapVisibility);
99
        generalProperties3D
100
            .setNorthIndicatorVisibility(northIndicatorVisibility);
101
        generalProperties3D
102
            .setStarsBackgroundVisibility(starsBackgroundVisibility);
103
        generalProperties3D.setScaleVisibility(scaleVisibility);
104
        generalProperties3D.setViewPortAnimation(viewportAnimation);
105
        
106
        if(cachePath != null){
107
            generalProperties3D.setCachePath(new File(cachePath));
108
        }
109

  
110
        swingManager.setGeneral3DProperties(generalProperties3D);
111
        
112
    }
113

  
114
    public void initializeDefaults() {
115
        
116
    }
117

  
118
    @Override
119
    public boolean isResizeable() {
120
        return true;
121
    }
122

  
123
    public ImageIcon getIcon() {
124
        return IconThemeHelper.getImageIcon("general-properties-view-3d");
125
    }
126

  
127
    public boolean isValueChanged() {
128
        
129
        int width = propertiesPanel.getDefaultWidth();
130
        int heigth = propertiesPanel.getDefaultHeight();
131
        boolean atmosphereVisibility = propertiesPanel.getAtmosphereVisibility();
132
        boolean minimapVisibility = propertiesPanel.getMinimapVisibility();
133
        boolean northIndicatorVisibility = propertiesPanel.getNorthIndicatorVisibility();
134
        boolean scaleVisiblity = propertiesPanel.getScaleVisiblity();
135
        boolean starsBackgroundVisiblity = propertiesPanel.getStarsBackgroundVisiblity();
136
        boolean viewPortAnimation = propertiesPanel.getViewPortAnimation();
137
        String cachePath = propertiesPanel.getCachePath();
138
        
139
        View3DSwingManager swingManager = View3DSwingLocator.getManager();
140
        GeneralProperties3D general3dProperties = swingManager.getGeneral3DProperties();
141

  
142
        if (width != general3dProperties.getDefaultViewWidth()
143
            || heigth != general3dProperties.getDefaultViewHeight()
144
            || atmosphereVisibility != general3dProperties
145
                .getAtmosphereVisibility()
146
            || minimapVisibility != general3dProperties.getMinimapVisibility()
147
            || northIndicatorVisibility != general3dProperties
148
                .getNorthIndicatorVisibility()
149
            || scaleVisiblity != general3dProperties.getScaleVisibility()
150
            || starsBackgroundVisiblity != general3dProperties
151
                .getStarsBackgroundVisibility()
152
            || viewPortAnimation != general3dProperties.getViewPortAnimation()
153
            || !cachePath.equals(general3dProperties.getCachePath()
154
                .getAbsolutePath())) {
155
            
156
            return true;
157
        }
158
        return false;
159
    }
160

  
161
    @Override
162
    public void storeValues() throws StoreException {
163

  
164
        this.pluginProperties.setDynValue("defultViewWidth",
165
            propertiesPanel.getDefaultWidth());
166
        this.pluginProperties.setDynValue("defultViewHeight",
167
            propertiesPanel.getDefaultHeight());
168
        this.pluginProperties.setDynValue("atmosphereVisibility",
169
            propertiesPanel.getAtmosphereVisibility());
170
        this.pluginProperties.setDynValue("minimapVisibility",
171
            propertiesPanel.getMinimapVisibility());
172
        this.pluginProperties.setDynValue("northIndicatorVisibility",
173
            propertiesPanel.getNorthIndicatorVisibility());
174
        this.pluginProperties.setDynValue("starsBackgroundVisibility",
175
            propertiesPanel.getStarsBackgroundVisiblity());
176
        this.pluginProperties.setDynValue("scaleVisibility",
177
            propertiesPanel.getScaleVisiblity());
178
        this.pluginProperties.setDynValue("viewportAnimation",
179
            propertiesPanel.getViewPortAnimation());
180
        this.pluginProperties.setDynValue("cachePath",
181
            propertiesPanel.getCachePath());
182

  
183
        this.plugin.savePluginProperties();
184
    }
185

  
186
    @Override
187
    public void setChangesApplied() {
188

  
189
        View3DSwingManager swingManager = View3DSwingLocator.getManager();
190
        GeneralProperties3D generalProperties3D =
191
            swingManager.getGeneral3DProperties();
192

  
193
        generalProperties3D.setDefaultViewWidth(propertiesPanel
194
            .getDefaultWidth());
195
        generalProperties3D.setDefaultViewHeight(propertiesPanel
196
            .getDefaultHeight());
197
        generalProperties3D.setAtmosphereVisibility(propertiesPanel
198
            .getAtmosphereVisibility());
199
        generalProperties3D.setMinimapVisibility(propertiesPanel
200
            .getMinimapVisibility());
201
        generalProperties3D.setNorthIndicatorVisibility(propertiesPanel
202
            .getNorthIndicatorVisibility());
203
        generalProperties3D.setScaleVisibility(propertiesPanel
204
            .getScaleVisiblity());
205
        generalProperties3D.setStarsBackgroundVisibility(propertiesPanel
206
            .getStarsBackgroundVisiblity());
207
        generalProperties3D.setViewPortAnimation(propertiesPanel
208
            .getViewPortAnimation());
209
        generalProperties3D.setCachePath(new File(propertiesPanel
210
            .getCachePath()));
211

  
212
        swingManager.setGeneral3DProperties(generalProperties3D);
213
    }
214

  
215
}
2.1/tags/org.gvsig.view3d-1.0.0/org.gvsig.view3d.app/org.gvsig.view3d.app.common/src/main/java/org/gvsig/view3d/app/properties/RasterLayerProperties3DPanel.java
1
package org.gvsig.view3d.app.properties;
2

  
3
import java.awt.BorderLayout;
4
import java.awt.Dimension;
5

  
6
import org.gvsig.fmap.mapcontext.layers.FLayer;
7
import org.gvsig.gui.beans.panelGroup.panels.AbstractPanel;
8
import org.gvsig.tools.ToolsLocator;
9
import org.gvsig.tools.i18n.I18nManager;
10
import org.gvsig.view3d.lib.api.View3DLocator;
11
import org.gvsig.view3d.lib.api.View3DManager;
12
import org.gvsig.view3d.lib.api.properties.LayerProperties3D;
13
import org.gvsig.view3d.lib.api.properties.VectorialLayerProperties3D;
14
import org.gvsig.view3d.swing.api.View3DSwingLocator;
15
import org.gvsig.view3d.swing.api.View3DSwingManager;
16
import org.gvsig.view3d.swing.api.properties.LayerProperties3DPanel;
17

  
18
public class RasterLayerProperties3DPanel extends AbstractPanel {
19

  
20
    private static final long serialVersionUID = 5429099827670959087L;
21

  
22
    private LayerProperties3DPanel propertiesPanel;
23
    private LayerProperties3D tmpProperties;
24

  
25
    public RasterLayerProperties3DPanel() {
26
        super();
27
        initialize();
28
    }
29

  
30
    public void accept() {
31
        apply();
32

  
33
        View3DManager manager = View3DLocator.getManager();
34
        manager.setLayerProperties(propertiesPanel.getLayer(), tmpProperties);
35
    }
36

  
37
    public void apply() {
38
        I18nManager i18nManager = ToolsLocator.getI18nManager();
39

  
40
        View3DManager manager = View3DLocator.getManager();
41
        LayerProperties3D layerProperties =
42
            manager.getLayerProperties(propertiesPanel.getLayer());
43

  
44
        layerProperties.setMinLevel(propertiesPanel.getMinLevel());
45
        layerProperties.setMaxLevel(propertiesPanel.getMaxLevel());
46
        layerProperties.setLevelZeroResolutionMultiplier(propertiesPanel
47
            .getResolutionMultiplier());
48
        layerProperties.setTileWidth(propertiesPanel.getTileWidth());
49
        layerProperties.setTileHeight(propertiesPanel.getTileHeight());
50

  
51
        if (propertiesPanel.getLoadMode().equalsIgnoreCase(
52
            i18nManager.getTranslation("elevation"))) {
53

  
54
            layerProperties.setElevation(true);
55

  
56
            if (layerProperties instanceof VectorialLayerProperties3D) {
57
                VectorialLayerProperties3D vectorialProperties =
58
                    (VectorialLayerProperties3D) layerProperties;
59
                vectorialProperties.setElevationField(propertiesPanel
60
                    .getElevationField());
61
            }
62

  
63
            layerProperties.setElevationUnits(propertiesPanel
64
                .getElevationUnits());
65
            layerProperties.setNoDataValue(propertiesPanel.getNoDataValue());
66

  
67
        } else {
68
            if (layerProperties instanceof VectorialLayerProperties3D) {
69
                VectorialLayerProperties3D vectorialProperties =
70
                    (VectorialLayerProperties3D) layerProperties;
71
                vectorialProperties.setRasterized(true);
72
            }
73
            layerProperties.setElevation(false);
74
        }
75
        tmpProperties = layerProperties;
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff