Fix shadow in light mode

Normand Briere

2019-06-11 98896326eb94666451b7e419becfb5d721840313

 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,129 @@
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
+		undoItem = menu.add(new MenuItem("Undo"));
158
+		undoItem.addActionListener(this);
159
+		redoItem = menu.add(new MenuItem("Redo"));
160
+		redoItem.addActionListener(this);
161
+		menu.add("-");
162
+		duplicateItem = menu.add(new MenuItem("Duplicate"));
163
+		duplicateItem.addActionListener(this);
164
+		cloneItem = menu.add(new MenuItem("Clone"));
165
+		cloneItem.addActionListener(this);
166
+        if (Globals.ADVANCED)
167
+        {
168
+		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
169
+		cloneSupportItem.addActionListener(this);
170
+        }
171
+		menu.add("-");
172
+		cutItem = menu.add(new MenuItem("Cut"));
173
+		cutItem.addActionListener(this);
174
+		copyItem = menu.add(new MenuItem("Copy"));
175
+		copyItem.addActionListener(this);
176
+		pasteItem = menu.add(new MenuItem("Paste"));
177
+		pasteItem.addActionListener(this);
178
+		menu.add("-");
179
+                
180
+		menu.add("-");
181
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
182
+		pasteIntoItem.addActionListener(this);
183
+		pasteLinkItem = menu.add(new MenuItem("Paste link"));
184
+		pasteLinkItem.addActionListener(this);
185
+		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
186
+		pasteCloneItem.addActionListener(this);
187
+//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188
+//		pasteExpandItem.addActionListener(this);
189
+		menu.add("-");
190
+		clearItem = menu.add(new MenuItem("Clear"));
191
+		clearItem.addActionListener(this);
192
+                
193
+        if (Globals.ADVANCED)
194
+        {
195
+                // Deletes the cameras...
196
+		clearAllItem = menu.add(new MenuItem("Clear All"));
197
+		clearAllItem.addActionListener(this);
198
+        }
199
+        
200
+        menuBar.add(cameraMenu = new Menu("View"));
201
+        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
202
+        //zBufferItem.addActionListener(this);
203
+        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204
+        //normalLensItem.addActionListener(this);
205
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206
+        revertCameraItem.addActionListener(this);
207
+        
208
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209
+        toggleFullScreenItem.addItemListener(this);
210
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211
+        cameraMenu.add("-");
212
+        
213
+        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214
+        toggleTextureItem.addItemListener(this);
215
+        toggleTextureItem.setState(CameraPane.textureon);
216
+        
217
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218
+        toggleSwitchItem.addItemListener(this);
219
+        toggleSwitchItem.setState(CameraPane.SWITCH);
220
+        
221
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
222
+        toggleHandleItem.addItemListener(this);
223
+        toggleHandleItem.setState(CameraPane.HANDLES);
224
+        
225
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
226
+        togglePaintItem.addItemListener(this);
227
+        togglePaintItem.setState(CameraPane.PAINTMODE);
228
+        
229
+        if (Globals.ADVANCED)
230
+        {
231
+        cameraMenu.add("-");
232
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
233
+                toggleLiveItem.addItemListener(this);
234
+                toggleLiveItem.setState(Globals.isLIVE());
235
+
236
+                cameraMenu.add(stepItem = new MenuItem("Step"));
237
+                stepItem.addActionListener(this);
238
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
239
+        //		toggleDLItem.addItemListener(this);
240
+        //                toggleDLItem.setState(false);
241
+
242
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
243
+                toggleRenderItem.addItemListener(this);
244
+                toggleRenderItem.setState(!CameraPane.frozen);
245
+
246
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247
+                toggleDebugItem.addItemListener(this);
248
+                toggleDebugItem.setState(CameraPane.DEBUG);
249
+
250
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251
+                toggleFrustumItem.addItemListener(this);
252
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
253
+
254
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
255
+                toggleFootContactItem.addItemListener(this);
256
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
257
+                
258
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
259
+                toggleTimelineItem.addItemListener(this);
260
+        }
261
+        
262
+//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
263
+//		toggleRootItem.addItemListener(this);
264
+//                    toggleRootItem.setState(false);
265
+//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
266
+//		animationItem.addItemListener(this);
267
+//                    animationItem.setState(CameraPane.ANIMATION);
268
+        cameraMenu.add("-");
269
+        cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
270
+        editCameraItem.addActionListener(this);
271
+        
272
+        if (Globals.ADVANCED)
273
+        {
153
274
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
275
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
276
 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..
..
@@ -161,45 +282,17 @@
161
282
 		lookAtItem.addActionListener(this);
162
283
 		//lookFromItem.addActinoListener(this);
163
284
 		//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
-
285
+        }
286
+        
193
287
 		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);
288
+        if (Globals.ADVANCED)
289
+        {
198
290
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199
291
 		revertMeshItem.addActionListener(this);
200
292
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
293
 		resetreferencesItem.addActionListener(this);
202
294
 		menu.add("-");
295
+        }
203
296
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
297
 		overwriteGeoItem.addActionListener(this);
205
298
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +304,26 @@
211
304
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
305
 		overwriteUVItem.addActionListener(this);
213
306
 		menu.add("-");
307
+        if (Globals.ADVANCED)
308
+        {
214
309
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
310
 		generateMeshItem.addActionListener(this);
216
311
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
312
 		poseMeshItem.addActionListener(this);
218
313
 		menu.add("-");
314
+        }
219
315
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
316
 		resetsupportItem.addActionListener(this);
221
317
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
318
 		linkverticesItem.addActionListener(this);
223
319
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
320
 		relinkverticesItem.addActionListener(this);
321
+                
322
+        if (Globals.ADVANCED)
323
+        {
225
324
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
325
 		setMasterItem.addActionListener(this);
326
+        }
227
327
                 
228
328
 		oe.menuBar.add(menu = new Menu("Group"));
229
329
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,27 +334,32 @@
234
334
 		frontItem.addActionListener(this);
235
335
 		compositeItem = menu.add(new MenuItem("Composite"));
