Bigger default size.

Normand Briere

2019-05-02 a7277e6c6381e55761f7fa87276260fac1c94d5e

 GroupEditor.java
..
..
@@ -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,18 +185,31 @@
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"));
211
+        if (Globals.ADVANCED)
212
+        {
194
213
                 resetMeshItem = menu.add(new MenuItem("Reset All"));
195
214
 		resetMeshItem.addActionListener(this);
196
215
 		stepAllItem = menu.add(new MenuItem("Step All"));
..
..
@@ -200,6 +219,7 @@
200
219
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
220
 		resetreferencesItem.addActionListener(this);
202
221
 		menu.add("-");
222
+        }
203
223
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
224
 		overwriteGeoItem.addActionListener(this);
205
225
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +231,26 @@
211
231
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
232
 		overwriteUVItem.addActionListener(this);
213
233
 		menu.add("-");
234
+        if (Globals.ADVANCED)
235
+        {
214
236
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
237
 		generateMeshItem.addActionListener(this);
216
238
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
239
 		poseMeshItem.addActionListener(this);
218
240
 		menu.add("-");
241
+        }
219
242
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
243
 		resetsupportItem.addActionListener(this);
221
244
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
245
 		linkverticesItem.addActionListener(this);
223
246
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
247
 		relinkverticesItem.addActionListener(this);
248
+                
249
+        if (Globals.ADVANCED)
250
+        {
225
251
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
252
 		setMasterItem.addActionListener(this);
253
+        }
227
254
                 
228
255
 		oe.menuBar.add(menu = new Menu("Group"));
229
256
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,27 +261,32 @@
234
261
 		frontItem.addActionListener(this);
235
262
 		compositeItem = menu.add(new MenuItem("Composite"));
236
263
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
264
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
265
 		hideItem.addActionListener(this);
239
266
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
267
 		ungroupItem.addActionListener(this);
241
268
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
269
+		randomItem = menu.add(new MenuItem("Switch node"));
243
270
 		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
271
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
272
 		switchGeoItem.addActionListener(this);
250
273
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
274
 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
275
+		morphItem = menu.add(new MenuItem("Morph Group"));
253
276
 		morphItem.addActionListener(this);
277
+                
278
+        if (Globals.ADVANCED)
279
+        {
280
+		menu.add("-");
281
+		physicsItem = menu.add(new MenuItem("Physics"));
282
+		physicsItem.addActionListener(this);
283
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
284
+		frameselectorItem.addActionListener(this);
254
285
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
286
 		scriptNodeItem.addActionListener(this);
256
287
 		cameraItem = menu.add(new MenuItem("Camera"));
257
288
 		cameraItem.addActionListener(this);
289
+        }
258
290
                 
259
291
 		oe.menuBar.add(menu = new Menu("Object"));
260
292
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,14 +301,18 @@
269
301
 		shadowYItem.addActionListener(this);
270
302
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
303
 		shadowZItem.addActionListener(this);
304
+        if (Globals.ADVANCED)
305
+        {
306
+		menu.add("-");
272
307
 		linkerItem = menu.add(new MenuItem("Linker"));
273
308
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
309
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
310
 		attributeItem.addActionListener(this);
311
+		templateItem = menu.add(new MenuItem("Template"));
312
+		templateItem.addActionListener(this);
278
313
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
314
 		pointflowItem.addActionListener(this);
315
+        }
280
316
 		menu.add("-");
281
317
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
318
 		resetTransformItem.addActionListener(this);
..
..
@@ -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,10 +356,14 @@
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"));
..
..
@@ -330,10 +373,13 @@
330
373
 		liveleavesItem.addActionListener(this);
331
374
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
375
 		unliveleavesItem.addActionListener(this);
376
+        if (Globals.ADVANCED)
377
+        {
333
378
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
379
 		supportleavesItem.addActionListener(this);
335
380
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
381
 		unsupportleavesItem.addActionListener(this);
382
+        }
337
383
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
384
 		hideleavesItem.addActionListener(this);
339
385
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -376,6 +422,8 @@
376
422
 		sortbysizeItem.addActionListener(this);
377
423
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
424
 		sortbynameItem.addActionListener(this);
