Fix shadow and bump issue.

Normand Briere

2019-06-09 cd87df088b1850ba0c90beb6c866c443e4eaf3b9

 GroupEditor.java
..
..
@@ -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
..
..
@@ -150,6 +150,8 @@
150
150
     
151
151
 	void SetupMenu2(ObjEditor oe)
152
152
 	{
153
+        if (Globals.ADVANCED)
154
+        {
153
155
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
156
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
157
 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..
..
@@ -161,17 +163,21 @@
161
163
 		lookAtItem.addActionListener(this);
162
164
 		//lookFromItem.addActinoListener(this);
163
165
 		//switchItem.addActionListener(this);
166
+        }
167
+        
164
168
 		Menu menu;
165
169
 		oe.menuBar.add(menu = new Menu("Edit"));
166
170
 		//editItem = menu.add(new MenuItem("Edit"));
167
171
 		//editItem.addActionListener(this);
168
172
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
169
173
 		duplicateItem.addActionListener(this);
170
-		menu.add("-");
171
174
 		cloneItem = menu.add(new MenuItem("Clone"));
172
175
 		cloneItem.addActionListener(this);
176
+        if (Globals.ADVANCED)
177
+        {
173
178
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174
179
 		cloneSupportItem.addActionListener(this);
180
+        }
175
181
 		menu.add("-");
176
182
 		cutItem = menu.add(new MenuItem("Cut"));
177
183
 		cutItem.addActionListener(this);
..
..
@@ -179,27 +185,37 @@
179
185
 		copyItem.addActionListener(this);
180
186
 		pasteItem = menu.add(new MenuItem("Paste"));
181
187
 		pasteItem.addActionListener(this);
188
+		menu.add("-");
189
+                
190
+		menu.add("-");
191
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
192
+		pasteIntoItem.addActionListener(this);
182
193
 		pasteLinkItem = menu.add(new MenuItem("Paste link"));
183
194
 		pasteLinkItem.addActionListener(this);
184
195
 		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185
196
 		pasteCloneItem.addActionListener(this);
186
197
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187
198
 //		pasteExpandItem.addActionListener(this);
199
+		menu.add("-");
188
200
 		clearItem = menu.add(new MenuItem("Clear"));
189
201
 		clearItem.addActionListener(this);
202
+                
203
+        if (Globals.ADVANCED)
204
+        {
205
+                // Deletes the cameras...
190
206
 		clearAllItem = menu.add(new MenuItem("Clear All"));
191
207
 		clearAllItem.addActionListener(this);
208
+        }
192
209
 
193
210
 		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);
211
+        if (Globals.ADVANCED)
212
+        {
198
213
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199
214
 		revertMeshItem.addActionListener(this);
200
215
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
216
 		resetreferencesItem.addActionListener(this);
202
217
 		menu.add("-");
218
+        }
203
219
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
220
 		overwriteGeoItem.addActionListener(this);
205
221
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +227,26 @@
211
227
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
228
 		overwriteUVItem.addActionListener(this);
213
229
 		menu.add("-");
230
+        if (Globals.ADVANCED)
231
+        {
214
232
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
233
 		generateMeshItem.addActionListener(this);
216
234
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
235
 		poseMeshItem.addActionListener(this);
218
236
 		menu.add("-");
237
+        }
219
238
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
239
 		resetsupportItem.addActionListener(this);
221
240
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
241
 		linkverticesItem.addActionListener(this);
223
242
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
243
 		relinkverticesItem.addActionListener(this);
244
+                
245
+        if (Globals.ADVANCED)
246
+        {
225
247
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
248
 		setMasterItem.addActionListener(this);
249
+        }
227
250
                 
228
251
 		oe.menuBar.add(menu = new Menu("Group"));
229
252
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,27 +257,32 @@
234
257
 		frontItem.addActionListener(this);
235
258
 		compositeItem = menu.add(new MenuItem("Composite"));
236
259
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
260
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
261
 		hideItem.addActionListener(this);
239
262
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
263
 		ungroupItem.addActionListener(this);
241
264
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
265
+		randomItem = menu.add(new MenuItem("Switch node"));
243
266
 		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
267
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
268
 		switchGeoItem.addActionListener(this);
250
269
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
270
 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
271
+		morphItem = menu.add(new MenuItem("Morph Group"));
253
272
 		morphItem.addActionListener(this);
273
+                
274
+        if (Globals.ADVANCED)
275
+        {
276
+		menu.add("-");
277
+		physicsItem = menu.add(new MenuItem("Physics"));
278
+		physicsItem.addActionListener(this);
279
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
280
+		frameselectorItem.addActionListener(this);
254
281
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
282
 		scriptNodeItem.addActionListener(this);
256
283
 		cameraItem = menu.add(new MenuItem("Camera"));
257
284
 		cameraItem.addActionListener(this);
285
+        }
258
286
                 
259
287
 		oe.menuBar.add(menu = new Menu("Object"));
260
288
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,21 +297,29 @@
269
297
 		shadowYItem.addActionListener(this);
270
298
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
299
 		shadowZItem.addActionListener(this);
300
+        if (Globals.ADVANCED)
301
+        {
302
+		menu.add("-");
272
303
 		linkerItem = menu.add(new MenuItem("Linker"));
273
304
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
305
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
306
 		attributeItem.addActionListener(this);
307
+		templateItem = menu.add(new MenuItem("Template"));
308
+		templateItem.addActionListener(this);
278
309
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
310
 		pointflowItem.addActionListener(this);
311
+        }
280
312
 		menu.add("-");
281
313
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
314
 		resetTransformItem.addActionListener(this);
283
315
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284
316
 		resetCentroidItem.addActionListener(this);
285
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
-		transformgeometryItem.addActionListener(this);
317
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
318
+		resetCentroidXZItem.addActionListener(this);
319
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
320
+		transformGeometryItem.addActionListener(this);
321
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
322
+		transformChildrenItem.addActionListener(this);
287
323
                 
288
324
 		oe.menuBar.add(menu = new Menu("Geometry"));
289
325
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -294,8 +330,11 @@
294
330
 		genNormalsCADItem.addActionListener(this);
295
331
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
332
 		genNormalsMESHItem.addActionListener(this);
