Mocap big data

Normand Briere

2019-06-13 4629090fafbef256abd0686a85ee12042d658868

 GroupEditor.java
..
..
@@ -74,7 +74,7 @@
74
74
 		this.copy = this.group = copy;
75
75
 		//selectees = this.group.selectees;
76
76
 		
77
-		SetupMenu2(objEditor);
77
+		SetupMenu2(this); //objEditor);
78
78
 		SetupUI2(objEditor);
79
79
 		objEditor.SetupUI(true);
80
80
 		SetupViews(objEditor);
..
..
@@ -98,14 +98,14 @@
98
98
 
99
99
     void CloneClipboard(boolean supports)
100
100
     {
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));
106
106
         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;
109
109
     }
110
110
     
111
111
     static Object3D CloneObject(Object3D obj, boolean supports)
..
..
@@ -119,7 +119,7 @@
119
119
         //               obj.support = null;
120
120
         if (!supports)
121
121
             obj.SaveSupports();
122
-        Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+        Object3D clone = (Object3D)Grafreed.clone(obj);
123
123
         obj.parent = parent;
124
124
         //               obj.support = support;
125
125
         //               clone.support = support; // aout 2013
..
..
@@ -148,8 +148,130 @@
148
148
         
149
149
     //JTextField nameField;
150
150
     
151
-	void SetupMenu2(ObjEditor oe)
151
+	void SetupMenu2(GroupEditor oe)
152
152
 	{
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
+        {
153
275
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
276
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
277
 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..
..
@@ -161,45 +283,17 @@
161
283
 		lookAtItem.addActionListener(this);
162
284
 		//lookFromItem.addActinoListener(this);
163
285
 		//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
+        
193
288
 		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
+        {
198
291
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199
292
 		revertMeshItem.addActionListener(this);
200
293
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
294
 		resetreferencesItem.addActionListener(this);
202
295
 		menu.add("-");
296
+        }
203
297
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
298
 		overwriteGeoItem.addActionListener(this);
205
299
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +305,26 @@
211
305
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
306
 		overwriteUVItem.addActionListener(this);
213
307
 		menu.add("-");
308
+        if (Globals.ADVANCED)
309
+        {
214
310
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
311
 		generateMeshItem.addActionListener(this);
216
312
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
313
 		poseMeshItem.addActionListener(this);
218
314
 		menu.add("-");
315
+        }
219
316
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
317
 		resetsupportItem.addActionListener(this);
221
318
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
319
 		linkverticesItem.addActionListener(this);
223
320
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
321
 		relinkverticesItem.addActionListener(this);
322
+                
323
+        if (Globals.ADVANCED)
324
+        {
225
325
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
326
 		setMasterItem.addActionListener(this);
327
+        }
227
328
                 
228
329
 		oe.menuBar.add(menu = new Menu("Group"));
229
330
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,27 +335,32 @@
234
335
 		frontItem.addActionListener(this);
235
336
 		compositeItem = menu.add(new MenuItem("Composite"));
236
337
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
338
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
339
 		hideItem.addActionListener(this);
239
340
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
341
 		ungroupItem.addActionListener(this);
241
342
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
343
+		randomItem = menu.add(new MenuItem("Switch node"));
243
344
 		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);
248
345
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
346
 		switchGeoItem.addActionListener(this);
250
347
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
348
 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
349
+		morphItem = menu.add(new MenuItem("Morph Group"));
253
350
 		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);
254
359
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
360
 		scriptNodeItem.addActionListener(this);
256
361
 		cameraItem = menu.add(new MenuItem("Camera"));
257
362
 		cameraItem.addActionListener(this);
363
+        }
258
364
                 
259
365
 		oe.menuBar.add(menu = new Menu("Object"));
260
366
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,21 +375,29 @@
269
375
 		shadowYItem.addActionListener(this);
270
376
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
377
 		shadowZItem.addActionListener(this);
378
+        if (Globals.ADVANCED)
379
+        {
380
+		menu.add("-");
272
381
 		linkerItem = menu.add(new MenuItem("Linker"));
273
382
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
383
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
384
 		attributeItem.addActionListener(this);
385
+		templateItem = menu.add(new MenuItem("Template"));
386
+		templateItem.addActionListener(this);
278
387
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
388
 		pointflowItem.addActionListener(this);
389
+        }
280
390
 		menu.add("-");
281
391
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
392
 		resetTransformItem.addActionListener(this);
283
393
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284
394
 		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);
287
401
                 
288
402
 		oe.menuBar.add(menu = new Menu("Geometry"));
289
403
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -294,8 +408,11 @@
294
408
 		genNormalsCADItem.addActionListener(this);
295
409
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
410
 		genNormalsMESHItem.addActionListener(this);
411
+        if (Globals.ADVANCED)
412
+        {
297
413
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
414
 		genNormalsMINEItem.addActionListener(this);
415
+        }
299
416
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
417
 		stripifyItem.addActionListener(this);
301
418
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,23 +434,34 @@
317
434
 		reduce34MeshItem.addActionListener(this);
318
435
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
436
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
437
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
438
 		clipMeshItem.addActionListener(this);
439
+                
440
+        if (Globals.ADVANCED)
441
+        {
442
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
443
+		smoothMeshItem.addActionListener(this);
444
+        }
324
445
 
325
446
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
447
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327
448
 		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);
328
453
 		menu.add("-");
329
454
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330
455
 		liveleavesItem.addActionListener(this);
331
456
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
457
 		unliveleavesItem.addActionListener(this);