425
+        if (Globals.ADVANCED)
426
+        {
379
427
 		menu.add("-");
380
428
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
429
 		extractGeometriesItem.addActionListener(this);
..
..
@@ -385,11 +433,11 @@
385
433
 		shareGeometriesItem.addActionListener(this);
386
434
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
435
 		mergeGeometriesItem.addActionListener(this);
436
+        }
388
437
                 
389
438
 		oe.menuBar.add(menu = new Menu("Insert"));
390
439
 		buildCreateMenu(menu);
391
440
                 
392
-               
393
441
                 oe.menuBar.add(menu = new Menu("Include"));
394
442
 		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395
443
 		importGFDItem.addActionListener(this);
..
..
@@ -434,110 +482,98 @@
434
482
         oe.radioPanel.add(dummyButton);
435
483
         oe.buttonGroup.add(dummyButton);
436
484
          */
437
-                aConstraints.gridy += 1;
438
-                
439
485
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440
486
                 
441
-		oe.aConstraints.gridwidth = 1;
442
-        	oe.aConstraints.gridx = 0;
443
-                
444
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
487
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
445
488
                 liveCB.setToolTipText("Enabled animation");
446
489
                                 liveCB.addItemListener(this);
447
490
 
448
-        	oe.aConstraints.gridx += 1;
449
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
491
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
+                oneStepButton.setToolTipText("Animate one step forward");
493
+		oneStepButton.addActionListener(this);
494
+                
495
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
496
+                fastCB.setToolTipText("Fast mode");
497
+                                fastCB.addItemListener(this);
498
+                                
499
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
450
500
                 trackCB.setToolTipText("Enable tracking");
451
501
                                 trackCB.addItemListener(this);
452
502
 
453
-        	oe.aConstraints.gridx += 1;
454
-		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
503
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
504
                 screenfitButton.setToolTipText("Screen fit");
456
505
 		screenfitButton.addActionListener(this);
457
-			oe.aConstraints.gridx += 1;
506
+
458
507
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459
508
 //		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
509
 
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);
510
+                if (Globals.ADVANCED)
511
+                {
512
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513
+                        snapobjectButton.addActionListener(this);
514
+                        snapobjectButton.setToolTipText("Snap Object");
515
+                }
516
+
517
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472
518
                 flashSelectionButton.setToolTipText("Show selection");
473
519
 		flashSelectionButton.addActionListener(this);
474
520
                 
475
-		oe.toolbarPanel.add(new cButton("     ", false));
521
+		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
476
522
                 
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);
523
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483
524
                 twoButton.setToolTipText("Show center view only");
484
525
 		twoButton.addActionListener(this);
485
-		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
526
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
486
527
 		fourButton.addActionListener(this);
487
528
                 fourButton.setToolTipText("Show left panel only");
488
-		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
529
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489
530
                 sixButton.setToolTipText("2-column layout left");
490
531
 		sixButton.addActionListener(this);
491
-		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
532
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
533
                 threeButton.setToolTipText("2-column layout right");
493
534
 		threeButton.addActionListener(this);
494
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
535
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
495
536
                 sevenButton.setToolTipText("3-column layout");
496
537
 		sevenButton.addActionListener(this);
497
538
                 //
498
539
 
499
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500
-                rootButton.setToolTipText("Edit object in new tab");
540
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541
+                rootButton.setToolTipText("Edit selection in new tab");
501
542
 		rootButton.addActionListener(this);
502
-			oe.aConstraints.gridx += 1;
503
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
543
+
544
+                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
545
                 closeButton.setToolTipText("Close tab");
505
546
 		closeButton.addActionListener(this);
506
547
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507
548
 		//clearButton.addActionListener(this);
508
-			oe.aConstraints.gridx += 1;
509
549
                         
510
-		oe.aConstraints.gridx = 1; //
511
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
550
+                cGridBag commandsPanel = new cGridBag();
551
+                
552
+		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553
+                editButton.setToolTipText("Edit selection");
512
554
 		editButton.addActionListener(this);
513
-		oe.aConstraints.gridx += 1;
514
-		oe.aConstraints.weighty = 0;
515
-		oe.aConstraints.gridwidth = 1;
516
555
 
517
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
556
+		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557
+                uneditButton.setToolTipText("Unedit selection");
518
558
 		uneditButton.addActionListener(this);
