Normand Briere
2019-06-16 7b6b5ba546450e71ecc812356952b594acc5add5
GroupEditor.java
....@@ -74,7 +74,7 @@
7474 this.copy = this.group = copy;
7575 //selectees = this.group.selectees;
7676
77
- SetupMenu2(objEditor);
77
+ SetupMenu2(this); //objEditor);
7878 SetupUI2(objEditor);
7979 objEditor.SetupUI(true);
8080 SetupViews(objEditor);
....@@ -98,14 +98,14 @@
9898
9999 void CloneClipboard(boolean supports)
100100 {
101
- assert(GrafreeD.clipboard.parent == null);
102
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
101
+ assert(Grafreed.clipboard.parent == null);
102
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
103
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
104
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
105
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106106 else
107
- makeSomething(CloneObject(GrafreeD.clipboard, false));
108
- GrafreeD.clipboard.get(0).parent = keepparent;
107
+ makeSomething(CloneObject(Grafreed.clipboard, false));
108
+ Grafreed.clipboard.get(0).parent = keepparent;
109109 }
110110
111111 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -119,7 +119,7 @@
119119 // obj.support = null;
120120 if (!supports)
121121 obj.SaveSupports();
122
- Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+ Object3D clone = (Object3D)Grafreed.clone(obj);
123123 obj.parent = parent;
124124 // obj.support = support;
125125 // clone.support = support; // aout 2013
....@@ -148,8 +148,130 @@
148148
149149 //JTextField nameField;
150150
151
- void SetupMenu2(ObjEditor oe)
151
+ void SetupMenu2(GroupEditor oe)
152152 {
153
+ Menu menu;
154
+ oe.menuBar.add(menu = new Menu("Edit"));
155
+ //editItem = menu.add(new MenuItem("Edit"));
156
+ //editItem.addActionListener(this);
157
+
158
+// undoItem = menu.add(new MenuItem("Undo"));
159
+// undoItem.addActionListener(this);
160
+// redoItem = menu.add(new MenuItem("Redo"));
161
+// redoItem.addActionListener(this);
162
+// menu.add("-");
163
+ duplicateItem = menu.add(new MenuItem("Duplicate"));
164
+ duplicateItem.addActionListener(this);
165
+ cloneItem = menu.add(new MenuItem("Clone"));
166
+ cloneItem.addActionListener(this);
167
+ if (Globals.ADVANCED)
168
+ {
169
+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170
+ cloneSupportItem.addActionListener(this);
171
+ }
172
+ menu.add("-");
173
+ cutItem = menu.add(new MenuItem("Cut"));
174
+ cutItem.addActionListener(this);
175
+ copyItem = menu.add(new MenuItem("Copy"));
176
+ copyItem.addActionListener(this);
177
+ pasteItem = menu.add(new MenuItem("Paste"));
178
+ pasteItem.addActionListener(this);
179
+ menu.add("-");
180
+
181
+ menu.add("-");
182
+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
183
+ pasteIntoItem.addActionListener(this);
184
+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
185
+ pasteLinkItem.addActionListener(this);
186
+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
187
+ pasteCloneItem.addActionListener(this);
188
+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189
+// pasteExpandItem.addActionListener(this);
190
+ menu.add("-");
191
+ clearItem = menu.add(new MenuItem("Clear"));
192
+ clearItem.addActionListener(this);
193
+
194
+ if (Globals.ADVANCED)
195
+ {
196
+ // Deletes the cameras...
197
+ clearAllItem = menu.add(new MenuItem("Clear All"));
198
+ clearAllItem.addActionListener(this);
199
+ }
200
+
201
+ menuBar.add(cameraMenu = new Menu("View"));
202
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
203
+ //zBufferItem.addActionListener(this);
204
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205
+ //normalLensItem.addActionListener(this);
206
+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207
+ revertCameraItem.addActionListener(this);
208
+
209
+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210
+ toggleFullScreenItem.addItemListener(this);
211
+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212
+ cameraMenu.add("-");
213
+
214
+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215
+ toggleTextureItem.addItemListener(this);
216
+ toggleTextureItem.setState(CameraPane.textureon);
217
+
218
+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219
+ toggleSwitchItem.addItemListener(this);
220
+ toggleSwitchItem.setState(CameraPane.SWITCH);
221
+
222
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223
+ toggleHandleItem.addItemListener(this);
224
+ toggleHandleItem.setState(CameraPane.HANDLES);
225
+
226
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
227
+ togglePaintItem.addItemListener(this);
228
+ togglePaintItem.setState(CameraPane.PAINTMODE);
229
+
230
+ if (Globals.ADVANCED)
231
+ {
232
+ cameraMenu.add("-");
233
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
234
+ toggleLiveItem.addItemListener(this);
235
+ toggleLiveItem.setState(Globals.isLIVE());
236
+
237
+ cameraMenu.add(stepItem = new MenuItem("Step"));
238
+ stepItem.addActionListener(this);
239
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
240
+ // toggleDLItem.addItemListener(this);
241
+ // toggleDLItem.setState(false);
242
+
243
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
244
+ toggleRenderItem.addItemListener(this);
245
+ toggleRenderItem.setState(!CameraPane.frozen);
246
+
247
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248
+ toggleDebugItem.addItemListener(this);
249
+ toggleDebugItem.setState(CameraPane.DEBUG);
250
+
251
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252
+ toggleFrustumItem.addItemListener(this);
253
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
254
+
255
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
256
+ toggleFootContactItem.addItemListener(this);
257
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
258
+
259
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
260
+ toggleTimelineItem.addItemListener(this);
261
+ }
262
+
263
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
264
+// toggleRootItem.addItemListener(this);
265
+// toggleRootItem.setState(false);
266
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
267
+// animationItem.addItemListener(this);
268
+// animationItem.setState(CameraPane.ANIMATION);
269
+ cameraMenu.add("-");
270
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
271
+ editCameraItem.addActionListener(this);
272
+
273
+ if (Globals.ADVANCED)
274
+ {
153275 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154276 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155277 //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
....@@ -161,45 +283,17 @@
161283 lookAtItem.addActionListener(this);
162284 //lookFromItem.addActinoListener(this);
163285 //switchItem.addActionListener(this);
164
- Menu menu;
165
- oe.menuBar.add(menu = new Menu("Edit"));
166
- //editItem = menu.add(new MenuItem("Edit"));
167
- //editItem.addActionListener(this);
168
- duplicateItem = menu.add(new MenuItem("Duplicate"));
169
- duplicateItem.addActionListener(this);
170
- menu.add("-");
171
- cloneItem = menu.add(new MenuItem("Clone"));
172
- cloneItem.addActionListener(this);
173
- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174
- cloneSupportItem.addActionListener(this);
175
- menu.add("-");
176
- cutItem = menu.add(new MenuItem("Cut"));
177
- cutItem.addActionListener(this);
178
- copyItem = menu.add(new MenuItem("Copy"));
179
- copyItem.addActionListener(this);
180
- pasteItem = menu.add(new MenuItem("Paste"));
181
- pasteItem.addActionListener(this);
182
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
183
- pasteLinkItem.addActionListener(this);
184
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185
- pasteCloneItem.addActionListener(this);
186
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187
-// pasteExpandItem.addActionListener(this);
188
- clearItem = menu.add(new MenuItem("Clear"));
189
- clearItem.addActionListener(this);
190
- clearAllItem = menu.add(new MenuItem("Clear All"));
191
- clearAllItem.addActionListener(this);
192
-
286
+ }
287
+
193288 oe.menuBar.add(menu = new Menu("Setting"));
194
- resetMeshItem = menu.add(new MenuItem("Reset All"));
195
- resetMeshItem.addActionListener(this);
196
- stepAllItem = menu.add(new MenuItem("Step All"));
197
- stepAllItem.addActionListener(this);
289
+ if (Globals.ADVANCED)
290
+ {
198291 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199292 revertMeshItem.addActionListener(this);
200293 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201294 resetreferencesItem.addActionListener(this);
202295 menu.add("-");
296
+ }
203297 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204298 overwriteGeoItem.addActionListener(this);
205299 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,19 +305,26 @@
211305 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212306 overwriteUVItem.addActionListener(this);
213307 menu.add("-");
308
+ if (Globals.ADVANCED)
309
+ {
214310 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215311 generateMeshItem.addActionListener(this);
216312 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217313 poseMeshItem.addActionListener(this);
218314 menu.add("-");
315
+ }
219316 resetsupportItem = menu.add(new MenuItem("Reset support"));
220317 resetsupportItem.addActionListener(this);
221318 linkverticesItem = menu.add(new MenuItem("Link to Support"));
222319 linkverticesItem.addActionListener(this);
223320 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224321 relinkverticesItem.addActionListener(this);
322
+
323
+ if (Globals.ADVANCED)
324
+ {
225325 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226326 setMasterItem.addActionListener(this);
327
+ }
227328
228329 oe.menuBar.add(menu = new Menu("Group"));
229330 grabItem = menu.add(new MenuItem("Grab"));
....@@ -234,27 +335,32 @@
234335 frontItem.addActionListener(this);
235336 compositeItem = menu.add(new MenuItem("Composite"));
236337 compositeItem.addActionListener(this);
237
- hideItem = menu.add(new MenuItem("Hide"));
338
+ hideItem = menu.add(new MenuItem("Hidden Group"));
238339 hideItem.addActionListener(this);
239340 ungroupItem = menu.add(new MenuItem("Ungroup"));
240341 ungroupItem.addActionListener(this);
241342 menu.add("-");
242
- randomItem = menu.add(new MenuItem("Random"));
343
+ randomItem = menu.add(new MenuItem("Switch node"));
243344 randomItem.addActionListener(this);
244
- physicsItem = menu.add(new MenuItem("Physics"));
245
- physicsItem.addActionListener(this);
246
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247
- frameselectorItem.addActionListener(this);
248345 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249346 switchGeoItem.addActionListener(this);
250347 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251348 switchTransfoItem.addActionListener(this);
252
- morphItem = menu.add(new MenuItem("Morph"));
349
+ morphItem = menu.add(new MenuItem("Morph Group"));
253350 morphItem.addActionListener(this);
351
+
352
+ if (Globals.ADVANCED)
353
+ {
354
+ menu.add("-");
355
+ physicsItem = menu.add(new MenuItem("Physics"));
356
+ physicsItem.addActionListener(this);
357
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
358
+ frameselectorItem.addActionListener(this);
254359 scriptNodeItem = menu.add(new MenuItem("Script Node"));
255360 scriptNodeItem.addActionListener(this);
256361 cameraItem = menu.add(new MenuItem("Camera"));
257362 cameraItem.addActionListener(this);
363
+ }
258364
259365 oe.menuBar.add(menu = new Menu("Object"));
260366 textureItem = menu.add(new MenuItem("Texture"));
....@@ -269,21 +375,29 @@
269375 shadowYItem.addActionListener(this);
270376 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271377 shadowZItem.addActionListener(this);
378
+ if (Globals.ADVANCED)
379
+ {
380
+ menu.add("-");
272381 linkerItem = menu.add(new MenuItem("Linker"));
273382 linkerItem.addActionListener(this);
274
- templateItem = menu.add(new MenuItem("Template"));
275
- templateItem.addActionListener(this);
276383 attributeItem = menu.add(new MenuItem("Attribute"));
277384 attributeItem.addActionListener(this);
385
+ templateItem = menu.add(new MenuItem("Template"));
386
+ templateItem.addActionListener(this);
278387 pointflowItem = menu.add(new MenuItem("Point Flow"));
279388 pointflowItem.addActionListener(this);
389
+ }
280390 menu.add("-");
281391 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282392 resetTransformItem.addActionListener(this);
283393 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284394 resetCentroidItem.addActionListener(this);
285
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
- transformgeometryItem.addActionListener(this);
395
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
396
+ resetCentroidXZItem.addActionListener(this);
397
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
398
+ transformGeometryItem.addActionListener(this);
399
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
400
+ transformChildrenItem.addActionListener(this);
287401
288402 oe.menuBar.add(menu = new Menu("Geometry"));
289403 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -294,8 +408,11 @@
294408 genNormalsCADItem.addActionListener(this);
295409 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296410 genNormalsMESHItem.addActionListener(this);
411
+ if (Globals.ADVANCED)
412
+ {
297413 genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298414 genNormalsMINEItem.addActionListener(this);
415
+ }
299416 stripifyItem = menu.add(new MenuItem("Stripify"));
300417 stripifyItem.addActionListener(this);
301418 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,23 +434,34 @@
317434 reduce34MeshItem.addActionListener(this);
318435 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319436 increaseMeshItem.addActionListener(this);
320
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
- smoothMeshItem.addActionListener(this);
322437 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323438 clipMeshItem.addActionListener(this);
439
+
440
+ if (Globals.ADVANCED)
441
+ {
442
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
443
+ smoothMeshItem.addActionListener(this);
444
+ }
324445
325446 oe.menuBar.add(menu = new Menu("Attributes"));
326447 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327448 clearMaterialsItem.addActionListener(this);
449
+ resetAllItem = menu.add(new MenuItem("Reset All"));
450
+ resetAllItem.addActionListener(this);
451
+ stepAllItem = menu.add(new MenuItem("Step All"));
452
+ stepAllItem.addActionListener(this);
328453 menu.add("-");
329454 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330455 liveleavesItem.addActionListener(this);
331456 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332457 unliveleavesItem.addActionListener(this);
458
+ if (Globals.ADVANCED)
459
+ {
333460 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334461 supportleavesItem.addActionListener(this);
335462 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336463 unsupportleavesItem.addActionListener(this);
464
+ }
337465 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338466 hideleavesItem.addActionListener(this);
339467 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -377,29 +505,22 @@
377505 sortbynameItem = menu.add(new MenuItem("Sort by name"));
378506 sortbynameItem.addActionListener(this);
379507 menu.add("-");
508
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
509
+ shareGeometriesItem.addActionListener(this);
510
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
511
+ mergeGeometriesItem.addActionListener(this);
512
+ if (Globals.ADVANCED)
513
+ {
514
+ // Pretty much the same as duplicate and clone.
380515 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381516 extractGeometriesItem.addActionListener(this);
382517 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383518 cloneGeometriesItem.addActionListener(this);
384
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385
- shareGeometriesItem.addActionListener(this);
386
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
- mergeGeometriesItem.addActionListener(this);
519
+ }
388520
389521 oe.menuBar.add(menu = new Menu("Insert"));
390522 buildCreateMenu(menu);
391523
392
-
393
- oe.menuBar.add(menu = new Menu("Include"));
394
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395
- importGFDItem.addActionListener(this);
396
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397
- importVRMLX3DItem.addActionListener(this);
398
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399
- importOBJItem.addActionListener(this);
400
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401
- import3DSItem.addActionListener(this);
402
-
403524 oe.menuBar.add(menu = new Menu("Tools"));
404525 buildToolsMenu(menu);
405526 }
....@@ -436,59 +557,76 @@
436557 */
437558 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438559
560
+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
+ undoButton.setToolTipText("Undo changes");
562
+ undoButton.addActionListener(this);
563
+
564
+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
+ redoButton.setToolTipText("Redo changes");
566
+ redoButton.addActionListener(this);
567
+
568
+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
+ saveButton.setToolTipText("Save changes");
570
+ saveButton.addActionListener(this);
571
+
439572 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
- liveCB.setToolTipText("Enabled animation");
573
+ liveCB.setToolTipText("Enable animation");
441574 liveCB.addItemListener(this);
442575
576
+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577
+ oneStepButton.setToolTipText("Animate one step forward");
578
+ oneStepButton.addActionListener(this);
579
+
580
+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
581
+ fastCB.setToolTipText("Fast mode");
582
+ fastCB.addItemListener(this);
583
+
443584 oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444585 trackCB.setToolTipText("Enable tracking");
445586 trackCB.addItemListener(this);
446587
447
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
588
+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448589 screenfitButton.setToolTipText("Screen fit");
449590 screenfitButton.addActionListener(this);
450591
451592 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452593 // screenfitpointButton.addActionListener(this);
453
-// oe.aConstraints.gridx += 1;
454
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
- snapobjectButton.addActionListener(this);
456
- snapobjectButton.setToolTipText("Snap Object");
457
- oe.aConstraints.gridx += 1;
458594
459
- //aConstraints.gridx = 0;
460
- //aConstraints.gridy += 1;
461
- oe.aConstraints.weighty = 0;
462
- oe.aConstraints.gridwidth = 1;
463
-
464
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
595
+ if (Globals.ADVANCED)
596
+ {
597
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598
+ snapobjectButton.addActionListener(this);
599
+ snapobjectButton.setToolTipText("Snap Object");
600
+ }
601
+
602
+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465603 flashSelectionButton.setToolTipText("Show selection");
466604 flashSelectionButton.addActionListener(this);
467605
468606 oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469607
470
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
608
+ oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471609 twoButton.setToolTipText("Show center view only");
472610 twoButton.addActionListener(this);
473
- oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
611
+ oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474612 fourButton.addActionListener(this);
475613 fourButton.setToolTipText("Show left panel only");
476
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
614
+ oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477615 sixButton.setToolTipText("2-column layout left");
478616 sixButton.addActionListener(this);
479
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
617
+ oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480618 threeButton.setToolTipText("2-column layout right");
481619 threeButton.addActionListener(this);
482
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
620
+ oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483621 sevenButton.setToolTipText("3-column layout");
484622 sevenButton.addActionListener(this);
485623 //
486624
487
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
625
+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488626 rootButton.setToolTipText("Edit selection in new tab");
489627 rootButton.addActionListener(this);
490628
491
- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
629
+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492630 closeButton.setToolTipText("Close tab");
493631 closeButton.addActionListener(this);
494632 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -496,23 +634,23 @@
496634
497635 cGridBag commandsPanel = new cGridBag();
498636
499
- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
637
+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500638 editButton.setToolTipText("Edit selection");
501639 editButton.addActionListener(this);
502640
503
- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
641
+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504642 uneditButton.setToolTipText("Unedit selection");
505643 uneditButton.addActionListener(this);
506644
507
- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
645
+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646
+ allParamsButton.setToolTipText("Edit all params");
647
+ allParamsButton.addActionListener(this);
648
+
649
+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508650 clearPanelButton.setToolTipText("Clear edit panel");
509651 clearPanelButton.addActionListener(this);
510652
511
- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
- allParamsButton.setToolTipText("All params??");
513
- allParamsButton.addActionListener(this);
514
-
515
- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
653
+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516654 unselectButton.setToolTipText("Unselect");
517655 unselectButton.addActionListener(this);
518656
....@@ -587,43 +725,35 @@
587725
588726 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589727 {
590
- //constraints.gridx = 0;
591
- //constraints.gridy = 0;
592
- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593
- fastCB.setToolTipText("Fast mode");
594
- fastCB.addItemListener(this);
595
- //constraints.gridy += 1;
596
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597
- supportCB.setToolTipText("Enabled rigging");
598
- supportCB.addItemListener(this);
599
-
600
- // constraints.gridy += 1;
601
- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
602
- // localCB.addItemListener(this);
603
-
604
- //constraints.gridy += 1;
605
- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
606
- crowdCB.setToolTipText("Used for crowds");
607
- crowdCB.addItemListener(this);
608
-
609
- //constraints.gridy += 1;
610
- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
611
- smoothCB.setToolTipText("Snapping delay");
612
- smoothCB.addItemListener(this);
613
-
614
- //constraints.gridy += 1;
615
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616
- slowCB.setToolTipText("Smooth interpolation");
617
- slowCB.addItemListener(this);
618
- //constraints.gridy += 1;
619728 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620729 boxCB.setToolTipText("Display bounding boxes");
621730 boxCB.addItemListener(this);
622
- //constraints.gridy += 1;
731
+
623732 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624733 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625734 zoomBoxCB.addItemListener(this);
626735
736
+ if (true) // Globals.ADVANCED)
737
+ {
738
+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739
+ supportCB.setToolTipText("Enable rigging");
740
+ supportCB.addItemListener(this);
741
+
742
+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743
+ // localCB.addItemListener(this);
744
+
745
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746
+ crowdCB.setToolTipText("Used for crowds");
747
+ crowdCB.addItemListener(this);
748
+
749
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
750
+ smoothCB.setToolTipText("Snapping delay");
751
+ smoothCB.addItemListener(this);
752
+
753
+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754
+ slowCB.setToolTipText("Smooth interpolation");
755
+ slowCB.addItemListener(this);
756
+
627757 // constraints.gridy += 1;
628758 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629759 // speakerMocapCB.addItemListener(this);
....@@ -648,14 +778,14 @@
648778 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649779 // debugCB.addItemListener(this);
650780
651
- //constraints.gridy += 1;
652781 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
653782 oeilCB.addItemListener(this);
654783
655
- //constraints.gridy += 1;
656784 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657785 lookAtCB.setToolTipText("Look-at target");
658786 lookAtCB.addItemListener(this);
787
+
788
+ }
659789
660790 cGridBag fill = new cGridBag();
661791
....@@ -676,6 +806,7 @@
676806 buttonGroup.add(radioButton);
677807 radioButton.doClick();
678808 }
809
+
679810 void SetupViews(ObjEditor oe)
680811 {
681812 oe.SetupViews();
....@@ -740,6 +871,7 @@
740871 } else if(e.getSource() == liveCB)
741872 {
742873 cameraView.ToggleLive();
874
+ refreshContents(false);
743875 }
744876 else if(e.getSource() == supportCB)
745877 {
....@@ -892,7 +1024,9 @@
8921024 // objEditor.DropFile((java.io.File[]) object, true);
8931025 // return;
8941026 // }
895
- if (string.charAt(0) == '/')
1027
+
1028
+ // File path for Mac and Windows
1029
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
8961030 {
8971031 // file(s)
8981032 String[] names = string.split("\n");
....@@ -919,7 +1053,7 @@
9191053
9201054 flashIt = false;
9211055 CameraPane pane = (CameraPane) target;
922
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1056
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9231057 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9241058
9251059 if (group.selection.size() == 1)
....@@ -946,11 +1080,11 @@
9461080 {
9471081 loadClipboard(true);
9481082 objEditor.jTree.setSelectionPath(destinationPath);
949
- pasteInto(false);
1083
+ pasteInto(false, false);
9501084 } else {
9511085 loadClipboard(false);
9521086 objEditor.jTree.setSelectionPath(destinationPath);
953
- pasteInto(false); // true); // ???
1087
+ pasteInto(false, false); // true); // ???
9541088 }
9551089 }
9561090 public void dropActionChanged(DropTargetDragEvent dtde)
....@@ -1072,27 +1206,33 @@
10721206 kleinItem.addActionListener(this);
10731207 particleItem = menu.add(new MenuItem("Particle system"));
10741208 particleItem.addActionListener(this);
1209
+ if (Globals.ADVANCED)
1210
+ {
10751211 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10761212 ragdollItem.addActionListener(this);
10771213 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10781214 ragdoll2Item.addActionListener(this);
1215
+ }
10791216 menu.add("-");
1080
- meshItem = menu.add(new MenuItem("Mesh"));
1217
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10811218 meshItem.addActionListener(this);
10821219 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10831220 // meshGroupItem.addActionListener(this);
1221
+ if (Globals.ADVANCED)
1222
+ {
10841223 springItem = menu.add(new MenuItem("Spring"));
10851224 springItem.addActionListener(this);
10861225 flagItem = menu.add(new MenuItem("Flag"));
10871226 flagItem.addActionListener(this);
1088
- bezierItem = menu.add(new MenuItem("Patch"));
1089
- bezierItem.addActionListener(this);
1090
- checkerItem = menu.add(new MenuItem("Checker"));
1091
- checkerItem.addActionListener(this);
10921227 blobItem = menu.add(new MenuItem("Blob"));
10931228 blobItem.addActionListener(this);
10941229 latheItem = menu.add(new MenuItem("Lathe"));
10951230 latheItem.addActionListener(this);
1231
+ }
1232
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1233
+ bezierItem.addActionListener(this);
1234
+ overlayItem = menu.add(new MenuItem("Overlay"));
1235
+ overlayItem.addActionListener(this);
10961236 lightItem = menu.add(new MenuItem("Light"));
10971237 lightItem.addActionListener(this);
10981238 menu.add("-");
....@@ -1102,39 +1242,44 @@
11021242 loopItem.addActionListener(this);
11031243 doubleItem = menu.add(new MenuItem("Fork"));
11041244 doubleItem.addActionListener(this);
1245
+ if (Globals.ADVANCED)
1246
+ {
11051247 tripleItem = menu.add(new MenuItem("Trident"));
11061248 tripleItem.addActionListener(this);
1249
+ }
11071250 }
11081251
11091252 void buildToolsMenu(Menu menu)
11101253 {
11111254 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11121255 animationItem.addItemListener(this);
1113
- animationItem.setState(CameraPane.ANIMATION);
1256
+ animationItem.setState(Globals.ANIMATION);
11141257
11151258 menu.add("-");
11161259 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11171260 parseverticesItem.addActionListener(this);
11181261 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11191262 textureFieldItem.addActionListener(this);
1120
- alignItem = menu.add(new MenuItem("Align"));
1263
+ alignItem = menu.add(new MenuItem("Align Objects"));
11211264 alignItem.addActionListener(this);
1122
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123
- mirrorItem.addActionListener(this);
11241265 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11251266 reduceMorphItem.addActionListener(this);
11261267 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11271268 reduce34MorphItem.addActionListener(this);
1128
-
1269
+ menu.add("-");
11291270 menu.add(computeAOItem = new MenuItem("Compute AO"));
11301271 computeAOItem.addActionListener(this);
1131
- menu.add("-");
11321272
1273
+ if (Globals.ADVANCED)
1274
+ {
1275
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1276
+ mirrorItem.addActionListener(this);
1277
+ menu.add("-");
11331278 menu.add(memoryItem = new MenuItem("Memory Usage"));
11341279 memoryItem.addActionListener(this);
11351280 menu.add(analyzeItem = new MenuItem("Analyze"));
11361281 analyzeItem.addActionListener(this);
1137
- menu.add(dumpItem = new MenuItem("Dump"));
1282
+ menu.add(dumpItem = new MenuItem("Print"));
11381283 dumpItem.addActionListener(this);
11391284 // menu.add(pathItem = new MenuItem("From-to path"));
11401285 // pathItem.addActionListener(this);
....@@ -1152,6 +1297,7 @@
11521297 menu.add("-");
11531298 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11541299 editScriptItem.addActionListener(this);
1300
+ }
11551301 }
11561302
11571303 void ScreenFit()
....@@ -1480,9 +1626,9 @@
14801626
14811627 void Overwrite(int mask)
14821628 {
1483
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1629
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14841630 {
1485
- Object3D content = GrafreeD.clipboard.get(0);
1631
+ Object3D content = Grafreed.clipboard.get(0);
14861632
14871633 if (content instanceof cGroup && ((cGroup)content).transientlink )
14881634 content = ((cGroup)content).get(0);
....@@ -1653,7 +1799,7 @@
16531799 {
16541800 makeSomething(new BezierSurface());
16551801 } else
1656
- if (source == checkerItem)
1802
+ if (source == overlayItem)
16571803 {
16581804 /*
16591805 Object3D obj = new BezierSurface(5,8);
....@@ -1787,23 +1933,6 @@
17871933 csg.addChild(child);
17881934 child.addChild(csg);
17891935 } else
1790
-
1791
- if (source == importGFDItem)
1792
- {
1793
- ImportGFD();
1794
- } else
1795
- if (source == importVRMLX3DItem)
1796
- {
1797
- ImportVRMLX3D();
1798
- } else
1799
- if (source == import3DSItem)
1800
- {
1801
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1802
- } else
1803
- if (source == importOBJItem)
1804
- {
1805
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1806
- } else
18071936 if (source == computeAOItem)
18081937 {
18091938 Globals.drawMode = CameraPane.OCCLUSION;
....@@ -1822,7 +1951,7 @@
18221951 if (source == invariantsItem)
18231952 {
18241953 System.out.println("Invariants:");
1825
- GrafreeD.grafreeD.universe.invariants();
1954
+ Grafreed.grafreeD.universe.invariants();
18261955 } else
18271956 if (source == memoryItem)
18281957 {
....@@ -1840,6 +1969,23 @@
18401969 if (source == dumpItem)
18411970 {
18421971 DumpObject();
1972
+ } else
1973
+ if (source == undoButton)
1974
+ {
1975
+ Undo();
1976
+ } else
1977
+ if (source == redoButton)
1978
+ {
1979
+ Redo();
1980
+ } else
1981
+ if (source == saveButton)
1982
+ {
1983
+ Save();
1984
+ } else
1985
+ if (source == oneStepButton)
1986
+ {
1987
+ Globals.ONESTEP = true;
1988
+ cameraView.repaint();
18431989 } else
18441990 if (source == screenfitButton)
18451991 {
....@@ -1890,12 +2036,20 @@
18902036 {
18912037 loadClipboard(true);
18922038 } else
2039
+ if (source == undoItem)
2040
+ {
2041
+ Undo();
2042
+ } else
2043
+ if (source == redoItem)
2044
+ {
2045
+ Redo();
2046
+ } else
18932047 if (source == duplicateItem)
18942048 {
1895
- Object3D keep = GrafreeD.clipboard;
2049
+ Object3D keep = Grafreed.clipboard;
18962050 loadClipboard(false);
18972051 paste(false);
1898
- GrafreeD.clipboard = keep;
2052
+ Grafreed.clipboard = keep;
18992053 } else
19002054 if (source == cloneItem)
19012055 {
....@@ -1913,13 +2067,17 @@
19132067 {
19142068 paste(false);
19152069 } else
2070
+ if (source == pasteIntoItem)
2071
+ {
2072
+ pasteInto(true, false);
2073
+ } else
19162074 if (source == pasteLinkItem)
19172075 {
1918
- pasteInto(false);
2076
+ pasteInto(false, false);
19192077 } else
19202078 if (source == pasteCloneItem)
19212079 {
1922
- pasteInto(true);
2080
+ pasteInto(true, true);
19232081 } else
19242082 if (source == pasteExpandItem)
19252083 {
....@@ -2111,9 +2269,9 @@
21112269 // group.selection.get(0).setMasterThis(content); // should be identity
21122270 // refreshContents();
21132271 // }
2114
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2272
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21152273 {
2116
- Object3D content = GrafreeD.clipboard.get(0);
2274
+ Object3D content = Grafreed.clipboard.get(0);
21172275
21182276 if (content instanceof cGroup && ((cGroup)content).transientlink )
21192277 content = ((cGroup)content).get(0);
....@@ -2121,11 +2279,11 @@
21212279 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21222280 for (int i=0; i<group.selection.size(); i++)
21232281 {
2124
- boolean random = CameraPane.RANDOM;
2125
- CameraPane.RANDOM = false; // parse all random nodes
2282
+ boolean random = CameraPane.SWITCH;
2283
+ CameraPane.SWITCH = false; // parse all random nodes
21262284 group.selection.get(i).linkVerticesThis(content);
21272285 // group.selection.get(i).setMasterThis(content); // should be identity
2128
- CameraPane.RANDOM = random;
2286
+ CameraPane.SWITCH = random;
21292287 }
21302288 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21312289 refreshContents();
....@@ -2135,20 +2293,20 @@
21352293 {
21362294 for (int i=0; i<group.selection.size(); i++)
21372295 {
2138
- boolean random = CameraPane.RANDOM;
2139
- CameraPane.RANDOM = false; // parse all random nodes
2296
+ boolean random = CameraPane.SWITCH;
2297
+ CameraPane.SWITCH = false; // parse all random nodes
21402298 group.selection.get(i).linkVerticesThis(null);
2141
- CameraPane.RANDOM = random;
2299
+ CameraPane.SWITCH = random;
21422300 }
21432301
21442302 refreshContents();
21452303 } else
21462304 if (source == relinkverticesItem)
21472305 {
2148
- boolean random = CameraPane.RANDOM;
2149
- CameraPane.RANDOM = false; // parse all random nodes
2306
+ boolean random = CameraPane.SWITCH;
2307
+ CameraPane.SWITCH = false; // parse all random nodes
21502308 group.selection.RelinkToSupport();
2151
- CameraPane.RANDOM = random;
2309
+ CameraPane.SWITCH = random;
21522310
21532311 refreshContents();
21542312 } else
....@@ -2163,9 +2321,9 @@
21632321 } else
21642322 if (source == setMasterItem)
21652323 {
2166
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2324
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21672325 {
2168
- Object3D content = GrafreeD.clipboard.get(0);
2326
+ Object3D content = Grafreed.clipboard.get(0);
21692327
21702328 if (content instanceof cGroup && ((cGroup)content).transientlink )
21712329 content = ((cGroup)content).get(0);
....@@ -2178,9 +2336,9 @@
21782336 {
21792337 if (group.selection.size() == 1)
21802338 {
2181
- if (GrafreeD.clipboard.size() == 1)
2339
+ if (Grafreed.clipboard.size() == 1)
21822340 {
2183
- Object3D content = GrafreeD.clipboard.get(0);
2341
+ Object3D content = Grafreed.clipboard.get(0);
21842342
21852343 if (content instanceof cGroup && ((cGroup)content).transientlink )
21862344 content = ((cGroup)content).get(0);
....@@ -2197,7 +2355,7 @@
21972355 {
21982356 RevertMeshes();
21992357 } else
2200
- if (source == resetMeshItem)
2358
+ if (source == resetAllItem)
22012359 {
22022360 ResetAll();
22032361 } else
....@@ -2246,7 +2404,7 @@
22462404 RandomNode random = new RandomNode();
22472405 group(random);
22482406 if (random.size() > 0)
2249
- random.name = random.get(0).name + "Rnd";
2407
+ random.name = random.get(0).name + "Switch";
22502408 } else
22512409 if (source == physicsItem)
22522410 {
....@@ -2385,7 +2543,7 @@
23852543 } else
23862544 if (source == genNormalsMESHItem)
23872545 {
2388
- GenNormals(true); // TODO
2546
+ GenNormalsMESH();
23892547 } else
23902548 if (source == genNormalsORGANItem)
23912549 {
....@@ -2535,9 +2693,13 @@
25352693 {
25362694 SmoothMesh();
25372695 } else
2538
- if (source == transformgeometryItem)
2696
+ if (source == transformGeometryItem)
25392697 {
25402698 TransformGeometry();
2699
+ } else
2700
+ if (source == transformChildrenItem)
2701
+ {
2702
+ TransformChildren();
25412703 } else
25422704 if (source == resetTransformItem)
25432705 {
....@@ -2545,7 +2707,11 @@
25452707 } else
25462708 if (source == resetCentroidItem)
25472709 {
2548
- ResetCentroid();
2710
+ ResetCentroid(true);
2711
+ } else
2712
+ if (source == resetCentroidXZItem)
2713
+ {
2714
+ ResetCentroid(false);
25492715 } else
25502716 if (source == resetParentItem)
25512717 {
....@@ -2901,9 +3067,9 @@
29013067 child.CloseUI();
29023068 listUI.remove(child);
29033069
2904
- child.editWindow = null; // ???????????
3070
+ //child.editWindow = null; // ???????????
29053071 }
2906
- objEditor.ctrlPanel.validate();
3072
+ objEditor.ctrlPanel.FlushUI();
29073073 //objEditor.jTree.clearSelection();
29083074 //objEditor.ResetSliders();
29093075 refreshContents(true);
....@@ -2987,7 +3153,10 @@
29873153 frontView.object = group;
29883154 sideView.object = group;
29893155 }
3156
+
3157
+// fix "+" issue
29903158 group.editWindow = this;
3159
+
29913160 /*
29923161 currentLayout = radio.layout;
29933162 if (currentLayout == null)
....@@ -3000,7 +3169,20 @@
30003169 //group.attributes = -1;
30013170 ResetModel();
30023171 refreshContents(true);
3003
- }
3172
+ } else if (event.getSource() == editCameraItem)
3173
+ {
3174
+ cameraView.ProtectCamera();
3175
+ cameraView.repaint();
3176
+ return;
3177
+ } else if (event.getSource() == revertCameraItem)
3178
+ {
3179
+ cameraView.RevertCamera();
3180
+ cameraView.repaint();
3181
+ return;
3182
+ // } else if (event.getSource() == textureButton)
3183
+ // {
3184
+ // return; // true;
3185
+ }
30043186 else
30053187 {
30063188 //return super.action(event, arg);
....@@ -3061,6 +3243,28 @@
30613243 refreshContents();
30623244 }
30633245
3246
+ void TransformChildren()
3247
+ {
3248
+ Object3D obj;
3249
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3250
+ {
3251
+ obj = (Object3D)e.nextElement();
3252
+ obj.KeepTextureMatrices();
3253
+ obj.TransformChildren();
3254
+ obj.RestoreTextureMatrices();
3255
+
3256
+// if (obj.parent == null)
3257
+// {
3258
+// System.out.println("NULL PARENT!");
3259
+// new Exception().printStackTrace();
3260
+// }
3261
+// else
3262
+// TouchTransform(obj);
3263
+// //obj.parent.Touch();
3264
+ }
3265
+
3266
+ refreshContents();
3267
+ }
30643268
30653269 void ResetTransform()
30663270 {
....@@ -3173,7 +3377,7 @@
31733377 refreshContents();
31743378 }
31753379
3176
- void ResetCentroid()
3380
+ void ResetCentroid(boolean full)
31773381 {
31783382 Object3D obj;
31793383 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3188,12 +3392,16 @@
31883392 LA.matIdentity(Object3D.mat);
31893393 obj.getBounds(minima, maxima, false);
31903394 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3395
+ if (full)
3396
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31923397 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31933398 obj.TransformMesh(Object3D.mat);
3399
+
31943400 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3401
+ if (full)
3402
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31963403 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3404
+
31973405 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
31983406 //Object3D.mat[3][0] = -Object3D.mat[3][0];
31993407 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3222,7 +3430,8 @@
32223430
32233431 int size = obj.MemorySize();
32243432
3225
- System.err.println((size/1024) + " KB is the size of " + obj);
3433
+ //System.err.println((size/1024) + " KB is the size of " + obj);
3434
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
32263435 }
32273436 }
32283437 catch (Exception e)
....@@ -3259,9 +3468,9 @@
32593468 obj = (Object3D)e.nextElement();
32603469
32613470 System.out.println("Object is: " + obj);
3262
- GrafreeD.AnalyzeObject(obj);
3471
+ Grafreed.AnalyzeObject(obj);
32633472 System.out.println("Boundary rep: " + obj.bRep);
3264
- GrafreeD.AnalyzeObject(obj.bRep);
3473
+ Grafreed.AnalyzeObject(obj.bRep);
32653474
32663475 // System.err.println((size/1024) + " KB is the size of " + obj);
32673476 }
....@@ -3303,6 +3512,13 @@
33033512 void GenNormals(boolean crease)
33043513 {
33053514 group.GenNormalsS(crease);
3515
+
3516
+ refreshContents();
3517
+ }
3518
+
3519
+ void GenNormalsMESH()
3520
+ {
3521
+ group.GenNormalsMeshS();
33063522
33073523 refreshContents();
33083524 }
....@@ -3475,8 +3691,8 @@
34753691
34763692 void ParseVertices()
34773693 {
3478
- boolean epsequal = GrafreeD.epsequal;
3479
- GrafreeD.epsequal = true;
3694
+ boolean epsequal = Grafreed.epsequal;
3695
+ Grafreed.epsequal = true;
34803696
34813697 for (int i=0; i<group.selection.size(); i++)
34823698 {
....@@ -3501,7 +3717,7 @@
35013717 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
35023718 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
35033719
3504
- g.add(GrafreeD.clipboard);
3720
+ g.add(Grafreed.clipboard);
35053721
35063722 buffer.add(g);
35073723 }
....@@ -3516,7 +3732,7 @@
35163732 makeSomething(buffer, i==group.selection.size()-1);
35173733 }
35183734
3519
- GrafreeD.epsequal = epsequal;
3735
+ Grafreed.epsequal = epsequal;
35203736
35213737 refreshContents();
35223738 }
....@@ -3534,7 +3750,16 @@
35343750 String pigment = Object3D.GetPigment(tex);
35353751 //String bump = Object3D.GetBump(tex);
35363752
3537
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3753
+ com.sun.opengl.util.texture.TextureData texturedata = null;
3754
+
3755
+ try
3756
+ {
3757
+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3758
+ }
3759
+ catch (Exception e)
3760
+ {
3761
+ System.err.println("FAIL: " + node);
3762
+ }
35383763
35393764 double s = v.s;
35403765
....@@ -3622,11 +3847,11 @@
36223847
36233848 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36243849
3625
- boolean random = CameraPane.RANDOM;
3626
- CameraPane.RANDOM = false; // parse all random nodes
3850
+ boolean random = CameraPane.SWITCH;
3851
+ CameraPane.SWITCH = false; // parse all random nodes
36273852 lowres.linkVerticesThis(null);
36283853 lowres.linkVerticesThis(sn);
3629
- CameraPane.RANDOM = random;
3854
+ CameraPane.SWITCH = random;
36303855
36313856 System.err.flush();
36323857
....@@ -3666,7 +3891,7 @@
36663891 return;
36673892
36683893 Object3D poses = group.selection.get(0);
3669
- Object3D ref = GrafreeD.clipboard.get(0);
3894
+ Object3D ref = Grafreed.clipboard.get(0);
36703895
36713896 Object3D newgroup = new Object3D("Po:" + poses.name);
36723897
....@@ -3860,9 +4085,9 @@
38604085
38614086 void ClipMesh()
38624087 {
3863
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4088
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38644089 {
3865
- Object3D content = GrafreeD.clipboard.get(0);
4090
+ Object3D content = Grafreed.clipboard.get(0);
38664091
38674092 if (content instanceof cGroup && ((cGroup)content).transientlink )
38684093 content = ((cGroup)content).get(0);
....@@ -3871,7 +4096,7 @@
38714096 // {
38724097 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38734098 // }
3874
- group.selection.ClipMesh(GrafreeD.clipboard);
4099
+ group.selection.ClipMesh(Grafreed.clipboard);
38754100 }
38764101 // group.selection.ClipMesh(GrafreeD.clipboard);
38774102 System.out.println("DONE.");
....@@ -4006,7 +4231,7 @@
40064231 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
40074232
40084233 Object3D elem = (Object3D)group.selection.elementAt(i);
4009
- if(elem != group)
4234
+ if(elem != group || !newWindow)
40104235 {
40114236 // if (!(elem instanceof Composite))
40124237 // newWindow = false;
....@@ -4096,7 +4321,6 @@
40964321 //case 702: // Event.LIST_DESELECT
40974322 group.deselectAll();
40984323 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4099
- objEditor.ClearInfo(); // .GetMaterial());
41004324 if (tps != null)
41014325 {
41024326 for (int i=0; i < tps.length; i++)
....@@ -4106,9 +4330,6 @@
41064330 //if (child.parent != null)
41074331 //child.parent.addSelectee(child);
41084332 group.addSelectee(child);
4109
- objEditor.SetMaterial(child); // .GetMaterial());
4110
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4111
- System.err.println("info : " + child.GetPath());
41124333 }
41134334 }
41144335 // else
....@@ -4118,16 +4339,17 @@
41184339 // System.err.println("info : " + group.GetPath());
41194340 // }
41204341
4121
- objEditor.SetText(); // jan 2014
4122
-
4123
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4342
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
41244343 CameraPane.flash = true;
41254344
4126
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4345
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
41274346 // a camera
41284347 {
4129
- CameraPane.camerachangeframe = 0; // don't refuse it
4130
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4348
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4349
+ {
4350
+ CameraPane.camerachangeframe = 0; // don't refuse it
4351
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4352
+ }
41314353 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
41324354 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
41334355 }
....@@ -4140,6 +4362,29 @@
41404362
41414363 freezemodel = false;
41424364 }
4365
+
4366
+ void refreshContents(boolean cp)
4367
+ {
4368
+ if (!Globals.MOUSEDRAGGED)
4369
+ {
4370
+ objEditor.ClearInfo(); // .GetMaterial());
4371
+
4372
+ for (int i=0; i < group.selection.size(); i++)
4373
+ {
4374
+ Object3D child = (Object3D) group.selection.reserve(i);
4375
+
4376
+ objEditor.SetMaterial(child);
4377
+ objEditor.AddInfo(child, this, true);
4378
+ System.err.println("info : " + child.GetPath());
4379
+
4380
+ group.selection.release(i);
4381
+ }
4382
+
4383
+ objEditor.SetText(); // jan 2014
4384
+ }
4385
+
4386
+ super.refreshContents(cp);
4387
+ }
41434388
41444389 void linkSomething(Object3D thing)
41454390 {
....@@ -4211,16 +4456,18 @@
42114456 {
42124457 if (group.selection.isEmpty())
42134458 return;
4214
- GrafreeD.clipboardIsTempGroup = false;
4459
+
4460
+ Grafreed.clipboardIsTempGroup = false;
42154461 Composite tGroup = null;
42164462 if (group.selection.size() > 0) // 1)
42174463 {
42184464 tGroup = new cGroup();
4219
- GrafreeD.clipboardIsTempGroup = true;
4465
+ Grafreed.clipboardIsTempGroup = true;
42204466 }
42214467
42224468 if (cut)
42234469 {
4470
+ Save();
42244471 //int indices[] = jList.getSelectedIndices();
42254472 //for (int i = indices.length - 1; i >= 0; i--)
42264473 //jList.remove(indices[i]);
....@@ -4256,16 +4503,16 @@
42564503 //System.out.println("cut " + child);
42574504 //System.out.println("parent = " + child.parent);
42584505 // tmp.addChild(child);
4259
- if (GrafreeD.clipboardIsTempGroup)
4506
+ if (Grafreed.clipboardIsTempGroup)
42604507 tGroup.add/*Child*/(tmp);
42614508 else
4262
- GrafreeD.clipboard = tmp;
4509
+ Grafreed.clipboard = tmp;
42634510 }
42644511 else
4265
- if (GrafreeD.clipboardIsTempGroup)
4512
+ if (Grafreed.clipboardIsTempGroup)
42664513 tGroup.add/*Child*/(child);
42674514 else
4268
- GrafreeD.clipboard = child;
4515
+ Grafreed.clipboard = child;
42694516 }
42704517
42714518 //ResetModel();
....@@ -4297,21 +4544,23 @@
42974544 //System.out.println("cut " + elem);
42984545 //System.out.println("parent = " + elem.parent);
42994546 // tmp.addChild(elem);
4300
- if (GrafreeD.clipboardIsTempGroup)
4547
+ if (Grafreed.clipboardIsTempGroup)
43014548 tGroup.add/*Child*/(tmp);
43024549 else
4303
- GrafreeD.clipboard = tmp;
4550
+ Grafreed.clipboard = tmp;
43044551 }
43054552 else
4306
- if (GrafreeD.clipboardIsTempGroup)
4553
+ if (Grafreed.clipboardIsTempGroup)
43074554 tGroup.add/*Child*/(child);
43084555 else
4309
- GrafreeD.clipboard = child;
4556
+ Grafreed.clipboard = child;
43104557 }
43114558
43124559 }
4313
- if (GrafreeD.clipboardIsTempGroup)
4314
- GrafreeD.clipboard = tGroup;
4560
+
4561
+ if (Grafreed.clipboardIsTempGroup)
4562
+ Grafreed.clipboard = tGroup;
4563
+
43154564 if (cut)
43164565 {
43174566 ResetModel();
....@@ -4325,7 +4574,7 @@
43254574 // return;
43264575 boolean first = true;
43274576
4328
- if (GrafreeD.clipboardIsTempGroup)
4577
+ if (Grafreed.clipboardIsTempGroup)
43294578 {
43304579 Composite temp;
43314580
....@@ -4336,7 +4585,7 @@
43364585 temp = (Composite)Applet3D.clipboard.deepCopy();
43374586 */
43384587 Object3D elem;
4339
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4588
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
43404589 {
43414590 Object3D child = (Object3D)e.nextElement();
43424591
....@@ -4370,21 +4619,21 @@
43704619 //Object3D cb = Applet3D.clipboard;
43714620 //temp.addChild(cb);
43724621 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4373
- assert(GrafreeD.clipboard.parent == null);
4374
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4375
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4376
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4377
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4622
+ assert(Grafreed.clipboard.parent == null);
4623
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4624
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4625
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
4626
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
43784627 else
4379
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380
- GrafreeD.clipboard.get(0).parent = keepparent;
4628
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4629
+ Grafreed.clipboard.get(0).parent = keepparent;
43814630 }
43824631
43834632 ResetModel();
43844633 refreshContents();
43854634 }
43864635
4387
- void pasteInto(boolean copyit)
4636
+ void pasteInto(boolean copyit, boolean clone)
43884637 {
43894638 // if (GrafreeD.clipboard == null)
43904639 // return;
....@@ -4413,15 +4662,22 @@
44134662 if (copyit)
44144663 {
44154664 // paste(false);
4416
- CloneClipboard(false); // sept 2014
4665
+ if (clone)
4666
+ {
4667
+ CloneClipboard(false); // sept 2014
4668
+ }
4669
+ else
4670
+ {
4671
+ paste(false);
4672
+ }
44174673 }
44184674 else
44194675 {
44204676 boolean first = true;
44214677
4422
- if (GrafreeD.clipboardIsTempGroup)
4678
+ if (Grafreed.clipboardIsTempGroup)
44234679 {
4424
- Composite temp = (Composite)GrafreeD.clipboard;
4680
+ Composite temp = (Composite)Grafreed.clipboard;
44254681 Object3D copy;
44264682 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
44274683 {
....@@ -4431,7 +4687,7 @@
44314687 }
44324688 } else
44334689 {
4434
- linkSomething(GrafreeD.clipboard); //.get(0));
4690
+ linkSomething(Grafreed.clipboard); //.get(0));
44354691 }
44364692 }
44374693 }
....@@ -4836,21 +5092,6 @@
48365092 }
48375093 */
48385094
4839
- void ImportGFD()
4840
- {
4841
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4842
- browser.show();
4843
- String filename = browser.getFile();
4844
- if (filename != null && filename.length() > 0)
4845
- {
4846
- String fullname = browser.getDirectory() + filename;
4847
-
4848
- //Object3D readobj =
4849
- objEditor.ReadGFD(fullname, objEditor);
4850
- //makeSomething(readobj);
4851
- }
4852
- }
4853
-
48545095 /*
48555096 public void Callback(Object obj)
48565097 {
....@@ -4874,26 +5115,9 @@
48745115 }
48755116 */
48765117
4877
- void ImportVRMLX3D()
4878
- {
4879
- if (GrafreeD.standAlone)
4880
- {
4881
- /**/
4882
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4883
- browser.show();
4884
- String filename = browser.getFile();
4885
- if (filename != null && filename.length() > 0)
4886
- {
4887
- String fullname = browser.getDirectory() + filename;
4888
- LoadVRMLX3D(fullname);
4889
- }
4890
- /**/
4891
- }
4892
- }
4893
-
48945118 String GetFile(String dialogName)
48955119 {
4896
- if (GrafreeD.standAlone)
5120
+ if (Grafreed.standAlone)
48975121 {
48985122 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
48995123 browser.show();
....@@ -4957,10 +5181,15 @@
49575181 cButton flashSelectionButton;
49585182 cButton editButton;
49595183 cButton uneditButton;
5184
+ JCheckBox allParamsButton;
49605185 cButton clearpanelButton;
4961
- cButton allParamsButton;
49625186 cButton unselectButton;
49635187
5188
+ cButton saveButton;
5189
+ cButton undoButton;
5190
+ cButton redoButton;
5191
+ cButton oneStepButton;
5192
+
49645193 cButton screenfitButton;
49655194 cButton screenfitpointButton;
49665195 cButton snapobjectButton;
....@@ -4991,6 +5220,8 @@
49915220 private MenuItem lookFromItem;
49925221 private MenuItem switchItem;
49935222 private MenuItem cutItem;
5223
+ private MenuItem undoItem;
5224
+ private MenuItem redoItem;
49945225 private MenuItem duplicateItem;
49955226 private MenuItem cloneItem;
49965227 private MenuItem cloneSupportItem;
....@@ -5004,7 +5235,7 @@
50045235 private MenuItem linkverticesItem;
50055236 private MenuItem relinkverticesItem;
50065237 private MenuItem setMasterItem;
5007
- private MenuItem resetMeshItem;
5238
+ private MenuItem resetAllItem;
50085239 private MenuItem stepAllItem;
50095240 private MenuItem revertMeshItem;
50105241 private MenuItem poseMeshItem;
....@@ -5015,6 +5246,7 @@
50155246 private MenuItem mergeGeometriesItem;
50165247 private MenuItem copyItem;
50175248 private MenuItem pasteItem;
5249
+ private MenuItem pasteIntoItem;
50185250 private MenuItem pasteLinkItem;
50195251 private MenuItem pasteCloneItem;
50205252 private MenuItem pasteExpandItem;
....@@ -5064,8 +5296,10 @@
50645296 private MenuItem panoTexturesItem;
50655297
50665298 private MenuItem resetCentroidItem;
5067
- private MenuItem transformgeometryItem;
5299
+ private MenuItem resetCentroidXZItem;
50685300 private MenuItem resetTransformItem;
5301
+ private MenuItem transformGeometryItem;
5302
+ private MenuItem transformChildrenItem;
50695303 private MenuItem hideItem;
50705304 private MenuItem grabItem;
50715305 private MenuItem backItem;
....@@ -5112,7 +5346,7 @@
51125346 private MenuItem blobItem;
51135347 private MenuItem latheItem;
51145348 private MenuItem bezierItem;
5115
- private MenuItem checkerItem;
5349
+ private MenuItem overlayItem;
51165350 private MenuItem meshItem;
51175351 // private MenuItem meshGroupItem;
51185352 private MenuItem springItem;
....@@ -5134,11 +5368,6 @@
51345368 private MenuItem doubleItem;
51355369 private MenuItem tripleItem;
51365370
5137
- private MenuItem importGFDItem;
5138
- private MenuItem importVRMLX3DItem;
5139
- private MenuItem import3DSItem;
5140
- private MenuItem importOBJItem;
5141
-
51425371 private MenuItem computeAOItem;
51435372 private MenuItem recompileItem;
51445373 private MenuItem editScriptItem;
....@@ -5148,4 +5377,8 @@
51485377 private MenuItem analyzeItem;
51495378 private MenuItem dumpItem;
51505379 //boolean freezemodel = false;
5380
+
5381
+ Menu cameraMenu;
5382
+ MenuItem editCameraItem;
5383
+ MenuItem revertCameraItem;
51515384 }