333
+        if (Globals.ADVANCED)
334
+        {
297
335
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
336
 		genNormalsMINEItem.addActionListener(this);
337
+        }
299
338
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
339
 		stripifyItem.addActionListener(this);
301
340
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,23 +356,34 @@
317
356
 		reduce34MeshItem.addActionListener(this);
318
357
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
358
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
359
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
360
 		clipMeshItem.addActionListener(this);
361
+                
362
+        if (Globals.ADVANCED)
363
+        {
364
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
365
+		smoothMeshItem.addActionListener(this);
366
+        }
324
367
 
325
368
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
369
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327
370
 		clearMaterialsItem.addActionListener(this);
371
+                resetAllItem = menu.add(new MenuItem("Reset All"));
372
+		resetAllItem.addActionListener(this);
373
+		stepAllItem = menu.add(new MenuItem("Step All"));
374
+		stepAllItem.addActionListener(this);
328
375
 		menu.add("-");
329
376
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330
377
 		liveleavesItem.addActionListener(this);
331
378
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
379
 		unliveleavesItem.addActionListener(this);
380
+        if (Globals.ADVANCED)
381
+        {
333
382
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
383
 		supportleavesItem.addActionListener(this);
335
384
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
385
 		unsupportleavesItem.addActionListener(this);
386
+        }
337
387
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
388
 		hideleavesItem.addActionListener(this);
339
389
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -377,28 +427,34 @@
377
427
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
428
 		sortbynameItem.addActionListener(this);
379
429
 		menu.add("-");
430
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
431
+		shareGeometriesItem.addActionListener(this);
432
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433
+		mergeGeometriesItem.addActionListener(this);
434
+        if (Globals.ADVANCED)
435
+        {
436
+            // Pretty much the same as duplicate and clone.
380
437
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
438
 		extractGeometriesItem.addActionListener(this);
382
439
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383
440
 		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);
441
+        }
388
442
                 
389
443
 		oe.menuBar.add(menu = new Menu("Insert"));
390
444
 		buildCreateMenu(menu);
391
445
                 
392
-               
393
446
                 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..."));
447
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
399
448
 		importOBJItem.addActionListener(this);
400
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
449
+		menu.add("-");
450
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
401
451
 		import3DSItem.addActionListener(this);
452
+		menu.add("-");
453
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454
+		importVRMLX3DItem.addActionListener(this);
455
+		menu.add("-");
456
+		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457
+		importGFDItem.addActionListener(this);
402
458
 
403
459
                 oe.menuBar.add(menu = new Menu("Tools"));
404
460
 		buildToolsMenu(menu);
..
..
@@ -434,110 +490,98 @@
434
490
         oe.radioPanel.add(dummyButton);
435
491
         oe.buttonGroup.add(dummyButton);
436
492
          */
437
-                aConstraints.gridy += 1;
438
-                
439
493
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440
494
                 
441
-		oe.aConstraints.gridwidth = 1;
442
-        	oe.aConstraints.gridx = 0;
443
-                
444
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445
-                liveCB.setToolTipText("Enabled animation");
495
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496
+                liveCB.setToolTipText("Enable animation");
446
497
                                 liveCB.addItemListener(this);
447
498
 
448
-        	oe.aConstraints.gridx += 1;
449
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
499
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500
+                oneStepButton.setToolTipText("Animate one step forward");
501
+		oneStepButton.addActionListener(this);
502
+                
503
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
504
+                fastCB.setToolTipText("Fast mode");
505
+                                fastCB.addItemListener(this);
506
+                                
507
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
450
508
                 trackCB.setToolTipText("Enable tracking");
451
509
                                 trackCB.addItemListener(this);
452
510
 
453
-        	oe.aConstraints.gridx += 1;
454
-		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
511
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455
512
                 screenfitButton.setToolTipText("Screen fit");
456
513
 		screenfitButton.addActionListener(this);
457
-			oe.aConstraints.gridx += 1;
514
+
458
515
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459
516
 //		screenfitpointButton.addActionListener(this);
460
-//			oe.aConstraints.gridx += 1;
461
-		oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462
-		snapobjectButton.addActionListener(this);
463
-                snapobjectButton.setToolTipText("Snap Object");
464
-			oe.aConstraints.gridx += 1;
465
517
 
466
-                //aConstraints.gridx = 0;
467
-                //aConstraints.gridy += 1;
468
-		oe.aConstraints.weighty = 0;
469
-		oe.aConstraints.gridwidth = 1;
470
-		
471
-		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
518
+                if (Globals.ADVANCED)
519
+                {
520
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521
+                        snapobjectButton.addActionListener(this);
522
+                        snapobjectButton.setToolTipText("Snap Object");
523
+                }
524
+
525
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472
526
                 flashSelectionButton.setToolTipText("Show selection");
473
527
 		flashSelectionButton.addActionListener(this);
474
528
                 
475
-		oe.toolbarPanel.add(new cButton("     ", false));
529
+		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
476
530
                 
477
-		oe.aConstraints.gridx += 1;
478
-		oe.aConstraints.weighty = 0;
479
-		oe.aConstraints.gridwidth = 1;
480
-                
481
-                //
482
-		oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
531
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483
532
                 twoButton.setToolTipText("Show center view only");
484
533
 		twoButton.addActionListener(this);
485
-		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
534
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486
535
 		fourButton.addActionListener(this);
487
536
                 fourButton.setToolTipText("Show left panel only");
488
-		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
537
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489
538
                 sixButton.setToolTipText("2-column layout left");
490
539
 		sixButton.addActionListener(this);
491
-		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
540
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492
541
                 threeButton.setToolTipText("2-column layout right");
493
542
 		threeButton.addActionListener(this);
494
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
543
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495
544
                 sevenButton.setToolTipText("3-column layout");
496
545
 		sevenButton.addActionListener(this);
497
546
                 //
498
547
 
499
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500
-                rootButton.setToolTipText("Edit object in new tab");
548
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549
+                rootButton.setToolTipText("Edit selection in new tab");
501
550
 		rootButton.addActionListener(this);
502
-			oe.aConstraints.gridx += 1;
503
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
551
+
552
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504
553
                 closeButton.setToolTipText("Close tab");
505
554
 		closeButton.addActionListener(this);