236
336
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
337
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
338
 		hideItem.addActionListener(this);
239
339
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
340
 		ungroupItem.addActionListener(this);
241
341
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
342
+		randomItem = menu.add(new MenuItem("Switch node"));
243
343
 		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
344
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
345
 		switchGeoItem.addActionListener(this);
250
346
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
347
 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
348
+		morphItem = menu.add(new MenuItem("Morph Group"));
253
349
 		morphItem.addActionListener(this);
350
+                
351
+        if (Globals.ADVANCED)
352
+        {
353
+		menu.add("-");
354
+		physicsItem = menu.add(new MenuItem("Physics"));
355
+		physicsItem.addActionListener(this);
356
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
357
+		frameselectorItem.addActionListener(this);
254
358
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
359
 		scriptNodeItem.addActionListener(this);
256
360
 		cameraItem = menu.add(new MenuItem("Camera"));
257
361
 		cameraItem.addActionListener(this);
362
+        }
258
363
                 
259
364
 		oe.menuBar.add(menu = new Menu("Object"));
260
365
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,21 +374,29 @@
269
374
 		shadowYItem.addActionListener(this);
270
375
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
376
 		shadowZItem.addActionListener(this);
377
+        if (Globals.ADVANCED)
378
+        {
379
+		menu.add("-");
272
380
 		linkerItem = menu.add(new MenuItem("Linker"));
273
381
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
382
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
383
 		attributeItem.addActionListener(this);
384
+		templateItem = menu.add(new MenuItem("Template"));
385
+		templateItem.addActionListener(this);
278
386
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
387
 		pointflowItem.addActionListener(this);
388
+        }
280
389
 		menu.add("-");
281
390
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
391
 		resetTransformItem.addActionListener(this);
283
392
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284
393
 		resetCentroidItem.addActionListener(this);
285
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
-		transformgeometryItem.addActionListener(this);
394
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
395
+		resetCentroidXZItem.addActionListener(this);
396
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
397
+		transformGeometryItem.addActionListener(this);
398
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
399
+		transformChildrenItem.addActionListener(this);
287
400
                 
288
401
 		oe.menuBar.add(menu = new Menu("Geometry"));
289
402
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -294,8 +407,11 @@
294
407
 		genNormalsCADItem.addActionListener(this);
295
408
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
409
 		genNormalsMESHItem.addActionListener(this);
410
+        if (Globals.ADVANCED)
411
+        {
297
412
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
413
 		genNormalsMINEItem.addActionListener(this);
414
+        }
299
415
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
416
 		stripifyItem.addActionListener(this);
301
417
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,23 +433,34 @@
317
433
 		reduce34MeshItem.addActionListener(this);
318
434
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
435
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
436
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
437
 		clipMeshItem.addActionListener(this);
438
+                
439
+        if (Globals.ADVANCED)
440
+        {
441
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
442
+		smoothMeshItem.addActionListener(this);
443
+        }
324
444
 
325
445
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
446
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327
447
 		clearMaterialsItem.addActionListener(this);
448
+                resetAllItem = menu.add(new MenuItem("Reset All"));
449
+		resetAllItem.addActionListener(this);
450
+		stepAllItem = menu.add(new MenuItem("Step All"));
451
+		stepAllItem.addActionListener(this);
328
452
 		menu.add("-");
329
453
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330
454
 		liveleavesItem.addActionListener(this);
331
455
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
456
 		unliveleavesItem.addActionListener(this);
457
+        if (Globals.ADVANCED)
458
+        {
333
459
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
460
 		supportleavesItem.addActionListener(this);
335
461
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
462
 		unsupportleavesItem.addActionListener(this);
463
+        }
337
464
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
465
 		hideleavesItem.addActionListener(this);
339
466
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -377,29 +504,22 @@
377
504
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
505
 		sortbynameItem.addActionListener(this);
379
506
 		menu.add("-");
507
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
508
+		shareGeometriesItem.addActionListener(this);
509
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
510
+		mergeGeometriesItem.addActionListener(this);
511
+        if (Globals.ADVANCED)
512
+        {
513
+            // Pretty much the same as duplicate and clone.
380
514
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
515
 		extractGeometriesItem.addActionListener(this);
382
516
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383
517
 		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);
518
+        }
388
519
                 
389
520
 		oe.menuBar.add(menu = new Menu("Insert"));
390
521
 		buildCreateMenu(menu);
391
522
                 
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
523
                 oe.menuBar.add(menu = new Menu("Tools"));
404
524
 		buildToolsMenu(menu);
405
525
 	}
..
..
@@ -437,58 +557,63 @@
437
557
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438
558
                 
439
559
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
-                liveCB.setToolTipText("Enabled animation");
560
+                liveCB.setToolTipText("Enable animation");
441
561
                                 liveCB.addItemListener(this);
442
562
 
563
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564
+                oneStepButton.setToolTipText("Animate one step forward");
565
+		oneStepButton.addActionListener(this);
566
+                
567
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
568
+                fastCB.setToolTipText("Fast mode");
569
+                                fastCB.addItemListener(this);
570
+                                
443
571
                 oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444
572
                 trackCB.setToolTipText("Enable tracking");
445
573
                                 trackCB.addItemListener(this);
446
574
 
447
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
575
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448
576
                 screenfitButton.setToolTipText("Screen fit");
449
577
 		screenfitButton.addActionListener(this);
450
578
 
451
579
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452
580
 //		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
581
 
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);
582
+                if (Globals.ADVANCED)
583
+                {
584
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585
+                        snapobjectButton.addActionListener(this);
586
+                        snapobjectButton.setToolTipText("Snap Object");
587
+                }
588
+
589
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465
590
                 flashSelectionButton.setToolTipText("Show selection");
466
591
 		flashSelectionButton.addActionListener(this);
467
592
                 
468
593
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469
594
                 
470
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
595
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471
596
                 twoButton.setToolTipText("Show center view only");
472
597
 		twoButton.addActionListener(this);
473
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
598
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474
599
 		fourButton.addActionListener(this);
