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

Merge pull request #1586 from SiboVG/issue-1574

Browse Source 
[#1574] Fix motor flame lighting when no motor
This commit is contained in:
SiboVG 2022-08-17 12:59:43 +02:00 committed by GitHub
commit fe2992ff70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -305,6 +305,9 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
while (!toProcess.isEmpty()) { while (!toProcess.isEmpty()) {
RocketComponent comp = toProcess.poll(); RocketComponent comp = toProcess.poll();
if (comp == null) {
continue;
}
toReturn.add(comp); toReturn.add(comp);
for (RocketComponent child : comp.getChildren()) { for (RocketComponent child : comp.getChildren()) {

2
swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java
View File

@ -381,7 +381,7 @@ public class DebugLogDialog extends JDialog {
}); });
GUIUtil.setDisposableDialogOptions(this, close); GUIUtil.setDisposableDialogOptions(this, close);
setLocationRelativeTo(null); setLocationRelativeTo(parent);
followBox.requestFocus(); followBox.requestFocus();
} }

2
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
View File

@ -393,7 +393,7 @@ public class PhotoPanel extends JPanel implements GLEventListener {
gl.glTranslated(dx - p.getAdvance(), 0, 0); gl.glTranslated(dx - p.getAdvance(), 0, 0);
if (p.isFlame()) { if (p.isFlame() && configuration.hasMotors()) {
convertColor(p.getFlameColor(), color); convertColor(p.getFlameColor(), color);
gl.glLightfv(GLLightingFunc.GL_LIGHT2, GLLightingFunc.GL_AMBIENT, gl.glLightfv(GLLightingFunc.GL_LIGHT2, GLLightingFunc.GL_AMBIENT,