458
+        if (Globals.ADVANCED)
459
+        {
333
460
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
461
 		supportleavesItem.addActionListener(this);
335
462
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
463
 		unsupportleavesItem.addActionListener(this);
464
+        }
337
465
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
466
 		hideleavesItem.addActionListener(this);
339
467
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -377,29 +505,22 @@
377
505
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
506
 		sortbynameItem.addActionListener(this);
379
507
 		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.
380
515
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
516
 		extractGeometriesItem.addActionListener(this);
382
517
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383
518
 		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
+        }
388
520
                 
389
521
 		oe.menuBar.add(menu = new Menu("Insert"));
390
522
 		buildCreateMenu(menu);
391
523
                 
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
-
403
524
                 oe.menuBar.add(menu = new Menu("Tools"));
404
525
 		buildToolsMenu(menu);
405
526
 	}
..
..
@@ -436,59 +557,76 @@
436
557
          */
437
558
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438
559
                 
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
+                
439
572
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
-                liveCB.setToolTipText("Enabled animation");
573
+                liveCB.setToolTipText("Enable animation");
441
574
                                 liveCB.addItemListener(this);
442
575
 
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
+                                
443
584
                 oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444
585
                 trackCB.setToolTipText("Enable tracking");
445
586
                                 trackCB.addItemListener(this);
446
587
 
447
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
588
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448
589
                 screenfitButton.setToolTipText("Screen fit");
449
590
 		screenfitButton.addActionListener(this);
450
591
 
451
592
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452
593
 //		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;
458
594
 
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);
465
603
                 flashSelectionButton.setToolTipText("Show selection");
466
604
 		flashSelectionButton.addActionListener(this);
467
605
                 
468
606
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469
607
                 
470
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
608
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471
609
                 twoButton.setToolTipText("Show center view only");
472
610
 		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);
474
612
 		fourButton.addActionListener(this);
475
613
                 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);
477
615
                 sixButton.setToolTipText("2-column layout left");
478
616
 		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);
480
618
                 threeButton.setToolTipText("2-column layout right");
481
619
 		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);
483
621
                 sevenButton.setToolTipText("3-column layout");
484
622
 		sevenButton.addActionListener(this);
485
623
                 //
486
624
 
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);
488
626
                 rootButton.setToolTipText("Edit selection in new tab");
489
627
 		rootButton.addActionListener(this);
490
628
 
491
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
629
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492
630
                 closeButton.setToolTipText("Close tab");
493
631
 		closeButton.addActionListener(this);
494
632
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -496,23 +634,23 @@
496
634
                         
497
635
                 cGridBag commandsPanel = new cGridBag();
498
636
                 
499
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
637
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500
638
                 editButton.setToolTipText("Edit selection");
501
639
 		editButton.addActionListener(this);
502
640
 
503
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
641
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504
642
                 uneditButton.setToolTipText("Unedit selection");
505
643
 		uneditButton.addActionListener(this);
506
644
 
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);
508
650
                 clearPanelButton.setToolTipText("Clear edit panel");
509
651
 		clearPanelButton.addActionListener(this);
510
652
 
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);
516
654
                 unselectButton.setToolTipText("Unselect");
517
655
 		unselectButton.addActionListener(this);
518
656
 
..
..
@@ -587,43 +725,35 @@
587
725
         
588
726
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589
727
         {
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;
619
728
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620
729
                 boxCB.setToolTipText("Display bounding boxes");
621
730
                                 boxCB.addItemListener(this);
622
-        	//constraints.gridy += 1;
731
+                                
623
732
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624
733
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625
734
                                 zoomBoxCB.addItemListener(this);
626
735
 
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
+                                
627
757
 //        	constraints.gridy += 1;
628
758
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629
759
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -648,14 +778,14 @@
648
778
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649
779
 //                debugCB.addItemListener(this);
650
780
 
651
-        	//constraints.gridy += 1;
652
781
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
653
782
                                 oeilCB.addItemListener(this);
654
783
 
655
-        	//constraints.gridy += 1;
656
784
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657
785
                 lookAtCB.setToolTipText("Look-at target");
658
786
                                 lookAtCB.addItemListener(this);
787
+                
788
+        }
659
789
                                 
660
790
                 cGridBag fill = new cGridBag();
661
791
                                 
..
..
@@ -676,6 +806,7 @@
676
806
             buttonGroup.add(radioButton);
677
807
             radioButton.doClick();
678
808
         }
809
+        
679
810
         void SetupViews(ObjEditor oe)