475
600
                 fourButton.setToolTipText("Show left panel only");
476
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
601
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477
602
                 sixButton.setToolTipText("2-column layout left");
478
603
 		sixButton.addActionListener(this);
479
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
604
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480
605
                 threeButton.setToolTipText("2-column layout right");
481
606
 		threeButton.addActionListener(this);
482
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483
608
                 sevenButton.setToolTipText("3-column layout");
484
609
 		sevenButton.addActionListener(this);
485
610
                 //
486
611
 
487
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
612
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488
613
                 rootButton.setToolTipText("Edit selection in new tab");
489
614
 		rootButton.addActionListener(this);
490
615
 
491
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
616
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492
617
                 closeButton.setToolTipText("Close tab");
493
618
 		closeButton.addActionListener(this);
494
619
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -496,23 +621,23 @@
496
621
                         
497
622
                 cGridBag commandsPanel = new cGridBag();
498
623
                 
499
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
624
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500
625
                 editButton.setToolTipText("Edit selection");
501
626
 		editButton.addActionListener(this);
502
627
 
503
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
628
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504
629
                 uneditButton.setToolTipText("Unedit selection");
505
630
 		uneditButton.addActionListener(this);
506
631
 
507
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
632
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633
+                allParamsButton.setToolTipText("Edit all params");
634
+		allParamsButton.addActionListener(this);
635
+
636
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508
637
                 clearPanelButton.setToolTipText("Clear edit panel");
509
638
 		clearPanelButton.addActionListener(this);
510
639
 
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);
640
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516
641
                 unselectButton.setToolTipText("Unselect");
517
642
 		unselectButton.addActionListener(this);
518
643
 
..
..
@@ -587,43 +712,35 @@
587
712
         
588
713
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589
714
         {
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
715
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620
716
                 boxCB.setToolTipText("Display bounding boxes");
621
717
                                 boxCB.addItemListener(this);
622
-        	//constraints.gridy += 1;
718
+                                
623
719
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624
720
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625
721
                                 zoomBoxCB.addItemListener(this);
626
722
 
723
+        if (true) // Globals.ADVANCED)
724
+        {
725
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726
+                supportCB.setToolTipText("Enable rigging");
727
+                                supportCB.addItemListener(this);
728
+
729
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730
+        //                        localCB.addItemListener(this);
731
+
732
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733
+                crowdCB.setToolTipText("Used for crowds");
734
+                                crowdCB.addItemListener(this);
735
+
736
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
737
+                smoothCB.setToolTipText("Snapping delay");
738
+                                smoothCB.addItemListener(this);
739
+
740
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
741
+                slowCB.setToolTipText("Smooth interpolation");
742
+                                slowCB.addItemListener(this);
743
+                                
627
744
 //        	constraints.gridy += 1;
628
745
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629
746
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -648,14 +765,14 @@
648
765
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649
766
 //                debugCB.addItemListener(this);
650
767
 
651
-        	//constraints.gridy += 1;
652
768
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
653
769
                                 oeilCB.addItemListener(this);
654
770
 
655
-        	//constraints.gridy += 1;
656
771
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657
772
                 lookAtCB.setToolTipText("Look-at target");
658
773
                                 lookAtCB.addItemListener(this);
774
+                
775
+        }
659
776
                                 
660
777
                 cGridBag fill = new cGridBag();
661
778
                                 
..
..
@@ -676,6 +793,7 @@
676
793
             buttonGroup.add(radioButton);
677
794
             radioButton.doClick();
678
795
         }
796
+        
679
797
         void SetupViews(ObjEditor oe)
680
798
         {
681
799
             oe.SetupViews();
..
..
@@ -892,7 +1010,9 @@
892
1010
 //                        objEditor.DropFile((java.io.File[]) object, true);
893
1011
 //                        return;
894
1012
 //                    }
895
-                    if (string.charAt(0) == '/')
1013
+                    
1014
+                    // File path for Mac and Windows
1015
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
896
1016
                     {
897
1017
                         // file(s)
898
1018
                         String[] names = string.split("\n");
..
..
@@ -919,7 +1039,7 @@
919
1039
                     
920
1040
                     flashIt = false;
921
1041
                     CameraPane pane = (CameraPane) target;
922
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1042
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
923
1043
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
924
1044
                     
925
1045
                     if (group.selection.size() == 1)
..
..
@@ -946,11 +1066,11 @@
946
1066
             {
947
1067
                 loadClipboard(true);
948
1068
                 objEditor.jTree.setSelectionPath(destinationPath);
949
-                pasteInto(false);
1069
+                pasteInto(false, false);
950
1070
             } else {
951
1071
                 loadClipboard(false);
952
1072
                 objEditor.jTree.setSelectionPath(destinationPath);
953
-                pasteInto(false); // true); // ???
1073
+                pasteInto(false, false); // true); // ???
954
1074
             }
955
1075
 	}
956
1076
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1072,27 +1192,33 @@
1072
1192
 		kleinItem.addActionListener(this);
1073
1193
 		particleItem = menu.add(new MenuItem("Particle system"));
1074
1194
 		particleItem.addActionListener(this);
1195
+        if (Globals.ADVANCED)
1196
+        {
1075
1197
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1076
1198
 		ragdollItem.addActionListener(this);
1077
1199
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1078
1200
 		ragdoll2Item.addActionListener(this);
1201
+        }
1079
1202
 		menu.add("-");
1080
-		meshItem = menu.add(new MenuItem("Mesh"));
1203
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1081
1204
 		meshItem.addActionListener(this);
1082
1205
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1083
1206
 	//	meshGroupItem.addActionListener(this);
1207
+        if (Globals.ADVANCED)
1208
+        {
1084
1209
 		springItem = menu.add(new MenuItem("Spring"));
1085
1210
 		springItem.addActionListener(this);
1086
1211
 		flagItem = menu.add(new MenuItem("Flag"));
1087
1212
 		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
1213
 		blobItem = menu.add(new MenuItem("Blob"));
1093
1214
 		blobItem.addActionListener(this);
1094
1215
 		latheItem = menu.add(new MenuItem("Lathe"));
1095
1216
 		latheItem.addActionListener(this);
1217
+        }
1218
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219
+		bezierItem.addActionListener(this);
1220
+		overlayItem = menu.add(new MenuItem("Overlay"));
1221
+		overlayItem.addActionListener(this);
1096
1222
 		lightItem = menu.add(new MenuItem("Light"));
1097
1223
 		lightItem.addActionListener(this);
1098
1224
 		menu.add("-");
..
..
@@ -1102,34 +1228,39 @@
1102
1228
 		loopItem.addActionListener(this);
1103
1229
 		doubleItem = menu.add(new MenuItem("Fork"));
1104
1230
 		doubleItem.addActionListener(this);
1231
+        if (Globals.ADVANCED)
1232
+        {
1105
1233
 		tripleItem = menu.add(new MenuItem("Trident"));
1106
1234
 		tripleItem.addActionListener(this);
1235
+        }
1107
1236
 	}
