add FOV feature
This commit is contained in:
@@ -152,14 +152,17 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
|
||||
|
||||
inputs.setLayout(new VerticalLayout().setSpacing(10)).addElements(new VerticalLayout.Data(0.5, false), lensPanel.load(this.keyframe));
|
||||
|
||||
link(lensPanel.focalDistanceField, lensPanel.apertureRadiusField, timeMinField, timeSecField, timeMSecField);
|
||||
link(lensPanel.focalDistanceField, lensPanel.apertureRadiusField, lensPanel.fovField, timeMinField, timeSecField, timeMSecField);
|
||||
|
||||
popup.invokeAll(IGuiLabel.class, e -> e.setColor(Colors.BLACK));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Change save() {
|
||||
return guiPathing.getMod().getCurrentTimeline().updateLensProperties(time, lensPanel.getFocalDistance(), lensPanel.getApertureRadius());
|
||||
SPTimeline timeline = guiPathing.getMod().getCurrentTimeline();
|
||||
Change lensChange = timeline.updateLensProperties(time, lensPanel.getFocalDistance(), lensPanel.getApertureRadius());
|
||||
Change fovChange = timeline.updateFov(time, lensPanel.getFov());
|
||||
return CombinedChange.createFromApplied(lensChange, fovChange);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -254,7 +257,7 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
|
||||
|
||||
lensPanel.load(this.keyframe);
|
||||
|
||||
link(xField, yField, zField, yawField, pitchField, rollField, timeMinField, lensPanel.focalDistanceField, lensPanel.apertureRadiusField, timeSecField, timeMSecField);
|
||||
link(xField, yField, zField, yawField, pitchField, rollField, lensPanel.focalDistanceField, lensPanel.apertureRadiusField, lensPanel.fovField, timeMinField, timeSecField, timeMSecField);
|
||||
|
||||
popup.invokeAll(IGuiLabel.class, e -> e.setColor(Colors.BLACK));
|
||||
}
|
||||
@@ -268,16 +271,17 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
|
||||
);
|
||||
Change lensChange = timeline.updateLensProperties(time,
|
||||
lensPanel.getFocalDistance(), lensPanel.getApertureRadius());
|
||||
Change fovChange = timeline.updateFov(time, lensPanel.getFov());
|
||||
if (interpolationPanel.getSettingsPanel() == null) {
|
||||
// The last keyframe doesn't have interpolator settings because there is no segment following it
|
||||
return CombinedChange.createFromApplied(positionChange, lensChange);
|
||||
return CombinedChange.createFromApplied(positionChange, lensChange, fovChange);
|
||||
}
|
||||
Interpolator interpolator = interpolationPanel.getSettingsPanel().createInterpolator();
|
||||
if (interpolationPanel.getInterpolatorType() == InterpolatorType.DEFAULT) {
|
||||
return CombinedChange.createFromApplied(positionChange, lensChange,
|
||||
return CombinedChange.createFromApplied(positionChange, lensChange, fovChange,
|
||||
timeline.setInterpolatorToDefault(time), timeline.setDefaultInterpolator(interpolator));
|
||||
} else {
|
||||
return CombinedChange.createFromApplied(positionChange, lensChange,
|
||||
return CombinedChange.createFromApplied(positionChange, lensChange, fovChange,
|
||||
timeline.setInterpolator(time, interpolator));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user