680
811
         {
681
812
             oe.SetupViews();
..
..
@@ -892,7 +1023,9 @@
892
1023
 //                        objEditor.DropFile((java.io.File[]) object, true);
893
1024
 //                        return;
894
1025
 //                    }
895
-                    if (string.charAt(0) == '/')
1026
+                    
1027
+                    // File path for Mac and Windows
1028
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
896
1029
                     {
897
1030
                         // file(s)
898
1031
                         String[] names = string.split("\n");
..
..
@@ -919,7 +1052,7 @@
919
1052
                     
920
1053
                     flashIt = false;
921
1054
                     CameraPane pane = (CameraPane) target;
922
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1055
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
923
1056
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
924
1057
                     
925
1058
                     if (group.selection.size() == 1)
..
..
@@ -946,11 +1079,11 @@
946
1079
             {
947
1080
                 loadClipboard(true);
948
1081
                 objEditor.jTree.setSelectionPath(destinationPath);
949
-                pasteInto(false);
1082
+                pasteInto(false, false);
950
1083
             } else {
951
1084
                 loadClipboard(false);
952
1085
                 objEditor.jTree.setSelectionPath(destinationPath);
953
-                pasteInto(false); // true); // ???
1086
+                pasteInto(false, false); // true); // ???
954
1087
             }
955
1088
 	}
956
1089
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1072,27 +1205,33 @@
1072
1205
 		kleinItem.addActionListener(this);
1073
1206
 		particleItem = menu.add(new MenuItem("Particle system"));
1074
1207
 		particleItem.addActionListener(this);
1208
+        if (Globals.ADVANCED)
1209
+        {
1075
1210
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1076
1211
 		ragdollItem.addActionListener(this);
1077
1212
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1078
1213
 		ragdoll2Item.addActionListener(this);
1214
+        }
1079
1215
 		menu.add("-");
1080
-		meshItem = menu.add(new MenuItem("Mesh"));
1216
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1081
1217
 		meshItem.addActionListener(this);
1082
1218
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1083
1219
 	//	meshGroupItem.addActionListener(this);
1220
+        if (Globals.ADVANCED)
1221
+        {
1084
1222
 		springItem = menu.add(new MenuItem("Spring"));
1085
1223
 		springItem.addActionListener(this);
1086
1224
 		flagItem = menu.add(new MenuItem("Flag"));
1087
1225
 		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);
1092
1226
 		blobItem = menu.add(new MenuItem("Blob"));
1093
1227
 		blobItem.addActionListener(this);
1094
1228
 		latheItem = menu.add(new MenuItem("Lathe"));
1095
1229
 		latheItem.addActionListener(this);
1230
+        }
1231
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232
+		bezierItem.addActionListener(this);
1233
+		overlayItem = menu.add(new MenuItem("Overlay"));
1234
+		overlayItem.addActionListener(this);
1096
1235
 		lightItem = menu.add(new MenuItem("Light"));
1097
1236
 		lightItem.addActionListener(this);
1098
1237
 		menu.add("-");
..
..
@@ -1102,34 +1241,39 @@
1102
1241
 		loopItem.addActionListener(this);
1103
1242
 		doubleItem = menu.add(new MenuItem("Fork"));
1104
1243
 		doubleItem.addActionListener(this);
1244
+        if (Globals.ADVANCED)
1245
+        {
1105
1246
 		tripleItem = menu.add(new MenuItem("Trident"));
1106
1247
 		tripleItem.addActionListener(this);
1248
+        }
1107
1249
 	}
1108
1250
         
1109
1251
 	void buildToolsMenu(Menu menu)
1110
1252
 	{
1111
1253
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1112
1254
 		animationItem.addItemListener(this);
1113
-                animationItem.setState(CameraPane.ANIMATION);
1255
+                animationItem.setState(Globals.ANIMATION);
1114
1256
                 
1115
1257
 		menu.add("-");
1116
1258
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1117
1259
 		parseverticesItem.addActionListener(this);
1118
1260
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1119
1261
 		textureFieldItem.addActionListener(this);
1120
-		alignItem = menu.add(new MenuItem("Align"));
1262
+		alignItem = menu.add(new MenuItem("Align Objects"));
1121
1263
 		alignItem.addActionListener(this);
1122
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123
-		mirrorItem.addActionListener(this);
1124
1264
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1125
1265
 		reduceMorphItem.addActionListener(this);
1126
1266
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1127
1267
 		reduce34MorphItem.addActionListener(this);
1128
-                
1268
+		menu.add("-");
1129
1269
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1130
1270
 		computeAOItem.addActionListener(this);
1131
-		menu.add("-");
1132
1271
                 
1272
+        if (Globals.ADVANCED)
1273
+        {
1274
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1275
+		mirrorItem.addActionListener(this);
1276
+		menu.add("-");
1133
1277
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1134
1278
 		memoryItem.addActionListener(this);
1135
1279
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1152,6 +1296,7 @@
1152
1296
 		menu.add("-");
1153
1297
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1154
1298
 		editScriptItem.addActionListener(this);
1299
+        }
1155
1300
         }
1156
1301
         
1157
1302
         void ScreenFit()
..
..
@@ -1480,9 +1625,9 @@
1480
1625
     
1481
1626
     void Overwrite(int mask)