1108
1237
         
1109
1238
 	void buildToolsMenu(Menu menu)
1110
1239
 	{
1111
1240
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1112
1241
 		animationItem.addItemListener(this);
1113
-                animationItem.setState(CameraPane.ANIMATION);
1242
+                animationItem.setState(Globals.ANIMATION);
1114
1243
                 
1115
1244
 		menu.add("-");
1116
1245
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1117
1246
 		parseverticesItem.addActionListener(this);
1118
1247
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1119
1248
 		textureFieldItem.addActionListener(this);
1120
-		alignItem = menu.add(new MenuItem("Align"));
1249
+		alignItem = menu.add(new MenuItem("Align Objects"));
1121
1250
 		alignItem.addActionListener(this);
1122
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123
-		mirrorItem.addActionListener(this);
1124
1251
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1125
1252
 		reduceMorphItem.addActionListener(this);
1126
1253
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1127
1254
 		reduce34MorphItem.addActionListener(this);
1128
-                
1255
+		menu.add("-");
1129
1256
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1130
1257
 		computeAOItem.addActionListener(this);
1131
-		menu.add("-");
1132
1258
                 
1259
+        if (Globals.ADVANCED)
1260
+        {
1261
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262
+		mirrorItem.addActionListener(this);
1263
+		menu.add("-");
1133
1264
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1134
1265
 		memoryItem.addActionListener(this);
1135
1266
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1152,6 +1283,7 @@
1152
1283
 		menu.add("-");
1153
1284
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1154
1285
 		editScriptItem.addActionListener(this);
1286
+        }
1155
1287
         }
1156
1288
         
1157
1289
         void ScreenFit()
..
..
@@ -1480,9 +1612,9 @@
1480
1612
     
1481
1613
     void Overwrite(int mask)