519
559
 
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);
560
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561
+                allParamsButton.setToolTipText("Edit all params");
532
562
 		allParamsButton.addActionListener(this);
533
563
 
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);
564
+		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
565
+                clearPanelButton.setToolTipText("Clear edit panel");
566
+		clearPanelButton.addActionListener(this);
567
+
568
+		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
569
+                unselectButton.setToolTipText("Unselect");
539
570
 		unselectButton.addActionListener(this);
540
571
 
572
+                commandsPanel.preferredHeight = 1;
573
+                
574
+                oe.treePanel.add(commandsPanel);
575
+                oe.treePanel.Return();
576
+                
541
577
 //		oe.aConstraints.gridx += 1;
542
578
 //		oe.aConstraints.weighty = 0;
543
579
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -549,40 +585,37 @@
549
585
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550
586
 //		gcButton.addActionListener(this);
551
587
                 
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;
588
+                cGridBag jSPPanel = new cGridBag();
589
+
590
+                JScrollPane jSP;
563
591
 		//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);
592
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
565
593
                 ResetModel();
566
-		oe.aConstraints.weighty = 0.5;
567
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568
-		oe.aConstraints.gridy += 1;
569
-		oe.aConstraints.gridwidth = 1;
594
+                
595
+                oe.treePanel.add(jSPPanel);
596
+                oe.treePanel.Return();
570
597
 
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);
598
+                cGridBag copyOptionsPanel = new cGridBag();
599
+                
600
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601
+                colorCB.setToolTipText("Copy color when dropped");
575
602
                 colorCB.addItemListener(this);
576
-                oe.aConstraints.gridx += 2;
577
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
603
+
604
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605
+                materialCB.setToolTipText("Copy material when dropped");
578
606
                 materialCB.addItemListener(this);
579
-                oe.aConstraints.gridx += 2;
580
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
607
+
608
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609
+                textureCB.setToolTipText("Copy texture when dropped");
581
610
                 textureCB.addItemListener(this);
582
611
                         
583
-                oe.aConstraints.gridx = 0;
584
-		oe.aConstraints.gridy += 1;
612
+                copyOptionsPanel.preferredHeight = 1;
613
+                oe.treePanel.add(copyOptionsPanel);
614
+                oe.treePanel.Return();
585
615
                 
616
+//        mainPanel.setDividerLocation(0.5); //1.0);
617
+//        mainPanel.setResizeWeight(0.5);
618
+        
586
619
 		//jList.addListSelectionListener(this);
587
620
 		oe.jTree.addTreeSelectionListener(this);
588
621
 		//jTree.setRootVisible(false);
..
..
@@ -607,43 +640,35 @@
607
640
         
608
641
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609
642
         {
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
643
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640
644
                 boxCB.setToolTipText("Display bounding boxes");
641
645
                                 boxCB.addItemListener(this);
642
-        	//constraints.gridy += 1;
646
+                                
643
647
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644
648
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645
649
                                 zoomBoxCB.addItemListener(this);
646
650
 
651
+        if (Globals.ADVANCED)
652
+        {
653
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654
+                supportCB.setToolTipText("Enable rigging");
655
+                                supportCB.addItemListener(this);
656
+
657
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658
+        //                        localCB.addItemListener(this);
659
+
660
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661
+                crowdCB.setToolTipText("Used for crowds");
662
+                                crowdCB.addItemListener(this);
663
+
664
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
665
+                smoothCB.setToolTipText("Snapping delay");
666
+                                smoothCB.addItemListener(this);
667
+
668
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
669
+                slowCB.setToolTipText("Smooth interpolation");
670
+                                slowCB.addItemListener(this);
671
+                                
647
672
 //        	constraints.gridy += 1;
648
673
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649
674
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -668,14 +693,20 @@
668
693
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669
694
 //                debugCB.addItemListener(this);
670
695
 
671
-        	//constraints.gridy += 1;
672
696
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
673
697
                                 oeilCB.addItemListener(this);
674
698
 
675
-        	//constraints.gridy += 1;
676
699
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677
700
                 lookAtCB.setToolTipText("Look-at target");
678
701
                                 lookAtCB.addItemListener(this);
702
+                
703
+        }
704
+                                
705
+                cGridBag fill = new cGridBag();
706
+                                
707
+                fill.preferredHeight = 200;
708
+                
709
+                panel.add(fill);
679
710
 
680
711
         }