506
555
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507
556
 		//clearButton.addActionListener(this);
508
-			oe.aConstraints.gridx += 1;
509
557
                         
510
-		oe.aConstraints.gridx = 1; //
511
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
558
+                cGridBag commandsPanel = new cGridBag();
559
+                
560
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
+                editButton.setToolTipText("Edit selection");
512
562
 		editButton.addActionListener(this);
513
-		oe.aConstraints.gridx += 1;
514
-		oe.aConstraints.weighty = 0;
515
-		oe.aConstraints.gridwidth = 1;
516
563
 
517
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
564
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
+                uneditButton.setToolTipText("Unedit selection");
518
566
 		uneditButton.addActionListener(this);
519
567
 
520
-		oe.aConstraints.gridx += 1;
521
-		oe.aConstraints.weighty = 0;
522
-		oe.aConstraints.gridwidth = 1;
523
-                
524
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525
-		clearPanelButton.addActionListener(this);
526
-
527
-		oe.aConstraints.gridx += 1;
528
-		oe.aConstraints.weighty = 0;
529
-		oe.aConstraints.gridwidth = 1;
530
-                
531
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
568
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569
+                allParamsButton.setToolTipText("Edit all params");
532
570
 		allParamsButton.addActionListener(this);
533
571
 
534
-		oe.aConstraints.gridx += 1;
535
-		oe.aConstraints.weighty = 0;
536
-		oe.aConstraints.gridwidth = 1;
537
-                
538
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
572
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573
+                clearPanelButton.setToolTipText("Clear edit panel");
574
+		clearPanelButton.addActionListener(this);
575
+
576
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577
+                unselectButton.setToolTipText("Unselect");
539
578
 		unselectButton.addActionListener(this);
540
579
 
580
+                commandsPanel.preferredHeight = 1;
581
+                
582
+                oe.treePanel.add(commandsPanel);
583
+                oe.treePanel.Return();
584
+                
541
585
 //		oe.aConstraints.gridx += 1;
542
586
 //		oe.aConstraints.weighty = 0;
543
587
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -549,40 +593,37 @@
549
593
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550
594
 //		gcButton.addActionListener(this);
551
595
                 
552
-                oe.aConstraints.gridx = 0;
553
-		oe.aConstraints.gridy += 1;
554
-                
555
-		//ctrlPanel.add(objList = new List(5, true));
556
-		oe.aConstraints.gridwidth = 100;
557
-	//	oe.aConstraints.gridheight = 100;
558
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559
-		oe.aConstraints.gridheight = 1;
560
-		oe.aConstraints.weighty = 0.5;
561
-		oe.aConstraints.gridx = 0;
562
-		JScrollPane jSP;
596
+                cGridBag jSPPanel = new cGridBag();
597
+
598
+                JScrollPane jSP;
563
599
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
600
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
565
601
                 ResetModel();
566
-		oe.aConstraints.weighty = 0.5;
567
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568
-		oe.aConstraints.gridy += 1;
569
-		oe.aConstraints.gridwidth = 1;
602
+                
603
+                oe.treePanel.add(jSPPanel);
604
+                oe.treePanel.Return();
570
605
 
571
-		oe.aConstraints.weighty = 0;
572
-		oe.aConstraints.gridwidth = 2;
573
-
574
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
606
+                cGridBag copyOptionsPanel = new cGridBag();
607
+                
608
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609
+                colorCB.setToolTipText("Copy color when dropped");
575
610
                 colorCB.addItemListener(this);
576
-                oe.aConstraints.gridx += 2;
577
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
611
+
612
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613
+                materialCB.setToolTipText("Copy material when dropped");
578
614
                 materialCB.addItemListener(this);
579
-                oe.aConstraints.gridx += 2;
580
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
615
+
616
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617
+                textureCB.setToolTipText("Copy texture when dropped");
581
618
                 textureCB.addItemListener(this);
582
619
                         
583
-                oe.aConstraints.gridx = 0;
584
-		oe.aConstraints.gridy += 1;
620
+                copyOptionsPanel.preferredHeight = 1;
621
+                oe.treePanel.add(copyOptionsPanel);
622
+                oe.treePanel.Return();
585
623
                 
624
+//        mainPanel.setDividerLocation(0.5); //1.0);
625
+//        mainPanel.setResizeWeight(0.5);
626
+        
586
627
 		//jList.addListSelectionListener(this);
587
628
 		oe.jTree.addTreeSelectionListener(this);
588
629
 		//jTree.setRootVisible(false);
..
..
@@ -607,43 +648,35 @@
607
648
         
608
649
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609
650
         {
610
-        	//constraints.gridx = 0;
611
-        	//constraints.gridy = 0;
612
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613
-                fastCB.setToolTipText("Fast mode");
614
-                                fastCB.addItemListener(this);
615
-        	//constraints.gridy += 1;
616
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617
-                supportCB.setToolTipText("Enabled rigging");
618
-                                supportCB.addItemListener(this);
619
-
620
-        //	constraints.gridy += 1;
621
-        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622
-        //                        localCB.addItemListener(this);
623
-
624
-        	//constraints.gridy += 1;
625
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626
-                crowdCB.setToolTipText("Used for crowds");
627
-                                crowdCB.addItemListener(this);
628
-
629
-        	//constraints.gridy += 1;
630
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631
-                smoothCB.setToolTipText("Snapping delay");
632
-                                smoothCB.addItemListener(this);
633
-
634
-        	//constraints.gridy += 1;
635
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636
-                slowCB.setToolTipText("Smooth interpolation");
637
-                                slowCB.addItemListener(this);
638
-        	//constraints.gridy += 1;
639
651
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640
652
                 boxCB.setToolTipText("Display bounding boxes");
641
653
                                 boxCB.addItemListener(this);
642
-        	//constraints.gridy += 1;
654
+                                
643
655
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644
656
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645
657
                                 zoomBoxCB.addItemListener(this);
646
658
 
659
+        if (true) // Globals.ADVANCED)
660
+        {
661
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662
+                supportCB.setToolTipText("Enable rigging");
663
+                                supportCB.addItemListener(this);
664
+
665
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666
+        //                        localCB.addItemListener(this);
667
+
668
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669
+                crowdCB.setToolTipText("Used for crowds");
670
+                                crowdCB.addItemListener(this);
671
+
672
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
673
+                smoothCB.setToolTipText("Snapping delay");
674
+                                smoothCB.addItemListener(this);
675
+
676
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677
+                slowCB.setToolTipText("Smooth interpolation");
678
+                                slowCB.addItemListener(this);
679
+                                
647
680
 //        	constraints.gridy += 1;
648
681
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649
682
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -668,14 +701,20 @@
668
701
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669
702
 //                debugCB.addItemListener(this);
670
703
 
671
-        	//constraints.gridy += 1;
672
704
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
673
705
                                 oeilCB.addItemListener(this);
674
706
 
675
-        	//constraints.gridy += 1;
676
707
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677
708
                 lookAtCB.setToolTipText("Look-at target");
678
709
                                 lookAtCB.addItemListener(this);
710
+                
711
+        }
712
+                                
713
+                cGridBag fill = new cGridBag();
714
+                                
715
+                fill.preferredHeight = 200;
716
+                
717
+                panel.add(fill);
679
718
 
680
719
         }
