Complete advanced mode.

Normand Briere

2019-05-02 c209bbe1cf788c9af3dcffea7667c830170a3f1f

 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,36 +163,48 @@
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
-		cloneItem = menu.add(new MenuItem("Clone"));
172
-		cloneItem.addActionListener(this);
173
-		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174
-		cloneSupportItem.addActionListener(this);
175
-		menu.add("-");
176
174
 		cutItem = menu.add(new MenuItem("Cut"));
177
175
 		cutItem.addActionListener(this);
178
176
 		copyItem = menu.add(new MenuItem("Copy"));
179
177
 		copyItem.addActionListener(this);
180
178
 		pasteItem = menu.add(new MenuItem("Paste"));
181
179
 		pasteItem.addActionListener(this);
180
+		menu.add("-");
181
+		cloneItem = menu.add(new MenuItem("Clone"));
182
+		cloneItem.addActionListener(this);
183
+		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184
+		cloneSupportItem.addActionListener(this);
185
+		menu.add("-");
186
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
187
+		pasteIntoItem.addActionListener(this);
182
188
 		pasteLinkItem = menu.add(new MenuItem("Paste link"));
183
189
 		pasteLinkItem.addActionListener(this);
184
190
 		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185
191
 		pasteCloneItem.addActionListener(this);
186
192
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187
193
 //		pasteExpandItem.addActionListener(this);
194
+		menu.add("-");
188
195
 		clearItem = menu.add(new MenuItem("Clear"));
189
196
 		clearItem.addActionListener(this);
197
+                
198
+        if (Globals.ADVANCED)
199
+        {
200
+                // Deletes the cameras...
190
201
 		clearAllItem = menu.add(new MenuItem("Clear All"));
191
202
 		clearAllItem.addActionListener(this);
203
+        }
192
204
 
193
205
 		oe.menuBar.add(menu = new Menu("Setting"));
206
+        if (Globals.ADVANCED)
207
+        {
194
208
                 resetMeshItem = menu.add(new MenuItem("Reset All"));
195
209
 		resetMeshItem.addActionListener(this);
196
210
 		stepAllItem = menu.add(new MenuItem("Step All"));
..
..
@@ -200,6 +214,7 @@
200
214
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
215
 		resetreferencesItem.addActionListener(this);
202
216
 		menu.add("-");
217
+        }
203
218
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
219
 		overwriteGeoItem.addActionListener(this);
205
220
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +226,26 @@
211
226
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
227
 		overwriteUVItem.addActionListener(this);
213
228
 		menu.add("-");
229
+        if (Globals.ADVANCED)
230
+        {
214
231
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
232
 		generateMeshItem.addActionListener(this);
216
233
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
234
 		poseMeshItem.addActionListener(this);
218
235
 		menu.add("-");
236
+        }
219
237
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
238
 		resetsupportItem.addActionListener(this);
221
239
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
240
 		linkverticesItem.addActionListener(this);
223
241
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
242
 		relinkverticesItem.addActionListener(this);
243
+                
244
+        if (Globals.ADVANCED)
245
+        {
225
246
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
247
 		setMasterItem.addActionListener(this);
248
+        }
227
249
                 
228
250
 		oe.menuBar.add(menu = new Menu("Group"));
229
251
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,27 +256,31 @@
234
256
 		frontItem.addActionListener(this);
235
257
 		compositeItem = menu.add(new MenuItem("Composite"));
236
258
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
259
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
260
 		hideItem.addActionListener(this);
239
261
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
262
 		ungroupItem.addActionListener(this);
241
263
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
264
+		randomItem = menu.add(new MenuItem("Switch node"));
243
265
 		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
266
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
267
 		switchGeoItem.addActionListener(this);
250
268
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
269
 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
270
+		morphItem = menu.add(new MenuItem("Morph Group"));
253
271
 		morphItem.addActionListener(this);
272
+                
273
+        if (Globals.ADVANCED)
274
+        {
275
+		physicsItem = menu.add(new MenuItem("Physics"));
276
+		physicsItem.addActionListener(this);
277
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278
+		frameselectorItem.addActionListener(this);
254
279
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
280
 		scriptNodeItem.addActionListener(this);
256
281
 		cameraItem = menu.add(new MenuItem("Camera"));
257
282
 		cameraItem.addActionListener(this);
283
+        }
258
284
                 