1482
1614
     {
1483
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1615
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1484
1616
         {
1485
-            Object3D content = GrafreeD.clipboard.get(0);
1617
+            Object3D content = Grafreed.clipboard.get(0);
1486
1618
 
1487
1619
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1488
1620
                 content = ((cGroup)content).get(0);
..
..
@@ -1653,7 +1785,7 @@
1653
1785
 		{
1654
1786
 			makeSomething(new BezierSurface());
1655
1787
 		} else
1656
-		if (source == checkerItem)
1788
+		if (source == overlayItem)
1657
1789
 		{
1658
1790
                     /*
1659
1791
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1787,23 +1919,6 @@
1787
1919
                         csg.addChild(child);
1788
1920
                         child.addChild(csg);
1789
1921
 		} 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
1922
 		if (source == computeAOItem)
1808
1923
 		{
1809
1924
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1822,7 +1937,7 @@
1822
1937
 		if (source == invariantsItem)
1823
1938
 		{
1824
1939
                     System.out.println("Invariants:");
1825
-                    GrafreeD.grafreeD.universe.invariants();
1940
+                    Grafreed.grafreeD.universe.invariants();
1826
1941
 		} else
1827
1942
 		if (source == memoryItem)
1828
1943
 		{
..
..
@@ -1840,6 +1955,11 @@
1840
1955
 		if (source == dumpItem)
1841
1956
 		{
1842
1957
                     DumpObject();
1958
+		} else
1959
+		if (source == oneStepButton)
1960
+		{
1961
+                    Globals.ONESTEP = true;
1962
+                    cameraView.repaint();
1843
1963
 		} else
1844
1964
 		if (source == screenfitButton)
1845
1965
 		{
..
..
@@ -1890,12 +2010,20 @@
1890
2010
 		{
1891
2011
 			loadClipboard(true);
1892
2012
 		} else
2013
+		if (source == undoItem)
2014
+		{
2015
+			Undo();
2016
+		} else
2017
+		if (source == redoItem)
2018
+		{
2019
+			Redo();
2020
+		} else
1893
2021
 		if (source == duplicateItem)
1894
2022
 		{
1895
-                    Object3D keep = GrafreeD.clipboard;
2023
+                    Object3D keep = Grafreed.clipboard;
1896
2024
 			loadClipboard(false);
1897
2025
 			paste(false);
1898
-                    GrafreeD.clipboard = keep;
2026
+                    Grafreed.clipboard = keep;
1899
2027
 		} else
1900
2028
 		if (source == cloneItem)
1901
2029
 		{
..
..
@@ -1913,13 +2041,17 @@
1913
2041
 		{
1914
2042
 			paste(false);
1915
2043
 		} else
2044
+		if (source == pasteIntoItem)
2045
+		{
2046
+			pasteInto(true, false);
2047
+		} else
1916
2048
 		if (source == pasteLinkItem)
1917
2049
 		{
1918
-			pasteInto(false);
2050
+			pasteInto(false, false);
1919
2051
 		} else
1920
2052
 		if (source == pasteCloneItem)
1921
2053
 		{
1922
-			pasteInto(true);
2054
+			pasteInto(true, true);
1923
2055
 		} else
1924
2056
 		if (source == pasteExpandItem)
1925
2057
 		{
..
..
@@ -2111,9 +2243,9 @@
2111
2243
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2112
2244
 //		refreshContents();
2113
2245
 //                    }
2114
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2246
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2115
2247
                     {
2116
-                        Object3D content = GrafreeD.clipboard.get(0);
2248
+                        Object3D content = Grafreed.clipboard.get(0);
2117
2249
                         
2118
2250
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2119
2251
                             content = ((cGroup)content).get(0);
..
..
@@ -2121,11 +2253,11 @@
2121
2253
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2122
2254
                         for (int i=0; i<group.selection.size(); i++)
2123
2255
                         {
2124
-                            boolean random = CameraPane.RANDOM;
2125
-                            CameraPane.RANDOM = false; // parse all random nodes
2256
+                            boolean random = CameraPane.SWITCH;
2257
+                            CameraPane.SWITCH = false; // parse all random nodes
2126
2258
                             group.selection.get(i).linkVerticesThis(content);
2127
2259
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2128
-                            CameraPane.RANDOM = random;
2260
+                            CameraPane.SWITCH = random;
2129
2261
                         }
2130
2262
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2131
2263
 		refreshContents();
..
..
@@ -2135,20 +2267,20 @@
2135
2267
 		{
2136
2268
                     for (int i=0; i<group.selection.size(); i++)
2137
2269
                     {
2138
-                        boolean random = CameraPane.RANDOM;
2139
-                        CameraPane.RANDOM = false; // parse all random nodes
2270
+                        boolean random = CameraPane.SWITCH;
2271
+                        CameraPane.SWITCH = false; // parse all random nodes
2140
2272
                         group.selection.get(i).linkVerticesThis(null);
2141
-                        CameraPane.RANDOM = random;
2273
+                        CameraPane.SWITCH = random;
2142
2274
                     }
2143
2275
 
2144
2276
                     refreshContents();
2145
2277
 		} else
2146
2278
 		if (source == relinkverticesItem)
2147
2279
 		{
2148
-                    boolean random = CameraPane.RANDOM;
2149
-                    CameraPane.RANDOM = false; // parse all random nodes
2280
+                    boolean random = CameraPane.SWITCH;
2281
+                    CameraPane.SWITCH = false; // parse all random nodes
2150
2282
                     group.selection.RelinkToSupport();
2151
-                    CameraPane.RANDOM = random;
2283
+                    CameraPane.SWITCH = random;
2152
2284
 
2153
2285
                     refreshContents();
2154
2286
 		} else
..
..
@@ -2163,9 +2295,9 @@
2163
2295
 		} else
2164
2296
 		if (source == setMasterItem)
2165
2297
 		{
2166
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2298
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2167
2299
                     {
2168
-                        Object3D content = GrafreeD.clipboard.get(0);
2300
+                        Object3D content = Grafreed.clipboard.get(0);
2169
2301
                         
2170
2302
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2171
2303
                             content = ((cGroup)content).get(0);
..
..
@@ -2178,9 +2310,9 @@
2178
2310
 		{
2179
2311
                     if (group.selection.size() == 1)
2180
2312
                     {
2181
-                        if (GrafreeD.clipboard.size() == 1)
2313
+                        if (Grafreed.clipboard.size() == 1)
2182
2314
                         {
2183
-                            Object3D content = GrafreeD.clipboard.get(0);
2315
+                            Object3D content = Grafreed.clipboard.get(0);
2184
2316
 
2185
2317
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2186
2318
                                 content = ((cGroup)content).get(0);
..
..
@@ -2197,7 +2329,7 @@
2197
2329
 		{
2198
2330
 			RevertMeshes();
2199
2331
 		} else
2200
-		if (source == resetMeshItem)
2332
+		if (source == resetAllItem)
2201
2333
 		{
2202
2334
 			ResetAll();
2203
2335
 		} else
..
..
@@ -2246,7 +2378,7 @@
2246
2378
                         RandomNode random = new RandomNode();
2247
2379
 			group(random);
2248
2380
                         if (random.size() > 0)
2249
-                            random.name = random.get(0).name + "Rnd";
2381
+                            random.name = random.get(0).name + "Switch";
2250
2382
 		} else
2251
2383
 		if (source == physicsItem)
2252
2384
                 {
..
..
@@ -2535,9 +2667,13 @@
2535
2667
                 {
2536
2668
 			SmoothMesh();
2537
2669
 		} else
2538
-		if (source == transformgeometryItem)
2670
+		if (source == transformGeometryItem)
2539
2671
 		{
2540
2672
                         TransformGeometry();
2673
+		} else
2674
+		if (source == transformChildrenItem)
2675
+		{
2676
+                        TransformChildren();
2541
2677
 		} else
2542
2678
 		if (source == resetTransformItem)
2543
2679
 		{
..
..
@@ -2545,7 +2681,11 @@
2545
2681
 		} else
2546
2682
 		if (source == resetCentroidItem)
2547
2683
 		{
2548
-                        ResetCentroid();
2684
+                        ResetCentroid(true);
2685
+		} else
2686
+		if (source == resetCentroidXZItem)
2687
+		{
2688
+                        ResetCentroid(false);
2549
2689
 		} else
2550
2690
 		if (source == resetParentItem)
2551
2691
 		{
..
..
@@ -2901,9 +3041,9 @@
2901
3041
 				child.CloseUI();
2902
3042
                                 listUI.remove(child);
2903
3043
                                 
2904
-                                child.editWindow = null; // ???????????
3044
+                                //child.editWindow = null; // ???????????
2905
3045
 			}
2906
-			objEditor.ctrlPanel.validate();
3046
+			objEditor.ctrlPanel.FlushUI();
2907
3047
 			//objEditor.jTree.clearSelection();
2908
3048
 			//objEditor.ResetSliders();
2909
3049
                     refreshContents(true);
..
..
@@ -2987,7 +3127,9 @@
2987
3127
                         frontView.object = group;
2988
3128
                         sideView.object = group;
2989
3129
                     }
2990
-                    group.editWindow = this;
3130
+                    
3131
+// fix "+" issue                    group.editWindow = this;
3132
+                    
2991
3133
                     /*
2992
3134
                     currentLayout = radio.layout;
2993
3135
                     if (currentLayout == null)
..
..
@@ -3000,7 +3142,20 @@
3000
3142
                     //group.attributes = -1;
3001
3143
                     ResetModel();
3002
3144
                     refreshContents(true);
3003
-                }
3145
+                } else if (event.getSource() == editCameraItem)
3146
+                {
3147
+                    cameraView.ProtectCamera();
3148
+                    cameraView.repaint();
3149
+                    return;
3150
+                } else if (event.getSource() == revertCameraItem)
3151
+                {
3152
+                    cameraView.RevertCamera();
3153
+                    cameraView.repaint();
3154
+                    return;
3155
+        //        } else if (event.getSource() == textureButton)
3156
+        //        {
3157
+        //            return; // true;
3158
+                } 
3004
3159
                 else
3005
3160
                 {
3006
3161
 			//return super.action(event, arg);
..
..
@@ -3061,6 +3216,28 @@
3061
3216
             refreshContents();
3062
3217
         }
3063
3218
         
3219
+        void TransformChildren()
3220
+        {
3221
+            Object3D obj;
3222
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3223
+            {
3224
+                    obj = (Object3D)e.nextElement();
3225
+                    obj.KeepTextureMatrices();
3226
+                    obj.TransformChildren();
3227
+                    obj.RestoreTextureMatrices();
3228
+                                        
3229
+//                    if (obj.parent == null)
3230
+//                    {
3231
+//                        System.out.println("NULL PARENT!");
3232
+//                        new Exception().printStackTrace();
3233
+//                    }
3234
+//                    else
3235
+//                        TouchTransform(obj);
3236
+//                        //obj.parent.Touch();
3237
+            }
3238
+
3239
+            refreshContents();
3240
+        }
3064
3241
         
3065
3242
         void ResetTransform()
3066
3243
         {
..
..
@@ -3173,7 +3350,7 @@
3173
3350
             refreshContents();
3174
3351
         }
3175
3352
         
3176
-        void ResetCentroid()
3353
+        void ResetCentroid(boolean full)
3177
3354
         {
3178
3355
             Object3D obj;
3179
3356
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3188,12 +3365,16 @@
3188
3365
                     LA.matIdentity(Object3D.mat);
3189
3366
                     obj.getBounds(minima, maxima, false);
3190
3367
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3368
+                    if (full)
3369
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3192
3370
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3193
3371
                     obj.TransformMesh(Object3D.mat);
3372
+                    
3194
3373
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3374
+                    if (full)
3375
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3196
3376
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3377
+                    
3197
3378
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3198
3379
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3199
3380
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3259,9 +3440,9 @@
3259
3440
                     obj = (Object3D)e.nextElement();
3260
3441
                     
3261
3442
                     System.out.println("Object is: " + obj);
3262
-                    GrafreeD.AnalyzeObject(obj);
3443
+                    Grafreed.AnalyzeObject(obj);
3263
3444
                     System.out.println("Boundary rep: " + obj.bRep);
3264
-                    GrafreeD.AnalyzeObject(obj.bRep);
3445
+                    Grafreed.AnalyzeObject(obj.bRep);
3265
3446
                     
3266
3447
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3267
3448
                 }
..
..
@@ -3475,8 +3656,8 @@
3475
3656
 	
3476
3657
 	void ParseVertices()
3477
3658
 	{
3478
-            boolean epsequal = GrafreeD.epsequal;
3479
-            GrafreeD.epsequal = true;
3659
+            boolean epsequal = Grafreed.epsequal;
3660
+            Grafreed.epsequal = true;
3480
3661
             
3481
3662
             for (int i=0; i<group.selection.size(); i++)
3482
3663
             {
..
..
@@ -3501,7 +3682,7 @@
3501
3682
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3502
3683
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3503
3684
 
3504
-                                g.add(GrafreeD.clipboard);
3685
+                                g.add(Grafreed.clipboard);
3505
3686
 
3506
3687
                                 buffer.add(g);
3507
3688
                             }
..
..
@@ -3516,7 +3697,7 @@
3516
3697
                 makeSomething(buffer, i==group.selection.size()-1);
3517
3698
             }
3518
3699
             
3519
-            GrafreeD.epsequal = epsequal;
3700
+            Grafreed.epsequal = epsequal;
3520
3701
             
3521
3702
             refreshContents();
3522
3703
 	}
..
..
@@ -3534,7 +3715,16 @@
3534
3715
                             String pigment = Object3D.GetPigment(tex);
3535
3716
                             //String bump = Object3D.GetBump(tex);
3536
3717
                             
3537
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3718
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3719
+                            
3720
+                            try
3721
+                            {
3722
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3723
+                            }
3724
+                            catch (Exception e)
3725
+                            {
3726
+                                System.err.println("FAIL: " + node);
3727
+                            }
3538
3728
                             
3539
3729
                             double s = v.s;
3540
3730
                             
..
..
@@ -3622,11 +3812,11 @@
3622
3812
 
3623
3813
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3624
3814
 
3625
-            boolean random = CameraPane.RANDOM;
3626
-            CameraPane.RANDOM = false; // parse all random nodes
3815
+            boolean random = CameraPane.SWITCH;
3816
+            CameraPane.SWITCH = false; // parse all random nodes
3627
3817
             lowres.linkVerticesThis(null);
3628
3818
             lowres.linkVerticesThis(sn);
3629
-            CameraPane.RANDOM = random;
3819
+            CameraPane.SWITCH = random;
3630
3820
 
3631
3821
             System.err.flush();
3632
3822
 
..
..
@@ -3666,7 +3856,7 @@
3666
3856
                 return;
3667
3857
             
3668
3858
             Object3D poses = group.selection.get(0);
3669
-            Object3D ref = GrafreeD.clipboard.get(0);
3859
+            Object3D ref = Grafreed.clipboard.get(0);
3670
3860
             
3671
3861
             Object3D newgroup = new Object3D("Po:" + poses.name);
3672
3862
             
..
..
@@ -3860,9 +4050,9 @@
3860
4050
 	
3861
4051
 	void ClipMesh()
3862
4052
 	{
3863
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4053
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3864
4054
             {
3865
-                Object3D content = GrafreeD.clipboard.get(0);
4055
+                Object3D content = Grafreed.clipboard.get(0);
3866
4056
 
3867
4057
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3868
4058
                     content = ((cGroup)content).get(0);
..
..
@@ -3871,7 +4061,7 @@
3871
4061
 //                {
3872
4062
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3873
4063
 //                }
3874
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4064
+                  group.selection.ClipMesh(Grafreed.clipboard);
3875
4065
             }
3876
4066
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3877
4067
             System.out.println("DONE.");
..
..
@@ -4006,7 +4196,7 @@
4006
4196
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4007
4197
                     
4008
4198
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4009
-                        if(elem != group)
4199
+                        if(elem != group || !newWindow)
4010
4200
                         {
4011
4201
                         //    if (!(elem instanceof Composite))
4012
4202
                         //        newWindow = false;
..
..
@@ -4120,14 +4310,17 @@
4120
4310
 			
4121
4311
                         objEditor.SetText(); // jan 2014
4122
4312
                         
4123
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4313
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4124
4314
 				CameraPane.flash = true;
4125
4315
                         
4126
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4316
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4127
4317
                             // a camera
4128
4318
                         {
4129
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4130
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4319
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4320
+                            {
4321
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4322
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4323
+                            }
4131
4324
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4132
4325
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4133
4326
                         }
..
..
@@ -4211,12 +4404,12 @@
4211
4404
 	{
4212
4405
 		if (group.selection.isEmpty())
4213
4406
 			return;
4214
-		GrafreeD.clipboardIsTempGroup = false;
4407
+		Grafreed.clipboardIsTempGroup = false;
4215
4408
 		Composite tGroup = null;
4216
4409
 		if (group.selection.size() > 0) // 1)
4217
4410
 		{
4218
4411
 			tGroup = new cGroup();
4219
-			GrafreeD.clipboardIsTempGroup = true;
4412
+			Grafreed.clipboardIsTempGroup = true;
4220
4413
 		}
4221
4414
                 
4222
4415
 		if (cut)
..
..
@@ -4256,16 +4449,16 @@
4256
4449
 		//System.out.println("cut " + child);
4257
4450
 		//System.out.println("parent = " + child.parent);
4258
4451
                 //                   tmp.addChild(child);
4259
-                                    if (GrafreeD.clipboardIsTempGroup)
4452
+                                    if (Grafreed.clipboardIsTempGroup)
4260
4453
                                             tGroup.add/*Child*/(tmp);
4261
4454
                                     else
4262
-                                            GrafreeD.clipboard = tmp;
4455
+                                            Grafreed.clipboard = tmp;
4263
4456
                                 }
4264
4457
                                 else
4265
-                                    if (GrafreeD.clipboardIsTempGroup)
4458
+                                    if (Grafreed.clipboardIsTempGroup)
4266
4459
                                             tGroup.add/*Child*/(child);
4267
4460
                                     else
4268
-                                            GrafreeD.clipboard = child;
4461
+                                            Grafreed.clipboard = child;
4269
4462
 			}
4270
4463
 			
4271
4464
 			//ResetModel();
..
..
@@ -4297,21 +4490,21 @@
4297
4490
 		//System.out.println("cut " + elem);
4298
4491
 		//System.out.println("parent = " + elem.parent);
4299
4492
                 //                    tmp.addChild(elem);
4300
-                                    if (GrafreeD.clipboardIsTempGroup)
4493
+                                    if (Grafreed.clipboardIsTempGroup)
4301
4494
                                             tGroup.add/*Child*/(tmp);
4302
4495
                                     else
4303
-                                            GrafreeD.clipboard = tmp;
4496
+                                            Grafreed.clipboard = tmp;
4304
4497
                                 }
