Merge branch 'kruland-integration-motor' into

kruland-integration-defaults

Conflicts:
	core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java

core/src/net/sf/openrocket/appearance/Appearance.java

@@ -10,7 +10,7 @@ import net.sf.openrocket.util.MathUtil;
  * @author Bill Kuker <bkuker@billkuker.com>
  */
 public class Appearance {
-	public static final Appearance MISSING = new Appearance(new Color(0, 0, 0), 100, null);
+	public static final Appearance MISSING = new Appearance(new Color(0, 0, 0), 1, null);
 	
 	private final Color paint;
 	private final double shine;

core/src/net/sf/openrocket/appearance/defaults/MotorAppearance.java

@@ -0,0 +1,42 @@
+package net.sf.openrocket.appearance.defaults;
+
+import net.sf.openrocket.appearance.Appearance;
+import net.sf.openrocket.appearance.Decal;
+import net.sf.openrocket.appearance.Decal.EdgeMode;
+import net.sf.openrocket.motor.Motor;
+import net.sf.openrocket.motor.ThrustCurveMotor;
+import net.sf.openrocket.util.Color;
+import net.sf.openrocket.util.Coordinate;
+
+public class MotorAppearance extends Appearance {
+	
+	
+	private static MotorAppearance ESTES = new MotorAppearance("/datafiles/textures/motors/estes.png");
+	private static MotorAppearance AEROTECH = new MotorAppearance("/datafiles/textures/motors/aerotech.png");
+	
+	public static Appearance getAppearance(Motor m) {
+		if (m instanceof ThrustCurveMotor) {
+			ThrustCurveMotor tcm = (ThrustCurveMotor) m;
+			if ("Estes".equals(tcm.getManufacturer().getSimpleName())) {
+				return ESTES;
+			}
+			if ("AeroTech".equals(tcm.getManufacturer().getSimpleName())) {
+				return AEROTECH;
+			}
+		}
+		return Appearance.MISSING;
+	}
+	
+	protected MotorAppearance(final String resource) {
+		super(
+				new Color(0, 0, 0),
+				.1,
+				new Decal(
+						new Coordinate(0, 0),
+						new Coordinate(0, 0),
+						new Coordinate(1, 1),
+						0,
+						new ResourceDecalImage(resource), EdgeMode.REPEAT));
+	}
+	
+}

core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java

@@ -7,7 +7,9 @@ import java.io.InputStream;
 
 import net.sf.openrocket.appearance.DecalImage;
 
+
 class ResourceDecalImage implements DecalImage {
+	
 	final String resource;
 	
 	ResourceDecalImage(final String resource) {

core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java

@@ -15,6 +15,7 @@ import javax.media.opengl.glu.GLUtessellatorCallback;
 import javax.media.opengl.glu.GLUtessellatorCallbackAdapter;
 
 import net.sf.openrocket.logging.LogHelper;
+import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.EllipticalFinSet;
 import net.sf.openrocket.rocketcomponent.FinSet;
@@ -314,10 +315,9 @@ public class ComponentRenderer {
 		
 	}
 	
-	public void renderMotor(final GL2 gl, final Coordinate c, double l, double r) {
+	public void renderMotor(final GL2 gl, final Coordinate c, Motor motor) {
-		final float outside[] = { 0.2f, 0.2f, 0.2f, 1.0f };
+		double l = motor.getLength();
-		gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_DIFFUSE, outside, 0);
+		double r = motor.getDiameter() / 2;
-		gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, outside, 0);
 		
 		gl.glPushMatrix();
 		
@@ -325,15 +325,48 @@ public class ComponentRenderer {
 		
 		gl.glRotated(90, 0, 1.0, 0);
 		
+		gl.glMatrixMode(GL.GL_TEXTURE);
+		gl.glPushMatrix();
+		gl.glTranslated(0, .125, 0);
+		gl.glScaled(1, .75, 0);
+		
 		glu.gluCylinder(q, r, r, l, LOD, 1);
 		
-		glu.gluDisk(q, r, 0, LOD, 2);
+		gl.glPopMatrix();
+		gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
+		
+		{
+			final double da = (2.0f * Math.PI) / LOD;
+			final double dt = 1.0 / LOD;
+			gl.glBegin(GL.GL_TRIANGLE_STRIP);
+			gl.glNormal3d(0, 0, 1);
+			for (int i = 0; i < LOD + 1; i++) {
+				gl.glTexCoord2d(i * dt, .125);
+				gl.glVertex3d(r * Math.cos(da * i), r * Math.sin(da * i), 0);
+				gl.glTexCoord2d(i * dt, 0);
+				gl.glVertex3d(0, 0, 0);
+				
+			}
+			gl.glEnd();
+		}
 		
 		gl.glTranslated(0, 0, l);
 		gl.glRotated(180, 0, 1.0, 0);
 		
-		glu.gluDisk(q, r, 0, LOD, 2);
+		{
+			final double da = (2.0f * Math.PI) / LOD;
+			final double dt = 1.0 / LOD;
+			gl.glBegin(GL.GL_TRIANGLE_STRIP);
+			gl.glNormal3d(0, 0, 1);
+			for (int i = 0; i < LOD + 1; i++) {
+				gl.glTexCoord2d(i * dt, .875);
+				gl.glVertex3d(r * Math.cos(da * i), r * Math.sin(da * i), 0);
+				gl.glTexCoord2d(i * dt, 1);
+				gl.glVertex3d(0, 0, 0);
 				
+			}
+			gl.glEnd();
+		}
 		gl.glPopMatrix();
 	}
 }

core/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java

@@ -8,6 +8,7 @@ import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.fixedfunc.GLLightingFunc;
 
+import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.ExternalComponent;
 import net.sf.openrocket.rocketcomponent.NoseCone;
@@ -16,6 +17,7 @@ import net.sf.openrocket.rocketcomponent.SymmetricComponent;
 import net.sf.openrocket.rocketcomponent.Transition;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.util.Color;
+import net.sf.openrocket.util.Coordinate;
 
 public class FigureRenderer extends RocketRenderer {
 	private final float[] color = new float[4];
@@ -30,7 +32,7 @@ public class FigureRenderer extends RocketRenderer {
 		GL2 gl = drawable.getGL().getGL2();
 		
 		gl.glLightModelfv(GL2ES1.GL_LIGHT_MODEL_AMBIENT,
-                new float[] { 0,0,0 }, 0);
+				new float[] { 0, 0, 0 }, 0);
 		
 		float amb = 0.3f;
 		float dif = 1.0f - amb;
@@ -142,7 +144,7 @@ public class FigureRenderer extends RocketRenderer {
 	}
 	
 	protected static void convertColor(Color color, float[] out) {
-		if ( color == null ){
+		if (color == null) {
 			out[0] = 1;
 			out[1] = 1;
 			out[2] = 0;
@@ -152,4 +154,13 @@ public class FigureRenderer extends RocketRenderer {
 			out[2] = Math.max(0.2f, (float) color.getBlue() / 255f) * 2;
 		}
 	}
+	
+	
+	@Override
+	protected void renderMotor(GL2 gl, Coordinate c, Motor motor) {
+		final float outside[] = { 0.2f, 0.2f, 0.2f, 1.0f };
+		gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_DIFFUSE, outside, 0);
+		gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, outside, 0);
+		super.renderMotor(gl, c, motor);
+	}
 }

core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java

@@ -15,9 +15,12 @@ import javax.media.opengl.fixedfunc.GLMatrixFunc;
 import net.sf.openrocket.appearance.Appearance;
 import net.sf.openrocket.appearance.Decal;
 import net.sf.openrocket.appearance.defaults.DefaultAppearance;
+import net.sf.openrocket.appearance.defaults.MotorAppearance;
 import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.util.Color;
+import net.sf.openrocket.util.Coordinate;
 
 import com.jogamp.opengl.util.texture.Texture;
 import com.jogamp.opengl.util.texture.TextureData;
@@ -93,8 +96,26 @@ public class RealisticRenderer extends RocketRenderer {
 	}
 	
 	@Override
-	public void renderComponent(GL2 gl, RocketComponent c, float alpha) {
+	protected void renderMotor(final GL2 gl, final Coordinate c, final Motor motor) {
-		final Appearance a = getAppearance(c);
+		render(gl, new Runnable() {
+			@Override
+			public void run() {
+				cr.renderMotor(gl, c, motor);
+			}
+		}, MotorAppearance.getAppearance(motor), 1);
+	}
+	
+	@Override
+	public void renderComponent(final GL2 gl, final RocketComponent c, final float alpha) {
+		render(gl, new Runnable() {
+			@Override
+			public void run() {
+				cr.renderGeometry(gl, c);
+			}
+		}, getAppearance(c), alpha);
+	}
+	
+	private void render(GL2 gl, Runnable g, Appearance a, float alpha) {
 		final Decal t = a.getTexture();
 		final Texture tex = getTexture(t);
 		
@@ -117,7 +138,7 @@ public class RealisticRenderer extends RocketRenderer {
 		gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_SPECULAR, colorBlack, 0);
 		gl.glMateriali(GL.GL_BACK, GLLightingFunc.GL_SHININESS, 0);
 		
-		cr.renderGeometry(gl, c);
+		g.run();
 		
 		if (t != null && tex != null) {
 			gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR_MIPMAP_LINEAR);
@@ -156,7 +177,7 @@ public class RealisticRenderer extends RocketRenderer {
 				gl.glTexParameterf(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotrophy);
 			}
 			
-			cr.renderGeometry(gl, c);
+			g.run();
 			
 			if (t.getEdgeMode() == Decal.EdgeMode.STICKER) {
 				gl.glDepthFunc(GL.GL_LESS);

core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java

@@ -176,16 +176,19 @@ public abstract class RocketRenderer {
 			MotorMount mount = iterator.next();
 			Motor motor = mount.getMotor(motorID);
 			double length = motor.getLength();
-			double radius = motor.getDiameter() / 2;
 			
 			Coordinate[] position = ((RocketComponent) mount).toAbsolute(new Coordinate(((RocketComponent) mount)
 					.getLength() + mount.getMotorOverhang() - length));
 			
 			for (int i = 0; i < position.length; i++) {
-				cr.renderMotor(gl, position[i], length, radius);
+				renderMotor(gl, position[i], motor);
 			}
 		}
 		
 	}
 	
+	protected void renderMotor(GL2 gl, Coordinate c, Motor motor) {
+		cr.renderMotor(gl, c, motor);
+	}
+	
 }