681
712
 	
..
..
@@ -960,11 +991,11 @@
960
991
             {
961
992
                 loadClipboard(true);
962
993
                 objEditor.jTree.setSelectionPath(destinationPath);
963
-                pasteInto(false);
994
+                pasteInto(false, false);
964
995
             } else {
965
996
                 loadClipboard(false);
966
997
                 objEditor.jTree.setSelectionPath(destinationPath);
967
-                pasteInto(false); // true); // ???
998
+                pasteInto(false, false); // true); // ???
968
999
             }
969
1000
 	}
970
1001
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1086,27 +1117,33 @@
1086
1117
 		kleinItem.addActionListener(this);
1087
1118
 		particleItem = menu.add(new MenuItem("Particle system"));
1088
1119
 		particleItem.addActionListener(this);
1120
+        if (Globals.ADVANCED)
1121
+        {
1089
1122
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090
1123
 		ragdollItem.addActionListener(this);
1091
1124
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092
1125
 		ragdoll2Item.addActionListener(this);
1126
+        }
1093
1127
 		menu.add("-");
1094
-		meshItem = menu.add(new MenuItem("Mesh"));
1128
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095
1129
 		meshItem.addActionListener(this);
1096
1130
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097
1131
 	//	meshGroupItem.addActionListener(this);
1132
+        if (Globals.ADVANCED)
1133
+        {
1098
1134
 		springItem = menu.add(new MenuItem("Spring"));
1099
1135
 		springItem.addActionListener(this);
1100
1136
 		flagItem = menu.add(new MenuItem("Flag"));
1101
1137
 		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
1138
 		blobItem = menu.add(new MenuItem("Blob"));
1107
1139
 		blobItem.addActionListener(this);
1108
1140
 		latheItem = menu.add(new MenuItem("Lathe"));
1109
1141
 		latheItem.addActionListener(this);
1142
+        }
1143
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144
+		bezierItem.addActionListener(this);
1145
+		overlayItem = menu.add(new MenuItem("Overlay"));
1146
+		overlayItem.addActionListener(this);
1110
1147
 		lightItem = menu.add(new MenuItem("Light"));
1111
1148
 		lightItem.addActionListener(this);
1112
1149
 		menu.add("-");
..
..
@@ -1116,34 +1153,39 @@
1116
1153
 		loopItem.addActionListener(this);
1117
1154
 		doubleItem = menu.add(new MenuItem("Fork"));
1118
1155
 		doubleItem.addActionListener(this);
1156
+        if (Globals.ADVANCED)
1157
+        {
1119
1158
 		tripleItem = menu.add(new MenuItem("Trident"));
1120
1159
 		tripleItem.addActionListener(this);
1160
+        }
1121
1161
 	}
1122
1162
         
1123
1163
 	void buildToolsMenu(Menu menu)
1124
1164
 	{
1125
1165
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126
1166
 		animationItem.addItemListener(this);
1127
-                animationItem.setState(CameraPane.ANIMATION);
1167
+                animationItem.setState(Globals.ANIMATION);
1128
1168
                 
1129
1169
 		menu.add("-");
1130
1170
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131
1171
 		parseverticesItem.addActionListener(this);
1132
1172
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133
1173
 		textureFieldItem.addActionListener(this);
1134
-		alignItem = menu.add(new MenuItem("Align"));
1174
+		alignItem = menu.add(new MenuItem("Align Objects"));
1135
1175
 		alignItem.addActionListener(this);
1136
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137
-		mirrorItem.addActionListener(this);
1138
1176
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139
1177
 		reduceMorphItem.addActionListener(this);
1140
1178
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141
1179
 		reduce34MorphItem.addActionListener(this);
1142
-                
1180
+		menu.add("-");
1143
1181
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1144
1182
 		computeAOItem.addActionListener(this);
1145
-		menu.add("-");
1146
1183
                 
1184
+        if (Globals.ADVANCED)
1185
+        {
1186
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187
+		mirrorItem.addActionListener(this);
1188
+		menu.add("-");
1147
1189
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1148
1190
 		memoryItem.addActionListener(this);
1149
1191
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1166,6 +1208,7 @@
1166
1208
 		menu.add("-");
1167
1209
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168
1210
 		editScriptItem.addActionListener(this);
1211
+        }
1169
1212
         }