1482
1627
     {
1483
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1628
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1484
1629
         {
1485
-            Object3D content = GrafreeD.clipboard.get(0);
1630
+            Object3D content = Grafreed.clipboard.get(0);
1486
1631
 
1487
1632
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1488
1633
                 content = ((cGroup)content).get(0);
..
..
@@ -1653,7 +1798,7 @@
1653
1798
 		{
1654
1799
 			makeSomething(new BezierSurface());
1655
1800
 		} else
1656
-		if (source == checkerItem)
1801
+		if (source == overlayItem)
1657
1802
 		{
1658
1803
                     /*
1659
1804
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1787,23 +1932,6 @@
1787
1932
                         csg.addChild(child);
1788
1933
                         child.addChild(csg);
1789
1934
 		} 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
1807
1935
 		if (source == computeAOItem)
1808
1936
 		{
1809
1937
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1822,7 +1950,7 @@
1822
1950
 		if (source == invariantsItem)
1823
1951
 		{
1824
1952
                     System.out.println("Invariants:");
1825
-                    GrafreeD.grafreeD.universe.invariants();
1953
+                    Grafreed.grafreeD.universe.invariants();
1826
1954
 		} else
1827
1955
 		if (source == memoryItem)
1828
1956
 		{
..
..
@@ -1840,6 +1968,23 @@
1840
1968
 		if (source == dumpItem)
1841
1969
 		{
1842
1970
                     DumpObject();
1971
+		} else
1972
+		if (source == undoButton)
1973
+		{
1974
+			Undo();
1975
+		} else
1976
+		if (source == redoButton)
1977
+		{
1978
+			Redo();
1979
+		} else
1980
+		if (source == saveButton)
1981
+		{
1982
+			Save();
1983
+		} else
1984
+		if (source == oneStepButton)
1985
+		{
1986
+                    Globals.ONESTEP = true;
1987
+                    cameraView.repaint();
1843
1988
 		} else
1844
1989
 		if (source == screenfitButton)
1845
1990
 		{
..
..
@@ -1890,12 +2035,20 @@
1890
2035
 		{
1891
2036
 			loadClipboard(true);
1892
2037
 		} else
2038
+		if (source == undoItem)
2039
+		{
2040
+			Undo();
2041
+		} else
2042
+		if (source == redoItem)
2043
+		{
2044
+			Redo();
2045
+		} else
1893
2046
 		if (source == duplicateItem)
1894
2047
 		{
1895
-                    Object3D keep = GrafreeD.clipboard;
2048
+                    Object3D keep = Grafreed.clipboard;
1896
2049
 			loadClipboard(false);
1897
2050
 			paste(false);
1898
-                    GrafreeD.clipboard = keep;
2051
+                    Grafreed.clipboard = keep;
1899
2052
 		} else
1900
2053
 		if (source == cloneItem)
1901
2054
 		{
..
..
@@ -1913,13 +2066,17 @@
1913
2066
 		{
1914
2067
 			paste(false);
1915
2068
 		} else
2069
+		if (source == pasteIntoItem)
2070
+		{
2071
+			pasteInto(true, false);
2072
+		} else
1916
2073
 		if (source == pasteLinkItem)
1917
2074
 		{
1918
-			pasteInto(false);
2075
+			pasteInto(false, false);
1919
2076
 		} else
1920
2077
 		if (source == pasteCloneItem)
1921
2078
 		{
1922
-			pasteInto(true);
2079
+			pasteInto(true, true);
1923
2080
 		} else
1924
2081
 		if (source == pasteExpandItem)
1925
2082
 		{
..
..
@@ -2111,9 +2268,9 @@
2111
2268
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2112
2269
 //		refreshContents();
2113
2270
 //                    }
2114
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2271
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2115
2272
                     {
2116
-                        Object3D content = GrafreeD.clipboard.get(0);
2273
+                        Object3D content = Grafreed.clipboard.get(0);
2117
2274
                         
2118
2275
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2119
2276
                             content = ((cGroup)content).get(0);
..
..
@@ -2121,11 +2278,11 @@
2121
2278
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2122
2279
                         for (int i=0; i<group.selection.size(); i++)
2123
2280
                         {
2124
-                            boolean random = CameraPane.RANDOM;
2125
-                            CameraPane.RANDOM = false; // parse all random nodes
2281
+                            boolean random = CameraPane.SWITCH;
2282
+                            CameraPane.SWITCH = false; // parse all random nodes
2126
2283
                             group.selection.get(i).linkVerticesThis(content);
2127
2284
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2128
-                            CameraPane.RANDOM = random;
2285
+                            CameraPane.SWITCH = random;
2129
2286
                         }
2130
2287
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2131
2288
 		refreshContents();
..
..
@@ -2135,20 +2292,20 @@
2135
2292
 		{
2136
2293
                     for (int i=0; i<group.selection.size(); i++)
2137
2294
                     {
2138
-                        boolean random = CameraPane.RANDOM;
2139
-                        CameraPane.RANDOM = false; // parse all random nodes
2295
+                        boolean random = CameraPane.SWITCH;
2296
+                        CameraPane.SWITCH = false; // parse all random nodes
2140
2297
                         group.selection.get(i).linkVerticesThis(null);
2141
-                        CameraPane.RANDOM = random;
2298
+                        CameraPane.SWITCH = random;
2142
2299
                     }
2143
2300
 
2144
2301
                     refreshContents();
2145
2302
 		} else
2146
2303
 		if (source == relinkverticesItem)
2147
2304
 		{
2148
-                    boolean random = CameraPane.RANDOM;
2149
-                    CameraPane.RANDOM = false; // parse all random nodes
2305
+                    boolean random = CameraPane.SWITCH;
2306
+                    CameraPane.SWITCH = false; // parse all random nodes
2150
2307
                     group.selection.RelinkToSupport();
2151
-                    CameraPane.RANDOM = random;
2308
+                    CameraPane.SWITCH = random;
2152
2309
 
2153
2310
                     refreshContents();
2154
2311
 		} else
..
..
@@ -2163,9 +2320,9 @@
2163
2320
 		} else
2164
2321
 		if (source == setMasterItem)
2165
2322
 		{
2166
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2323
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2167
2324
                     {
2168
-                        Object3D content = GrafreeD.clipboard.get(0);
2325
+                        Object3D content = Grafreed.clipboard.get(0);
2169
2326
                         
2170
2327
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2171
2328
                             content = ((cGroup)content).get(0);
..
..
@@ -2178,9 +2335,9 @@
2178
2335
 		{
2179
2336
                     if (group.selection.size() == 1)
2180
2337
                     {
2181
-                        if (GrafreeD.clipboard.size() == 1)
2338
+                        if (Grafreed.clipboard.size() == 1)
2182
2339
                         {
2183
-                            Object3D content = GrafreeD.clipboard.get(0);
2340
+                            Object3D content = Grafreed.clipboard.get(0);
2184
2341
 
2185
2342
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2186
2343
                                 content = ((cGroup)content).get(0);
..
..
@@ -2197,7 +2354,7 @@
2197
2354
 		{
2198
2355
 			RevertMeshes();
2199
2356
 		} else
2200
-		if (source == resetMeshItem)
2357
+		if (source == resetAllItem)
2201
2358
 		{
2202
2359
 			ResetAll();
2203
2360
 		} else
..
..
@@ -2246,7 +2403,7 @@
2246
2403
                         RandomNode random = new RandomNode();
2247
2404
 			group(random);
2248
2405
                         if (random.size() > 0)
2249
-                            random.name = random.get(0).name + "Rnd";
2406
+                            random.name = random.get(0).name + "Switch";
2250
2407
 		} else
2251
2408
 		if (source == physicsItem)
2252
2409
                 {
..
..
@@ -2385,7 +2542,7 @@
2385
2542
 		} else
2386
2543
 		if (source == genNormalsMESHItem)
2387
2544
                 {
2388
-			GenNormals(true); // TODO
2545
+			GenNormalsMESH();
2389
2546
 		} else
2390
2547
 		if (source == genNormalsORGANItem)
2391
2548
                 {
..
..
@@ -2535,9 +2692,13 @@
2535
2692
                 {
2536
2693
 			SmoothMesh();
2537
2694
 		} else
2538
-		if (source == transformgeometryItem)
2695
+		if (source == transformGeometryItem)
2539
2696
 		{
2540
2697
                         TransformGeometry();
2698
+		} else
2699
+		if (source == transformChildrenItem)
2700
+		{
2701
+                        TransformChildren();
2541
2702
 		} else
2542
2703
 		if (source == resetTransformItem)
2543
2704
 		{
..
..
@@ -2545,7 +2706,11 @@
2545
2706
 		} else
2546
2707
 		if (source == resetCentroidItem)
2547
2708
 		{
2548
-                        ResetCentroid();
2709
+                        ResetCentroid(true);
2710
+		} else
2711
+		if (source == resetCentroidXZItem)
2712
+		{
2713
+                        ResetCentroid(false);
2549
2714
 		} else
2550
2715
 		if (source == resetParentItem)
2551
2716
 		{
..
..
@@ -2901,9 +3066,9 @@
2901
3066
 				child.CloseUI();
2902
3067
                                 listUI.remove(child);
2903
3068
                                 
2904
-                                child.editWindow = null; // ???????????
3069
+                                //child.editWindow = null; // ???????????
2905
3070
 			}
2906
-			objEditor.ctrlPanel.validate();
3071
+			objEditor.ctrlPanel.FlushUI();
2907
3072
 			//objEditor.jTree.clearSelection();
2908
3073
 			//objEditor.ResetSliders();
2909
3074
                     refreshContents(true);
..
..
@@ -2987,7 +3152,10 @@
2987
3152
                         frontView.object = group;
2988
3153
                         sideView.object = group;
2989
3154
                     }
3155
+                    
3156
+// fix "+" issue
2990
3157
                     group.editWindow = this;
3158
+                    
2991
3159
                     /*
2992
3160
                     currentLayout = radio.layout;
2993
3161
                     if (currentLayout == null)
..
..
@@ -3000,7 +3168,20 @@
3000
3168
                     //group.attributes = -1;
3001
3169
                     ResetModel();
3002
3170
                     refreshContents(true);
3003
-                }
3171
+                } else if (event.getSource() == editCameraItem)
3172
+                {
3173
+                    cameraView.ProtectCamera();
3174
+                    cameraView.repaint();
3175
+                    return;
3176
+                } else if (event.getSource() == revertCameraItem)
3177
+                {
3178
+                    cameraView.RevertCamera();
3179
+                    cameraView.repaint();
3180
+                    return;
3181
+        //        } else if (event.getSource() == textureButton)
3182
+        //        {
3183
+        //            return; // true;
3184
+                } 
3004
3185
                 else
3005
3186
                 {
3006
3187
 			//return super.action(event, arg);
..
..
@@ -3061,6 +3242,28 @@
3061
3242
             refreshContents();
3062
3243
         }
3063
3244
         
3245
+        void TransformChildren()
3246
+        {
3247
+            Object3D obj;
3248
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3249
+            {
3250
+                    obj = (Object3D)e.nextElement();
3251
+                    obj.KeepTextureMatrices();
3252
+                    obj.TransformChildren();
3253
+                    obj.RestoreTextureMatrices();
3254
+                                        
3255
+//                    if (obj.parent == null)
3256
+//                    {
3257
+//                        System.out.println("NULL PARENT!");
3258
+//                        new Exception().printStackTrace();
3259
+//                    }
3260
+//                    else
3261
+//                        TouchTransform(obj);
3262
+//                        //obj.parent.Touch();
3263
+            }
3264
+
3265
+            refreshContents();
3266
+        }
3064
3267
         
3065
3268
         void ResetTransform()
3066
3269
         {
..
..
@@ -3173,7 +3376,7 @@
3173
3376
             refreshContents();
3174
3377
         }
3175
3378
         
3176
-        void ResetCentroid()
3379
+        void ResetCentroid(boolean full)
3177
3380
         {
3178
3381
             Object3D obj;
3179
3382
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3188,12 +3391,16 @@
3188
3391
                     LA.matIdentity(Object3D.mat);
3189
3392
                     obj.getBounds(minima, maxima, false);
3190
3393
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3394
+                    if (full)
3395
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3192
3396
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3193
3397
                     obj.TransformMesh(Object3D.mat);
3398
+                    
3194
3399
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3400
+                    if (full)
3401
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3196
3402
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3403
+                    
3197
3404
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3198
3405
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3199
3406
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3222,7 +3429,8 @@
3222
3429
                     
3223
3430
                     int size = obj.MemorySize();
3224
3431
                     
3225
-                    System.err.println((size/1024) + " KB is the size of " + obj);
3432
+                    //System.err.println((size/1024) + " KB is the size of " + obj);
3433
+                    System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3226
3434
                 }
3227
3435
             }
3228
3436
             catch (Exception e)
..
..
@@ -3259,9 +3467,9 @@
3259
3467
                     obj = (Object3D)e.nextElement();
3260
3468
                     
3261
3469
                     System.out.println("Object is: " + obj);
3262
-                    GrafreeD.AnalyzeObject(obj);
3470
+                    Grafreed.AnalyzeObject(obj);
3263
3471
                     System.out.println("Boundary rep: " + obj.bRep);
3264
-                    GrafreeD.AnalyzeObject(obj.bRep);
3472
+                    Grafreed.AnalyzeObject(obj.bRep);
3265
3473
                     
3266
3474
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3267
3475
                 }
..
..
@@ -3303,6 +3511,13 @@
3303
3511
 	void GenNormals(boolean crease)
3304
3512
 	{
3305
3513
 		group.GenNormalsS(crease);
3514
+		
3515
+		refreshContents();
3516
+	}
3517
+	
3518
+	void GenNormalsMESH()
3519
+	{
3520
+		group.GenNormalsMeshS();
3306
3521
 		
3307
3522
 		refreshContents();
3308
3523
 	}
..
..
@@ -3475,8 +3690,8 @@
3475
3690
 	
3476
3691
 	void ParseVertices()
3477
3692
 	{
3478
-            boolean epsequal = GrafreeD.epsequal;
3479
-            GrafreeD.epsequal = true;
3693
+            boolean epsequal = Grafreed.epsequal;
3694
+            Grafreed.epsequal = true;
3480
3695
             
3481
3696
             for (int i=0; i<group.selection.size(); i++)
3482
3697
             {
..
..
@@ -3501,7 +3716,7 @@
3501
3716
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3502
3717
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3503
3718
 
3504
-                                g.add(GrafreeD.clipboard);
3719
+                                g.add(Grafreed.clipboard);
3505
3720
 
3506
3721
                                 buffer.add(g);
3507
3722
                             }
..
..
@@ -3516,7 +3731,7 @@
3516
3731
                 makeSomething(buffer, i==group.selection.size()-1);
3517
3732
             }
3518
3733
             
3519
-            GrafreeD.epsequal = epsequal;
3734
+            Grafreed.epsequal = epsequal;
3520
3735
             
3521
3736
             refreshContents();
3522
3737
 	}
..
..
@@ -3534,7 +3749,16 @@
3534
3749
                             String pigment = Object3D.GetPigment(tex);
3535
3750
                             //String bump = Object3D.GetBump(tex);
3536
3751
                             
3537
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3752
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3753
+                            
3754
+                            try
3755
+                            {
3756
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3757
+                            }
3758
+                            catch (Exception e)
3759
+                            {
3760
+                                System.err.println("FAIL: " + node);
3761
+                            }
3538
3762
                             
3539
3763
                             double s = v.s;
3540
3764
                             
..
..
@@ -3622,11 +3846,11 @@
3622
3846
 
3623
3847
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3624
3848
 
3625
-            boolean random = CameraPane.RANDOM;
3626
-            CameraPane.RANDOM = false; // parse all random nodes
3849
+            boolean random = CameraPane.SWITCH;
3850
+            CameraPane.SWITCH = false; // parse all random nodes
3627
3851
             lowres.linkVerticesThis(null);
3628
3852
             lowres.linkVerticesThis(sn);
3629
-            CameraPane.RANDOM = random;
3853
+            CameraPane.SWITCH = random;
3630
3854
 
3631
3855
             System.err.flush();
3632
3856
 
..
..
@@ -3666,7 +3890,7 @@
3666
3890
                 return;
3667
3891
             
3668
3892
             Object3D poses = group.selection.get(0);
3669
-            Object3D ref = GrafreeD.clipboard.get(0);
3893
+            Object3D ref = Grafreed.clipboard.get(0);
3670
3894
             
3671
3895
             Object3D newgroup = new Object3D("Po:" + poses.name);
3672
3896
             
..
..
@@ -3860,9 +4084,9 @@
3860
4084
 	
3861
4085
 	void ClipMesh()
3862
4086
 	{
3863
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4087
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3864
4088
             {
3865
-                Object3D content = GrafreeD.clipboard.get(0);
4089
+                Object3D content = Grafreed.clipboard.get(0);
3866
4090
 
3867
4091
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3868
4092
                     content = ((cGroup)content).get(0);
..
..
@@ -3871,7 +4095,7 @@
3871
4095
 //                {
3872
4096
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3873
4097
 //                }
3874
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4098
+                  group.selection.ClipMesh(Grafreed.clipboard);
3875
4099
             }
3876
4100
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3877
4101
             System.out.println("DONE.");
..
..
@@ -4006,7 +4230,7 @@
4006
4230
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4007
4231
                     
4008
4232
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4009
-                        if(elem != group)
4233
+                        if(elem != group || !newWindow)
4010
4234
                         {
4011
4235
                         //    if (!(elem instanceof Composite))
4012
4236
                         //        newWindow = false;
..
..
@@ -4120,14 +4344,17 @@
4120
4344
 			
4121
4345
                         objEditor.SetText(); // jan 2014
4122
4346
                         
4123
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4347
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4124
4348
 				CameraPane.flash = true;
4125
4349
                         
4126
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4350
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4127
4351
                             // a camera
4128
4352
                         {
4129
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4130
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4353
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4354
+                            {
4355
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4356
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4357
+                            }
4131
4358
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4132
4359
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4133
4360
                         }
..
..
@@ -4211,16 +4438,18 @@
4211
4438
 	{
4212
4439
 		if (group.selection.isEmpty())
4213
4440
 			return;
4214
-		GrafreeD.clipboardIsTempGroup = false;
4441
+                
4442
+		Grafreed.clipboardIsTempGroup = false;
4215
4443
 		Composite tGroup = null;
4216
4444
 		if (group.selection.size() > 0) // 1)
4217
4445
 		{
4218
4446
 			tGroup = new cGroup();
4219
-			GrafreeD.clipboardIsTempGroup = true;
4447
+			Grafreed.clipboardIsTempGroup = true;
4220
4448
 		}
4221
4449
                 
4222
4450
 		if (cut)
4223
4451
 		{
4452
+                    Save();
4224
4453
 			//int indices[] = jList.getSelectedIndices();
4225
4454
 			//for (int i = indices.length - 1; i >= 0; i--)
4226
4455
 			//jList.remove(indices[i]);
..
..
@@ -4256,16 +4485,16 @@
4256
4485
 		//System.out.println("cut " + child);
4257
4486
 		//System.out.println("parent = " + child.parent);
4258
4487
                 //                   tmp.addChild(child);
4259
-                                    if (GrafreeD.clipboardIsTempGroup)
4488
+                                    if (Grafreed.clipboardIsTempGroup)
4260
4489
                                             tGroup.add/*Child*/(tmp);
4261
4490
                                     else
4262
-                                            GrafreeD.clipboard = tmp;
4491
+                                            Grafreed.clipboard = tmp;
4263
4492
                                 }
4264
4493
                                 else
4265
-                                    if (GrafreeD.clipboardIsTempGroup)
4494
+                                    if (Grafreed.clipboardIsTempGroup)
4266
4495
                                             tGroup.add/*Child*/(child);
4267
4496
                                     else
4268
-                                            GrafreeD.clipboard = child;
4497
+                                            Grafreed.clipboard = child;
4269
4498
 			}
4270
4499
 			
4271
4500
 			//ResetModel();
..
..
@@ -4297,21 +4526,23 @@
4297
4526
 		//System.out.println("cut " + elem);
4298
4527
 		//System.out.println("parent = " + elem.parent);
4299
4528
                 //                    tmp.addChild(elem);
4300
-                                    if (GrafreeD.clipboardIsTempGroup)
4529
+                                    if (Grafreed.clipboardIsTempGroup)
4301
4530
                                             tGroup.add/*Child*/(tmp);
4302
4531
                                     else
4303
-                                            GrafreeD.clipboard = tmp;
4532
+                                            Grafreed.clipboard = tmp;
4304
4533
                                 }
