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

Merge pull request #1773 from SiboVG/issue-1771

Browse Source 
[#1771, #939, #1191] FIX OVERLAY ISSUES IN 3D VIEW!!!!
This commit is contained in:
Sibo Van Gool 2022-10-28 21:09:49 +02:00 committed by GitHub
commit 1e3790d9a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
View File

@ -324,9 +324,9 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
} }
rr.render(drawable, configuration, selection); rr.render(drawable, configuration, selection);
drawExtras(gl, glu); drawExtras(drawable, gl, glu);
if (drawCarets) { if (drawCarets) {
drawCarets(gl, glu); drawCarets(drawable, gl, glu);
} }
// GLJPanel with GLSL Flipper relies on this: // GLJPanel with GLSL Flipper relies on this:
@ -353,12 +353,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
return og2d; return og2d;
} }
private void drawCarets(final GL2 gl, final GLU glu) { private void drawCarets(final GLAutoDrawable drawable, final GL2 gl, final GLU glu) {
final Graphics2D og2d = createOverlayGraphics(caretOverlay); final Graphics2D og2d = createOverlayGraphics(caretOverlay);
og2d.setBackground(new Color(0, 0, 0, 0)); og2d.setBackground(new Color(0, 0, 0, 0));
og2d.clearRect(0, 0, canvas.getWidth(), canvas.getHeight()); og2d.clearRect(0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
caretOverlay.markDirty(0, 0, canvas.getWidth(), canvas.getHeight()); caretOverlay.markDirty(0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
// The existing relative Extras don't really work right for 3d. // The existing relative Extras don't really work right for 3d.
Coordinate pCP = project(cp, gl, glu); Coordinate pCP = project(cp, gl, glu);
@ -399,7 +399,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
* Re-blits the overlay every frame. Only re-renders the overlay * Re-blits the overlay every frame. Only re-renders the overlay
* when needed. * when needed.
*/ */
private void drawExtras(final GL2 gl, final GLU glu) { private void drawExtras(final GLAutoDrawable drawable, final GL2 gl, final GLU glu) {
//Only re-render if needed //Only re-render if needed
// redrawExtras: Some external change (new simulation data) means // redrawExtras: Some external change (new simulation data) means
// the data is out of date. // the data is out of date.
@ -411,8 +411,8 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
final Graphics2D og2d = createOverlayGraphics(extrasOverlay); final Graphics2D og2d = createOverlayGraphics(extrasOverlay);
og2d.setBackground(new Color(0, 0, 0, 0)); og2d.setBackground(new Color(0, 0, 0, 0));
og2d.clearRect(0, 0, canvas.getWidth(), canvas.getHeight()); og2d.clearRect(0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
extrasOverlay.markDirty(0, 0, canvas.getWidth(), canvas.getHeight()); extrasOverlay.markDirty(0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
for (FigureElement e : relativeExtra) { for (FigureElement e : relativeExtra) {
e.paint(og2d, 1); e.paint(og2d, 1);

2
swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
View File

@ -824,7 +824,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
@Override @Override
public void stateChanged(EventObject e) { public void stateChanged(EventObject e) {
if (updateFlightData(sim) && sim.getFlightConfigurationId() == document.getSelectedConfiguration().getFlightConfigurationID()) { if (updateFlightData(sim) && sim.getFlightConfigurationId() == document.getSelectedConfiguration().getFlightConfigurationID()) {
// TODO HIGH: this gets updated for every sim run; not necessary... // TODO: HIGH: this gets updated for every sim run; not necessary...
updateFigures(); updateFigures();
} }
} }