681
720
 	
..
..
@@ -906,7 +945,9 @@
906
945
 //                        objEditor.DropFile((java.io.File[]) object, true);
907
946
 //                        return;
908
947
 //                    }
909
-                    if (string.charAt(0) == '/')
948
+                    
949
+                    // File path for Mac and Windows
950
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
910
951
                     {
911
952
                         // file(s)
912
953
                         String[] names = string.split("\n");
..
..
@@ -933,7 +974,7 @@
933
974
                     
934
975
                     flashIt = false;
935
976
                     CameraPane pane = (CameraPane) target;
936
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
977
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937
978
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938
979
                     
939
980
                     if (group.selection.size() == 1)
..
..
@@ -960,11 +1001,11 @@
960
1001
             {
961
1002
                 loadClipboard(true);
962
1003
                 objEditor.jTree.setSelectionPath(destinationPath);
963
-                pasteInto(false);
1004
+                pasteInto(false, false);
964
1005
             } else {
965
1006
                 loadClipboard(false);
966
1007
                 objEditor.jTree.setSelectionPath(destinationPath);
967
-                pasteInto(false); // true); // ???
1008
+                pasteInto(false, false); // true); // ???
968
1009
             }
969
1010
 	}
970
1011
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1086,27 +1127,33 @@
1086
1127
 		kleinItem.addActionListener(this);
1087
1128
 		particleItem = menu.add(new MenuItem("Particle system"));
1088
1129
 		particleItem.addActionListener(this);
1130
+        if (Globals.ADVANCED)
1131
+        {
1089
1132
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090
1133
 		ragdollItem.addActionListener(this);
1091
1134
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092
1135
 		ragdoll2Item.addActionListener(this);
1136
+        }
1093
1137
 		menu.add("-");
1094
-		meshItem = menu.add(new MenuItem("Mesh"));
1138
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095
1139
 		meshItem.addActionListener(this);
1096
1140
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097
1141
 	//	meshGroupItem.addActionListener(this);
1142
+        if (Globals.ADVANCED)
1143
+        {
1098
1144
 		springItem = menu.add(new MenuItem("Spring"));
1099
1145
 		springItem.addActionListener(this);
1100
1146
 		flagItem = menu.add(new MenuItem("Flag"));
1101
1147
 		flagItem.addActionListener(this);
1102
-		bezierItem = menu.add(new MenuItem("Patch"));
1103
-		bezierItem.addActionListener(this);
1104
-		checkerItem = menu.add(new MenuItem("Checker"));
1105
-		checkerItem.addActionListener(this);
1106
1148
 		blobItem = menu.add(new MenuItem("Blob"));
1107
1149
 		blobItem.addActionListener(this);
1108
1150
 		latheItem = menu.add(new MenuItem("Lathe"));
1109
1151
 		latheItem.addActionListener(this);
1152
+        }
1153
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154
+		bezierItem.addActionListener(this);
1155
+		overlayItem = menu.add(new MenuItem("Overlay"));
1156
+		overlayItem.addActionListener(this);
1110
1157
 		lightItem = menu.add(new MenuItem("Light"));
1111
1158
 		lightItem.addActionListener(this);
1112
1159
 		menu.add("-");
..
..
@@ -1116,34 +1163,39 @@
1116
1163
 		loopItem.addActionListener(this);
1117
1164
 		doubleItem = menu.add(new MenuItem("Fork"));
1118
1165
 		doubleItem.addActionListener(this);
1166
+        if (Globals.ADVANCED)
1167
+        {
1119
1168
 		tripleItem = menu.add(new MenuItem("Trident"));
1120
1169
 		tripleItem.addActionListener(this);
1170
+        }
1121
1171
 	}
1122
1172
         
1123
1173
 	void buildToolsMenu(Menu menu)
1124
1174
 	{
1125
1175
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126
1176
 		animationItem.addItemListener(this);
1127
-                animationItem.setState(CameraPane.ANIMATION);
1177
+                animationItem.setState(Globals.ANIMATION);
1128
1178
                 
1129
1179
 		menu.add("-");
1130
1180
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131
1181
 		parseverticesItem.addActionListener(this);
1132
1182
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133
1183
 		textureFieldItem.addActionListener(this);
1134
-		alignItem = menu.add(new MenuItem("Align"));
1184
+		alignItem = menu.add(new MenuItem("Align Objects"));
1135
1185
 		alignItem.addActionListener(this);
1136
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137
-		mirrorItem.addActionListener(this);
1138
1186
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139
1187
 		reduceMorphItem.addActionListener(this);
1140
1188
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141
1189
 		reduce34MorphItem.addActionListener(this);
1142
-                
1190
+		menu.add("-");
1143
1191
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1144
1192
 		computeAOItem.addActionListener(this);
1145
-		menu.add("-");
1146
1193
                 
1194
+        if (Globals.ADVANCED)
1195
+        {
1196
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1197
+		mirrorItem.addActionListener(this);
1198
+		menu.add("-");
1147
1199
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1148
1200
 		memoryItem.addActionListener(this);
1149
1201
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1166,6 +1218,7 @@
1166
1218
 		menu.add("-");
1167
1219
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168
1220
 		editScriptItem.addActionListener(this);
1221
+        }
1169
1222
         }