4305
4534
                                 else
4306
-                                    if (GrafreeD.clipboardIsTempGroup)
4535
+                                    if (Grafreed.clipboardIsTempGroup)
4307
4536
                                             tGroup.add/*Child*/(child);
4308
4537
                                     else
4309
-                                            GrafreeD.clipboard = child;
4538
+                                            Grafreed.clipboard = child;
4310
4539
 			}
4311
4540
 			
4312
4541
 		}
4313
-		if (GrafreeD.clipboardIsTempGroup)
4314
-			GrafreeD.clipboard = tGroup;
4542
+                
4543
+		if (Grafreed.clipboardIsTempGroup)
4544
+			Grafreed.clipboard = tGroup;
4545
+                
4315
4546
 		if (cut)
4316
4547
                 {
4317
4548
                     ResetModel();
..
..
@@ -4325,7 +4556,7 @@
4325
4556
 	//		return;
4326
4557
 		boolean first = true;
4327
4558
 		
4328
-		if (GrafreeD.clipboardIsTempGroup)
4559
+		if (Grafreed.clipboardIsTempGroup)
4329
4560
 		{
4330
4561
 			Composite temp;
4331
4562
 			
..
..
@@ -4336,7 +4567,7 @@
4336
4567
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4337
4568
                          */
4338
4569
 			Object3D elem;
4339
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4570
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4340
4571
 			{
4341
4572
 				Object3D child = (Object3D)e.nextElement();
4342
4573
                                 
..
..
@@ -4370,21 +4601,21 @@
4370
4601
 			//Object3D cb = Applet3D.clipboard;
4371
4602
 			//temp.addChild(cb);
4372
4603
 			//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());
4604
+                    assert(Grafreed.clipboard.parent == null);
4605
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4606
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4607
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4608
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4378
4609
                         else
4379
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4610
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4611
+                        Grafreed.clipboard.get(0).parent = keepparent;
4381
4612
 		}
4382
4613
 		
4383
4614
 		ResetModel();
4384
4615
 		refreshContents();
4385
4616
 	}
4386
4617
 	
4387
-	void pasteInto(boolean copyit)
4618
+	void pasteInto(boolean copyit, boolean clone)
4388
4619
 	{
4389
4620
 //		if (GrafreeD.clipboard == null)
4390
4621
 //			return;
..
..
@@ -4413,15 +4644,22 @@
4413
4644
 		if (copyit)
4414
4645
 		{
4415
4646
 		//	paste(false);
4416
-                    CloneClipboard(false); // sept 2014
4647
+                        if (clone)
4648
+                        {
4649
+                            CloneClipboard(false); // sept 2014
4650
+                        }
4651
+                        else
4652
+                        {
4653
+                            paste(false);
4654
+                        }
4417
4655
 		}
4418
4656
 		else
4419
4657
 		{
4420
4658
 			boolean first = true;
4421
4659
 			
4422
-			if (GrafreeD.clipboardIsTempGroup)
4660
+			if (Grafreed.clipboardIsTempGroup)
4423
4661
 			{
4424
-				Composite temp = (Composite)GrafreeD.clipboard;
4662
+				Composite temp = (Composite)Grafreed.clipboard;
4425
4663
 				Object3D copy;
4426
4664
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4427
4665
 				{
..
..
@@ -4431,7 +4669,7 @@
4431
4669
 				}
4432
4670
 			} else
4433
4671
 			{
4434
-				linkSomething(GrafreeD.clipboard); //.get(0));
4672
+				linkSomething(Grafreed.clipboard); //.get(0));
4435
4673
 			}
4436
4674
 		}
4437
4675
             }
..
..
@@ -4836,21 +5074,6 @@
4836
5074
         }
