Added Color Button to qualifying shapes (planar polygon param window did NOT receive color button).

Added new constructor to MenuItem to prevent or allow color button (bool value, false to turn off button), use two parameter constructor or true in three param to turn on color button. 

Removed color chooser after clicking enter button on both particle emitter and particle as this function is now handled by the color button.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/tesseract/newmenu/NewParticleMenuItem.java b/src/tesseract/newmenu/NewParticleMenuItem.java
index 4b87852..360b7ed 100644
--- a/src/tesseract/newmenu/NewParticleMenuItem.java
+++ b/src/tesseract/newmenu/NewParticleMenuItem.java
@@ -89,10 +89,10 @@ public class NewParticleMenuItem extends MenuItem {
 				}

 				if (event.getSource() == enterButton) {

 					params.dispose();

-					Color c = JColorChooser.showDialog(null, "Particle Color",

-							Color.RED);

+					//Color c = JColorChooser.showDialog(null, "Particle Color",

+					//		Color.RED);

 					myWorld.addObject(new Particle(getPosition(), getMass(),

-						new Color3f(c)));

+						new Color3f(myColor)));

 					

 				}

 			}