Mercurial > hg > Database > Alice

changeset 406:d28b1216d615 dispose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
timing put FishInfo dataSegment in "register" is wrong
author sugi
date Tue, 24 Jun 2014 14:31:11 +0900
parents c817721af5ec
children 4b38d3e6520e
files .project src/main/java/alice/test/topology/aquarium/fx/AddObject.java src/main/java/alice/test/topology/aquarium/fx/CheckMyName.java src/main/java/alice/test/topology/aquarium/fx/CreateObject.java src/main/java/alice/test/topology/aquarium/fx/FishInfo.java
diffstat 5 files changed, 20 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.project	Tue Jun 24 13:38:34 2014 +0900
+++ b/.project	Tue Jun 24 14:31:11 2014 +0900
@@ -15,4 +15,15 @@
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1403587644303</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
--- a/src/main/java/alice/test/topology/aquarium/fx/AddObject.java	Tue Jun 24 13:38:34 2014 +0900
+++ b/src/main/java/alice/test/topology/aquarium/fx/AddObject.java	Tue Jun 24 14:31:11 2014 +0900
@@ -43,7 +43,13 @@
 				// controlled own fish  
 				if (myName.equals(obj.getId())){
 					new CalculatePosition(obj.getId()+"FishdiffP");
-				} 
+				}
+				new SetTranslate(obj.getId()+"Fish");
+				
+				FishInfo fishInfo = new FishInfo();
+				fishInfo.name = obj.getId();
+				fishInfo.size = obj.getScaleX();
+				ods.put("register", fishInfo);
 			}
 			ods.flip(info);
 			
--- a/src/main/java/alice/test/topology/aquarium/fx/CheckMyName.java	Tue Jun 24 13:38:34 2014 +0900
+++ b/src/main/java/alice/test/topology/aquarium/fx/CheckMyName.java	Tue Jun 24 14:31:11 2014 +0900
@@ -47,6 +47,7 @@
 		ods.put("fishData", fishInfo);
 
 		new CreateObject();
+		new AddObject();
 		
 		String[] args = {name};
 		Aquarium.main(args);
--- a/src/main/java/alice/test/topology/aquarium/fx/CreateObject.java	Tue Jun 24 13:38:34 2014 +0900
+++ b/src/main/java/alice/test/topology/aquarium/fx/CreateObject.java	Tue Jun 24 14:31:11 2014 +0900
@@ -37,13 +37,10 @@
 		obj.setScaleZ(fishInfo.size);
 		obj.setId(fishInfo.name);
 
-		new SetTranslate(fishInfo.name+"Fish");	
 		ods.put("addOffer", obj);
-		ods.put("register", fishInfo);
 		new SendDataOthers(info, "fishData");
 		
 		new CreateObject();
-		new AddObject();
 	}
 
 	// for read *.obj file
--- a/src/main/java/alice/test/topology/aquarium/fx/FishInfo.java	Tue Jun 24 13:38:34 2014 +0900
+++ b/src/main/java/alice/test/topology/aquarium/fx/FishInfo.java	Tue Jun 24 14:31:11 2014 +0900
@@ -31,7 +31,7 @@
 		this.name = name;
 	}
 	
-	public void setSize(int size){
+	public void setSize(double size){
 		this.size = size;
 	}