blame | history | patch | commit | commitdiff
Normand Briere
2019-05-05 1e1c7fcdb3d0f8be350c5f6c32b6afa6705168ea 
 GroupEditor.java
....@@ -150,6 +150,8 @@
150150     
151151 	void SetupMenu2(ObjEditor oe)
152152 	{
153
+        if (Globals.ADVANCED)
154
+        {
153155 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154156 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155157 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
....@@ -161,17 +163,21 @@
161163 		lookAtItem.addActionListener(this);
162164 		//lookFromItem.addActinoListener(this);
163165 		//switchItem.addActionListener(this);
166
+        }
167
+        
164168 		Menu menu;
165169 		oe.menuBar.add(menu = new Menu("Edit"));
166170 		//editItem = menu.add(new MenuItem("Edit"));
167171 		//editItem.addActionListener(this);
168172 		duplicateItem = menu.add(new MenuItem("Duplicate"));
169173 		duplicateItem.addActionListener(this);
170
-		menu.add("-");
171174 		cloneItem = menu.add(new MenuItem("Clone"));
172175 		cloneItem.addActionListener(this);
176
+        if (Globals.ADVANCED)
177
+        {
173178 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174179 		cloneSupportItem.addActionListener(this);
180
+        }
175181 		menu.add("-");
176182 		cutItem = menu.add(new MenuItem("Cut"));
177183 		cutItem.addActionListener(this);
....@@ -179,18 +185,31 @@
179185 		copyItem.addActionListener(this);
180186 		pasteItem = menu.add(new MenuItem("Paste"));
181187 		pasteItem.addActionListener(this);
188
+		menu.add("-");
189
+                
190
+		menu.add("-");
191
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
192
+		pasteIntoItem.addActionListener(this);
182193 		pasteLinkItem = menu.add(new MenuItem("Paste link"));
183194 		pasteLinkItem.addActionListener(this);
184195 		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185196 		pasteCloneItem.addActionListener(this);
186197 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187198 //		pasteExpandItem.addActionListener(this);
199
+		menu.add("-");
188200 		clearItem = menu.add(new MenuItem("Clear"));
189201 		clearItem.addActionListener(this);
202
+                
203
+        if (Globals.ADVANCED)
204
+        {
205
+                // Deletes the cameras...
190206 		clearAllItem = menu.add(new MenuItem("Clear All"));
191207 		clearAllItem.addActionListener(this);
208
+        }
192209 
193210 		oe.menuBar.add(menu = new Menu("Setting"));
211
+        if (Globals.ADVANCED)
212
+        {
194213                 resetMeshItem = menu.add(new MenuItem("Reset All"));
195214 		resetMeshItem.addActionListener(this);
196215 		stepAllItem = menu.add(new MenuItem("Step All"));
....@@ -200,6 +219,7 @@
200219 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201220 		resetreferencesItem.addActionListener(this);
202221 		menu.add("-");
222
+        }
203223 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204224 		overwriteGeoItem.addActionListener(this);
205225 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,19 +231,26 @@
211231 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212232 		overwriteUVItem.addActionListener(this);
213233 		menu.add("-");
234
+        if (Globals.ADVANCED)
235
+        {
214236 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215237 		generateMeshItem.addActionListener(this);
216238 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217239 		poseMeshItem.addActionListener(this);
218240 		menu.add("-");
241
+        }
219242 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220243 		resetsupportItem.addActionListener(this);
221244 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222245 		linkverticesItem.addActionListener(this);
223246 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224247 		relinkverticesItem.addActionListener(this);
248
+                
249
+        if (Globals.ADVANCED)
250
+        {
225251 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226252 		setMasterItem.addActionListener(this);
253
+        }
227254                 
228255 		oe.menuBar.add(menu = new Menu("Group"));
229256 		grabItem = menu.add(new MenuItem("Grab"));
....@@ -234,27 +261,32 @@
234261 		frontItem.addActionListener(this);
235262 		compositeItem = menu.add(new MenuItem("Composite"));
236263 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
264
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238265 		hideItem.addActionListener(this);
239266 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240267 		ungroupItem.addActionListener(this);
241268 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
269
+		randomItem = menu.add(new MenuItem("Switch node"));
243270 		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);
248271 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249272 		switchGeoItem.addActionListener(this);
250273 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251274 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
275
+		morphItem = menu.add(new MenuItem("Morph Group"));
253276 		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);
254285 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255286 		scriptNodeItem.addActionListener(this);
256287 		cameraItem = menu.add(new MenuItem("Camera"));
257288 		cameraItem.addActionListener(this);
289
+        }
258290                 
259291 		oe.menuBar.add(menu = new Menu("Object"));
260292 		textureItem = menu.add(new MenuItem("Texture"));
....@@ -269,14 +301,18 @@
269301 		shadowYItem.addActionListener(this);
270302                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271303 		shadowZItem.addActionListener(this);
304
+        if (Globals.ADVANCED)
305
+        {
306
+		menu.add("-");
272307 		linkerItem = menu.add(new MenuItem("Linker"));
273308 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276309 		attributeItem = menu.add(new MenuItem("Attribute"));
277310 		attributeItem.addActionListener(this);
311
+		templateItem = menu.add(new MenuItem("Template"));
312
+		templateItem.addActionListener(this);
278313 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279314 		pointflowItem.addActionListener(this);
315
+        }
280316 		menu.add("-");
281317 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282318 		resetTransformItem.addActionListener(this);
....@@ -294,8 +330,11 @@
294330 		genNormalsCADItem.addActionListener(this);
295331 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296332 		genNormalsMESHItem.addActionListener(this);
333
+        if (Globals.ADVANCED)
334
+        {
297335 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298336 		genNormalsMINEItem.addActionListener(this);
337
+        }
299338 		stripifyItem = menu.add(new MenuItem("Stripify"));
300339 		stripifyItem.addActionListener(this);
301340 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,10 +356,14 @@
317356 		reduce34MeshItem.addActionListener(this);
318357 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319358 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322359 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323360 		clipMeshItem.addActionListener(this);
361
+                
362
+        if (Globals.ADVANCED)
363
+        {
364
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
365
+		smoothMeshItem.addActionListener(this);
366
+        }
324367 
325368                 oe.menuBar.add(menu = new Menu("Attributes"));
326369 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
....@@ -330,10 +373,13 @@
330373 		liveleavesItem.addActionListener(this);
331374 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332375 		unliveleavesItem.addActionListener(this);
376
+        if (Globals.ADVANCED)
377
+        {
333378 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334379 		supportleavesItem.addActionListener(this);
335380 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336381 		unsupportleavesItem.addActionListener(this);
382
+        }
337383 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338384 		hideleavesItem.addActionListener(this);
339385 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -376,6 +422,8 @@
376422 		sortbysizeItem.addActionListener(this);
377423 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378424 		sortbynameItem.addActionListener(this);
425
+        if (Globals.ADVANCED)
426
+        {
379427 		menu.add("-");
380428 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381429 		extractGeometriesItem.addActionListener(this);
....@@ -385,20 +433,23 @@
385433 		shareGeometriesItem.addActionListener(this);
386434 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387435 		mergeGeometriesItem.addActionListener(this);
436
+        }
388437                 
389438 		oe.menuBar.add(menu = new Menu("Insert"));
390439 		buildCreateMenu(menu);
391440                 
392
-               
393441                 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..."));
442
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
399443 		importOBJItem.addActionListener(this);
400
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
444
+		menu.add("-");
445
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
401446 		import3DSItem.addActionListener(this);
447
+		menu.add("-");
448
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449
+		importVRMLX3DItem.addActionListener(this);
450
+		menu.add("-");
451
+		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452
+		importGFDItem.addActionListener(this);
402453 
403454                 oe.menuBar.add(menu = new Menu("Tools"));
404455 		buildToolsMenu(menu);
....@@ -436,11 +487,19 @@
436487          */
437488                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438489                 
439
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
490
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440491                 liveCB.setToolTipText("Enabled animation");
441492                                 liveCB.addItemListener(this);
442493 
443
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
494
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
495
+                oneStepButton.setToolTipText("Animate one step forward");
496
+		oneStepButton.addActionListener(this);
497
+                
498
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
499
+                fastCB.setToolTipText("Fast mode");
500
+                                fastCB.addItemListener(this);
501
+                                
502
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444503                 trackCB.setToolTipText("Enable tracking");
445504                                 trackCB.addItemListener(this);
446505 
....@@ -450,17 +509,14 @@
450509 
451510 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452511 //		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;
458512 
459
-                //aConstraints.gridx = 0;
460
-                //aConstraints.gridy += 1;
461
-		oe.aConstraints.weighty = 0;
462
-		oe.aConstraints.gridwidth = 1;
463
-		
513
+                if (Globals.ADVANCED)
514
+                {
515
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
+                        snapobjectButton.addActionListener(this);
517
+                        snapobjectButton.setToolTipText("Snap Object");
518
+                }
519
+
464520 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465521                 flashSelectionButton.setToolTipText("Show selection");
466522 		flashSelectionButton.addActionListener(this);
....@@ -485,47 +541,42 @@
485541                 //
486542 
487543 		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
-                rootButton.setToolTipText("Edit object in new tab");
544
+                rootButton.setToolTipText("Edit selection in new tab");
489545 		rootButton.addActionListener(this);
490
-			oe.aConstraints.gridx += 1;
491
-		oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546
+
547
+                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492548                 closeButton.setToolTipText("Close tab");
493549 		closeButton.addActionListener(this);
494550 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495551 		//clearButton.addActionListener(this);
496
-			oe.aConstraints.gridx += 1;
497552                         
498
-		oe.aConstraints.gridx = 1; //
499
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
553
+                cGridBag commandsPanel = new cGridBag();
554
+                
555
+		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556
+                editButton.setToolTipText("Edit selection");
500557 		editButton.addActionListener(this);
501
-		oe.aConstraints.gridx += 1;
502
-		oe.aConstraints.weighty = 0;
503
-		oe.aConstraints.gridwidth = 1;
504558 
505
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
559
+		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560
+                uneditButton.setToolTipText("Unedit selection");
506561 		uneditButton.addActionListener(this);
507562 
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);
563
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564
+                allParamsButton.setToolTipText("Edit all params");
520565 		allParamsButton.addActionListener(this);
521566 
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);
567
+		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
568
+                clearPanelButton.setToolTipText("Clear edit panel");
569
+		clearPanelButton.addActionListener(this);
570
+
571
+		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
572
+                unselectButton.setToolTipText("Unselect");
527573 		unselectButton.addActionListener(this);
528574 
575
+                commandsPanel.preferredHeight = 1;
576
+                
577
+                oe.treePanel.add(commandsPanel);
578
+                oe.treePanel.Return();
579
+                
529580 //		oe.aConstraints.gridx += 1;
530581 //		oe.aConstraints.weighty = 0;
531582 //		oe.aConstraints.gridwidth = 1;
....@@ -537,40 +588,37 @@
537588 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538589 //		gcButton.addActionListener(this);
539590                 
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;
591
+                cGridBag jSPPanel = new cGridBag();
592
+
593
+                JScrollPane jSP;
551594 		//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);
595
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553596                 ResetModel();
554
-		oe.aConstraints.weighty = 0.5;
555
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556
-		oe.aConstraints.gridy += 1;
557
-		oe.aConstraints.gridwidth = 1;
597
+                
598
+                oe.treePanel.add(jSPPanel);
599
+                oe.treePanel.Return();
558600 
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);
601
+                cGridBag copyOptionsPanel = new cGridBag();
602
+                
603
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604
+                colorCB.setToolTipText("Copy color when dropped");
563605                 colorCB.addItemListener(this);
564
-                oe.aConstraints.gridx += 2;
565
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
606
+
607
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608
+                materialCB.setToolTipText("Copy material when dropped");
566609                 materialCB.addItemListener(this);
567
-                oe.aConstraints.gridx += 2;
568
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610
+
611
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612
+                textureCB.setToolTipText("Copy texture when dropped");
569613                 textureCB.addItemListener(this);
570614                         
571
-                oe.aConstraints.gridx = 0;
572
-		oe.aConstraints.gridy += 1;
615
+                copyOptionsPanel.preferredHeight = 1;
616
+                oe.treePanel.add(copyOptionsPanel);
617
+                oe.treePanel.Return();
573618                 
619
+//        mainPanel.setDividerLocation(0.5); //1.0);
620
+//        mainPanel.setResizeWeight(0.5);
621
+        
574622 		//jList.addListSelectionListener(this);
575623 		oe.jTree.addTreeSelectionListener(this);
576624 		//jTree.setRootVisible(false);
....@@ -595,43 +643,35 @@
595643         
596644         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597645         {
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;
627646                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628647                 boxCB.setToolTipText("Display bounding boxes");
629648                                 boxCB.addItemListener(this);
630
-        	//constraints.gridy += 1;
649
+                                
631650                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632651                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633652                                 zoomBoxCB.addItemListener(this);
634653 
654
+        if (Globals.ADVANCED)
655
+        {
656
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657
+                supportCB.setToolTipText("Enable rigging");
658
+                                supportCB.addItemListener(this);
659
+
660
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661
+        //                        localCB.addItemListener(this);
662
+
663
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664
+                crowdCB.setToolTipText("Used for crowds");
665
+                                crowdCB.addItemListener(this);
666
+
667
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
668
+                smoothCB.setToolTipText("Snapping delay");
669
+                                smoothCB.addItemListener(this);
670
+
671
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
672
+                slowCB.setToolTipText("Smooth interpolation");
673
+                                slowCB.addItemListener(this);
674
+                                
635675 //        	constraints.gridy += 1;
636676 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637677 //                                speakerMocapCB.addItemListener(this);
....@@ -656,14 +696,20 @@
656696 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657697 //                debugCB.addItemListener(this);
658698 
659
-        	//constraints.gridy += 1;
660699                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
661700                                 oeilCB.addItemListener(this);
662701 
663
-        	//constraints.gridy += 1;
664702                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665703                 lookAtCB.setToolTipText("Look-at target");
666704                                 lookAtCB.addItemListener(this);
705
+                
706
+        }
707
+                                
708
+                cGridBag fill = new cGridBag();
709
+                                
710
+                fill.preferredHeight = 200;
711
+                
712
+                panel.add(fill);
667713 
668714         }
669715 	
....@@ -948,11 +994,11 @@
948994             {
949995                 loadClipboard(true);
950996                 objEditor.jTree.setSelectionPath(destinationPath);
951
-                pasteInto(false);
997
+                pasteInto(false, false);
952998             } else {
953999                 loadClipboard(false);
9541000                 objEditor.jTree.setSelectionPath(destinationPath);
955
-                pasteInto(false); // true); // ???
1001
+                pasteInto(false, false); // true); // ???
9561002             }
9571003 	}
9581004 	public void	dropActionChanged(DropTargetDragEvent dtde) 
....@@ -1074,27 +1120,33 @@
10741120 		kleinItem.addActionListener(this);
10751121 		particleItem = menu.add(new MenuItem("Particle system"));
10761122 		particleItem.addActionListener(this);
1123
+        if (Globals.ADVANCED)
1124
+        {
10771125 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
10781126 		ragdollItem.addActionListener(this);
10791127 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10801128 		ragdoll2Item.addActionListener(this);
1129
+        }
10811130 		menu.add("-");
1082
-		meshItem = menu.add(new MenuItem("Mesh"));
1131
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10831132 		meshItem.addActionListener(this);
10841133 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10851134 	//	meshGroupItem.addActionListener(this);
1135
+        if (Globals.ADVANCED)
1136
+        {
10861137 		springItem = menu.add(new MenuItem("Spring"));
10871138 		springItem.addActionListener(this);
10881139 		flagItem = menu.add(new MenuItem("Flag"));
10891140 		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);
10941141 		blobItem = menu.add(new MenuItem("Blob"));
10951142 		blobItem.addActionListener(this);
10961143 		latheItem = menu.add(new MenuItem("Lathe"));
10971144 		latheItem.addActionListener(this);
1145
+        }
1146
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147
+		bezierItem.addActionListener(this);
1148
+		overlayItem = menu.add(new MenuItem("Overlay"));
1149
+		overlayItem.addActionListener(this);
10981150 		lightItem = menu.add(new MenuItem("Light"));
10991151 		lightItem.addActionListener(this);
11001152 		menu.add("-");
....@@ -1104,34 +1156,39 @@
11041156 		loopItem.addActionListener(this);
11051157 		doubleItem = menu.add(new MenuItem("Fork"));
11061158 		doubleItem.addActionListener(this);
1159
+        if (Globals.ADVANCED)
1160
+        {
11071161 		tripleItem = menu.add(new MenuItem("Trident"));
11081162 		tripleItem.addActionListener(this);
1163
+        }
11091164 	}
11101165         
11111166 	void buildToolsMenu(Menu menu)
11121167 	{
11131168 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11141169 		animationItem.addItemListener(this);
1115
-                animationItem.setState(CameraPane.ANIMATION);
1170
+                animationItem.setState(Globals.ANIMATION);
11161171                 
11171172 		menu.add("-");
11181173 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11191174 		parseverticesItem.addActionListener(this);
11201175 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
11211176 		textureFieldItem.addActionListener(this);
1122
-		alignItem = menu.add(new MenuItem("Align"));
1177
+		alignItem = menu.add(new MenuItem("Align Objects"));
11231178 		alignItem.addActionListener(this);
1124
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125
-		mirrorItem.addActionListener(this);
11261179 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11271180 		reduceMorphItem.addActionListener(this);
11281181 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11291182 		reduce34MorphItem.addActionListener(this);
1130
-                
1183
+		menu.add("-");
11311184 		menu.add(computeAOItem = new MenuItem("Compute AO"));
11321185 		computeAOItem.addActionListener(this);
1133
-		menu.add("-");
11341186                 
1187
+        if (Globals.ADVANCED)
1188
+        {
1189
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1190
+		mirrorItem.addActionListener(this);
1191
+		menu.add("-");
11351192 		menu.add(memoryItem = new MenuItem("Memory Usage"));
11361193 		memoryItem.addActionListener(this);
11371194 		menu.add(analyzeItem = new MenuItem("Analyze"));
....@@ -1154,6 +1211,7 @@
11541211 		menu.add("-");
11551212 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
11561213 		editScriptItem.addActionListener(this);
1214
+        }
11571215         }
11581216         
11591217         void ScreenFit()
....@@ -1655,7 +1713,7 @@
16551713 		{
16561714 			makeSomething(new BezierSurface());
16571715 		} else
1658
-		if (source == checkerItem)
1716
+		if (source == overlayItem)
16591717 		{
16601718                     /*
16611719 			Object3D obj = new BezierSurface(5,8);
....@@ -1804,7 +1862,15 @@
18041862 		} else
18051863 		if (source == importOBJItem)
18061864 		{
1807
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1865
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867
+                            browser.setVisible(true);
1868
+                            String filename = browser.getFile();
1869
+                            if (filename != null && filename.length() > 0)
1870
+                            {
1871
+                                String fullname = browser.getDirectory() + filename;
1872
+                                makeSomething(ReadOBJ(fullname), true);
1873
+                            }
18081874 		} else
18091875 		if (source == computeAOItem)
18101876 		{
....@@ -1842,6 +1908,11 @@
18421908 		if (source == dumpItem)
18431909 		{
18441910                     DumpObject();
1911
+		} else
1912
+		if (source == oneStepButton)
1913
+		{
1914
+                    Globals.ONESTEP = true;
1915
+                    cameraView.repaint();
18451916 		} else
18461917 		if (source == screenfitButton)
18471918 		{
....@@ -1915,13 +1986,17 @@
19151986 		{
19161987 			paste(false);
19171988 		} else
1989
+		if (source == pasteIntoItem)
1990
+		{
1991
+			pasteInto(true, false);
1992
+		} else
19181993 		if (source == pasteLinkItem)
19191994 		{
1920
-			pasteInto(false);
1995
+			pasteInto(false, false);
19211996 		} else
19221997 		if (source == pasteCloneItem)
19231998 		{
1924
-			pasteInto(true);
1999
+			pasteInto(true, true);
19252000 		} else
19262001 		if (source == pasteExpandItem)
19272002 		{
....@@ -2123,11 +2198,11 @@
21232198             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21242199                         for (int i=0; i<group.selection.size(); i++)
21252200                         {
2126
-                            boolean random = CameraPane.RANDOM;
2127
-                            CameraPane.RANDOM = false; // parse all random nodes
2201
+                            boolean random = CameraPane.SWITCH;
2202
+                            CameraPane.SWITCH = false; // parse all random nodes
21282203                             group.selection.get(i).linkVerticesThis(content);
21292204                       //      group.selection.get(i).setMasterThis(content); // should be identity
2130
-                            CameraPane.RANDOM = random;
2205
+                            CameraPane.SWITCH = random;
21312206                         }
21322207             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21332208 		refreshContents();
....@@ -2137,20 +2212,20 @@
21372212 		{
21382213                     for (int i=0; i<group.selection.size(); i++)
21392214                     {
2140
-                        boolean random = CameraPane.RANDOM;
2141
-                        CameraPane.RANDOM = false; // parse all random nodes
2215
+                        boolean random = CameraPane.SWITCH;
2216
+                        CameraPane.SWITCH = false; // parse all random nodes
21422217                         group.selection.get(i).linkVerticesThis(null);
2143
-                        CameraPane.RANDOM = random;
2218
+                        CameraPane.SWITCH = random;
21442219                     }
21452220 
21462221                     refreshContents();
21472222 		} else
21482223 		if (source == relinkverticesItem)
21492224 		{
2150
-                    boolean random = CameraPane.RANDOM;
2151
-                    CameraPane.RANDOM = false; // parse all random nodes
2225
+                    boolean random = CameraPane.SWITCH;
2226
+                    CameraPane.SWITCH = false; // parse all random nodes
21522227                     group.selection.RelinkToSupport();
2153
-                    CameraPane.RANDOM = random;
2228
+                    CameraPane.SWITCH = random;
21542229 
21552230                     refreshContents();
21562231 		} else
....@@ -2248,7 +2323,7 @@
22482323                         RandomNode random = new RandomNode();
22492324 			group(random);
22502325                         if (random.size() > 0)
2251
-                            random.name = random.get(0).name + "Rnd";
2326
+                            random.name = random.get(0).name + "Switch";
22522327 		} else
22532328 		if (source == physicsItem)
22542329                 {
....@@ -2905,7 +2980,7 @@
29052980                                 
29062981                                 child.editWindow = null; // ???????????
29072982 			}
2908
-			objEditor.ctrlPanel.validate();
2983
+			objEditor.ctrlPanel.FlushUI();
29092984 			//objEditor.jTree.clearSelection();
29102985 			//objEditor.ResetSliders();
29112986                     refreshContents(true);
....@@ -3624,11 +3699,11 @@
36243699 
36253700             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36263701 
3627
-            boolean random = CameraPane.RANDOM;
3628
-            CameraPane.RANDOM = false; // parse all random nodes
3702
+            boolean random = CameraPane.SWITCH;
3703
+            CameraPane.SWITCH = false; // parse all random nodes
36293704             lowres.linkVerticesThis(null);
36303705             lowres.linkVerticesThis(sn);
3631
-            CameraPane.RANDOM = random;
3706
+            CameraPane.SWITCH = random;
36323707 
36333708             System.err.flush();
36343709 
....@@ -4113,12 +4188,12 @@
41134188             System.err.println("info : " + child.GetPath());
41144189 				}
41154190 			}
4116
-			else
4117
-                        {
4118
-				objEditor.SetMaterial(group); // .GetMaterial());
4119
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4120
-            System.err.println("info : " + group.GetPath());
4121
-                        }
4191
+//			else
4192
+//                        {
4193
+//				objEditor.SetMaterial(group); // .GetMaterial());
4194
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4195
+//            System.err.println("info : " + group.GetPath());
4196
+//                        }
41224197 			
41234198                         objEditor.SetText(); // jan 2014
41244199                         
....@@ -4386,7 +4461,7 @@
43864461 		refreshContents();
43874462 	}
43884463 	
4389
-	void pasteInto(boolean copyit)
4464
+	void pasteInto(boolean copyit, boolean clone)
43904465 	{
43914466 //		if (GrafreeD.clipboard == null)
43924467 //			return;
....@@ -4415,7 +4490,14 @@
44154490 		if (copyit)
44164491 		{
44174492 		//	paste(false);
4418
-                    CloneClipboard(false); // sept 2014
4493
+                        if (clone)
4494
+                        {
4495
+                            CloneClipboard(false); // sept 2014
4496
+                        }
4497
+                        else
4498
+                        {
4499
+                            paste(false);
4500
+                        }
44194501 		}
44204502 		else
44214503 		{
....@@ -4959,10 +5041,12 @@
49595041 	cButton flashSelectionButton;
49605042 	cButton editButton;
49615043 	cButton uneditButton;
5044
+	JCheckBox allParamsButton;
49625045 	cButton clearpanelButton;
4963
-	cButton allParamsButton;
49645046 	cButton unselectButton;
49655047 	
5048
+	cButton oneStepButton;
5049
+        
49665050 	cButton screenfitButton;
49675051 	cButton screenfitpointButton;
49685052 	cButton snapobjectButton;
....@@ -5017,6 +5101,7 @@
50175101 	private MenuItem mergeGeometriesItem;
50185102 	private MenuItem copyItem;
50195103 	private MenuItem pasteItem;
5104
+	private MenuItem pasteIntoItem;
50205105 	private MenuItem pasteLinkItem;
50215106 	private MenuItem pasteCloneItem;
50225107 	private MenuItem pasteExpandItem;
....@@ -5114,7 +5199,7 @@
51145199 	private MenuItem blobItem;
51155200 	private MenuItem latheItem;
51165201 	private MenuItem bezierItem;
5117
-	private MenuItem checkerItem;
5202
+	private MenuItem overlayItem;
51185203 	private MenuItem meshItem;
51195204 //	private MenuItem meshGroupItem;
51205205 	private MenuItem springItem;