259
285
 		oe.menuBar.add(menu = new Menu("Object"));
260
286
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,15 +295,18 @@
269
295
 		shadowYItem.addActionListener(this);
270
296
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
297
 		shadowZItem.addActionListener(this);
298
+        if (Globals.ADVANCED)
299
+        {
272
300
 		linkerItem = menu.add(new MenuItem("Linker"));
273
301
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
302
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
303
 		attributeItem.addActionListener(this);
304
+		templateItem = menu.add(new MenuItem("Template"));
305
+		templateItem.addActionListener(this);
278
306
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
307
 		pointflowItem.addActionListener(this);
280
308
 		menu.add("-");
309
+        }
281
310
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
311
 		resetTransformItem.addActionListener(this);
283
312
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
..
..
@@ -294,8 +323,11 @@
294
323
 		genNormalsCADItem.addActionListener(this);
295
324
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
325
 		genNormalsMESHItem.addActionListener(this);
326
+        if (Globals.ADVANCED)
327
+        {
297
328
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
329
 		genNormalsMINEItem.addActionListener(this);
330
+        }
299
331
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
332
 		stripifyItem.addActionListener(this);
301
333
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,10 +349,14 @@
317
349
 		reduce34MeshItem.addActionListener(this);
318
350
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
351
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
352
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
353
 		clipMeshItem.addActionListener(this);
354
+                
355
+        if (Globals.ADVANCED)
356
+        {
357
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
358
+		smoothMeshItem.addActionListener(this);
359
+        }
324
360
 
325
361
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
362
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..
..
@@ -330,10 +366,13 @@
330
366
 		liveleavesItem.addActionListener(this);
331
367
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
368
 		unliveleavesItem.addActionListener(this);
369
+        if (Globals.ADVANCED)
370
+        {
333
371
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
372
 		supportleavesItem.addActionListener(this);
335
373
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
374
 		unsupportleavesItem.addActionListener(this);
375
+        }
337
376
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
377
 		hideleavesItem.addActionListener(this);
339
378
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -376,6 +415,8 @@
376
415
 		sortbysizeItem.addActionListener(this);
377
416
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
417
 		sortbynameItem.addActionListener(this);
418
+        if (Globals.ADVANCED)
419
+        {
379
420
 		menu.add("-");
380
421
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
422
 		extractGeometriesItem.addActionListener(this);
..
..
@@ -385,11 +426,11 @@
385
426
 		shareGeometriesItem.addActionListener(this);
386
427
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
428
 		mergeGeometriesItem.addActionListener(this);
429
+        }
388
430
                 
389
431
 		oe.menuBar.add(menu = new Menu("Insert"));
390
432
 		buildCreateMenu(menu);
391
433
                 
392
-               
393
434
                 oe.menuBar.add(menu = new Menu("Include"));
394
435
 		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395
436
 		importGFDItem.addActionListener(this);
..
..
@@ -436,11 +477,19 @@
436
477
          */
437
478
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438
479
                 
439
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
480
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
481
                 liveCB.setToolTipText("Enabled animation");
441
482
                                 liveCB.addItemListener(this);
442
483
 
443
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
484
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
485
+                oneStepButton.setToolTipText("Animate one step forward");
486
+		oneStepButton.addActionListener(this);
487
+                
488
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
489
+                fastCB.setToolTipText("Fast mode");
490
+                                fastCB.addItemListener(this);
491
+                                
492
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444
493
                 trackCB.setToolTipText("Enable tracking");
445
494
                                 trackCB.addItemListener(this);
446
495
 
..
..
@@ -450,17 +499,14 @@
450
499
 
451
500
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452
501
 //		screenfitpointButton.addActionListener(this);
453
-//			oe.aConstraints.gridx += 1;
454
-		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
-		snapobjectButton.addActionListener(this);
456
-                snapobjectButton.setToolTipText("Snap Object");
457
-			oe.aConstraints.gridx += 1;
458
502
 
