Added possibility to define conf and galaxies on compiled code

Author: sliiser

build.xml

@@ -0,0 +1,46 @@
+<project name="kompfys" basedir="." default="main">
+
+  <!-- set global properties for this build -->
+  <property name="main-class"  value="ee.liiser.siim.galaxies.Main"/>
+  <property name="src.dir"     value="src"/>
+  <property name="build.dir"   value="build"/>
+  <property name="classes.dir" value="${build.dir}/classes"/>
+  <property name="jar.dir"     value="${build.dir}/jar"/>
+  <property name="lib.dir"     value="lib"/>
+
+  <!-- adds every jar in the lib directory to the classpath-->
+  <path id="classpath">
+  <fileset dir="${lib.dir}" includes="**/*.jar"/>
+  </path>
+
+  <target name="clean">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <target name="compile">
+    <mkdir dir="${classes.dir}"/>
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+  </target>
+
+  <target name="jar" depends="compile">
+    <mkdir dir="${jar.dir}"/>
+    <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+      <manifest>
+        <attribute name="Main-Class" value="${main-class}"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="run" depends="jar">
+    <java fork="true" classname="${main-class}">
+      <classpath>
+        <path refid="classpath"/>
+        <path location="${jar.dir}/${ant.project.name}.jar"/>
+      </classpath>
+    </java>
+  </target>
+
+  <target name="clean-build" depends="clean,jar"/>
+
+  <target name="main" depends="clean,run"/>
+</project>

conf.txt

@@ -0,0 +1,2 @@
+#Method(Velocity/Basic),dt,fps
+Velocity,0.001,60

galaxies.txt

@@ -0,0 +1,3 @@
+#position;velocity;normal;width;starcount
+0,0,0;0,0,0;0,0,1;1;500
+0,5,-30;0,0,0.5;0,1,0;1;500

src/ee/liiser/siim/galaxies/Main.java

@@ -1,5 +1,11 @@
 package ee.liiser.siim.galaxies;
 
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+
 import javax.vecmath.Vector3d;
 
 import ee.liiser.siim.galaxies.calculations.Calculator;
@@ -26,7 +32,7 @@ public class Main {
 	/**
 	 * An array to hold all galaxy cores in the system
 	 */
-	//FIXME should not be public
+	// FIXME should not be public
 	public static Core[] cores;
 
 	/**
@@ -38,26 +44,83 @@ public class Main {
 	 * Calculation method to use. Value should be one of
 	 * {@link Calculator.Method}
 	 */
-	private static final Method METHOD = Method.VELOCITY_VERLET;
+	private static Method METHOD = Method.VELOCITY_VERLET;
 
 	public static void main(String[] args) {
-
+		Galaxy[] galaxies = null;
+		
+		if(args.length >= 2){
+			try {
+				BufferedReader r = new BufferedReader(new FileReader(args[1]));
+				String line;
+				do{
+					line = r.readLine();
+				}while(line != null && line.startsWith("#"));
+				r.close();
+				String[] params = line.split(",");
+				if(params[0].toLowerCase().equals("velocity")){
+					METHOD = Method.VELOCITY_VERLET;
+				}else if(params[0].toLowerCase().equals("basic")){
+					METHOD = Method.BASIC_VERLET;
+				}else{
+					throw new IllegalArgumentException(params[0] + " is not a method in " + args[1]);
+				}
+				Calculator.dt = Double.parseDouble(params[1]);
+				GraphicsThread.fps = Double.parseDouble(params[2]);
+				
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		
 		ObjectFactory factory = new ObjectFactory(METHOD);
-
-		Galaxy galaxy1 = factory.makeGalaxy(new Vector3d(), new Vector3d(), new Vector3d(0,0,1), 1, STARCOUNT);
-		Galaxy galaxy2 = factory.makeGalaxy(new Vector3d(0,5,-30), new Vector3d(0,0,0.5), new Vector3d(0,1,0), 1, STARCOUNT);
 
-		Galaxy[] galaxies = new Galaxy[]{galaxy1, galaxy2};
 
+		if (args.length >= 1) {
+			
+			try {
+				BufferedReader r = new BufferedReader(new FileReader(args[0]));
+				ArrayList<Galaxy> list = new ArrayList<Galaxy>();
+				while(true){
+					String line = r.readLine();
+					if(line == null) break;
+					if(line.isEmpty()) break;
+					if(line.startsWith("#")) continue;
+					
+					list.add(factory.makeGalaxy(line));
+					
+				}
+				r.close();
+				galaxies = new Galaxy[list.size()];
+				galaxies = list.toArray(galaxies);
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			
+		} else {
+			// Default galaxy configuration
+			Galaxy galaxy1 = factory.makeGalaxy(new Vector3d(), new Vector3d(),
+					new Vector3d(0, 0, 1), 1, STARCOUNT);
+			Galaxy galaxy2 = factory.makeGalaxy(new Vector3d(0, 5, -30),
+					new Vector3d(0, 0, 0.5), new Vector3d(0, 1, 0), 1,
+					STARCOUNT);
+
+			galaxies = new Galaxy[] { galaxy1, galaxy2 };
+		}
 		run(galaxies);
-		
+
 	}
 
 	/**
 	 * Main entry point of the application. Call this with an array of galaxies
 	 * to simulate their movement
 	 * 
-	 * @param galaxies is the array of galaxies to be simulated
+	 * @param galaxies
+	 *            is the array of galaxies to be simulated
 	 */
 	public static void run(Galaxy[] galaxies) {
 

src/ee/liiser/siim/galaxies/data/ObjectFactory.java

@@ -24,6 +24,22 @@ public class ObjectFactory {
 	public ObjectFactory(Method method) {
 		this.method = method;
 	}
+	
+	/**
+	 * Generates a galaxy from a formatted string
+	 * @param string
+	 * @return galaxy
+	 */
+	public Galaxy makeGalaxy(String line) {
+		String[] parts = line.split(";");
+		Vector3d[] vecs = new Vector3d[3];
+		for(int i = 0; i < 3; i++){
+			String[] nrs = parts[i].split(",");
+			vecs[i] = new Vector3d(Double.parseDouble(nrs[0]), Double.parseDouble(nrs[1]), Double.parseDouble(nrs[2]));
+		}
+		
+		return makeGalaxy(vecs[0], vecs[1], vecs[2], Double.parseDouble(parts[3]), Integer.parseInt(parts[4]));
+	}
 
 	/**
 	 * Generates a galaxy

src/ee/liiser/siim/galaxies/drawing/GraphicsThread.java

@@ -9,7 +9,7 @@
  */
 public class GraphicsThread extends Thread {
 
-	private static final double fps = 60.0f;
+	public static double fps = 60.0f;
 
 	private Drawable[] points;