blame | history | patch | commit | commitdiff
Normand Briere
2019-05-05 1e3de699b037989e8deded5c7830139f97c64136 
 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);
....@@ -440,6 +491,10 @@
440491                 liveCB.setToolTipText("Enabled animation");
441492                                 liveCB.addItemListener(this);
442493 
494
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
495
+                oneStepButton.setToolTipText("Animate one step forward");
496
+		oneStepButton.addActionListener(this);
497
+                
443498                 oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444499                 fastCB.setToolTipText("Fast mode");
445500                                 fastCB.addItemListener(this);
....@@ -454,17 +509,14 @@
454509 
455510 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456511 //		screenfitpointButton.addActionListener(this);
457
-//			oe.aConstraints.gridx += 1;
458
-		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459
-		snapobjectButton.addActionListener(this);
460
-                snapobjectButton.setToolTipText("Snap Object");
461
-			oe.aConstraints.gridx += 1;
462512 
463
-                //aConstraints.gridx = 0;
464
-                //aConstraints.gridy += 1;
465
-		oe.aConstraints.weighty = 0;
466
-		oe.aConstraints.gridwidth = 1;
467
-		
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
+
468520 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469521                 flashSelectionButton.setToolTipText("Show selection");
470522 		flashSelectionButton.addActionListener(this);
....@@ -508,13 +560,13 @@
508560                 uneditButton.setToolTipText("Unedit selection");
509561 		uneditButton.addActionListener(this);
510562 
563
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564
+                allParamsButton.setToolTipText("Edit all params");
565
+		allParamsButton.addActionListener(this);
566
+
511567 		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512568                 clearPanelButton.setToolTipText("Clear edit panel");
513569 		clearPanelButton.addActionListener(this);
514
-
515
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
-                allParamsButton.setToolTipText("All params??");
517
-		allParamsButton.addActionListener(this);
518570 
519571 		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520572                 unselectButton.setToolTipText("Unselect");
....@@ -591,8 +643,18 @@
591643         
592644         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593645         {
646
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647
+                boxCB.setToolTipText("Display bounding boxes");
648
+                                boxCB.addItemListener(this);
649
+                                
650
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651
+                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652
+                                zoomBoxCB.addItemListener(this);
653
+
654
+        if (Globals.ADVANCED)
655
+        {
594656                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595
-                supportCB.setToolTipText("Enabled rigging");
657
+                supportCB.setToolTipText("Enable rigging");
596658                                 supportCB.addItemListener(this);
597659 
598660         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
....@@ -610,14 +672,6 @@
610672                 slowCB.setToolTipText("Smooth interpolation");
611673                                 slowCB.addItemListener(this);
612674                                 
613
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
614
-                boxCB.setToolTipText("Display bounding boxes");
615
-                                boxCB.addItemListener(this);
616
-                                
617
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
618
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
619
-                                zoomBoxCB.addItemListener(this);
620
-
621675 //        	constraints.gridy += 1;
622676 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623677 //                                speakerMocapCB.addItemListener(this);
....@@ -648,6 +702,8 @@
648702                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649703                 lookAtCB.setToolTipText("Look-at target");
650704                                 lookAtCB.addItemListener(this);
705
+                
706
+        }
651707                                 
652708                 cGridBag fill = new cGridBag();
653709                                 
....@@ -884,7 +940,9 @@
884940 //                        objEditor.DropFile((java.io.File[]) object, true);
885941 //                        return;
886942 //                    }
887
-                    if (string.charAt(0) == '/')
943
+                    
944
+                    // File path for Mac and Windows
945
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
888946                     {
889947                         // file(s)
890948                         String[] names = string.split("\n");
....@@ -938,11 +996,11 @@
938996             {
939997                 loadClipboard(true);
940998                 objEditor.jTree.setSelectionPath(destinationPath);
941
-                pasteInto(false);
999
+                pasteInto(false, false);
9421000             } else {
9431001                 loadClipboard(false);
9441002                 objEditor.jTree.setSelectionPath(destinationPath);
945
-                pasteInto(false); // true); // ???
1003
+                pasteInto(false, false); // true); // ???
9461004             }
9471005 	}
9481006 	public void	dropActionChanged(DropTargetDragEvent dtde) 
....@@ -1064,27 +1122,33 @@
10641122 		kleinItem.addActionListener(this);
10651123 		particleItem = menu.add(new MenuItem("Particle system"));
10661124 		particleItem.addActionListener(this);
1125
+        if (Globals.ADVANCED)
1126
+        {
10671127 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
10681128 		ragdollItem.addActionListener(this);
10691129 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10701130 		ragdoll2Item.addActionListener(this);
1131
+        }
10711132 		menu.add("-");
1072
-		meshItem = menu.add(new MenuItem("Mesh"));
1133
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10731134 		meshItem.addActionListener(this);
10741135 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10751136 	//	meshGroupItem.addActionListener(this);
1137
+        if (Globals.ADVANCED)
1138
+        {
10761139 		springItem = menu.add(new MenuItem("Spring"));
10771140 		springItem.addActionListener(this);
10781141 		flagItem = menu.add(new MenuItem("Flag"));
10791142 		flagItem.addActionListener(this);
1080
-		bezierItem = menu.add(new MenuItem("Patch"));
1081
-		bezierItem.addActionListener(this);
1082
-		checkerItem = menu.add(new MenuItem("Checker"));
1083
-		checkerItem.addActionListener(this);
10841143 		blobItem = menu.add(new MenuItem("Blob"));
10851144 		blobItem.addActionListener(this);
10861145 		latheItem = menu.add(new MenuItem("Lathe"));
10871146 		latheItem.addActionListener(this);
1147
+        }
1148
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149
+		bezierItem.addActionListener(this);
1150
+		overlayItem = menu.add(new MenuItem("Overlay"));
1151
+		overlayItem.addActionListener(this);
10881152 		lightItem = menu.add(new MenuItem("Light"));
10891153 		lightItem.addActionListener(this);
10901154 		menu.add("-");
....@@ -1094,8 +1158,11 @@
10941158 		loopItem.addActionListener(this);
10951159 		doubleItem = menu.add(new MenuItem("Fork"));
10961160 		doubleItem.addActionListener(this);
1161
+        if (Globals.ADVANCED)
1162
+        {
10971163 		tripleItem = menu.add(new MenuItem("Trident"));
10981164 		tripleItem.addActionListener(this);
1165
+        }
10991166 	}
11001167         
11011168 	void buildToolsMenu(Menu menu)
....@@ -1109,19 +1176,21 @@
11091176 		parseverticesItem.addActionListener(this);
11101177 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
11111178 		textureFieldItem.addActionListener(this);
1112
-		alignItem = menu.add(new MenuItem("Align"));
1179
+		alignItem = menu.add(new MenuItem("Align Objects"));
11131180 		alignItem.addActionListener(this);
1114
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115
-		mirrorItem.addActionListener(this);
11161181 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11171182 		reduceMorphItem.addActionListener(this);
11181183 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11191184 		reduce34MorphItem.addActionListener(this);
1120
-                
1185
+		menu.add("-");
11211186 		menu.add(computeAOItem = new MenuItem("Compute AO"));
11221187 		computeAOItem.addActionListener(this);
1123
-		menu.add("-");
11241188                 
1189
+        if (Globals.ADVANCED)
1190
+        {
1191
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192
+		mirrorItem.addActionListener(this);
1193
+		menu.add("-");
11251194 		menu.add(memoryItem = new MenuItem("Memory Usage"));
11261195 		memoryItem.addActionListener(this);
11271196 		menu.add(analyzeItem = new MenuItem("Analyze"));
....@@ -1144,6 +1213,7 @@
11441213 		menu.add("-");
11451214 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
11461215 		editScriptItem.addActionListener(this);
1216
+        }
11471217         }
11481218         
11491219         void ScreenFit()
....@@ -1645,7 +1715,7 @@
16451715 		{
16461716 			makeSomething(new BezierSurface());
16471717 		} else
1648
-		if (source == checkerItem)
1718
+		if (source == overlayItem)
16491719 		{
16501720                     /*
16511721 			Object3D obj = new BezierSurface(5,8);
....@@ -1794,7 +1864,15 @@
17941864 		} else
17951865 		if (source == importOBJItem)
17961866 		{
1797
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1867
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869
+                            browser.setVisible(true);
1870
+                            String filename = browser.getFile();
1871
+                            if (filename != null && filename.length() > 0)
1872
+                            {
1873
+                                String fullname = browser.getDirectory() + filename;
1874
+                                makeSomething(ReadOBJ(fullname), true);
1875
+                            }
17981876 		} else
17991877 		if (source == computeAOItem)
18001878 		{
....@@ -1832,6 +1910,11 @@
18321910 		if (source == dumpItem)
18331911 		{
18341912                     DumpObject();
1913
+		} else
1914
+		if (source == oneStepButton)
1915
+		{
1916
+                    Globals.ONESTEP = true;
1917
+                    cameraView.repaint();
18351918 		} else
18361919 		if (source == screenfitButton)
18371920 		{
....@@ -1905,13 +1988,17 @@
19051988 		{
19061989 			paste(false);
19071990 		} else
1991
+		if (source == pasteIntoItem)
1992
+		{
1993
+			pasteInto(true, false);
1994
+		} else
19081995 		if (source == pasteLinkItem)
19091996 		{
1910
-			pasteInto(false);
1997
+			pasteInto(false, false);
19111998 		} else
19121999 		if (source == pasteCloneItem)
19132000 		{
1914
-			pasteInto(true);
2001
+			pasteInto(true, true);
19152002 		} else
19162003 		if (source == pasteExpandItem)
19172004 		{
....@@ -2113,11 +2200,11 @@
21132200             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21142201                         for (int i=0; i<group.selection.size(); i++)
21152202                         {
2116
-                            boolean random = CameraPane.RANDOM;
2117
-                            CameraPane.RANDOM = false; // parse all random nodes
2203
+                            boolean random = CameraPane.SWITCH;
2204
+                            CameraPane.SWITCH = false; // parse all random nodes
21182205                             group.selection.get(i).linkVerticesThis(content);
21192206                       //      group.selection.get(i).setMasterThis(content); // should be identity
2120
-                            CameraPane.RANDOM = random;
2207
+                            CameraPane.SWITCH = random;
21212208                         }
21222209             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21232210 		refreshContents();
....@@ -2127,20 +2214,20 @@
21272214 		{
21282215                     for (int i=0; i<group.selection.size(); i++)
21292216                     {
2130
-                        boolean random = CameraPane.RANDOM;
2131
-                        CameraPane.RANDOM = false; // parse all random nodes
2217
+                        boolean random = CameraPane.SWITCH;
2218
+                        CameraPane.SWITCH = false; // parse all random nodes
21322219                         group.selection.get(i).linkVerticesThis(null);
2133
-                        CameraPane.RANDOM = random;
2220
+                        CameraPane.SWITCH = random;
21342221                     }
21352222 
21362223                     refreshContents();
21372224 		} else
21382225 		if (source == relinkverticesItem)
21392226 		{
2140
-                    boolean random = CameraPane.RANDOM;
2141
-                    CameraPane.RANDOM = false; // parse all random nodes
2227
+                    boolean random = CameraPane.SWITCH;
2228
+                    CameraPane.SWITCH = false; // parse all random nodes
21422229                     group.selection.RelinkToSupport();
2143
-                    CameraPane.RANDOM = random;
2230
+                    CameraPane.SWITCH = random;
21442231 
21452232                     refreshContents();
21462233 		} else
....@@ -2238,7 +2325,7 @@
22382325                         RandomNode random = new RandomNode();
22392326 			group(random);
22402327                         if (random.size() > 0)
2241
-                            random.name = random.get(0).name + "Rnd";
2328
+                            random.name = random.get(0).name + "Switch";
22422329 		} else
22432330 		if (source == physicsItem)
22442331                 {
....@@ -2895,7 +2982,7 @@
28952982                                 
28962983                                 child.editWindow = null; // ???????????
28972984 			}
2898
-			objEditor.ctrlPanel.validate();
2985
+			objEditor.ctrlPanel.FlushUI();
28992986 			//objEditor.jTree.clearSelection();
29002987 			//objEditor.ResetSliders();
29012988                     refreshContents(true);
....@@ -3614,11 +3701,11 @@
36143701 
36153702             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36163703 
3617
-            boolean random = CameraPane.RANDOM;
3618
-            CameraPane.RANDOM = false; // parse all random nodes
3704
+            boolean random = CameraPane.SWITCH;
3705
+            CameraPane.SWITCH = false; // parse all random nodes
36193706             lowres.linkVerticesThis(null);
36203707             lowres.linkVerticesThis(sn);
3621
-            CameraPane.RANDOM = random;
3708
+            CameraPane.SWITCH = random;
36223709 
36233710             System.err.flush();
36243711 
....@@ -4376,7 +4463,7 @@
43764463 		refreshContents();
43774464 	}
43784465 	
4379
-	void pasteInto(boolean copyit)
4466
+	void pasteInto(boolean copyit, boolean clone)
43804467 	{
43814468 //		if (GrafreeD.clipboard == null)
43824469 //			return;
....@@ -4405,7 +4492,14 @@
44054492 		if (copyit)
44064493 		{
44074494 		//	paste(false);
4408
-                    CloneClipboard(false); // sept 2014
4495
+                        if (clone)
4496
+                        {
4497
+                            CloneClipboard(false); // sept 2014
4498
+                        }
4499
+                        else
4500
+                        {
4501
+                            paste(false);
4502
+                        }
44094503 		}
44104504 		else
44114505 		{
....@@ -4949,10 +5043,12 @@
49495043 	cButton flashSelectionButton;
49505044 	cButton editButton;
49515045 	cButton uneditButton;
5046
+	JCheckBox allParamsButton;
49525047 	cButton clearpanelButton;
4953
-	cButton allParamsButton;
49545048 	cButton unselectButton;
49555049 	
5050
+	cButton oneStepButton;
5051
+        
49565052 	cButton screenfitButton;
49575053 	cButton screenfitpointButton;
49585054 	cButton snapobjectButton;
....@@ -5007,6 +5103,7 @@
50075103 	private MenuItem mergeGeometriesItem;
50085104 	private MenuItem copyItem;
50095105 	private MenuItem pasteItem;
5106
+	private MenuItem pasteIntoItem;
50105107 	private MenuItem pasteLinkItem;
50115108 	private MenuItem pasteCloneItem;
50125109 	private MenuItem pasteExpandItem;
....@@ -5104,7 +5201,7 @@
51045201 	private MenuItem blobItem;
51055202 	private MenuItem latheItem;
51065203 	private MenuItem bezierItem;
5107
-	private MenuItem checkerItem;
5204
+	private MenuItem overlayItem;
51085205 	private MenuItem meshItem;
51095206 //	private MenuItem meshGroupItem;
51105207 	private MenuItem springItem;