.. | .. |
---|
210 | 210 | oe.menuBar.add(menu = new Menu("Setting")); |
---|
211 | 211 | if (Globals.ADVANCED) |
---|
212 | 212 | { |
---|
213 | | - resetMeshItem = menu.add(new MenuItem("Reset All")); |
---|
214 | | - resetMeshItem.addActionListener(this); |
---|
215 | | - stepAllItem = menu.add(new MenuItem("Step All")); |
---|
216 | | - stepAllItem.addActionListener(this); |
---|
217 | 213 | revertMeshItem = menu.add(new MenuItem("Revert Meshes")); |
---|
218 | 214 | revertMeshItem.addActionListener(this); |
---|
219 | 215 | resetreferencesItem = menu.add(new MenuItem("Reset Mesh References")); |
---|
.. | .. |
---|
372 | 368 | oe.menuBar.add(menu = new Menu("Attributes")); |
---|
373 | 369 | clearMaterialsItem = menu.add(new MenuItem("Clear Materials")); |
---|
374 | 370 | clearMaterialsItem.addActionListener(this); |
---|
| 371 | + resetAllItem = menu.add(new MenuItem("Reset All")); |
---|
| 372 | + resetAllItem.addActionListener(this); |
---|
| 373 | + stepAllItem = menu.add(new MenuItem("Step All")); |
---|
| 374 | + stepAllItem.addActionListener(this); |
---|
375 | 375 | menu.add("-"); |
---|
376 | 376 | liveleavesItem = menu.add(new MenuItem("Live Leaves")); |
---|
377 | 377 | liveleavesItem.addActionListener(this); |
---|
.. | .. |
---|
493 | 493 | //this.AddOptions(oe.toolbarPanel, oe.aConstraints); |
---|
494 | 494 | |
---|
495 | 495 | oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints); |
---|
496 | | - liveCB.setToolTipText("Enabled animation"); |
---|
| 496 | + liveCB.setToolTipText("Enable animation"); |
---|
497 | 497 | liveCB.addItemListener(this); |
---|
498 | 498 | |
---|
499 | 499 | oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
.. | .. |
---|
2281 | 2281 | { |
---|
2282 | 2282 | RevertMeshes(); |
---|
2283 | 2283 | } else |
---|
2284 | | - if (source == resetMeshItem) |
---|
| 2284 | + if (source == resetAllItem) |
---|
2285 | 2285 | { |
---|
2286 | 2286 | ResetAll(); |
---|
2287 | 2287 | } else |
---|
.. | .. |
---|
3652 | 3652 | String pigment = Object3D.GetPigment(tex); |
---|
3653 | 3653 | //String bump = Object3D.GetBump(tex); |
---|
3654 | 3654 | |
---|
3655 | | - com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres); |
---|
| 3655 | + com.sun.opengl.util.texture.TextureData texturedata = null; |
---|
| 3656 | + |
---|
| 3657 | + try |
---|
| 3658 | + { |
---|
| 3659 | + texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres); |
---|
| 3660 | + } |
---|
| 3661 | + catch (Exception e) |
---|
| 3662 | + { |
---|
| 3663 | + System.err.println("FAIL: " + node); |
---|
| 3664 | + } |
---|
3656 | 3665 | |
---|
3657 | 3666 | double s = v.s; |
---|
3658 | 3667 | |
---|
.. | .. |
---|
5131 | 5140 | private MenuItem linkverticesItem; |
---|
5132 | 5141 | private MenuItem relinkverticesItem; |
---|
5133 | 5142 | private MenuItem setMasterItem; |
---|
5134 | | - private MenuItem resetMeshItem; |
---|
| 5143 | + private MenuItem resetAllItem; |
---|
5135 | 5144 | private MenuItem stepAllItem; |
---|
5136 | 5145 | private MenuItem revertMeshItem; |
---|
5137 | 5146 | private MenuItem poseMeshItem; |
---|