Normand Briere
2019-06-09 c5b599b48b333b34e554b464aefbca0b9bc66275
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,124 @@
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
+ duplicateItem = menu.add(new MenuItem("Duplicate"));
158
+ duplicateItem.addActionListener(this);
159
+ cloneItem = menu.add(new MenuItem("Clone"));
160
+ cloneItem.addActionListener(this);
161
+ if (Globals.ADVANCED)
162
+ {
163
+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
164
+ cloneSupportItem.addActionListener(this);
165
+ }
166
+ menu.add("-");
167
+ cutItem = menu.add(new MenuItem("Cut"));
168
+ cutItem.addActionListener(this);
169
+ copyItem = menu.add(new MenuItem("Copy"));
170
+ copyItem.addActionListener(this);
171
+ pasteItem = menu.add(new MenuItem("Paste"));
172
+ pasteItem.addActionListener(this);
173
+ menu.add("-");
174
+
175
+ menu.add("-");
176
+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
177
+ pasteIntoItem.addActionListener(this);
178
+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
179
+ pasteLinkItem.addActionListener(this);
180
+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
181
+ pasteCloneItem.addActionListener(this);
182
+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183
+// pasteExpandItem.addActionListener(this);
184
+ menu.add("-");
185
+ clearItem = menu.add(new MenuItem("Clear"));
186
+ clearItem.addActionListener(this);
187
+
188
+ if (Globals.ADVANCED)
189
+ {
190
+ // Deletes the cameras...
191
+ clearAllItem = menu.add(new MenuItem("Clear All"));
192
+ clearAllItem.addActionListener(this);
193
+ }
194
+
195
+ menuBar.add(cameraMenu = new Menu("View"));
196
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
197
+ //zBufferItem.addActionListener(this);
198
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199
+ //normalLensItem.addActionListener(this);
200
+ cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201
+ revertCameraItem.addActionListener(this);
202
+
203
+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204
+ toggleFullScreenItem.addItemListener(this);
205
+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206
+ cameraMenu.add("-");
207
+
208
+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209
+ toggleTextureItem.addItemListener(this);
210
+ toggleTextureItem.setState(CameraPane.textureon);
211
+
212
+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213
+ toggleSwitchItem.addItemListener(this);
214
+ toggleSwitchItem.setState(CameraPane.SWITCH);
215
+
216
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
217
+ toggleHandleItem.addItemListener(this);
218
+ toggleHandleItem.setState(CameraPane.HANDLES);
219
+
220
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
221
+ togglePaintItem.addItemListener(this);
222
+ togglePaintItem.setState(CameraPane.PAINTMODE);
223
+
224
+ if (Globals.ADVANCED)
225
+ {
226
+ cameraMenu.add("-");
227
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
228
+ toggleLiveItem.addItemListener(this);
229
+ toggleLiveItem.setState(Globals.isLIVE());
230
+
231
+ cameraMenu.add(stepItem = new MenuItem("Step"));
232
+ stepItem.addActionListener(this);
233
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
234
+ // toggleDLItem.addItemListener(this);
235
+ // toggleDLItem.setState(false);
236
+
237
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
238
+ toggleRenderItem.addItemListener(this);
239
+ toggleRenderItem.setState(!CameraPane.frozen);
240
+
241
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242
+ toggleDebugItem.addItemListener(this);
243
+ toggleDebugItem.setState(CameraPane.DEBUG);
244
+
245
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246
+ toggleFrustumItem.addItemListener(this);
247
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
248
+
249
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
250
+ toggleFootContactItem.addItemListener(this);
251
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
252
+
253
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
254
+ toggleTimelineItem.addItemListener(this);
255
+ }
256
+
257
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
258
+// toggleRootItem.addItemListener(this);
259
+// toggleRootItem.setState(false);
260
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
261
+// animationItem.addItemListener(this);
262
+// animationItem.setState(CameraPane.ANIMATION);
263
+ cameraMenu.add("-");
264
+ cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
265
+ editCameraItem.addActionListener(this);
266
+
267
+ if (Globals.ADVANCED)
268
+ {
153269 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154270 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155271 //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
....@@ -161,45 +277,17 @@
161277 lookAtItem.addActionListener(this);
162278 //lookFromItem.addActinoListener(this);
163279 //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
-
280
+ }
281
+
193282 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);
283
+ if (Globals.ADVANCED)
284
+ {
198285 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199286 revertMeshItem.addActionListener(this);
200287 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201288 resetreferencesItem.addActionListener(this);
202289 menu.add("-");
290
+ }
203291 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204292 overwriteGeoItem.addActionListener(this);
205293 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,19 +299,26 @@
211299 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212300 overwriteUVItem.addActionListener(this);
213301 menu.add("-");
302
+ if (Globals.ADVANCED)
303
+ {
214304 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215305 generateMeshItem.addActionListener(this);
216306 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217307 poseMeshItem.addActionListener(this);
218308 menu.add("-");
309
+ }
219310 resetsupportItem = menu.add(new MenuItem("Reset support"));
220311 resetsupportItem.addActionListener(this);
221312 linkverticesItem = menu.add(new MenuItem("Link to Support"));
222313 linkverticesItem.addActionListener(this);
223314 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224315 relinkverticesItem.addActionListener(this);
316
+
317
+ if (Globals.ADVANCED)
318
+ {
225319 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226320 setMasterItem.addActionListener(this);
321
+ }
227322
228323 oe.menuBar.add(menu = new Menu("Group"));
229324 grabItem = menu.add(new MenuItem("Grab"));
....@@ -234,27 +329,32 @@
234329 frontItem.addActionListener(this);
235330 compositeItem = menu.add(new MenuItem("Composite"));
236331 compositeItem.addActionListener(this);
237
- hideItem = menu.add(new MenuItem("Hide"));
332
+ hideItem = menu.add(new MenuItem("Hidden Group"));
238333 hideItem.addActionListener(this);
239334 ungroupItem = menu.add(new MenuItem("Ungroup"));
240335 ungroupItem.addActionListener(this);
241336 menu.add("-");
242
- randomItem = menu.add(new MenuItem("Random"));
337
+ randomItem = menu.add(new MenuItem("Switch node"));
243338 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);
248339 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249340 switchGeoItem.addActionListener(this);
250341 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251342 switchTransfoItem.addActionListener(this);
252
- morphItem = menu.add(new MenuItem("Morph"));
343
+ morphItem = menu.add(new MenuItem("Morph Group"));
253344 morphItem.addActionListener(this);
345
+
346
+ if (Globals.ADVANCED)
347
+ {
348
+ menu.add("-");
349
+ physicsItem = menu.add(new MenuItem("Physics"));
350
+ physicsItem.addActionListener(this);
351
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
352
+ frameselectorItem.addActionListener(this);
254353 scriptNodeItem = menu.add(new MenuItem("Script Node"));
255354 scriptNodeItem.addActionListener(this);
256355 cameraItem = menu.add(new MenuItem("Camera"));
257356 cameraItem.addActionListener(this);
357
+ }
258358
259359 oe.menuBar.add(menu = new Menu("Object"));
260360 textureItem = menu.add(new MenuItem("Texture"));
....@@ -269,21 +369,29 @@
269369 shadowYItem.addActionListener(this);
270370 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271371 shadowZItem.addActionListener(this);
372
+ if (Globals.ADVANCED)
373
+ {
374
+ menu.add("-");
272375 linkerItem = menu.add(new MenuItem("Linker"));
273376 linkerItem.addActionListener(this);
274
- templateItem = menu.add(new MenuItem("Template"));
275
- templateItem.addActionListener(this);
276377 attributeItem = menu.add(new MenuItem("Attribute"));
277378 attributeItem.addActionListener(this);
379
+ templateItem = menu.add(new MenuItem("Template"));
380
+ templateItem.addActionListener(this);
278381 pointflowItem = menu.add(new MenuItem("Point Flow"));
279382 pointflowItem.addActionListener(this);
383
+ }
280384 menu.add("-");
281385 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282386 resetTransformItem.addActionListener(this);
283387 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284388 resetCentroidItem.addActionListener(this);
285
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
- transformgeometryItem.addActionListener(this);
389
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
390
+ resetCentroidXZItem.addActionListener(this);
391
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
392
+ transformGeometryItem.addActionListener(this);
393
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
394
+ transformChildrenItem.addActionListener(this);
287395
288396 oe.menuBar.add(menu = new Menu("Geometry"));
289397 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -294,8 +402,11 @@
294402 genNormalsCADItem.addActionListener(this);
295403 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296404 genNormalsMESHItem.addActionListener(this);
405
+ if (Globals.ADVANCED)
406
+ {
297407 genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298408 genNormalsMINEItem.addActionListener(this);
409
+ }
299410 stripifyItem = menu.add(new MenuItem("Stripify"));
300411 stripifyItem.addActionListener(this);
301412 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,23 +428,34 @@
317428 reduce34MeshItem.addActionListener(this);
318429 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319430 increaseMeshItem.addActionListener(this);
320
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
- smoothMeshItem.addActionListener(this);
322431 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323432 clipMeshItem.addActionListener(this);
433
+
434
+ if (Globals.ADVANCED)
435
+ {
436
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
437
+ smoothMeshItem.addActionListener(this);
438
+ }
324439
325440 oe.menuBar.add(menu = new Menu("Attributes"));
326441 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327442 clearMaterialsItem.addActionListener(this);
443
+ resetAllItem = menu.add(new MenuItem("Reset All"));
444
+ resetAllItem.addActionListener(this);
445
+ stepAllItem = menu.add(new MenuItem("Step All"));
446
+ stepAllItem.addActionListener(this);
328447 menu.add("-");
329448 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330449 liveleavesItem.addActionListener(this);
331450 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332451 unliveleavesItem.addActionListener(this);
452
+ if (Globals.ADVANCED)
453
+ {
333454 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334455 supportleavesItem.addActionListener(this);
335456 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336457 unsupportleavesItem.addActionListener(this);
458
+ }
337459 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338460 hideleavesItem.addActionListener(this);
339461 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -377,29 +499,22 @@
377499 sortbynameItem = menu.add(new MenuItem("Sort by name"));
378500 sortbynameItem.addActionListener(this);
379501 menu.add("-");
502
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
503
+ shareGeometriesItem.addActionListener(this);
504
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505
+ mergeGeometriesItem.addActionListener(this);
506
+ if (Globals.ADVANCED)
507
+ {
508
+ // Pretty much the same as duplicate and clone.
380509 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381510 extractGeometriesItem.addActionListener(this);
382511 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383512 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);
513
+ }
388514
389515 oe.menuBar.add(menu = new Menu("Insert"));
390516 buildCreateMenu(menu);
391517
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
-
403518 oe.menuBar.add(menu = new Menu("Tools"));
404519 buildToolsMenu(menu);
405520 }
....@@ -436,96 +551,96 @@
436551 */
437552 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438553
439
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440
- liveCB.setToolTipText("Enabled animation");
554
+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555
+ liveCB.setToolTipText("Enable animation");
441556 liveCB.addItemListener(this);
442557
443
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
558
+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559
+ oneStepButton.setToolTipText("Animate one step forward");
560
+ oneStepButton.addActionListener(this);
561
+
562
+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
563
+ fastCB.setToolTipText("Fast mode");
564
+ fastCB.addItemListener(this);
565
+
566
+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444567 trackCB.setToolTipText("Enable tracking");
445568 trackCB.addItemListener(this);
446569
447
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
570
+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448571 screenfitButton.setToolTipText("Screen fit");
449572 screenfitButton.addActionListener(this);
450573
451574 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452575 // 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;
458576
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);
577
+ if (Globals.ADVANCED)
578
+ {
579
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580
+ snapobjectButton.addActionListener(this);
581
+ snapobjectButton.setToolTipText("Snap Object");
582
+ }
583
+
584
+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465585 flashSelectionButton.setToolTipText("Show selection");
466586 flashSelectionButton.addActionListener(this);
467587
468588 oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469589
470
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
590
+ oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471591 twoButton.setToolTipText("Show center view only");
472592 twoButton.addActionListener(this);
473
- oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
593
+ oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474594 fourButton.addActionListener(this);
475595 fourButton.setToolTipText("Show left panel only");
476
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
596
+ oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477597 sixButton.setToolTipText("2-column layout left");
478598 sixButton.addActionListener(this);
479
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
599
+ oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480600 threeButton.setToolTipText("2-column layout right");
481601 threeButton.addActionListener(this);
482
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
602
+ oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483603 sevenButton.setToolTipText("3-column layout");
484604 sevenButton.addActionListener(this);
485605 //
486606
487
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
- rootButton.setToolTipText("Edit object in new tab");
607
+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608
+ rootButton.setToolTipText("Edit selection in new tab");
489609 rootButton.addActionListener(this);
490
- oe.aConstraints.gridx += 1;
491
- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
610
+
611
+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492612 closeButton.setToolTipText("Close tab");
493613 closeButton.addActionListener(this);
494614 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495615 //clearButton.addActionListener(this);
496
- oe.aConstraints.gridx += 1;
497616
498
- oe.aConstraints.gridx = 1; //
499
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
617
+ cGridBag commandsPanel = new cGridBag();
618
+
619
+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
+ editButton.setToolTipText("Edit selection");
500621 editButton.addActionListener(this);
501
- oe.aConstraints.gridx += 1;
502
- oe.aConstraints.weighty = 0;
503
- oe.aConstraints.gridwidth = 1;
504622
505
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
623
+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
+ uneditButton.setToolTipText("Unedit selection");
506625 uneditButton.addActionListener(this);
507626
508
- oe.aConstraints.gridx += 1;
509
- oe.aConstraints.weighty = 0;
510
- oe.aConstraints.gridwidth = 1;
511
-
512
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513
- clearPanelButton.addActionListener(this);
514
-
515
- oe.aConstraints.gridx += 1;
516
- oe.aConstraints.weighty = 0;
517
- oe.aConstraints.gridwidth = 1;
518
-
519
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
627
+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628
+ allParamsButton.setToolTipText("Edit all params");
520629 allParamsButton.addActionListener(this);
521630
522
- oe.aConstraints.gridx += 1;
523
- oe.aConstraints.weighty = 0;
524
- oe.aConstraints.gridwidth = 1;
525
-
526
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
631
+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
+ clearPanelButton.setToolTipText("Clear edit panel");
633
+ clearPanelButton.addActionListener(this);
634
+
635
+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636
+ unselectButton.setToolTipText("Unselect");
527637 unselectButton.addActionListener(this);
528638
639
+ commandsPanel.preferredHeight = 1;
640
+
641
+ oe.treePanel.add(commandsPanel);
642
+ oe.treePanel.Return();
643
+
529644 // oe.aConstraints.gridx += 1;
530645 // oe.aConstraints.weighty = 0;
531646 // oe.aConstraints.gridwidth = 1;
....@@ -537,40 +652,37 @@
537652 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538653 // gcButton.addActionListener(this);
539654
540
- oe.aConstraints.gridx = 0;
541
- oe.aConstraints.gridy += 1;
542
-
543
- //ctrlPanel.add(objList = new List(5, true));
544
- oe.aConstraints.gridwidth = 100;
545
- // oe.aConstraints.gridheight = 100;
546
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547
- oe.aConstraints.gridheight = 1;
548
- oe.aConstraints.weighty = 0.5;
549
- oe.aConstraints.gridx = 0;
550
- JScrollPane jSP;
655
+ cGridBag jSPPanel = new cGridBag();
656
+
657
+ JScrollPane jSP;
551658 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
659
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553660 ResetModel();
554
- oe.aConstraints.weighty = 0.5;
555
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556
- oe.aConstraints.gridy += 1;
557
- oe.aConstraints.gridwidth = 1;
661
+
662
+ oe.treePanel.add(jSPPanel);
663
+ oe.treePanel.Return();
558664
559
- oe.aConstraints.weighty = 0;
560
- oe.aConstraints.gridwidth = 2;
561
-
562
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
665
+ cGridBag copyOptionsPanel = new cGridBag();
666
+
667
+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668
+ colorCB.setToolTipText("Copy color when dropped");
563669 colorCB.addItemListener(this);
564
- oe.aConstraints.gridx += 2;
565
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
670
+
671
+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672
+ materialCB.setToolTipText("Copy material when dropped");
566673 materialCB.addItemListener(this);
567
- oe.aConstraints.gridx += 2;
568
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
674
+
675
+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676
+ textureCB.setToolTipText("Copy texture when dropped");
569677 textureCB.addItemListener(this);
570678
571
- oe.aConstraints.gridx = 0;
572
- oe.aConstraints.gridy += 1;
679
+ copyOptionsPanel.preferredHeight = 1;
680
+ oe.treePanel.add(copyOptionsPanel);
681
+ oe.treePanel.Return();
573682
683
+// mainPanel.setDividerLocation(0.5); //1.0);
684
+// mainPanel.setResizeWeight(0.5);
685
+
574686 //jList.addListSelectionListener(this);
575687 oe.jTree.addTreeSelectionListener(this);
576688 //jTree.setRootVisible(false);
....@@ -595,43 +707,35 @@
595707
596708 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597709 {
598
- //constraints.gridx = 0;
599
- //constraints.gridy = 0;
600
- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601
- fastCB.setToolTipText("Fast mode");
602
- fastCB.addItemListener(this);
603
- //constraints.gridy += 1;
604
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605
- supportCB.setToolTipText("Enabled rigging");
606
- supportCB.addItemListener(this);
607
-
608
- // constraints.gridy += 1;
609
- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610
- // localCB.addItemListener(this);
611
-
612
- //constraints.gridy += 1;
613
- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614
- crowdCB.setToolTipText("Used for crowds");
615
- crowdCB.addItemListener(this);
616
-
617
- //constraints.gridy += 1;
618
- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619
- smoothCB.setToolTipText("Snapping delay");
620
- smoothCB.addItemListener(this);
621
-
622
- //constraints.gridy += 1;
623
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624
- slowCB.setToolTipText("Smooth interpolation");
625
- slowCB.addItemListener(this);
626
- //constraints.gridy += 1;
627710 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628711 boxCB.setToolTipText("Display bounding boxes");
629712 boxCB.addItemListener(this);
630
- //constraints.gridy += 1;
713
+
631714 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632715 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633716 zoomBoxCB.addItemListener(this);
634717
718
+ if (true) // Globals.ADVANCED)
719
+ {
720
+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721
+ supportCB.setToolTipText("Enable rigging");
722
+ supportCB.addItemListener(this);
723
+
724
+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725
+ // localCB.addItemListener(this);
726
+
727
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728
+ crowdCB.setToolTipText("Used for crowds");
729
+ crowdCB.addItemListener(this);
730
+
731
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
732
+ smoothCB.setToolTipText("Snapping delay");
733
+ smoothCB.addItemListener(this);
734
+
735
+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736
+ slowCB.setToolTipText("Smooth interpolation");
737
+ slowCB.addItemListener(this);
738
+
635739 // constraints.gridy += 1;
636740 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637741 // speakerMocapCB.addItemListener(this);
....@@ -656,14 +760,20 @@
656760 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657761 // debugCB.addItemListener(this);
658762
659
- //constraints.gridy += 1;
660763 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
661764 oeilCB.addItemListener(this);
662765
663
- //constraints.gridy += 1;
664766 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665767 lookAtCB.setToolTipText("Look-at target");
666768 lookAtCB.addItemListener(this);
769
+
770
+ }
771
+
772
+ cGridBag fill = new cGridBag();
773
+
774
+ fill.preferredHeight = 200;
775
+
776
+ panel.add(fill);
667777
668778 }
669779
....@@ -678,6 +788,7 @@
678788 buttonGroup.add(radioButton);
679789 radioButton.doClick();
680790 }
791
+
681792 void SetupViews(ObjEditor oe)
682793 {
683794 oe.SetupViews();
....@@ -894,7 +1005,9 @@
8941005 // objEditor.DropFile((java.io.File[]) object, true);
8951006 // return;
8961007 // }
897
- if (string.charAt(0) == '/')
1008
+
1009
+ // File path for Mac and Windows
1010
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
8981011 {
8991012 // file(s)
9001013 String[] names = string.split("\n");
....@@ -921,7 +1034,7 @@
9211034
9221035 flashIt = false;
9231036 CameraPane pane = (CameraPane) target;
924
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1037
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
9251038 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
9261039
9271040 if (group.selection.size() == 1)
....@@ -948,11 +1061,11 @@
9481061 {
9491062 loadClipboard(true);
9501063 objEditor.jTree.setSelectionPath(destinationPath);
951
- pasteInto(false);
1064
+ pasteInto(false, false);
9521065 } else {
9531066 loadClipboard(false);
9541067 objEditor.jTree.setSelectionPath(destinationPath);
955
- pasteInto(false); // true); // ???
1068
+ pasteInto(false, false); // true); // ???
9561069 }
9571070 }
9581071 public void dropActionChanged(DropTargetDragEvent dtde)
....@@ -1074,27 +1187,33 @@
10741187 kleinItem.addActionListener(this);
10751188 particleItem = menu.add(new MenuItem("Particle system"));
10761189 particleItem.addActionListener(this);
1190
+ if (Globals.ADVANCED)
1191
+ {
10771192 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10781193 ragdollItem.addActionListener(this);
10791194 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10801195 ragdoll2Item.addActionListener(this);
1196
+ }
10811197 menu.add("-");
1082
- meshItem = menu.add(new MenuItem("Mesh"));
1198
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10831199 meshItem.addActionListener(this);
10841200 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10851201 // meshGroupItem.addActionListener(this);
1202
+ if (Globals.ADVANCED)
1203
+ {
10861204 springItem = menu.add(new MenuItem("Spring"));
10871205 springItem.addActionListener(this);
10881206 flagItem = menu.add(new MenuItem("Flag"));
10891207 flagItem.addActionListener(this);
1090
- bezierItem = menu.add(new MenuItem("Patch"));
1091
- bezierItem.addActionListener(this);
1092
- checkerItem = menu.add(new MenuItem("Checker"));
1093
- checkerItem.addActionListener(this);
10941208 blobItem = menu.add(new MenuItem("Blob"));
10951209 blobItem.addActionListener(this);
10961210 latheItem = menu.add(new MenuItem("Lathe"));
10971211 latheItem.addActionListener(this);
1212
+ }
1213
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214
+ bezierItem.addActionListener(this);
1215
+ overlayItem = menu.add(new MenuItem("Overlay"));
1216
+ overlayItem.addActionListener(this);
10981217 lightItem = menu.add(new MenuItem("Light"));
10991218 lightItem.addActionListener(this);
11001219 menu.add("-");
....@@ -1104,34 +1223,39 @@
11041223 loopItem.addActionListener(this);
11051224 doubleItem = menu.add(new MenuItem("Fork"));
11061225 doubleItem.addActionListener(this);
1226
+ if (Globals.ADVANCED)
1227
+ {
11071228 tripleItem = menu.add(new MenuItem("Trident"));
11081229 tripleItem.addActionListener(this);
1230
+ }
11091231 }
11101232
11111233 void buildToolsMenu(Menu menu)
11121234 {
11131235 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11141236 animationItem.addItemListener(this);
1115
- animationItem.setState(CameraPane.ANIMATION);
1237
+ animationItem.setState(Globals.ANIMATION);
11161238
11171239 menu.add("-");
11181240 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11191241 parseverticesItem.addActionListener(this);
11201242 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11211243 textureFieldItem.addActionListener(this);
1122
- alignItem = menu.add(new MenuItem("Align"));
1244
+ alignItem = menu.add(new MenuItem("Align Objects"));
11231245 alignItem.addActionListener(this);
1124
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125
- mirrorItem.addActionListener(this);
11261246 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11271247 reduceMorphItem.addActionListener(this);
11281248 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11291249 reduce34MorphItem.addActionListener(this);
1130
-
1250
+ menu.add("-");
11311251 menu.add(computeAOItem = new MenuItem("Compute AO"));
11321252 computeAOItem.addActionListener(this);
1133
- menu.add("-");
11341253
1254
+ if (Globals.ADVANCED)
1255
+ {
1256
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257
+ mirrorItem.addActionListener(this);
1258
+ menu.add("-");
11351259 menu.add(memoryItem = new MenuItem("Memory Usage"));
11361260 memoryItem.addActionListener(this);
11371261 menu.add(analyzeItem = new MenuItem("Analyze"));
....@@ -1154,6 +1278,7 @@
11541278 menu.add("-");
11551279 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11561280 editScriptItem.addActionListener(this);
1281
+ }
11571282 }
11581283
11591284 void ScreenFit()
....@@ -1482,9 +1607,9 @@
14821607
14831608 void Overwrite(int mask)
14841609 {
1485
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1610
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14861611 {
1487
- Object3D content = GrafreeD.clipboard.get(0);
1612
+ Object3D content = Grafreed.clipboard.get(0);
14881613
14891614 if (content instanceof cGroup && ((cGroup)content).transientlink )
14901615 content = ((cGroup)content).get(0);
....@@ -1655,7 +1780,7 @@
16551780 {
16561781 makeSomething(new BezierSurface());
16571782 } else
1658
- if (source == checkerItem)
1783
+ if (source == overlayItem)
16591784 {
16601785 /*
16611786 Object3D obj = new BezierSurface(5,8);
....@@ -1789,23 +1914,6 @@
17891914 csg.addChild(child);
17901915 child.addChild(csg);
17911916 } else
1792
-
1793
- if (source == importGFDItem)
1794
- {
1795
- ImportGFD();
1796
- } else
1797
- if (source == importVRMLX3DItem)
1798
- {
1799
- ImportVRMLX3D();
1800
- } else
1801
- if (source == import3DSItem)
1802
- {
1803
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804
- } else
1805
- if (source == importOBJItem)
1806
- {
1807
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808
- } else
18091917 if (source == computeAOItem)
18101918 {
18111919 Globals.drawMode = CameraPane.OCCLUSION;
....@@ -1824,7 +1932,7 @@
18241932 if (source == invariantsItem)
18251933 {
18261934 System.out.println("Invariants:");
1827
- GrafreeD.grafreeD.universe.invariants();
1935
+ Grafreed.grafreeD.universe.invariants();
18281936 } else
18291937 if (source == memoryItem)
18301938 {
....@@ -1842,6 +1950,11 @@
18421950 if (source == dumpItem)
18431951 {
18441952 DumpObject();
1953
+ } else
1954
+ if (source == oneStepButton)
1955
+ {
1956
+ Globals.ONESTEP = true;
1957
+ cameraView.repaint();
18451958 } else
18461959 if (source == screenfitButton)
18471960 {
....@@ -1894,10 +2007,10 @@
18942007 } else
18952008 if (source == duplicateItem)
18962009 {
1897
- Object3D keep = GrafreeD.clipboard;
2010
+ Object3D keep = Grafreed.clipboard;
18982011 loadClipboard(false);
18992012 paste(false);
1900
- GrafreeD.clipboard = keep;
2013
+ Grafreed.clipboard = keep;
19012014 } else
19022015 if (source == cloneItem)
19032016 {
....@@ -1915,13 +2028,17 @@
19152028 {
19162029 paste(false);
19172030 } else
2031
+ if (source == pasteIntoItem)
2032
+ {
2033
+ pasteInto(true, false);
2034
+ } else
19182035 if (source == pasteLinkItem)
19192036 {
1920
- pasteInto(false);
2037
+ pasteInto(false, false);
19212038 } else
19222039 if (source == pasteCloneItem)
19232040 {
1924
- pasteInto(true);
2041
+ pasteInto(true, true);
19252042 } else
19262043 if (source == pasteExpandItem)
19272044 {
....@@ -2113,9 +2230,9 @@
21132230 // group.selection.get(0).setMasterThis(content); // should be identity
21142231 // refreshContents();
21152232 // }
2116
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2233
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
21172234 {
2118
- Object3D content = GrafreeD.clipboard.get(0);
2235
+ Object3D content = Grafreed.clipboard.get(0);
21192236
21202237 if (content instanceof cGroup && ((cGroup)content).transientlink )
21212238 content = ((cGroup)content).get(0);
....@@ -2123,11 +2240,11 @@
21232240 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21242241 for (int i=0; i<group.selection.size(); i++)
21252242 {
2126
- boolean random = CameraPane.RANDOM;
2127
- CameraPane.RANDOM = false; // parse all random nodes
2243
+ boolean random = CameraPane.SWITCH;
2244
+ CameraPane.SWITCH = false; // parse all random nodes
21282245 group.selection.get(i).linkVerticesThis(content);
21292246 // group.selection.get(i).setMasterThis(content); // should be identity
2130
- CameraPane.RANDOM = random;
2247
+ CameraPane.SWITCH = random;
21312248 }
21322249 Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21332250 refreshContents();
....@@ -2137,20 +2254,20 @@
21372254 {
21382255 for (int i=0; i<group.selection.size(); i++)
21392256 {
2140
- boolean random = CameraPane.RANDOM;
2141
- CameraPane.RANDOM = false; // parse all random nodes
2257
+ boolean random = CameraPane.SWITCH;
2258
+ CameraPane.SWITCH = false; // parse all random nodes
21422259 group.selection.get(i).linkVerticesThis(null);
2143
- CameraPane.RANDOM = random;
2260
+ CameraPane.SWITCH = random;
21442261 }
21452262
21462263 refreshContents();
21472264 } else
21482265 if (source == relinkverticesItem)
21492266 {
2150
- boolean random = CameraPane.RANDOM;
2151
- CameraPane.RANDOM = false; // parse all random nodes
2267
+ boolean random = CameraPane.SWITCH;
2268
+ CameraPane.SWITCH = false; // parse all random nodes
21522269 group.selection.RelinkToSupport();
2153
- CameraPane.RANDOM = random;
2270
+ CameraPane.SWITCH = random;
21542271
21552272 refreshContents();
21562273 } else
....@@ -2165,9 +2282,9 @@
21652282 } else
21662283 if (source == setMasterItem)
21672284 {
2168
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2285
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21692286 {
2170
- Object3D content = GrafreeD.clipboard.get(0);
2287
+ Object3D content = Grafreed.clipboard.get(0);
21712288
21722289 if (content instanceof cGroup && ((cGroup)content).transientlink )
21732290 content = ((cGroup)content).get(0);
....@@ -2180,9 +2297,9 @@
21802297 {
21812298 if (group.selection.size() == 1)
21822299 {
2183
- if (GrafreeD.clipboard.size() == 1)
2300
+ if (Grafreed.clipboard.size() == 1)
21842301 {
2185
- Object3D content = GrafreeD.clipboard.get(0);
2302
+ Object3D content = Grafreed.clipboard.get(0);
21862303
21872304 if (content instanceof cGroup && ((cGroup)content).transientlink )
21882305 content = ((cGroup)content).get(0);
....@@ -2199,7 +2316,7 @@
21992316 {
22002317 RevertMeshes();
22012318 } else
2202
- if (source == resetMeshItem)
2319
+ if (source == resetAllItem)
22032320 {
22042321 ResetAll();
22052322 } else
....@@ -2248,7 +2365,7 @@
22482365 RandomNode random = new RandomNode();
22492366 group(random);
22502367 if (random.size() > 0)
2251
- random.name = random.get(0).name + "Rnd";
2368
+ random.name = random.get(0).name + "Switch";
22522369 } else
22532370 if (source == physicsItem)
22542371 {
....@@ -2537,9 +2654,13 @@
25372654 {
25382655 SmoothMesh();
25392656 } else
2540
- if (source == transformgeometryItem)
2657
+ if (source == transformGeometryItem)
25412658 {
25422659 TransformGeometry();
2660
+ } else
2661
+ if (source == transformChildrenItem)
2662
+ {
2663
+ TransformChildren();
25432664 } else
25442665 if (source == resetTransformItem)
25452666 {
....@@ -2547,7 +2668,11 @@
25472668 } else
25482669 if (source == resetCentroidItem)
25492670 {
2550
- ResetCentroid();
2671
+ ResetCentroid(true);
2672
+ } else
2673
+ if (source == resetCentroidXZItem)
2674
+ {
2675
+ ResetCentroid(false);
25512676 } else
25522677 if (source == resetParentItem)
25532678 {
....@@ -2905,7 +3030,7 @@
29053030
29063031 child.editWindow = null; // ???????????
29073032 }
2908
- objEditor.ctrlPanel.validate();
3033
+ objEditor.ctrlPanel.FlushUI();
29093034 //objEditor.jTree.clearSelection();
29103035 //objEditor.ResetSliders();
29113036 refreshContents(true);
....@@ -2989,7 +3114,9 @@
29893114 frontView.object = group;
29903115 sideView.object = group;
29913116 }
2992
- group.editWindow = this;
3117
+
3118
+// fix "+" issue group.editWindow = this;
3119
+
29933120 /*
29943121 currentLayout = radio.layout;
29953122 if (currentLayout == null)
....@@ -3002,7 +3129,20 @@
30023129 //group.attributes = -1;
30033130 ResetModel();
30043131 refreshContents(true);
3005
- }
3132
+ } else if (event.getSource() == editCameraItem)
3133
+ {
3134
+ cameraView.ProtectCamera();
3135
+ cameraView.repaint();
3136
+ return;
3137
+ } else if (event.getSource() == revertCameraItem)
3138
+ {
3139
+ cameraView.RevertCamera();
3140
+ cameraView.repaint();
3141
+ return;
3142
+ // } else if (event.getSource() == textureButton)
3143
+ // {
3144
+ // return; // true;
3145
+ }
30063146 else
30073147 {
30083148 //return super.action(event, arg);
....@@ -3063,6 +3203,28 @@
30633203 refreshContents();
30643204 }
30653205
3206
+ void TransformChildren()
3207
+ {
3208
+ Object3D obj;
3209
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3210
+ {
3211
+ obj = (Object3D)e.nextElement();
3212
+ obj.KeepTextureMatrices();
3213
+ obj.TransformChildren();
3214
+ obj.RestoreTextureMatrices();
3215
+
3216
+// if (obj.parent == null)
3217
+// {
3218
+// System.out.println("NULL PARENT!");
3219
+// new Exception().printStackTrace();
3220
+// }
3221
+// else
3222
+// TouchTransform(obj);
3223
+// //obj.parent.Touch();
3224
+ }
3225
+
3226
+ refreshContents();
3227
+ }
30663228
30673229 void ResetTransform()
30683230 {
....@@ -3175,7 +3337,7 @@
31753337 refreshContents();
31763338 }
31773339
3178
- void ResetCentroid()
3340
+ void ResetCentroid(boolean full)
31793341 {
31803342 Object3D obj;
31813343 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3190,12 +3352,16 @@
31903352 LA.matIdentity(Object3D.mat);
31913353 obj.getBounds(minima, maxima, false);
31923354 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3355
+ if (full)
3356
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31943357 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31953358 obj.TransformMesh(Object3D.mat);
3359
+
31963360 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3361
+ if (full)
3362
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31983363 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3364
+
31993365 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
32003366 //Object3D.mat[3][0] = -Object3D.mat[3][0];
32013367 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3261,9 +3427,9 @@
32613427 obj = (Object3D)e.nextElement();
32623428
32633429 System.out.println("Object is: " + obj);
3264
- GrafreeD.AnalyzeObject(obj);
3430
+ Grafreed.AnalyzeObject(obj);
32653431 System.out.println("Boundary rep: " + obj.bRep);
3266
- GrafreeD.AnalyzeObject(obj.bRep);
3432
+ Grafreed.AnalyzeObject(obj.bRep);
32673433
32683434 // System.err.println((size/1024) + " KB is the size of " + obj);
32693435 }
....@@ -3477,8 +3643,8 @@
34773643
34783644 void ParseVertices()
34793645 {
3480
- boolean epsequal = GrafreeD.epsequal;
3481
- GrafreeD.epsequal = true;
3646
+ boolean epsequal = Grafreed.epsequal;
3647
+ Grafreed.epsequal = true;
34823648
34833649 for (int i=0; i<group.selection.size(); i++)
34843650 {
....@@ -3503,7 +3669,7 @@
35033669 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
35043670 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
35053671
3506
- g.add(GrafreeD.clipboard);
3672
+ g.add(Grafreed.clipboard);
35073673
35083674 buffer.add(g);
35093675 }
....@@ -3518,7 +3684,7 @@
35183684 makeSomething(buffer, i==group.selection.size()-1);
35193685 }
35203686
3521
- GrafreeD.epsequal = epsequal;
3687
+ Grafreed.epsequal = epsequal;
35223688
35233689 refreshContents();
35243690 }
....@@ -3536,7 +3702,16 @@
35363702 String pigment = Object3D.GetPigment(tex);
35373703 //String bump = Object3D.GetBump(tex);
35383704
3539
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3705
+ com.sun.opengl.util.texture.TextureData texturedata = null;
3706
+
3707
+ try
3708
+ {
3709
+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3710
+ }
3711
+ catch (Exception e)
3712
+ {
3713
+ System.err.println("FAIL: " + node);
3714
+ }
35403715
35413716 double s = v.s;
35423717
....@@ -3624,11 +3799,11 @@
36243799
36253800 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36263801
3627
- boolean random = CameraPane.RANDOM;
3628
- CameraPane.RANDOM = false; // parse all random nodes
3802
+ boolean random = CameraPane.SWITCH;
3803
+ CameraPane.SWITCH = false; // parse all random nodes
36293804 lowres.linkVerticesThis(null);
36303805 lowres.linkVerticesThis(sn);
3631
- CameraPane.RANDOM = random;
3806
+ CameraPane.SWITCH = random;
36323807
36333808 System.err.flush();
36343809
....@@ -3668,7 +3843,7 @@
36683843 return;
36693844
36703845 Object3D poses = group.selection.get(0);
3671
- Object3D ref = GrafreeD.clipboard.get(0);
3846
+ Object3D ref = Grafreed.clipboard.get(0);
36723847
36733848 Object3D newgroup = new Object3D("Po:" + poses.name);
36743849
....@@ -3862,9 +4037,9 @@
38624037
38634038 void ClipMesh()
38644039 {
3865
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4040
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
38664041 {
3867
- Object3D content = GrafreeD.clipboard.get(0);
4042
+ Object3D content = Grafreed.clipboard.get(0);
38684043
38694044 if (content instanceof cGroup && ((cGroup)content).transientlink )
38704045 content = ((cGroup)content).get(0);
....@@ -3873,7 +4048,7 @@
38734048 // {
38744049 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
38754050 // }
3876
- group.selection.ClipMesh(GrafreeD.clipboard);
4051
+ group.selection.ClipMesh(Grafreed.clipboard);
38774052 }
38784053 // group.selection.ClipMesh(GrafreeD.clipboard);
38794054 System.out.println("DONE.");
....@@ -4008,7 +4183,7 @@
40084183 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
40094184
40104185 Object3D elem = (Object3D)group.selection.elementAt(i);
4011
- if(elem != group)
4186
+ if(elem != group || !newWindow)
40124187 {
40134188 // if (!(elem instanceof Composite))
40144189 // newWindow = false;
....@@ -4113,12 +4288,12 @@
41134288 System.err.println("info : " + child.GetPath());
41144289 }
41154290 }
4116
- else
4117
- {
4118
- objEditor.SetMaterial(group); // .GetMaterial());
4119
- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120
- System.err.println("info : " + group.GetPath());
4121
- }
4291
+// else
4292
+// {
4293
+// objEditor.SetMaterial(group); // .GetMaterial());
4294
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
4295
+// System.err.println("info : " + group.GetPath());
4296
+// }
41224297
41234298 objEditor.SetText(); // jan 2014
41244299
....@@ -4213,12 +4388,12 @@
42134388 {
42144389 if (group.selection.isEmpty())
42154390 return;
4216
- GrafreeD.clipboardIsTempGroup = false;
4391
+ Grafreed.clipboardIsTempGroup = false;
42174392 Composite tGroup = null;
42184393 if (group.selection.size() > 0) // 1)
42194394 {
42204395 tGroup = new cGroup();
4221
- GrafreeD.clipboardIsTempGroup = true;
4396
+ Grafreed.clipboardIsTempGroup = true;
42224397 }
42234398
42244399 if (cut)
....@@ -4258,16 +4433,16 @@
42584433 //System.out.println("cut " + child);
42594434 //System.out.println("parent = " + child.parent);
42604435 // tmp.addChild(child);
4261
- if (GrafreeD.clipboardIsTempGroup)
4436
+ if (Grafreed.clipboardIsTempGroup)
42624437 tGroup.add/*Child*/(tmp);
42634438 else
4264
- GrafreeD.clipboard = tmp;
4439
+ Grafreed.clipboard = tmp;
42654440 }
42664441 else
4267
- if (GrafreeD.clipboardIsTempGroup)
4442
+ if (Grafreed.clipboardIsTempGroup)
42684443 tGroup.add/*Child*/(child);
42694444 else
4270
- GrafreeD.clipboard = child;
4445
+ Grafreed.clipboard = child;
42714446 }
42724447
42734448 //ResetModel();
....@@ -4299,21 +4474,21 @@
42994474 //System.out.println("cut " + elem);
43004475 //System.out.println("parent = " + elem.parent);
43014476 // tmp.addChild(elem);
4302
- if (GrafreeD.clipboardIsTempGroup)
4477
+ if (Grafreed.clipboardIsTempGroup)
43034478 tGroup.add/*Child*/(tmp);
43044479 else
4305
- GrafreeD.clipboard = tmp;
4480
+ Grafreed.clipboard = tmp;
43064481 }
43074482 else
4308
- if (GrafreeD.clipboardIsTempGroup)
4483
+ if (Grafreed.clipboardIsTempGroup)
43094484 tGroup.add/*Child*/(child);
43104485 else
4311
- GrafreeD.clipboard = child;
4486
+ Grafreed.clipboard = child;
43124487 }
43134488
43144489 }
4315
- if (GrafreeD.clipboardIsTempGroup)
4316
- GrafreeD.clipboard = tGroup;
4490
+ if (Grafreed.clipboardIsTempGroup)
4491
+ Grafreed.clipboard = tGroup;
43174492 if (cut)
43184493 {
43194494 ResetModel();
....@@ -4327,7 +4502,7 @@
43274502 // return;
43284503 boolean first = true;
43294504
4330
- if (GrafreeD.clipboardIsTempGroup)
4505
+ if (Grafreed.clipboardIsTempGroup)
43314506 {
43324507 Composite temp;
43334508
....@@ -4338,7 +4513,7 @@
43384513 temp = (Composite)Applet3D.clipboard.deepCopy();
43394514 */
43404515 Object3D elem;
4341
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4516
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
43424517 {
43434518 Object3D child = (Object3D)e.nextElement();
43444519
....@@ -4372,21 +4547,21 @@
43724547 //Object3D cb = Applet3D.clipboard;
43734548 //temp.addChild(cb);
43744549 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375
- assert(GrafreeD.clipboard.parent == null);
4376
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4377
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4550
+ assert(Grafreed.clipboard.parent == null);
4551
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4552
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4553
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
4554
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
43804555 else
4381
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382
- GrafreeD.clipboard.get(0).parent = keepparent;
4556
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4557
+ Grafreed.clipboard.get(0).parent = keepparent;
43834558 }
43844559
43854560 ResetModel();
43864561 refreshContents();
43874562 }
43884563
4389
- void pasteInto(boolean copyit)
4564
+ void pasteInto(boolean copyit, boolean clone)
43904565 {
43914566 // if (GrafreeD.clipboard == null)
43924567 // return;
....@@ -4415,15 +4590,22 @@
44154590 if (copyit)
44164591 {
44174592 // paste(false);
4418
- CloneClipboard(false); // sept 2014
4593
+ if (clone)
4594
+ {
4595
+ CloneClipboard(false); // sept 2014
4596
+ }
4597
+ else
4598
+ {
4599
+ paste(false);
4600
+ }
44194601 }
44204602 else
44214603 {
44224604 boolean first = true;
44234605
4424
- if (GrafreeD.clipboardIsTempGroup)
4606
+ if (Grafreed.clipboardIsTempGroup)
44254607 {
4426
- Composite temp = (Composite)GrafreeD.clipboard;
4608
+ Composite temp = (Composite)Grafreed.clipboard;
44274609 Object3D copy;
44284610 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
44294611 {
....@@ -4433,7 +4615,7 @@
44334615 }
44344616 } else
44354617 {
4436
- linkSomething(GrafreeD.clipboard); //.get(0));
4618
+ linkSomething(Grafreed.clipboard); //.get(0));
44374619 }
44384620 }
44394621 }
....@@ -4838,21 +5020,6 @@
48385020 }
48395021 */
48405022
4841
- void ImportGFD()
4842
- {
4843
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844
- browser.show();
4845
- String filename = browser.getFile();
4846
- if (filename != null && filename.length() > 0)
4847
- {
4848
- String fullname = browser.getDirectory() + filename;
4849
-
4850
- //Object3D readobj =
4851
- objEditor.ReadGFD(fullname, objEditor);
4852
- //makeSomething(readobj);
4853
- }
4854
- }
4855
-
48565023 /*
48575024 public void Callback(Object obj)
48585025 {
....@@ -4876,26 +5043,9 @@
48765043 }
48775044 */
48785045
4879
- void ImportVRMLX3D()
4880
- {
4881
- if (GrafreeD.standAlone)
4882
- {
4883
- /**/
4884
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885
- browser.show();
4886
- String filename = browser.getFile();
4887
- if (filename != null && filename.length() > 0)
4888
- {
4889
- String fullname = browser.getDirectory() + filename;
4890
- LoadVRMLX3D(fullname);
4891
- }
4892
- /**/
4893
- }
4894
- }
4895
-
48965046 String GetFile(String dialogName)
48975047 {
4898
- if (GrafreeD.standAlone)
5048
+ if (Grafreed.standAlone)
48995049 {
49005050 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
49015051 browser.show();
....@@ -4959,10 +5109,12 @@
49595109 cButton flashSelectionButton;
49605110 cButton editButton;
49615111 cButton uneditButton;
5112
+ JCheckBox allParamsButton;
49625113 cButton clearpanelButton;
4963
- cButton allParamsButton;
49645114 cButton unselectButton;
49655115
5116
+ cButton oneStepButton;
5117
+
49665118 cButton screenfitButton;
49675119 cButton screenfitpointButton;
49685120 cButton snapobjectButton;
....@@ -5006,7 +5158,7 @@
50065158 private MenuItem linkverticesItem;
50075159 private MenuItem relinkverticesItem;
50085160 private MenuItem setMasterItem;
5009
- private MenuItem resetMeshItem;
5161
+ private MenuItem resetAllItem;
50105162 private MenuItem stepAllItem;
50115163 private MenuItem revertMeshItem;
50125164 private MenuItem poseMeshItem;
....@@ -5017,6 +5169,7 @@
50175169 private MenuItem mergeGeometriesItem;
50185170 private MenuItem copyItem;
50195171 private MenuItem pasteItem;
5172
+ private MenuItem pasteIntoItem;
50205173 private MenuItem pasteLinkItem;
50215174 private MenuItem pasteCloneItem;
50225175 private MenuItem pasteExpandItem;
....@@ -5066,8 +5219,10 @@
50665219 private MenuItem panoTexturesItem;
50675220
50685221 private MenuItem resetCentroidItem;
5069
- private MenuItem transformgeometryItem;
5222
+ private MenuItem resetCentroidXZItem;
50705223 private MenuItem resetTransformItem;
5224
+ private MenuItem transformGeometryItem;
5225
+ private MenuItem transformChildrenItem;
50715226 private MenuItem hideItem;
50725227 private MenuItem grabItem;
50735228 private MenuItem backItem;
....@@ -5114,7 +5269,7 @@
51145269 private MenuItem blobItem;
51155270 private MenuItem latheItem;
51165271 private MenuItem bezierItem;
5117
- private MenuItem checkerItem;
5272
+ private MenuItem overlayItem;
51185273 private MenuItem meshItem;
51195274 // private MenuItem meshGroupItem;
51205275 private MenuItem springItem;
....@@ -5136,11 +5291,6 @@
51365291 private MenuItem doubleItem;
51375292 private MenuItem tripleItem;
51385293
5139
- private MenuItem importGFDItem;
5140
- private MenuItem importVRMLX3DItem;
5141
- private MenuItem import3DSItem;
5142
- private MenuItem importOBJItem;
5143
-
51445294 private MenuItem computeAOItem;
51455295 private MenuItem recompileItem;
51465296 private MenuItem editScriptItem;
....@@ -5150,4 +5300,8 @@
51505300 private MenuItem analyzeItem;
51515301 private MenuItem dumpItem;
51525302 //boolean freezemodel = false;
5303
+
5304
+ Menu cameraMenu;
5305
+ MenuItem editCameraItem;
5306
+ MenuItem revertCameraItem;
51535307 }