# HG changeset patch
# User surug
# Date 1500891395 -32400
# Node ID 82736f6fae50adbabaaa34a482f433ff90b79987
# Parent 9324ef9728c0312368c249dfad9469e4092b7b05# Parent 86b39f5bf1d7be53d9d782b30da1adc1e53c9248
merge
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__com_massisframework_j3d_java3d_core_1_6_0.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__com_massisframework_j3d_java3d_core_1_6_0.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__com_massisframework_j3d_vecmath_1_6_0_1.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__com_massisframework_j3d_vecmath_1_6_0_1.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_gluegen_gluegen_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_gluegen_gluegen_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_main_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_main_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_android_aarch64_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_android_aarch64_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_android_armv6_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_android_armv6_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_amd64_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_amd64_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_armv6_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_armv6_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_armv6hf_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_armv6hf_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_i586_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_linux_i586_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_macosx_universal_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_macosx_universal_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_solaris_amd64_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_solaris_amd64_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_solaris_i586_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_solaris_i586_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_windows_amd64_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_windows_amd64_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_windows_i586_2_3_2.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/Gradle__org_jogamp_jogl_jogl_all_natives_windows_i586_2_3_2.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 .idea/libraries/com_massisframework_j3d_java3d_core_1_6_0_1.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/com_massisframework_j3d_java3d_core_1_6_0_1.xml Mon Jul 24 19:16:35 2017 +0900
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 Alice.iml
--- a/Alice.iml Wed Apr 19 21:36:06 2017 +0900
+++ b/Alice.iml Mon Jul 24 19:16:35 2017 +0900
@@ -1,152 +1,13 @@
-
-
-
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 build.gradle
--- a/build.gradle Wed Apr 19 21:36:06 2017 +0900
+++ b/build.gradle Mon Jul 24 19:16:35 2017 +0900
@@ -9,12 +9,19 @@
group = 'cr.ie.u_ryukyu.ac.jp'
version = '1.1'
+repositories {
+ mavenCentral()
+ maven { url "http://www.cr.ie.u-ryukyu.ac.jp/maven"}
+}
+
dependencies {
compile fileTree(dir: 'lib', include: '*.jar')
+ compile group: 'com.massisframework.j3d', name: 'java3d-core', version: '1.6.0'
+ compile group: 'com.massisframework.j3d', name: 'vecmath', version: '1.6.0.1'
}
+
jar {
- exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
manifest {
attributes 'Implementation-Title': 'Gradle Quickstart', 'Implementation-Version': version
}
@@ -23,7 +30,7 @@
}
ext {
- mavenRepository = System.getenv()['HOME']+'/Documents/workspace/maven'
+ mavenRepository = System.getenv()['HOME']+'/workspace/maven'
}
uploadArchives {
@@ -33,17 +40,3 @@
}
}
}
-task AliceTopologyManager(type: Jar) {
- exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
- baseName = "aliceTopologyManager"
- manifest {
- attributes 'Main-Class': 'alice.topology.manager.TopologyManager',
- 'Implementation-Title': 'TopologyManager',
- 'Implementation-Description': 'Quickstart',
- 'Implementation-Version': version,
- 'Assembly-Date': new java.util.Date().toString()
-
- }
- from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
- with jar
-}
\ No newline at end of file
diff -r 86b39f5bf1d7 -r 82736f6fae50 src/main/java/alice/test/topology/aquarium/ViewChange.java
--- a/src/main/java/alice/test/topology/aquarium/ViewChange.java Wed Apr 19 21:36:06 2017 +0900
+++ b/src/main/java/alice/test/topology/aquarium/ViewChange.java Mon Jul 24 19:16:35 2017 +0900
@@ -1,10 +1,15 @@
package alice.test.topology.aquarium;
+import com.sun.j3d.utils.universe.SimpleUniverse;
+import com.sun.j3d.utils.universe.ViewingPlatform;
+
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Vector3f;
import java.awt.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import com.sun.j3d.utils.universe.*;
+import static com.sun.java.accessibility.util.AWTEventMonitor.addMouseMotionListener;
public class ViewChange extends Canvas3D {