changeset 618:41a5977e754c dispose

aquarium
author suruga
date Wed, 26 Jul 2017 16:17:33 +0900
parents 9ac910236f59
children 32e849e09c88
files Alice.iml build.gradle src/main/java/alice/test/topology/aquarium/ViewChange.java src/main/java/alice/test/topology/aquarium/fx/Aquarium.java
diffstat 4 files changed, 18 insertions(+), 146 deletions(-) [+]
line wrap: on
line diff
--- a/Alice.iml	Mon Jul 24 19:35:01 2017 +0900
+++ b/Alice.iml	Wed Jul 26 16:17:33 2017 +0900
@@ -1,152 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="Alice" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="cr.ie.u_ryukyu.ac.jp" external.system.module.version="1.1" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: com.alexmerz.graphviz">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/com.alexmerz.graphviz.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: commons-lang3-3.3.2">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/commons-lang3-3.3.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: j3dcore">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/j3dcore.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: j3dutils">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/j3dutils.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: javassist">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/javassist.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: jimColModelImporterJFX">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jimColModelImporterJFX.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: jimObjModelImporterJFX">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jimObjModelImporterJFX.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: log4j-1.2.16">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/log4j-1.2.16.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: msgpack-0.6.13-SNAPSHOT-sources">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/msgpack-0.6.13-SNAPSHOT-sources.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: msgpack-0.6.13-SNAPSHOT">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/msgpack-0.6.13-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: slf4j-api-1.6.1-sources">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/slf4j-api-1.6.1-sources.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: slf4j-api-1.6.1">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/slf4j-api-1.6.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: slf4j-log4j12-1.6.1-sources">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/slf4j-log4j12-1.6.1-sources.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: slf4j-log4j12-1.6.1">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/slf4j-log4j12-1.6.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle: vecmath">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/vecmath.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
\ No newline at end of file
--- a/build.gradle	Mon Jul 24 19:35:01 2017 +0900
+++ b/build.gradle	Wed Jul 26 16:17:33 2017 +0900
@@ -9,8 +9,15 @@
 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 {
--- a/src/main/java/alice/test/topology/aquarium/ViewChange.java	Mon Jul 24 19:35:01 2017 +0900
+++ b/src/main/java/alice/test/topology/aquarium/ViewChange.java	Wed Jul 26 16:17:33 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 {
 
--- a/src/main/java/alice/test/topology/aquarium/fx/Aquarium.java	Mon Jul 24 19:35:01 2017 +0900
+++ b/src/main/java/alice/test/topology/aquarium/fx/Aquarium.java	Wed Jul 26 16:17:33 2017 +0900
@@ -31,7 +31,7 @@
 
     @Override
     public void start(Stage primaryStage) throws IOException {
-        final String myName = getParameters().getRaw().get(0); // name
+        String myName = getParameters().getRaw().get(0); // name
         primaryStage.setTitle("Aquarium "+ myName);
         primaryStage.setResizable(false);
         primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>(){