459
-                //aConstraints.gridx = 0;
460
-                //aConstraints.gridy += 1;
461
-		oe.aConstraints.weighty = 0;
462
-		oe.aConstraints.gridwidth = 1;
463
-		
503
+                if (Globals.ADVANCED)
504
+                {
505
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
506
+                        snapobjectButton.addActionListener(this);
507
+                        snapobjectButton.setToolTipText("Snap Object");
508
+                }
509
+
464
510
 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465
511
                 flashSelectionButton.setToolTipText("Show selection");
466
512
 		flashSelectionButton.addActionListener(this);
..
..
@@ -485,47 +531,42 @@
485
531
                 //
486
532
 
487
533
 		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
-                rootButton.setToolTipText("Edit object in new tab");
534
+                rootButton.setToolTipText("Edit selection in new tab");
489
535
 		rootButton.addActionListener(this);
490
-			oe.aConstraints.gridx += 1;
491
-		oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536
+
537
+                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
538
                 closeButton.setToolTipText("Close tab");
493
539
 		closeButton.addActionListener(this);
494
540
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495
541
 		//clearButton.addActionListener(this);
496
-			oe.aConstraints.gridx += 1;
497
542
                         
498
-		oe.aConstraints.gridx = 1; //
499
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
543
+                cGridBag commandsPanel = new cGridBag();
544
+                
545
+		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546
+                editButton.setToolTipText("Edit selection");
500
547
 		editButton.addActionListener(this);
501
-		oe.aConstraints.gridx += 1;
502
-		oe.aConstraints.weighty = 0;
503
-		oe.aConstraints.gridwidth = 1;
504
548
 
505
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
549
+		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550
+                uneditButton.setToolTipText("Unedit selection");
506
551
 		uneditButton.addActionListener(this);
507
552
 
508
-		oe.aConstraints.gridx += 1;
509
-		oe.aConstraints.weighty = 0;
510
-		oe.aConstraints.gridwidth = 1;
511
-                
512
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513
-		clearPanelButton.addActionListener(this);
514
-
515
-		oe.aConstraints.gridx += 1;
516
-		oe.aConstraints.weighty = 0;
517
-		oe.aConstraints.gridwidth = 1;
518
-                
519
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
553
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554
+                allParamsButton.setToolTipText("Edit all params");
520
555
 		allParamsButton.addActionListener(this);
521
556
 
522
-		oe.aConstraints.gridx += 1;
523
-		oe.aConstraints.weighty = 0;
524
-		oe.aConstraints.gridwidth = 1;
525
-                
526
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
557
+		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558
+                clearPanelButton.setToolTipText("Clear edit panel");
559
+		clearPanelButton.addActionListener(this);
560
+
561
+		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562
+                unselectButton.setToolTipText("Unselect");
527
563
 		unselectButton.addActionListener(this);
528
564
 
565
+                commandsPanel.preferredHeight = 1;
566
+                
567
+                oe.treePanel.add(commandsPanel);
568
+                oe.treePanel.Return();
569
+                
529
570
 //		oe.aConstraints.gridx += 1;
530
571
 //		oe.aConstraints.weighty = 0;
531
572
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -537,40 +578,37 @@
537
578
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538
579
 //		gcButton.addActionListener(this);
539
580
                 
540
-                oe.aConstraints.gridx = 0;
541
-		oe.aConstraints.gridy += 1;
542
-                
543
-		//ctrlPanel.add(objList = new List(5, true));
544
-		oe.aConstraints.gridwidth = 100;
545
-	//	oe.aConstraints.gridheight = 100;
546
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547
-		oe.aConstraints.gridheight = 1;
548
-		oe.aConstraints.weighty = 0.5;
549
-		oe.aConstraints.gridx = 0;
550
-		JScrollPane jSP;
581
+                cGridBag jSPPanel = new cGridBag();
582
+
583
+                JScrollPane jSP;
551
584
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
585
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553
586
                 ResetModel();
554
-		oe.aConstraints.weighty = 0.5;
555
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556
-		oe.aConstraints.gridy += 1;
557
-		oe.aConstraints.gridwidth = 1;
587
+                
588
+                oe.treePanel.add(jSPPanel);
589
+                oe.treePanel.Return();
558
590
 