4305
4498
                                 else
4306
-                                    if (GrafreeD.clipboardIsTempGroup)
4499
+                                    if (Grafreed.clipboardIsTempGroup)
4307
4500
                                             tGroup.add/*Child*/(child);
4308
4501
                                     else
4309
-                                            GrafreeD.clipboard = child;
4502
+                                            Grafreed.clipboard = child;
4310
4503
 			}
4311
4504
 			
4312
4505
 		}
4313
-		if (GrafreeD.clipboardIsTempGroup)
4314
-			GrafreeD.clipboard = tGroup;
4506
+		if (Grafreed.clipboardIsTempGroup)
4507
+			Grafreed.clipboard = tGroup;
4315
4508
 		if (cut)
4316
4509
                 {
4317
4510
                     ResetModel();
..
..
@@ -4325,7 +4518,7 @@
4325
4518
 	//		return;
4326
4519
 		boolean first = true;
4327
4520
 		
4328
-		if (GrafreeD.clipboardIsTempGroup)
4521
+		if (Grafreed.clipboardIsTempGroup)
4329
4522
 		{
4330
4523
 			Composite temp;
4331
4524
 			
..
..
@@ -4336,7 +4529,7 @@
4336
4529
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4337
4530
                          */
4338
4531
 			Object3D elem;
4339
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4532
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4340
4533
 			{
4341
4534
 				Object3D child = (Object3D)e.nextElement();
4342
4535
                                 
..
..
@@ -4370,21 +4563,21 @@
4370
4563
 			//Object3D cb = Applet3D.clipboard;
4371
4564
 			//temp.addChild(cb);
4372
4565
 			//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());
4566
+                    assert(Grafreed.clipboard.parent == null);
4567
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4568
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4569
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4570
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4378
4571
                         else
4379
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4572
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4573
+                        Grafreed.clipboard.get(0).parent = keepparent;
4381
4574
 		}
4382
4575
 		
4383
4576
 		ResetModel();
4384
4577
 		refreshContents();
4385
4578
 	}
4386
4579
 	
4387
-	void pasteInto(boolean copyit)
4580
+	void pasteInto(boolean copyit, boolean clone)
4388
4581
 	{
4389
4582
 //		if (GrafreeD.clipboard == null)
4390
4583
 //			return;
..
..
@@ -4413,15 +4606,22 @@
4413
4606
 		if (copyit)
4414
4607
 		{
4415
4608
 		//	paste(false);
4416
-                    CloneClipboard(false); // sept 2014
4609
+                        if (clone)
4610
+                        {
4611
+                            CloneClipboard(false); // sept 2014
4612
+                        }
4613
+                        else
4614
+                        {
4615
+                            paste(false);
4616
+                        }
4417
4617
 		}
4418
4618
 		else
4419
4619
 		{
4420
4620
 			boolean first = true;
4421
4621
 			
4422
-			if (GrafreeD.clipboardIsTempGroup)
4622
+			if (Grafreed.clipboardIsTempGroup)
4423
4623
 			{
4424
-				Composite temp = (Composite)GrafreeD.clipboard;
4624
+				Composite temp = (Composite)Grafreed.clipboard;
4425
4625
 				Object3D copy;
4426
4626
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4427
4627
 				{
..
..
@@ -4431,7 +4631,7 @@
4431
4631
 				}
4432
4632
 			} else
4433
4633
 			{
4434
-				linkSomething(GrafreeD.clipboard); //.get(0));
4634
+				linkSomething(Grafreed.clipboard); //.get(0));
4435
4635
 			}
4436
4636
 		}
4437
4637
             }
..
..
@@ -4836,21 +5036,6 @@
4836
5036
         }