1170
1223
         
1171
1224
         void ScreenFit()
..
..
@@ -1494,9 +1547,9 @@
1494
1547
     
1495
1548
     void Overwrite(int mask)
1496
1549
     {
1497
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1550
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1498
1551
         {
1499
-            Object3D content = GrafreeD.clipboard.get(0);
1552
+            Object3D content = Grafreed.clipboard.get(0);
1500
1553
 
1501
1554
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1502
1555
                 content = ((cGroup)content).get(0);
..
..
@@ -1667,7 +1720,7 @@
1667
1720
 		{
1668
1721
 			makeSomething(new BezierSurface());
1669
1722
 		} else
1670
-		if (source == checkerItem)
1723
+		if (source == overlayItem)
1671
1724
 		{
1672
1725
                     /*
1673
1726
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1816,7 +1869,15 @@
1816
1869
 		} else
1817
1870
 		if (source == importOBJItem)
1818
1871
 		{
1819
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1872
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874
+                            browser.setVisible(true);
1875
+                            String filename = browser.getFile();
1876
+                            if (filename != null && filename.length() > 0)
1877
+                            {
1878
+                                String fullname = browser.getDirectory() + filename;
1879
+                                makeSomething(ReadOBJ(fullname), true);
1880
+                            }
1820
1881
 		} else
1821
1882
 		if (source == computeAOItem)
1822
1883
 		{
..
..
@@ -1836,7 +1897,7 @@
1836
1897
 		if (source == invariantsItem)
1837
1898
 		{
1838
1899
                     System.out.println("Invariants:");
1839
-                    GrafreeD.grafreeD.universe.invariants();
1900
+                    Grafreed.grafreeD.universe.invariants();
1840
1901
 		} else
1841
1902
 		if (source == memoryItem)
1842
1903
 		{
..
..
@@ -1854,6 +1915,11 @@
1854
1915
 		if (source == dumpItem)
1855
1916
 		{
1856
1917
                     DumpObject();
1918
+		} else
1919
+		if (source == oneStepButton)
1920
+		{
1921
+                    Globals.ONESTEP = true;
1922
+                    cameraView.repaint();
1857
1923
 		} else
1858
1924
 		if (source == screenfitButton)
1859
1925
 		{
..
..
@@ -1906,10 +1972,10 @@
1906
1972
 		} else
1907
1973
 		if (source == duplicateItem)
1908
1974
 		{
1909
-                    Object3D keep = GrafreeD.clipboard;
1975
+                    Object3D keep = Grafreed.clipboard;
1910
1976
 			loadClipboard(false);
1911
1977
 			paste(false);
1912
-                    GrafreeD.clipboard = keep;
1978
+                    Grafreed.clipboard = keep;
1913
1979
 		} else
1914
1980
 		if (source == cloneItem)
1915
1981
 		{
..
..
@@ -1927,13 +1993,17 @@
1927
1993
 		{
1928
1994
 			paste(false);
1929
1995
 		} else
1996
+		if (source == pasteIntoItem)
1997
+		{
1998
+			pasteInto(true, false);
1999
+		} else
1930
2000
 		if (source == pasteLinkItem)
1931
2001
 		{
1932
-			pasteInto(false);
2002
+			pasteInto(false, false);
1933
2003
 		} else
1934
2004
 		if (source == pasteCloneItem)
1935
2005
 		{
1936
-			pasteInto(true);
2006
+			pasteInto(true, true);
1937
2007
 		} else
1938
2008
 		if (source == pasteExpandItem)
1939
2009
 		{
..
..
@@ -2125,9 +2195,9 @@
2125
2195
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2126
2196
 //		refreshContents();
2127
2197
 //                    }
2128
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2198
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2129
2199
                     {
2130
-                        Object3D content = GrafreeD.clipboard.get(0);
2200
+                        Object3D content = Grafreed.clipboard.get(0);
2131
2201
                         
2132
2202
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2133
2203
                             content = ((cGroup)content).get(0);
..
..
@@ -2135,11 +2205,11 @@
2135
2205
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136
2206
                         for (int i=0; i<group.selection.size(); i++)
2137
2207
                         {
2138
-                            boolean random = CameraPane.RANDOM;
2139
-                            CameraPane.RANDOM = false; // parse all random nodes
2208
+                            boolean random = CameraPane.SWITCH;
2209
+                            CameraPane.SWITCH = false; // parse all random nodes
2140
2210
                             group.selection.get(i).linkVerticesThis(content);
2141
2211
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2142
-                            CameraPane.RANDOM = random;
2212
+                            CameraPane.SWITCH = random;
2143
2213
                         }
2144
2214
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145
2215
 		refreshContents();
..
..
@@ -2149,20 +2219,20 @@
2149
2219
 		{
2150
2220
                     for (int i=0; i<group.selection.size(); i++)
2151
2221
                     {
2152
-                        boolean random = CameraPane.RANDOM;
2153
-                        CameraPane.RANDOM = false; // parse all random nodes
2222
+                        boolean random = CameraPane.SWITCH;
2223
+                        CameraPane.SWITCH = false; // parse all random nodes
2154
2224
                         group.selection.get(i).linkVerticesThis(null);
2155
-                        CameraPane.RANDOM = random;
2225
+                        CameraPane.SWITCH = random;
2156
2226
                     }
2157
2227
 
2158
2228
                     refreshContents();
2159
2229
 		} else
2160
2230
 		if (source == relinkverticesItem)
2161
2231
 		{
2162
-                    boolean random = CameraPane.RANDOM;
2163
-                    CameraPane.RANDOM = false; // parse all random nodes
2232
+                    boolean random = CameraPane.SWITCH;
2233
+                    CameraPane.SWITCH = false; // parse all random nodes
2164
2234
                     group.selection.RelinkToSupport();
2165
-                    CameraPane.RANDOM = random;
2235
+                    CameraPane.SWITCH = random;
2166
2236
 
2167
2237
                     refreshContents();
2168
2238
 		} else
..
..
@@ -2177,9 +2247,9 @@
2177
2247
 		} else
2178
2248
 		if (source == setMasterItem)
2179
2249
 		{
2180
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2250
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181
2251
                     {
2182
-                        Object3D content = GrafreeD.clipboard.get(0);
2252
+                        Object3D content = Grafreed.clipboard.get(0);
2183
2253
                         
2184
2254
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2185
2255
                             content = ((cGroup)content).get(0);
..
..
@@ -2192,9 +2262,9 @@
2192
2262
 		{
2193
2263
                     if (group.selection.size() == 1)
2194
2264
                     {
2195
-                        if (GrafreeD.clipboard.size() == 1)
2265
+                        if (Grafreed.clipboard.size() == 1)
2196
2266
                         {
2197
-                            Object3D content = GrafreeD.clipboard.get(0);
2267
+                            Object3D content = Grafreed.clipboard.get(0);
2198
2268
 
2199
2269
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2200
2270
                                 content = ((cGroup)content).get(0);
..
..
@@ -2211,7 +2281,7 @@
2211
2281
 		{
2212
2282
 			RevertMeshes();
2213
2283
 		} else
2214
-		if (source == resetMeshItem)
2284
+		if (source == resetAllItem)
2215
2285
 		{
2216
2286
 			ResetAll();
2217
2287
 		} else
..
..
@@ -2260,7 +2330,7 @@
2260
2330
                         RandomNode random = new RandomNode();
2261
2331
 			group(random);
2262
2332
                         if (random.size() > 0)
2263
-                            random.name = random.get(0).name + "Rnd";
2333
+                            random.name = random.get(0).name + "Switch";
2264
2334
 		} else
2265
2335
 		if (source == physicsItem)
2266
2336
                 {
..
..
@@ -2549,9 +2619,13 @@
2549
2619
                 {
2550
2620
 			SmoothMesh();
2551
2621
 		} else
2552
-		if (source == transformgeometryItem)
2622
+		if (source == transformGeometryItem)
2553
2623
 		{
2554
2624
                         TransformGeometry();
2625
+		} else
2626
+		if (source == transformChildrenItem)
2627
+		{
2628
+                        TransformChildren();
2555
2629
 		} else
2556
2630
 		if (source == resetTransformItem)
2557
2631
 		{
..
..
@@ -2559,7 +2633,11 @@
2559
2633
 		} else
2560
2634
 		if (source == resetCentroidItem)
2561
2635
 		{
2562
-                        ResetCentroid();
2636
+                        ResetCentroid(true);
2637
+		} else
2638
+		if (source == resetCentroidXZItem)
2639
+		{
2640
+                        ResetCentroid(false);
2563
2641
 		} else
2564
2642
 		if (source == resetParentItem)
2565
2643
 		{
..
..
@@ -2917,7 +2995,7 @@
2917
2995
                                 
2918
2996
                                 child.editWindow = null; // ???????????
2919
2997
 			}
2920
-			objEditor.ctrlPanel.validate();
2998
+			objEditor.ctrlPanel.FlushUI();
2921
2999
 			//objEditor.jTree.clearSelection();
2922
3000
 			//objEditor.ResetSliders();
2923
3001
                     refreshContents(true);
..
..
@@ -3075,6 +3153,28 @@
3075
3153
             refreshContents();
3076
3154
         }
3077
3155
         
3156
+        void TransformChildren()
3157
+        {
3158
+            Object3D obj;
3159
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3160
+            {
3161
+                    obj = (Object3D)e.nextElement();
3162
+                    obj.KeepTextureMatrices();
3163
+                    obj.TransformChildren();
3164
+                    obj.RestoreTextureMatrices();
3165
+                                        
3166
+//                    if (obj.parent == null)
3167
+//                    {
3168
+//                        System.out.println("NULL PARENT!");
3169
+//                        new Exception().printStackTrace();
3170
+//                    }
3171
+//                    else
3172
+//                        TouchTransform(obj);
3173
+//                        //obj.parent.Touch();
3174
+            }
3175
+
3176
+            refreshContents();
3177
+        }
3078
3178
         
3079
3179
         void ResetTransform()
3080
3180
         {
..
..
@@ -3187,7 +3287,7 @@
3187
3287
             refreshContents();
3188
3288
         }
3189
3289
         
3190
-        void ResetCentroid()
3290
+        void ResetCentroid(boolean full)
3191
3291
         {
3192
3292
             Object3D obj;
3193
3293
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3202,12 +3302,16 @@
3202
3302
                     LA.matIdentity(Object3D.mat);
3203
3303
                     obj.getBounds(minima, maxima, false);
3204
3304
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3305
+                    if (full)
3306
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206
3307
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207
3308
                     obj.TransformMesh(Object3D.mat);
3309
+                    
3208
3310
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3311
+                    if (full)
3312
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210
3313
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3314
+                    
3211
3315
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212
3316
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3213
3317
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3273,9 +3377,9 @@
3273
3377
                     obj = (Object3D)e.nextElement();
3274
3378
                     
3275
3379
                     System.out.println("Object is: " + obj);
3276
-                    GrafreeD.AnalyzeObject(obj);
3380
+                    Grafreed.AnalyzeObject(obj);
3277
3381
                     System.out.println("Boundary rep: " + obj.bRep);
3278
-                    GrafreeD.AnalyzeObject(obj.bRep);
3382
+                    Grafreed.AnalyzeObject(obj.bRep);
3279
3383
                     
3280
3384
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3281
3385
                 }
..
..
@@ -3489,8 +3593,8 @@
3489
3593
 	
3490
3594
 	void ParseVertices()
3491
3595
 	{
3492
-            boolean epsequal = GrafreeD.epsequal;
3493
-            GrafreeD.epsequal = true;
3596
+            boolean epsequal = Grafreed.epsequal;
3597
+            Grafreed.epsequal = true;
3494
3598
             
3495
3599
             for (int i=0; i<group.selection.size(); i++)
3496
3600
             {
..
..
@@ -3515,7 +3619,7 @@
3515
3619
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516
3620
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517
3621
 
3518
-                                g.add(GrafreeD.clipboard);
3622
+                                g.add(Grafreed.clipboard);
3519
3623
 
3520
3624
                                 buffer.add(g);
3521
3625
                             }
..
..
@@ -3530,7 +3634,7 @@
3530
3634
                 makeSomething(buffer, i==group.selection.size()-1);
3531
3635
             }
3532
3636
             
3533
-            GrafreeD.epsequal = epsequal;
3637
+            Grafreed.epsequal = epsequal;
3534
3638
             
3535
3639
             refreshContents();
3536
3640
 	}
..
..
@@ -3548,7 +3652,16 @@
3548
3652
                             String pigment = Object3D.GetPigment(tex);
3549
3653
                             //String bump = Object3D.GetBump(tex);
3550
3654
                             
3551
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3655
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3656
+                            
3657
+                            try
3658
+                            {
3659
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3660
+                            }
3661
+                            catch (Exception e)
3662
+                            {
3663
+                                System.err.println("FAIL: " + node);
3664
+                            }
3552
3665
                             
3553
3666
                             double s = v.s;
3554
3667
                             
..
..
@@ -3636,11 +3749,11 @@
3636
3749
 
3637
3750
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638
3751
 
3639
-            boolean random = CameraPane.RANDOM;
3640
-            CameraPane.RANDOM = false; // parse all random nodes
3752
+            boolean random = CameraPane.SWITCH;
3753
+            CameraPane.SWITCH = false; // parse all random nodes
3641
3754
             lowres.linkVerticesThis(null);
3642
3755
             lowres.linkVerticesThis(sn);
3643
-            CameraPane.RANDOM = random;
3756
+            CameraPane.SWITCH = random;
3644
3757
 
3645
3758
             System.err.flush();
3646
3759
 
..
..
@@ -3680,7 +3793,7 @@
3680
3793
                 return;
3681
3794
             
3682
3795
             Object3D poses = group.selection.get(0);
3683
-            Object3D ref = GrafreeD.clipboard.get(0);
3796
+            Object3D ref = Grafreed.clipboard.get(0);
3684
3797
             
3685
3798
             Object3D newgroup = new Object3D("Po:" + poses.name);
3686
3799
             
..
..
@@ -3874,9 +3987,9 @@
3874
3987
 	
3875
3988
 	void ClipMesh()
3876
3989
 	{
3877
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3990
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3878
3991
             {
3879
-                Object3D content = GrafreeD.clipboard.get(0);
3992
+                Object3D content = Grafreed.clipboard.get(0);
3880
3993
 
3881
3994
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3882
3995
                     content = ((cGroup)content).get(0);
..
..
@@ -3885,7 +3998,7 @@
3885
3998
 //                {
3886
3999
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887
4000
 //                }
3888
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4001
+                  group.selection.ClipMesh(Grafreed.clipboard);
3889
4002
             }
3890
4003
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3891
4004
             System.out.println("DONE.");
..
..
@@ -4125,12 +4238,12 @@
4125
4238
             System.err.println("info : " + child.GetPath());
4126
4239
 				}
4127
4240
 			}
4128
-			else
4129
-                        {
4130
-				objEditor.SetMaterial(group); // .GetMaterial());
4131
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4132
-            System.err.println("info : " + group.GetPath());
4133
-                        }
4241
+//			else
4242
+//                        {
4243
+//				objEditor.SetMaterial(group); // .GetMaterial());
4244
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4245
+//            System.err.println("info : " + group.GetPath());
4246
+//                        }
4134
4247
 			
4135
4248
                         objEditor.SetText(); // jan 2014
4136
4249
                         
..
..
@@ -4225,12 +4338,12 @@
4225
4338
 	{
4226
4339
 		if (group.selection.isEmpty())
4227
4340
 			return;
4228
-		GrafreeD.clipboardIsTempGroup = false;
4341
+		Grafreed.clipboardIsTempGroup = false;
4229
4342
 		Composite tGroup = null;
4230
4343
 		if (group.selection.size() > 0) // 1)
4231
4344
 		{
4232
4345
 			tGroup = new cGroup();
4233
-			GrafreeD.clipboardIsTempGroup = true;
4346
+			Grafreed.clipboardIsTempGroup = true;
4234
4347
 		}
4235
4348
                 
4236
4349
 		if (cut)
..
..
@@ -4270,16 +4383,16 @@
4270
4383
 		//System.out.println("cut " + child);
4271
4384
 		//System.out.println("parent = " + child.parent);
4272
4385
                 //                   tmp.addChild(child);
4273
-                                    if (GrafreeD.clipboardIsTempGroup)
4386
+                                    if (Grafreed.clipboardIsTempGroup)
4274
4387
                                             tGroup.add/*Child*/(tmp);
4275
4388
                                     else
4276
-                                            GrafreeD.clipboard = tmp;
4389
+                                            Grafreed.clipboard = tmp;
4277
4390
                                 }
4278
4391
                                 else
4279
-                                    if (GrafreeD.clipboardIsTempGroup)
4392
+                                    if (Grafreed.clipboardIsTempGroup)
4280
4393
                                             tGroup.add/*Child*/(child);
4281
4394
                                     else
4282
-                                            GrafreeD.clipboard = child;
4395
+                                            Grafreed.clipboard = child;
4283
4396
 			}
4284
4397
 			
4285
4398
 			//ResetModel();
..
..
@@ -4311,21 +4424,21 @@
4311
4424
 		//System.out.println("cut " + elem);
4312
4425
 		//System.out.println("parent = " + elem.parent);
4313
4426
                 //                    tmp.addChild(elem);
4314
-                                    if (GrafreeD.clipboardIsTempGroup)
4427
+                                    if (Grafreed.clipboardIsTempGroup)
4315
4428
                                             tGroup.add/*Child*/(tmp);
4316
4429
                                     else
4317
-                                            GrafreeD.clipboard = tmp;
4430
+                                            Grafreed.clipboard = tmp;
4318
4431
                                 }
