hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit some setting values to sensible ranges

Browse Source
This commit is contained in:
bkuker 2014-01-12 12:54:04 -05:00
parent 8e98ab42f6
commit 0d31819648
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettings.java
View File

@ -5,6 +5,7 @@ import net.sf.openrocket.gui.figure3d.photo.sky.Sky;
import net.sf.openrocket.gui.figure3d.photo.sky.builtin.Mountains; import net.sf.openrocket.gui.figure3d.photo.sky.builtin.Mountains;
import net.sf.openrocket.util.AbstractChangeSource; import net.sf.openrocket.util.AbstractChangeSource;
import net.sf.openrocket.util.Color; import net.sf.openrocket.util.Color;
import net.sf.openrocket.util.MathUtil;
public class PhotoSettings extends AbstractChangeSource implements FlameSettings { public class PhotoSettings extends AbstractChangeSource implements FlameSettings {
private double roll = 3.14; private double roll = 3.14;
@ -29,7 +30,7 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
private boolean flame = false; private boolean flame = false;
private Color flameColor = new Color(255, 100, 50); private Color flameColor = new Color(255, 100, 50);
private boolean smoke = true; private boolean smoke = true;
private Color smokeColor = new Color(230, 230, 230, 204); private Color smokeColor = new Color(230, 230, 230, 102);
private boolean sparks = false; private boolean sparks = false;
private double exhaustScale = 1.0; private double exhaustScale = 1.0;
private double flameAspectRatio = 1.0; private double flameAspectRatio = 1.0;
@ -65,14 +66,7 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
this.pitch = pitch; this.pitch = pitch;
fireChangeEvent(); fireChangeEvent();
} }
public void setPitchYawRoll(double pitch, double yaw, double roll) {
this.roll = roll;
this.yaw = yaw;
this.pitch = pitch;
fireChangeEvent();
}
public double getAdvance() { public double getAdvance() {
return advance; return advance;
} }
@ -88,11 +82,11 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
public void setViewAltAz(double viewAlt, double viewAz){ public void setViewAltAz(double viewAlt, double viewAz){
this.viewAz = viewAz; this.viewAz = viewAz;
this.viewAlt = viewAlt; this.viewAlt = MathUtil.clamp(viewAlt, -Math.PI/2, Math.PI/2);
fireChangeEvent(); fireChangeEvent();
} }
public void setViewAlt(double viewAlt) { public void setViewAlt(double viewAlt) {
this.viewAlt = viewAlt; this.viewAlt = MathUtil.clamp(viewAlt, -Math.PI/2, Math.PI/2);
fireChangeEvent(); fireChangeEvent();
} }
@ -110,7 +104,7 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
} }
public void setViewDistance(double viewDistance) { public void setViewDistance(double viewDistance) {
this.viewDistance = viewDistance; this.viewDistance = Math.max(viewDistance, 0);
fireChangeEvent(); fireChangeEvent();
} }
@ -119,7 +113,7 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings
} }
public void setFov(double fov) { public void setFov(double fov) {
this.fov = fov; this.fov = MathUtil.clamp(fov, 1, Math.PI);
fireChangeEvent(); fireChangeEvent();
} }