559
-		oe.aConstraints.weighty = 0;
560
-		oe.aConstraints.gridwidth = 2;
561
-
562
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
591
+                cGridBag copyOptionsPanel = new cGridBag();
592
+                
593
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594
+                colorCB.setToolTipText("Copy color when dropped");
563
595
                 colorCB.addItemListener(this);
564
-                oe.aConstraints.gridx += 2;
565
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
596
+
597
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598
+                materialCB.setToolTipText("Copy material when dropped");
566
599
                 materialCB.addItemListener(this);
567
-                oe.aConstraints.gridx += 2;
568
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
600
+
601
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602
+                textureCB.setToolTipText("Copy texture when dropped");
569
603
                 textureCB.addItemListener(this);
570
604
                         
571
-                oe.aConstraints.gridx = 0;
572
-		oe.aConstraints.gridy += 1;
605
+                copyOptionsPanel.preferredHeight = 1;
606
+                oe.treePanel.add(copyOptionsPanel);
607
+                oe.treePanel.Return();
573
608
                 
609
+//        mainPanel.setDividerLocation(0.5); //1.0);
610
+//        mainPanel.setResizeWeight(0.5);
611
+        
574
612
 		//jList.addListSelectionListener(this);
575
613
 		oe.jTree.addTreeSelectionListener(this);
576
614
 		//jTree.setRootVisible(false);
..
..
@@ -595,43 +633,35 @@
595
633
         
596
634
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597
635
         {
598
-        	//constraints.gridx = 0;
599
-        	//constraints.gridy = 0;
600
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601
-                fastCB.setToolTipText("Fast mode");
602
-                                fastCB.addItemListener(this);
603
-        	//constraints.gridy += 1;
604
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605
-                supportCB.setToolTipText("Enabled rigging");
606
-                                supportCB.addItemListener(this);
607
-
608
-        //	constraints.gridy += 1;
609
-        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610
-        //                        localCB.addItemListener(this);
611
-
612
-        	//constraints.gridy += 1;
613
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614
-                crowdCB.setToolTipText("Used for crowds");
615
-                                crowdCB.addItemListener(this);
616
-
617
-        	//constraints.gridy += 1;
618
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619
-                smoothCB.setToolTipText("Snapping delay");
620
-                                smoothCB.addItemListener(this);
621
-
622
-        	//constraints.gridy += 1;
623
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624
-                slowCB.setToolTipText("Smooth interpolation");
625
-                                slowCB.addItemListener(this);
626
-        	//constraints.gridy += 1;
627
636
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628
637
                 boxCB.setToolTipText("Display bounding boxes");
629
638
                                 boxCB.addItemListener(this);
630
-        	//constraints.gridy += 1;
639
+                                
631
640
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632
641
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633
642
                                 zoomBoxCB.addItemListener(this);
634
643
 
644
+        if (Globals.ADVANCED)
645
+        {
646
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647
+                supportCB.setToolTipText("Enable rigging");
648
+                                supportCB.addItemListener(this);
649
+
650
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651
+        //                        localCB.addItemListener(this);
652
+
653
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654
+                crowdCB.setToolTipText("Used for crowds");
655
+                                crowdCB.addItemListener(this);
656
+
657
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
658
+                smoothCB.setToolTipText("Snapping delay");
659
+                                smoothCB.addItemListener(this);
660
+
661
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662
+                slowCB.setToolTipText("Smooth interpolation");
663
+                                slowCB.addItemListener(this);
664
+                                
635
665
 //        	constraints.gridy += 1;
636
666
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637
667
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -656,14 +686,20 @@
656
686
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657
687
 //                debugCB.addItemListener(this);
658
688
 
659
-        	//constraints.gridy += 1;
660
689
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
661
690
                                 oeilCB.addItemListener(this);
662
691
 
663
-        	//constraints.gridy += 1;
664
692
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665
693
                 lookAtCB.setToolTipText("Look-at target");
666
694
                                 lookAtCB.addItemListener(this);
695
+                
696
+        }
697
+                                
698
+                cGridBag fill = new cGridBag();
699
+                                
700
+                fill.preferredHeight = 200;
701
+                
702
+                panel.add(fill);
667
703
 
668
704
         }
669
705
 	