1170
1213
         
1171
1214
         void ScreenFit()
..
..
@@ -1667,7 +1710,7 @@
1667
1710
 		{
1668
1711
 			makeSomething(new BezierSurface());
1669
1712
 		} else
1670
-		if (source == checkerItem)
1713
+		if (source == overlayItem)
1671
1714
 		{
1672
1715
                     /*
1673
1716
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1855,6 +1898,11 @@
1855
1898
 		{
1856
1899
                     DumpObject();
1857
1900
 		} else
1901
+		if (source == oneStepButton)
1902
+		{
1903
+                    Globals.ONESTEP = true;
1904
+                    cameraView.repaint();
1905
+		} else
1858
1906
 		if (source == screenfitButton)
1859
1907
 		{
1860
1908
 			//Reload(lastConverter, lastFilename, true);
..
..
@@ -1927,13 +1975,17 @@
1927
1975
 		{
1928
1976
 			paste(false);
1929
1977
 		} else
1978
+		if (source == pasteIntoItem)
1979
+		{
1980
+			pasteInto(true, false);
1981
+		} else
1930
1982
 		if (source == pasteLinkItem)
1931
1983
 		{
1932
-			pasteInto(false);
1984
+			pasteInto(false, false);
1933
1985
 		} else
1934
1986
 		if (source == pasteCloneItem)
1935
1987
 		{
1936
-			pasteInto(true);
1988
+			pasteInto(true, true);
1937
1989
 		} else
1938
1990
 		if (source == pasteExpandItem)
1939
1991
 		{
..
..
@@ -2135,11 +2187,11 @@
2135
2187
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136
2188
                         for (int i=0; i<group.selection.size(); i++)
2137
2189
                         {
2138
-                            boolean random = CameraPane.RANDOM;
2139
-                            CameraPane.RANDOM = false; // parse all random nodes
2190
+                            boolean random = CameraPane.SWITCH;
2191
+                            CameraPane.SWITCH = false; // parse all random nodes
2140
2192
                             group.selection.get(i).linkVerticesThis(content);
2141
2193
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2142
-                            CameraPane.RANDOM = random;
2194
+                            CameraPane.SWITCH = random;
2143
2195
                         }
2144
2196
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145
2197
 		refreshContents();
..
..
@@ -2149,20 +2201,20 @@
2149
2201
 		{
2150
2202
                     for (int i=0; i<group.selection.size(); i++)
2151
2203
                     {
2152
-                        boolean random = CameraPane.RANDOM;
2153
-                        CameraPane.RANDOM = false; // parse all random nodes
2204
+                        boolean random = CameraPane.SWITCH;
2205
+                        CameraPane.SWITCH = false; // parse all random nodes
2154
2206
                         group.selection.get(i).linkVerticesThis(null);
2155
-                        CameraPane.RANDOM = random;
2207
+                        CameraPane.SWITCH = random;
2156
2208
                     }
2157
2209
 
2158
2210
                     refreshContents();
2159
2211
 		} else
2160
2212
 		if (source == relinkverticesItem)
2161
2213
 		{
2162
-                    boolean random = CameraPane.RANDOM;
2163
-                    CameraPane.RANDOM = false; // parse all random nodes
2214
+                    boolean random = CameraPane.SWITCH;
2215
+                    CameraPane.SWITCH = false; // parse all random nodes
2164
2216
                     group.selection.RelinkToSupport();
2165
-                    CameraPane.RANDOM = random;
2217
+                    CameraPane.SWITCH = random;
2166
2218
 
2167
2219
                     refreshContents();
2168
2220
 		} else
..
..
@@ -2260,7 +2312,7 @@
2260
2312
                         RandomNode random = new RandomNode();
2261
2313
 			group(random);
2262
2314
                         if (random.size() > 0)
2263
-                            random.name = random.get(0).name + "Rnd";
2315
+                            random.name = random.get(0).name + "Switch";
2264
2316
 		} else
2265
2317
 		if (source == physicsItem)
2266
2318
                 {
..
..
@@ -2917,7 +2969,7 @@
2917
2969
                                 
2918
2970
                                 child.editWindow = null; // ???????????
2919
2971
 			}
2920
-			objEditor.ctrlPanel.validate();
2972
+			objEditor.ctrlPanel.FlushUI();
2921
2973
 			//objEditor.jTree.clearSelection();
2922
2974
 			//objEditor.ResetSliders();
2923
2975
                     refreshContents(true);
..
..
@@ -3636,11 +3688,11 @@
3636
3688
 
3637
3689
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638
3690
 
3639
-            boolean random = CameraPane.RANDOM;
3640
-            CameraPane.RANDOM = false; // parse all random nodes
3691
+            boolean random = CameraPane.SWITCH;
3692
+            CameraPane.SWITCH = false; // parse all random nodes
3641
3693
             lowres.linkVerticesThis(null);
3642
3694
             lowres.linkVerticesThis(sn);
3643
-            CameraPane.RANDOM = random;
3695
+            CameraPane.SWITCH = random;
3644
3696
 
3645
3697
             System.err.flush();
3646
3698
 
..
..
@@ -4125,12 +4177,12 @@
4125
4177
             System.err.println("info : " + child.GetPath());
4126
4178
 				}
4127
4179
 			}
4128
-			else
4129
-                        {
4130
-				objEditor.SetMaterial(group); // .GetMaterial());
4131
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4132
-            System.err.println("info : " + group.GetPath());
4133
-                        }
4180
+//			else
4181
+//                        {
4182
+//				objEditor.SetMaterial(group); // .GetMaterial());
4183
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4184
+//            System.err.println("info : " + group.GetPath());
4185
+//                        }
4134
4186
 			
4135
4187
                         objEditor.SetText(); // jan 2014
4136
4188
                         
..
..
@@ -4398,7 +4450,7 @@
4398
4450
 		refreshContents();
4399
4451
 	}
4400
4452
 	
4401
-	void pasteInto(boolean copyit)
4453
+	void pasteInto(boolean copyit, boolean clone)
4402
4454
 	{
4403
4455
 //		if (GrafreeD.clipboard == null)
4404
4456
 //			return;
..
..
@@ -4427,7 +4479,14 @@
4427
4479
 		if (copyit)
4428
4480
 		{
4429
4481
 		//	paste(false);
4430
-                    CloneClipboard(false); // sept 2014
4482
+                        if (clone)
4483
+                        {
4484
+                            CloneClipboard(false); // sept 2014
4485
+                        }
4486
+                        else
4487
+                        {
4488
+                            paste(false);
4489
+                        }
4431
4490
 		}
4432
4491
 		else
4433
4492
 		{
..
..
@@ -4971,10 +5030,12 @@
4971
5030
 	cButton flashSelectionButton;
4972
5031
 	cButton editButton;
4973
5032
 	cButton uneditButton;
5033
+	JCheckBox allParamsButton;
4974
5034
 	cButton clearpanelButton;
4975
-	cButton allParamsButton;
4976
5035
 	cButton unselectButton;
4977
5036
 	
5037
+	cButton oneStepButton;
5038
+        
4978
5039
 	cButton screenfitButton;
4979
5040
 	cButton screenfitpointButton;
4980
5041
 	cButton snapobjectButton;
..
..
@@ -5029,6 +5090,7 @@
5029
5090
 	private MenuItem mergeGeometriesItem;
5030
5091
 	private MenuItem copyItem;
5031
5092
 	private MenuItem pasteItem;
5093
+	private MenuItem pasteIntoItem;
5032
5094
 	private MenuItem pasteLinkItem;
5033
5095
 	private MenuItem pasteCloneItem;
5034
5096
 	private MenuItem pasteExpandItem;
..
..
@@ -5126,7 +5188,7 @@
5126
5188
 	private MenuItem blobItem;
5127
5189
 	private MenuItem latheItem;
5128
5190
 	private MenuItem bezierItem;
5129
-	private MenuItem checkerItem;
5191
+	private MenuItem overlayItem;
5130
5192
 	private MenuItem meshItem;
5131
5193
 //	private MenuItem meshGroupItem;
5132
5194
 	private MenuItem springItem;