4837
5075
          */
4838
5076
 
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
-        
4854
5077
         /*
4855
5078
         public void Callback(Object obj)
4856
5079
         {
..
..
@@ -4874,26 +5097,9 @@
4874
5097
         }
4875
5098
          */
4876
5099
 
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
-				
4894
5100
 	String GetFile(String dialogName)
4895
5101
 	{
4896
-		if (GrafreeD.standAlone)
5102
+		if (Grafreed.standAlone)
4897
5103
 		{
4898
5104
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4899
5105
 			browser.show();
..
..
@@ -4957,10 +5163,15 @@
4957
5163
 	cButton flashSelectionButton;
4958
5164
 	cButton editButton;
4959
5165
 	cButton uneditButton;
5166
+	JCheckBox allParamsButton;
4960
5167
 	cButton clearpanelButton;
4961
-	cButton allParamsButton;
4962
5168
 	cButton unselectButton;
4963
5169
 	
5170
+	cButton saveButton;
5171
+	cButton undoButton;
5172
+	cButton redoButton;
5173
+	cButton oneStepButton;
5174
+        
4964
5175
 	cButton screenfitButton;
4965
5176
 	cButton screenfitpointButton;
4966
5177
 	cButton snapobjectButton;
..
..
@@ -4991,6 +5202,8 @@
4991
5202
 	private MenuItem lookFromItem;
4992
5203
 	private MenuItem switchItem;
4993
5204
 	private MenuItem cutItem;
5205
+	private MenuItem undoItem;
5206
+	private MenuItem redoItem;
4994
5207
 	private MenuItem duplicateItem;
4995
5208
 	private MenuItem cloneItem;
4996
5209
 	private MenuItem cloneSupportItem;
..
..
@@ -5004,7 +5217,7 @@
5004
5217
 	private MenuItem linkverticesItem;
5005
5218
 	private MenuItem relinkverticesItem;
5006
5219
 	private MenuItem setMasterItem;
5007
-	private MenuItem resetMeshItem;
5220
+	private MenuItem resetAllItem;
5008
5221
 	private MenuItem stepAllItem;
5009
5222
 	private MenuItem revertMeshItem;
5010
5223
 	private MenuItem poseMeshItem;
..
..
@@ -5015,6 +5228,7 @@
5015
5228
 	private MenuItem mergeGeometriesItem;
5016
5229
 	private MenuItem copyItem;
5017
5230
 	private MenuItem pasteItem;
5231
+	private MenuItem pasteIntoItem;
5018
5232
 	private MenuItem pasteLinkItem;
5019
5233
 	private MenuItem pasteCloneItem;
5020
5234
 	private MenuItem pasteExpandItem;
..
..
@@ -5064,8 +5278,10 @@
5064
5278
 	private MenuItem panoTexturesItem;
5065
5279
         
5066
5280
 	private MenuItem resetCentroidItem;
5067
-	private MenuItem transformgeometryItem;
5281
+	private MenuItem resetCentroidXZItem;
5068
5282
 	private MenuItem resetTransformItem;
5283
+	private MenuItem transformGeometryItem;
5284
+	private MenuItem transformChildrenItem;
5069
5285
 	private MenuItem hideItem;
5070
5286
 	private MenuItem grabItem;
5071
5287
 	private MenuItem backItem;
..
..
@@ -5112,7 +5328,7 @@
5112
5328
 	private MenuItem blobItem;
5113
5329
 	private MenuItem latheItem;
5114
5330
 	private MenuItem bezierItem;
5115
-	private MenuItem checkerItem;
5331
+	private MenuItem overlayItem;
5116
5332
 	private MenuItem meshItem;
5117
5333
 //	private MenuItem meshGroupItem;
5118
5334
 	private MenuItem springItem;
..
..
@@ -5134,11 +5350,6 @@
5134
5350
 	private MenuItem doubleItem;
5135
5351
 	private MenuItem tripleItem;
5136
5352
         
5137
-	private MenuItem importGFDItem;
5138
-	private MenuItem importVRMLX3DItem;
5139
-	private MenuItem import3DSItem;
5140
-	private MenuItem importOBJItem;
5141
-
5142
5353
 	private MenuItem computeAOItem;
5143
5354
 	private MenuItem recompileItem;
5144
5355
 	private MenuItem editScriptItem;
..
..
@@ -5148,4 +5359,8 @@
5148
5359
 	private MenuItem analyzeItem;
5149
5360
 	private MenuItem dumpItem;
5150
5361
 	//boolean freezemodel = false;
5362
+        
5363
+    Menu cameraMenu;
5364
+    MenuItem editCameraItem;
5365
+    MenuItem revertCameraItem;
5151
5366
 }