..
..
@@ -948,11 +984,11 @@
948
984
             {
949
985
                 loadClipboard(true);
950
986
                 objEditor.jTree.setSelectionPath(destinationPath);
951
-                pasteInto(false);
987
+                pasteInto(false, false);
952
988
             } else {
953
989
                 loadClipboard(false);
954
990
                 objEditor.jTree.setSelectionPath(destinationPath);
955
-                pasteInto(false); // true); // ???
991
+                pasteInto(false, false); // true); // ???
956
992
             }
957
993
 	}
958
994
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1074,27 +1110,33 @@
1074
1110
 		kleinItem.addActionListener(this);
1075
1111
 		particleItem = menu.add(new MenuItem("Particle system"));
1076
1112
 		particleItem.addActionListener(this);
1113
+        if (Globals.ADVANCED)
1114
+        {
1077
1115
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078
1116
 		ragdollItem.addActionListener(this);
1079
1117
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080
1118
 		ragdoll2Item.addActionListener(this);
1119
+        }
1081
1120
 		menu.add("-");
1082
-		meshItem = menu.add(new MenuItem("Mesh"));
1121
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083
1122
 		meshItem.addActionListener(this);
1084
1123
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085
1124
 	//	meshGroupItem.addActionListener(this);
1125
+        if (Globals.ADVANCED)
1126
+        {
1086
1127
 		springItem = menu.add(new MenuItem("Spring"));
1087
1128
 		springItem.addActionListener(this);
1088
1129
 		flagItem = menu.add(new MenuItem("Flag"));
1089
1130
 		flagItem.addActionListener(this);
1090
-		bezierItem = menu.add(new MenuItem("Patch"));
1091
-		bezierItem.addActionListener(this);
1092
-		checkerItem = menu.add(new MenuItem("Checker"));
1093
-		checkerItem.addActionListener(this);
1094
1131
 		blobItem = menu.add(new MenuItem("Blob"));
1095
1132
 		blobItem.addActionListener(this);
1096
1133
 		latheItem = menu.add(new MenuItem("Lathe"));
1097
1134
 		latheItem.addActionListener(this);
1135
+        }
1136
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137
+		bezierItem.addActionListener(this);
1138
+		overlayItem = menu.add(new MenuItem("Overlay"));
1139
+		overlayItem.addActionListener(this);
1098
1140
 		lightItem = menu.add(new MenuItem("Light"));
1099
1141
 		lightItem.addActionListener(this);
1100
1142
 		menu.add("-");
..
..
@@ -1104,25 +1146,26 @@
1104
1146
 		loopItem.addActionListener(this);
1105
1147
 		doubleItem = menu.add(new MenuItem("Fork"));
1106
1148
 		doubleItem.addActionListener(this);
1149
+        if (Globals.ADVANCED)
1150
+        {
1107
1151
 		tripleItem = menu.add(new MenuItem("Trident"));
1108
1152
 		tripleItem.addActionListener(this);
1153
+        }
1109
1154
 	}
1110
1155
         
1111
1156
 	void buildToolsMenu(Menu menu)
1112
1157
 	{
1113
1158
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114
1159
 		animationItem.addItemListener(this);
1115
-                animationItem.setState(CameraPane.ANIMATION);
1160
+                animationItem.setState(Globals.ANIMATION);
1116
1161
                 
1117
1162
 		menu.add("-");
1118
1163
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119
1164
 		parseverticesItem.addActionListener(this);
1120
1165
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121
1166
 		textureFieldItem.addActionListener(this);
1122
-		alignItem = menu.add(new MenuItem("Align"));
1167
+		alignItem = menu.add(new MenuItem("Align Object"));
1123
1168
 		alignItem.addActionListener(this);
1124
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125
-		mirrorItem.addActionListener(this);
1126
1169
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127
1170
 		reduceMorphItem.addActionListener(this);
1128
1171
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
..
..
@@ -1130,8 +1173,12 @@
1130
1173
                 
1131
1174
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1132
1175
 		computeAOItem.addActionListener(this);
1133
-		menu.add("-");
1134
1176
                 
1177
+        if (Globals.ADVANCED)
1178
+        {
1179
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180
+		mirrorItem.addActionListener(this);
1181
+		menu.add("-");
1135
1182
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1136
1183
 		memoryItem.addActionListener(this);
1137
1184
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1154,6 +1201,7 @@
1154
1201
 		menu.add("-");
1155
1202
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156
1203
 		editScriptItem.addActionListener(this);
1204
+        }
1157
1205
         }
