blame | history | patch | commit | commitdiff
Normand Briere
2019-05-05 631719825b865aaf9fa1cb124d9fc5bd9dd78bd4 
 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,7 +261,7 @@
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);
....@@ -245,16 +272,21 @@
245272 		switchGeoItem.addActionListener(this);
246273 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247274 		switchTransfoItem.addActionListener(this);
275
+		morphItem = menu.add(new MenuItem("Morph Group"));
276
+		morphItem.addActionListener(this);
277
+                
278
+        if (Globals.ADVANCED)
279
+        {
280
+		menu.add("-");
248281 		physicsItem = menu.add(new MenuItem("Physics"));
249282 		physicsItem.addActionListener(this);
250283 		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251284 		frameselectorItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
253
-		morphItem.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);
....@@ -505,13 +560,13 @@
505560                 uneditButton.setToolTipText("Unedit selection");
506561 		uneditButton.addActionListener(this);
507562 
563
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564
+                allParamsButton.setToolTipText("Edit all params");
565
+		allParamsButton.addActionListener(this);
566
+
508567 		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
509568                 clearPanelButton.setToolTipText("Clear edit panel");
510569 		clearPanelButton.addActionListener(this);
511
-
512
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513
-                allParamsButton.setToolTipText("All params??");
514
-		allParamsButton.addActionListener(this);
515570 
516571 		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517572                 unselectButton.setToolTipText("Unselect");
....@@ -588,8 +643,18 @@
588643         
589644         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590645         {
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
+        {
591656                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592
-                supportCB.setToolTipText("Enabled rigging");
657
+                supportCB.setToolTipText("Enable rigging");
593658                                 supportCB.addItemListener(this);
594659 
595660         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
....@@ -607,14 +672,6 @@
607672                 slowCB.setToolTipText("Smooth interpolation");
608673                                 slowCB.addItemListener(this);
609674                                 
610
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611
-                boxCB.setToolTipText("Display bounding boxes");
612
-                                boxCB.addItemListener(this);
613
-                                
614
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616
-                                zoomBoxCB.addItemListener(this);
617
-
618675 //        	constraints.gridy += 1;
619676 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620677 //                                speakerMocapCB.addItemListener(this);
....@@ -645,6 +702,8 @@
645702                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646703                 lookAtCB.setToolTipText("Look-at target");
647704                                 lookAtCB.addItemListener(this);
705
+                
706
+        }
648707                                 
649708                 cGridBag fill = new cGridBag();
650709                                 
....@@ -881,7 +940,9 @@
881940 //                        objEditor.DropFile((java.io.File[]) object, true);
882941 //                        return;
883942 //                    }
884
-                    if (string.charAt(0) == '/')
943
+                    
944
+                    // File path for Mac and Windows
945
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
885946                     {
886947                         // file(s)
887948                         String[] names = string.split("\n");
....@@ -908,7 +969,7 @@
908969                     
909970                     flashIt = false;
910971                     CameraPane pane = (CameraPane) target;
911
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
972
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912973                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913974                     
914975                     if (group.selection.size() == 1)
....@@ -935,11 +996,11 @@
935996             {
936997                 loadClipboard(true);
937998                 objEditor.jTree.setSelectionPath(destinationPath);
938
-                pasteInto(false);
999
+                pasteInto(false, false);
9391000             } else {
9401001                 loadClipboard(false);
9411002                 objEditor.jTree.setSelectionPath(destinationPath);
942
-                pasteInto(false); // true); // ???
1003
+                pasteInto(false, false); // true); // ???
9431004             }
9441005 	}
9451006 	public void	dropActionChanged(DropTargetDragEvent dtde) 
....@@ -1061,27 +1122,33 @@
10611122 		kleinItem.addActionListener(this);
10621123 		particleItem = menu.add(new MenuItem("Particle system"));
10631124 		particleItem.addActionListener(this);
1125
+        if (Globals.ADVANCED)
1126
+        {
10641127 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
10651128 		ragdollItem.addActionListener(this);
10661129 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10671130 		ragdoll2Item.addActionListener(this);
1131
+        }
10681132 		menu.add("-");
1069
-		meshItem = menu.add(new MenuItem("Mesh"));
1133
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10701134 		meshItem.addActionListener(this);
10711135 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10721136 	//	meshGroupItem.addActionListener(this);
1137
+        if (Globals.ADVANCED)
1138
+        {
10731139 		springItem = menu.add(new MenuItem("Spring"));
10741140 		springItem.addActionListener(this);
10751141 		flagItem = menu.add(new MenuItem("Flag"));
10761142 		flagItem.addActionListener(this);
1077
-		bezierItem = menu.add(new MenuItem("Patch"));
1078
-		bezierItem.addActionListener(this);
1079
-		checkerItem = menu.add(new MenuItem("Checker"));
1080
-		checkerItem.addActionListener(this);
10811143 		blobItem = menu.add(new MenuItem("Blob"));
10821144 		blobItem.addActionListener(this);
10831145 		latheItem = menu.add(new MenuItem("Lathe"));
10841146 		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);
10851152 		lightItem = menu.add(new MenuItem("Light"));
10861153 		lightItem.addActionListener(this);
10871154 		menu.add("-");
....@@ -1091,8 +1158,11 @@
10911158 		loopItem.addActionListener(this);
10921159 		doubleItem = menu.add(new MenuItem("Fork"));
10931160 		doubleItem.addActionListener(this);
1161
+        if (Globals.ADVANCED)
1162
+        {
10941163 		tripleItem = menu.add(new MenuItem("Trident"));
10951164 		tripleItem.addActionListener(this);
1165
+        }
10961166 	}
10971167         
10981168 	void buildToolsMenu(Menu menu)
....@@ -1106,19 +1176,21 @@
11061176 		parseverticesItem.addActionListener(this);
11071177 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
11081178 		textureFieldItem.addActionListener(this);
1109
-		alignItem = menu.add(new MenuItem("Align"));
1179
+		alignItem = menu.add(new MenuItem("Align Objects"));
11101180 		alignItem.addActionListener(this);
1111
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112
-		mirrorItem.addActionListener(this);
11131181 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11141182 		reduceMorphItem.addActionListener(this);
11151183 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11161184 		reduce34MorphItem.addActionListener(this);
1117
-                
1185
+		menu.add("-");
11181186 		menu.add(computeAOItem = new MenuItem("Compute AO"));
11191187 		computeAOItem.addActionListener(this);
1120
-		menu.add("-");
11211188                 
1189
+        if (Globals.ADVANCED)
1190
+        {
1191
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192
+		mirrorItem.addActionListener(this);
1193
+		menu.add("-");
11221194 		menu.add(memoryItem = new MenuItem("Memory Usage"));
11231195 		memoryItem.addActionListener(this);
11241196 		menu.add(analyzeItem = new MenuItem("Analyze"));
....@@ -1141,6 +1213,7 @@
11411213 		menu.add("-");
11421214 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
11431215 		editScriptItem.addActionListener(this);
1216
+        }
11441217         }
11451218         
11461219         void ScreenFit()
....@@ -1642,7 +1715,7 @@
16421715 		{
16431716 			makeSomething(new BezierSurface());
16441717 		} else
1645
-		if (source == checkerItem)
1718
+		if (source == overlayItem)
16461719 		{
16471720                     /*
16481721 			Object3D obj = new BezierSurface(5,8);
....@@ -1791,7 +1864,15 @@
17911864 		} else
17921865 		if (source == importOBJItem)
17931866 		{
1794
-			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
+                            }
17951876 		} else
17961877 		if (source == computeAOItem)
17971878 		{
....@@ -1829,6 +1910,11 @@
18291910 		if (source == dumpItem)
18301911 		{
18311912                     DumpObject();
1913
+		} else
1914
+		if (source == oneStepButton)
1915
+		{
1916
+                    Globals.ONESTEP = true;
1917
+                    cameraView.repaint();
18321918 		} else
18331919 		if (source == screenfitButton)
18341920 		{
....@@ -1902,13 +1988,17 @@
19021988 		{
19031989 			paste(false);
19041990 		} else
1991
+		if (source == pasteIntoItem)
1992
+		{
1993
+			pasteInto(true, false);
1994
+		} else
19051995 		if (source == pasteLinkItem)
19061996 		{
1907
-			pasteInto(false);
1997
+			pasteInto(false, false);
19081998 		} else
19091999 		if (source == pasteCloneItem)
19102000 		{
1911
-			pasteInto(true);
2001
+			pasteInto(true, true);
19122002 		} else
19132003 		if (source == pasteExpandItem)
19142004 		{
....@@ -2110,11 +2200,11 @@
21102200             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21112201                         for (int i=0; i<group.selection.size(); i++)
21122202                         {
2113
-                            boolean random = CameraPane.RANDOM;
2114
-                            CameraPane.RANDOM = false; // parse all random nodes
2203
+                            boolean random = CameraPane.SWITCH;
2204
+                            CameraPane.SWITCH = false; // parse all random nodes
21152205                             group.selection.get(i).linkVerticesThis(content);
21162206                       //      group.selection.get(i).setMasterThis(content); // should be identity
2117
-                            CameraPane.RANDOM = random;
2207
+                            CameraPane.SWITCH = random;
21182208                         }
21192209             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21202210 		refreshContents();
....@@ -2124,20 +2214,20 @@
21242214 		{
21252215                     for (int i=0; i<group.selection.size(); i++)
21262216                     {
2127
-                        boolean random = CameraPane.RANDOM;
2128
-                        CameraPane.RANDOM = false; // parse all random nodes
2217
+                        boolean random = CameraPane.SWITCH;
2218
+                        CameraPane.SWITCH = false; // parse all random nodes
21292219                         group.selection.get(i).linkVerticesThis(null);
2130
-                        CameraPane.RANDOM = random;
2220
+                        CameraPane.SWITCH = random;
21312221                     }
21322222 
21332223                     refreshContents();
21342224 		} else
21352225 		if (source == relinkverticesItem)
21362226 		{
2137
-                    boolean random = CameraPane.RANDOM;
2138
-                    CameraPane.RANDOM = false; // parse all random nodes
2227
+                    boolean random = CameraPane.SWITCH;
2228
+                    CameraPane.SWITCH = false; // parse all random nodes
21392229                     group.selection.RelinkToSupport();
2140
-                    CameraPane.RANDOM = random;
2230
+                    CameraPane.SWITCH = random;
21412231 
21422232                     refreshContents();
21432233 		} else
....@@ -2892,7 +2982,7 @@
28922982                                 
28932983                                 child.editWindow = null; // ???????????
28942984 			}
2895
-			objEditor.ctrlPanel.validate();
2985
+			objEditor.ctrlPanel.FlushUI();
28962986 			//objEditor.jTree.clearSelection();
28972987 			//objEditor.ResetSliders();
28982988                     refreshContents(true);
....@@ -3611,11 +3701,11 @@
36113701 
36123702             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36133703 
3614
-            boolean random = CameraPane.RANDOM;
3615
-            CameraPane.RANDOM = false; // parse all random nodes
3704
+            boolean random = CameraPane.SWITCH;
3705
+            CameraPane.SWITCH = false; // parse all random nodes
36163706             lowres.linkVerticesThis(null);
36173707             lowres.linkVerticesThis(sn);
3618
-            CameraPane.RANDOM = random;
3708
+            CameraPane.SWITCH = random;
36193709 
36203710             System.err.flush();
36213711 
....@@ -4373,7 +4463,7 @@
43734463 		refreshContents();
43744464 	}
43754465 	
4376
-	void pasteInto(boolean copyit)
4466
+	void pasteInto(boolean copyit, boolean clone)
43774467 	{
43784468 //		if (GrafreeD.clipboard == null)
43794469 //			return;
....@@ -4402,7 +4492,14 @@
44024492 		if (copyit)
44034493 		{
44044494 		//	paste(false);
4405
-                    CloneClipboard(false); // sept 2014
4495
+                        if (clone)
4496
+                        {
4497
+                            CloneClipboard(false); // sept 2014
4498
+                        }
4499
+                        else
4500
+                        {
4501
+                            paste(false);
4502
+                        }
44064503 		}
44074504 		else
44084505 		{
....@@ -4946,10 +5043,12 @@
49465043 	cButton flashSelectionButton;
49475044 	cButton editButton;
49485045 	cButton uneditButton;
5046
+	JCheckBox allParamsButton;
49495047 	cButton clearpanelButton;
4950
-	cButton allParamsButton;
49515048 	cButton unselectButton;
49525049 	
5050
+	cButton oneStepButton;
5051
+        
49535052 	cButton screenfitButton;
49545053 	cButton screenfitpointButton;
49555054 	cButton snapobjectButton;
....@@ -5004,6 +5103,7 @@
50045103 	private MenuItem mergeGeometriesItem;
50055104 	private MenuItem copyItem;
50065105 	private MenuItem pasteItem;
5106
+	private MenuItem pasteIntoItem;
50075107 	private MenuItem pasteLinkItem;
50085108 	private MenuItem pasteCloneItem;
50095109 	private MenuItem pasteExpandItem;
....@@ -5101,7 +5201,7 @@
51015201 	private MenuItem blobItem;
51025202 	private MenuItem latheItem;
51035203 	private MenuItem bezierItem;
5104
-	private MenuItem checkerItem;
5204
+	private MenuItem overlayItem;
51055205 	private MenuItem meshItem;
51065206 //	private MenuItem meshGroupItem;
51075207 	private MenuItem springItem;