4837
5037
          */
4838
5038
 
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
5039
         /*
4855
5040
         public void Callback(Object obj)
4856
5041
         {
..
..
@@ -4874,26 +5059,9 @@
4874
5059
         }
4875
5060
          */
4876
5061
 
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
5062
 	String GetFile(String dialogName)
4895
5063
 	{
4896
-		if (GrafreeD.standAlone)
5064
+		if (Grafreed.standAlone)
4897
5065
 		{
4898
5066
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4899
5067
 			browser.show();
..
..
@@ -4957,10 +5125,12 @@
4957
5125
 	cButton flashSelectionButton;
4958
5126
 	cButton editButton;
4959
5127
 	cButton uneditButton;
5128
+	JCheckBox allParamsButton;
4960
5129
 	cButton clearpanelButton;
4961
-	cButton allParamsButton;
4962
5130
 	cButton unselectButton;
4963
5131
 	
5132
+	cButton oneStepButton;
5133
+        
4964
5134
 	cButton screenfitButton;
4965
5135
 	cButton screenfitpointButton;
4966
5136
 	cButton snapobjectButton;
..
..
@@ -4991,6 +5161,8 @@
4991
5161
 	private MenuItem lookFromItem;
4992
5162
 	private MenuItem switchItem;
4993
5163
 	private MenuItem cutItem;
5164
+	private MenuItem undoItem;
5165
+	private MenuItem redoItem;
4994
5166
 	private MenuItem duplicateItem;
4995
5167
 	private MenuItem cloneItem;
4996
5168
 	private MenuItem cloneSupportItem;
..
..
@@ -5004,7 +5176,7 @@
5004
5176
 	private MenuItem linkverticesItem;
5005
5177
 	private MenuItem relinkverticesItem;
5006
5178
 	private MenuItem setMasterItem;
5007
-	private MenuItem resetMeshItem;
5179
+	private MenuItem resetAllItem;
5008
5180
 	private MenuItem stepAllItem;
5009
5181
 	private MenuItem revertMeshItem;
5010
5182
 	private MenuItem poseMeshItem;
..
..
@@ -5015,6 +5187,7 @@
5015
5187
 	private MenuItem mergeGeometriesItem;
5016
5188
 	private MenuItem copyItem;
5017
5189
 	private MenuItem pasteItem;
5190
+	private MenuItem pasteIntoItem;
5018
5191
 	private MenuItem pasteLinkItem;
5019
5192
 	private MenuItem pasteCloneItem;
5020
5193
 	private MenuItem pasteExpandItem;
..
..
@@ -5064,8 +5237,10 @@
5064
5237
 	private MenuItem panoTexturesItem;
5065
5238
         
5066
5239
 	private MenuItem resetCentroidItem;
5067
-	private MenuItem transformgeometryItem;
5240
+	private MenuItem resetCentroidXZItem;
5068
5241
 	private MenuItem resetTransformItem;
5242
+	private MenuItem transformGeometryItem;
5243
+	private MenuItem transformChildrenItem;
5069
5244
 	private MenuItem hideItem;
5070
5245
 	private MenuItem grabItem;
5071
5246
 	private MenuItem backItem;
..
..
@@ -5112,7 +5287,7 @@
5112
5287
 	private MenuItem blobItem;
5113
5288
 	private MenuItem latheItem;
5114
5289
 	private MenuItem bezierItem;
5115
-	private MenuItem checkerItem;
5290
+	private MenuItem overlayItem;
5116
5291
 	private MenuItem meshItem;
5117
5292
 //	private MenuItem meshGroupItem;
5118
5293
 	private MenuItem springItem;
..
..
@@ -5134,11 +5309,6 @@
5134
5309
 	private MenuItem doubleItem;
5135
5310
 	private MenuItem tripleItem;
5136
5311
         
5137
-	private MenuItem importGFDItem;
5138
-	private MenuItem importVRMLX3DItem;
5139
-	private MenuItem import3DSItem;
5140
-	private MenuItem importOBJItem;
5141
-
5142
5312
 	private MenuItem computeAOItem;
5143
5313
 	private MenuItem recompileItem;
5144
5314
 	private MenuItem editScriptItem;
..
..
@@ -5148,4 +5318,8 @@
5148
5318
 	private MenuItem analyzeItem;
5149
5319
 	private MenuItem dumpItem;
5150
5320
 	//boolean freezemodel = false;
5321
+        
5322
+    Menu cameraMenu;
5323
+    MenuItem editCameraItem;
5324
+    MenuItem revertCameraItem;
5151
5325
 }