1158
1206
         
1159
1207
         void ScreenFit()
..
..
@@ -1655,7 +1703,7 @@
1655
1703
 		{
1656
1704
 			makeSomething(new BezierSurface());
1657
1705
 		} else
1658
-		if (source == checkerItem)
1706
+		if (source == overlayItem)
1659
1707
 		{
1660
1708
                     /*
1661
1709
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1843,6 +1891,11 @@
1843
1891
 		{
1844
1892
                     DumpObject();
1845
1893
 		} else
1894
+		if (source == oneStepButton)
1895
+		{
1896
+                    Globals.ONESTEP = true;
1897
+                    cameraView.repaint();
1898
+		} else
1846
1899
 		if (source == screenfitButton)
1847
1900
 		{
1848
1901
 			//Reload(lastConverter, lastFilename, true);
..
..
@@ -1915,13 +1968,17 @@
1915
1968
 		{
1916
1969
 			paste(false);
1917
1970
 		} else
1971
+		if (source == pasteIntoItem)
1972
+		{
1973
+			pasteInto(true, false);
1974
+		} else
1918
1975
 		if (source == pasteLinkItem)
1919
1976
 		{
1920
-			pasteInto(false);
1977
+			pasteInto(false, false);
1921
1978
 		} else
1922
1979
 		if (source == pasteCloneItem)
1923
1980
 		{
1924
-			pasteInto(true);
1981
+			pasteInto(true, true);
1925
1982
 		} else
1926
1983
 		if (source == pasteExpandItem)
1927
1984
 		{
..
..
@@ -2123,11 +2180,11 @@
2123
2180
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124
2181
                         for (int i=0; i<group.selection.size(); i++)
2125
2182
                         {
2126
-                            boolean random = CameraPane.RANDOM;
2127
-                            CameraPane.RANDOM = false; // parse all random nodes
2183
+                            boolean random = CameraPane.SWITCH;
2184
+                            CameraPane.SWITCH = false; // parse all random nodes
2128
2185
                             group.selection.get(i).linkVerticesThis(content);
2129
2186
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2130
-                            CameraPane.RANDOM = random;
2187
+                            CameraPane.SWITCH = random;
2131
2188
                         }
2132
2189
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133
2190
 		refreshContents();
..
..
@@ -2137,20 +2194,20 @@
2137
2194
 		{
2138
2195
                     for (int i=0; i<group.selection.size(); i++)
2139
2196
                     {
2140
-                        boolean random = CameraPane.RANDOM;
2141
-                        CameraPane.RANDOM = false; // parse all random nodes
2197
+                        boolean random = CameraPane.SWITCH;
2198
+                        CameraPane.SWITCH = false; // parse all random nodes
2142
2199
                         group.selection.get(i).linkVerticesThis(null);
2143
-                        CameraPane.RANDOM = random;
2200
+                        CameraPane.SWITCH = random;
2144
2201
                     }
2145
2202
 
2146
2203
                     refreshContents();
2147
2204
 		} else
2148
2205
 		if (source == relinkverticesItem)
2149
2206
 		{
2150
-                    boolean random = CameraPane.RANDOM;
2151
-                    CameraPane.RANDOM = false; // parse all random nodes
2207
+                    boolean random = CameraPane.SWITCH;
2208
+                    CameraPane.SWITCH = false; // parse all random nodes
2152
2209
                     group.selection.RelinkToSupport();
2153
-                    CameraPane.RANDOM = random;
2210
+                    CameraPane.SWITCH = random;
2154
2211
 
2155
2212
                     refreshContents();
2156
2213
 		} else
..
..
@@ -2248,7 +2305,7 @@
2248
2305
                         RandomNode random = new RandomNode();
2249
2306
 			group(random);
2250
2307
                         if (random.size() > 0)
2251
-                            random.name = random.get(0).name + "Rnd";
2308
+                            random.name = random.get(0).name + "Switch";
2252
2309
 		} else
2253
2310
 		if (source == physicsItem)
2254
2311
                 {
..
..
@@ -2905,7 +2962,7 @@
2905
2962
                                 
2906
2963
                                 child.editWindow = null; // ???????????
2907
2964
 			}
2908
-			objEditor.ctrlPanel.validate();
2965
+			objEditor.ctrlPanel.FlushUI();
2909
2966
 			//objEditor.jTree.clearSelection();
2910
2967
 			//objEditor.ResetSliders();
2911
2968
                     refreshContents(true);
..
..
@@ -3624,11 +3681,11 @@
3624
3681
 
3625
3682
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626
3683
 
3627
-            boolean random = CameraPane.RANDOM;
3628
-            CameraPane.RANDOM = false; // parse all random nodes
3684
+            boolean random = CameraPane.SWITCH;
3685
+            CameraPane.SWITCH = false; // parse all random nodes
3629
3686
             lowres.linkVerticesThis(null);
3630
3687
             lowres.linkVerticesThis(sn);
3631
-            CameraPane.RANDOM = random;
3688
+            CameraPane.SWITCH = random;
3632
3689
 
3633
3690
             System.err.flush();
3634
3691
 
..
..
@@ -4113,12 +4170,12 @@
4113
4170
             System.err.println("info : " + child.GetPath());
4114
4171
 				}
4115
4172
 			}
4116
-			else
4117
-                        {
4118
-				objEditor.SetMaterial(group); // .GetMaterial());
4119
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4120
-            System.err.println("info : " + group.GetPath());
4121
-                        }
4173
+//			else
4174
+//                        {
4175
+//				objEditor.SetMaterial(group); // .GetMaterial());
4176
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4177
+//            System.err.println("info : " + group.GetPath());
4178
+//                        }
4122
4179
 			
4123
4180
                         objEditor.SetText(); // jan 2014
4124
4181
                         
..
..
@@ -4386,7 +4443,7 @@
4386
4443
 		refreshContents();
4387
4444
 	}
4388
4445
 	
4389
-	void pasteInto(boolean copyit)
4446
+	void pasteInto(boolean copyit, boolean clone)
4390
4447
 	{
4391
4448
 //		if (GrafreeD.clipboard == null)
4392
4449
 //			return;
..
..
@@ -4415,7 +4472,14 @@
4415
4472
 		if (copyit)
4416
4473
 		{
4417
4474
 		//	paste(false);
4418
-                    CloneClipboard(false); // sept 2014
4475
+                        if (clone)
4476
+                        {
4477
+                            CloneClipboard(false); // sept 2014
4478
+                        }
4479
+                        else
4480
+                        {
4481
+                            paste(false);
4482
+                        }
4419
4483
 		}
4420
4484
 		else
4421
4485
 		{
..
..
@@ -4959,10 +5023,12 @@
4959
5023
 	cButton flashSelectionButton;
4960
5024
 	cButton editButton;
4961
5025
 	cButton uneditButton;
5026
+	JCheckBox allParamsButton;
4962
5027
 	cButton clearpanelButton;
4963
-	cButton allParamsButton;
4964
5028
 	cButton unselectButton;
4965
5029
 	
5030
+	cButton oneStepButton;
5031
+        
4966
5032
 	cButton screenfitButton;
4967
5033
 	cButton screenfitpointButton;
4968
5034
 	cButton snapobjectButton;
..
..
@@ -5017,6 +5083,7 @@
5017
5083
 	private MenuItem mergeGeometriesItem;
5018
5084
 	private MenuItem copyItem;
5019
5085
 	private MenuItem pasteItem;
5086
+	private MenuItem pasteIntoItem;
5020
5087
 	private MenuItem pasteLinkItem;
5021
5088
 	private MenuItem pasteCloneItem;
5022
5089
 	private MenuItem pasteExpandItem;
..
..
@@ -5114,7 +5181,7 @@
5114
5181
 	private MenuItem blobItem;
5115
5182
 	private MenuItem latheItem;
5116
5183
 	private MenuItem bezierItem;
5117
-	private MenuItem checkerItem;
5184
+	private MenuItem overlayItem;
5118
5185
 	private MenuItem meshItem;
5119
5186
 //	private MenuItem meshGroupItem;
5120
5187
 	private MenuItem springItem;