diff options
author | Phillip <pacardon@u.washington.edu> | 2011-02-23 08:19:21 +0000 |
---|---|---|
committer | Phillip <pacardon@u.washington.edu> | 2011-02-23 08:19:21 +0000 |
commit | d65550e3a82364d6c5048ac4628143dcd2168ea7 (patch) | |
tree | f23266371a36bdaec13cac927d19a388402ca076 /src/tesseract/newmenu/NewEllipsoidMenuItem.java | |
parent | 943d399633381d5a7138d7276eb13372288189d0 (diff) |
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.
Diffstat (limited to 'src/tesseract/newmenu/NewEllipsoidMenuItem.java')
-rw-r--r-- | src/tesseract/newmenu/NewEllipsoidMenuItem.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tesseract/newmenu/NewEllipsoidMenuItem.java b/src/tesseract/newmenu/NewEllipsoidMenuItem.java index 2261c73..d5ee1ca 100644 --- a/src/tesseract/newmenu/NewEllipsoidMenuItem.java +++ b/src/tesseract/newmenu/NewEllipsoidMenuItem.java @@ -82,7 +82,8 @@ public class NewEllipsoidMenuItem extends MenuItem { }
if (event.getSource() == enterButton) {
myWorld.addObject(new Ellipsoid(getPosition(), getMass(),
- ((Float) myParameters.get("Radius")).floatValue()));
+ ((Float) myParameters.get("Radius")).floatValue(),
+ myColor));
params.dispose();
}
}
|