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

[fixes #969] Updated custom FinSet appearance with unstable

Browse Source
This commit is contained in:
Sibo Van Gool 2021-07-13 20:25:59 +02:00
parent 354c05fa60
commit 34ddba4e2f
1 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/src/net/sf/openrocket/rocketcomponent/FinSet.java
View File

@ -122,10 +122,7 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
private double totalVolume = Double.NaN; private double totalVolume = Double.NaN;
private Coordinate centerOfMass = Coordinate.NaN; private Coordinate centerOfMass = Coordinate.NaN;
// Settings for inside/edge appearance private final InsideColorComponentHandler insideColorComponentHandler = new InsideColorComponentHandler(this);
private Appearance insideAppearance = null;
private boolean insideSameAsOutside = true;
private boolean edgesSameAsInside = true;
/** /**
* New FinSet with given number of fins and given base rotation angle. * New FinSet with given number of fins and given base rotation angle.
@ -1272,47 +1269,7 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
} }
@Override @Override
public Appearance getInsideAppearance() { public InsideColorComponentHandler getInsideColorComponentHandler() {
return this.insideAppearance; return this.insideColorComponentHandler;
}
@Override
public void setInsideAppearance(Appearance appearance) {
this.insideAppearance = appearance;
if (this.insideAppearance != null) {
Decal d = this.insideAppearance.getTexture();
if (d != null) {
d.getImage().addChangeListener(new StateChangeListener() {
@Override
public void stateChanged(EventObject e) {
fireComponentChangeEvent(ComponentChangeEvent.TEXTURE_CHANGE);
}
});
}
}
// CHECK - should this be a TEXTURE_CHANGE and not NONFUNCTIONAL_CHANGE?
fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
}
@Override
public boolean isEdgesSameAsInside() {
return this.edgesSameAsInside;
}
@Override
public void setEdgesSameAsInside(boolean newState) {
this.edgesSameAsInside = newState;
}
@Override
public boolean isInsideSameAsOutside() {
return this.insideSameAsOutside;
}
@Override
public void setInsideSameAsOutside(boolean newState) {
this.insideSameAsOutside = newState;
} }
} }