4319
4432
                                 else
4320
-                                    if (GrafreeD.clipboardIsTempGroup)
4433
+                                    if (Grafreed.clipboardIsTempGroup)
4321
4434
                                             tGroup.add/*Child*/(child);
4322
4435
                                     else
4323
-                                            GrafreeD.clipboard = child;
4436
+                                            Grafreed.clipboard = child;
4324
4437
 			}
4325
4438
 			
4326
4439
 		}
4327
-		if (GrafreeD.clipboardIsTempGroup)
4328
-			GrafreeD.clipboard = tGroup;
4440
+		if (Grafreed.clipboardIsTempGroup)
4441
+			Grafreed.clipboard = tGroup;
4329
4442
 		if (cut)
4330
4443
                 {
4331
4444
                     ResetModel();
..
..
@@ -4339,7 +4452,7 @@
4339
4452
 	//		return;
4340
4453
 		boolean first = true;
4341
4454
 		
4342
-		if (GrafreeD.clipboardIsTempGroup)
4455
+		if (Grafreed.clipboardIsTempGroup)
4343
4456
 		{
4344
4457
 			Composite temp;
4345
4458
 			
..
..
@@ -4350,7 +4463,7 @@
4350
4463
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4351
4464
                          */
4352
4465
 			Object3D elem;
4353
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4466
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354
4467
 			{
4355
4468
 				Object3D child = (Object3D)e.nextElement();
4356
4469
                                 
..
..
@@ -4384,21 +4497,21 @@
4384
4497
 			//Object3D cb = Applet3D.clipboard;
4385
4498
 			//temp.addChild(cb);
4386
4499
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387
-                    assert(GrafreeD.clipboard.parent == null);
4388
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4389
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4500
+                    assert(Grafreed.clipboard.parent == null);
4501
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4502
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4503
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4504
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392
4505
                         else
4393
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4506
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4507
+                        Grafreed.clipboard.get(0).parent = keepparent;
4395
4508
 		}
4396
4509
 		
4397
4510
 		ResetModel();
4398
4511
 		refreshContents();
4399
4512
 	}
4400
4513
 	
4401
-	void pasteInto(boolean copyit)
4514
+	void pasteInto(boolean copyit, boolean clone)
4402
4515
 	{
4403
4516
 //		if (GrafreeD.clipboard == null)
4404
4517
 //			return;
..
..
@@ -4427,15 +4540,22 @@
4427
4540
 		if (copyit)
4428
4541
 		{
4429
4542
 		//	paste(false);
4430
-                    CloneClipboard(false); // sept 2014
4543
+                        if (clone)
4544
+                        {
4545
+                            CloneClipboard(false); // sept 2014
4546
+                        }
4547
+                        else
4548
+                        {
4549
+                            paste(false);
4550
+                        }
4431
4551
 		}
4432
4552
 		else
4433
4553
 		{
4434
4554
 			boolean first = true;
4435
4555
 			
4436
-			if (GrafreeD.clipboardIsTempGroup)
4556
+			if (Grafreed.clipboardIsTempGroup)
4437
4557
 			{
4438
-				Composite temp = (Composite)GrafreeD.clipboard;
4558
+				Composite temp = (Composite)Grafreed.clipboard;
4439
4559
 				Object3D copy;
4440
4560
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441
4561
 				{
..
..
@@ -4445,7 +4565,7 @@
4445
4565
 				}
4446
4566
 			} else
4447
4567
 			{
4448
-				linkSomething(GrafreeD.clipboard); //.get(0));
4568
+				linkSomething(Grafreed.clipboard); //.get(0));
4449
4569
 			}
4450
4570
 		}
4451
4571
             }
..
..
@@ -4890,7 +5010,7 @@
4890
5010
 
4891
5011
 	void ImportVRMLX3D()
4892
5012
 	{
4893
-		if (GrafreeD.standAlone)
5013
+		if (Grafreed.standAlone)
4894
5014
 		{
4895
5015
                     /**/
4896
5016
 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..
..
@@ -4907,7 +5027,7 @@
4907
5027
 				
4908
5028
 	String GetFile(String dialogName)
4909
5029
 	{
4910
-		if (GrafreeD.standAlone)
5030
+		if (Grafreed.standAlone)
4911
5031
 		{
4912
5032
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913
5033
 			browser.show();
..
..
@@ -4971,10 +5091,12 @@
4971
5091
 	cButton flashSelectionButton;
4972
5092
 	cButton editButton;
4973
5093
 	cButton uneditButton;
5094
+	JCheckBox allParamsButton;
4974
5095
 	cButton clearpanelButton;
4975
-	cButton allParamsButton;
4976
5096
 	cButton unselectButton;
4977
5097
 	
5098
+	cButton oneStepButton;
5099
+        
4978
5100
 	cButton screenfitButton;
4979
5101
 	cButton screenfitpointButton;
4980
5102
 	cButton snapobjectButton;
..
..
@@ -5018,7 +5140,7 @@
5018
5140
 	private MenuItem linkverticesItem;
5019
5141
 	private MenuItem relinkverticesItem;
5020
5142
 	private MenuItem setMasterItem;
5021
-	private MenuItem resetMeshItem;
5143
+	private MenuItem resetAllItem;
5022
5144
 	private MenuItem stepAllItem;
5023
5145
 	private MenuItem revertMeshItem;
5024
5146
 	private MenuItem poseMeshItem;
..
..
@@ -5029,6 +5151,7 @@
5029
5151
 	private MenuItem mergeGeometriesItem;
5030
5152
 	private MenuItem copyItem;
5031
5153
 	private MenuItem pasteItem;
5154
+	private MenuItem pasteIntoItem;
5032
5155
 	private MenuItem pasteLinkItem;
5033
5156
 	private MenuItem pasteCloneItem;
5034
5157
 	private MenuItem pasteExpandItem;
..
..
@@ -5078,8 +5201,10 @@
5078
5201
 	private MenuItem panoTexturesItem;
5079
5202
         
5080
5203
 	private MenuItem resetCentroidItem;
5081
-	private MenuItem transformgeometryItem;
5204
+	private MenuItem resetCentroidXZItem;
5082
5205
 	private MenuItem resetTransformItem;
5206
+	private MenuItem transformGeometryItem;
5207
+	private MenuItem transformChildrenItem;
5083
5208
 	private MenuItem hideItem;
5084
5209
 	private MenuItem grabItem;
5085
5210
 	private MenuItem backItem;
..
..
@@ -5126,7 +5251,7 @@
5126
5251
 	private MenuItem blobItem;
5127
5252
 	private MenuItem latheItem;
5128
5253
 	private MenuItem bezierItem;
5129
-	private MenuItem checkerItem;
5254
+	private MenuItem overlayItem;
5130
5255
 	private MenuItem meshItem;
5131
5256
 //	private MenuItem meshGroupItem;
5132
5257
 	private MenuItem springItem;