blame | history | patch | commit | commitdiff
Normand Briere
2019-05-02 c209bbe1cf788c9af3dcffea7667c830170a3f1f 
 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,36 +163,48 @@
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("-");
171
-		cloneItem = menu.add(new MenuItem("Clone"));
172
-		cloneItem.addActionListener(this);
173
-		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174
-		cloneSupportItem.addActionListener(this);
175
-		menu.add("-");
176174 		cutItem = menu.add(new MenuItem("Cut"));
177175 		cutItem.addActionListener(this);
178176 		copyItem = menu.add(new MenuItem("Copy"));
179177 		copyItem.addActionListener(this);
180178 		pasteItem = menu.add(new MenuItem("Paste"));
181179 		pasteItem.addActionListener(this);
180
+		menu.add("-");
181
+		cloneItem = menu.add(new MenuItem("Clone"));
182
+		cloneItem.addActionListener(this);
183
+		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184
+		cloneSupportItem.addActionListener(this);
185
+		menu.add("-");
186
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
187
+		pasteIntoItem.addActionListener(this);
182188 		pasteLinkItem = menu.add(new MenuItem("Paste link"));
183189 		pasteLinkItem.addActionListener(this);
184190 		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185191 		pasteCloneItem.addActionListener(this);
186192 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187193 //		pasteExpandItem.addActionListener(this);
194
+		menu.add("-");
188195 		clearItem = menu.add(new MenuItem("Clear"));
189196 		clearItem.addActionListener(this);
197
+                
198
+        if (Globals.ADVANCED)
199
+        {
200
+                // Deletes the cameras...
190201 		clearAllItem = menu.add(new MenuItem("Clear All"));
191202 		clearAllItem.addActionListener(this);
203
+        }
192204 
193205 		oe.menuBar.add(menu = new Menu("Setting"));
206
+        if (Globals.ADVANCED)
207
+        {
194208                 resetMeshItem = menu.add(new MenuItem("Reset All"));
195209 		resetMeshItem.addActionListener(this);
196210 		stepAllItem = menu.add(new MenuItem("Step All"));
....@@ -200,6 +214,7 @@
200214 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201215 		resetreferencesItem.addActionListener(this);
202216 		menu.add("-");
217
+        }
203218 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204219 		overwriteGeoItem.addActionListener(this);
205220 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -211,19 +226,26 @@
211226 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212227 		overwriteUVItem.addActionListener(this);
213228 		menu.add("-");
229
+        if (Globals.ADVANCED)
230
+        {
214231 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215232 		generateMeshItem.addActionListener(this);
216233 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217234 		poseMeshItem.addActionListener(this);
218235 		menu.add("-");
236
+        }
219237 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220238 		resetsupportItem.addActionListener(this);
221239 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222240 		linkverticesItem.addActionListener(this);
223241 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224242 		relinkverticesItem.addActionListener(this);
243
+                
244
+        if (Globals.ADVANCED)
245
+        {
225246 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226247 		setMasterItem.addActionListener(this);
248
+        }
227249                 
228250 		oe.menuBar.add(menu = new Menu("Group"));
229251 		grabItem = menu.add(new MenuItem("Grab"));
....@@ -234,27 +256,31 @@
234256 		frontItem.addActionListener(this);
235257 		compositeItem = menu.add(new MenuItem("Composite"));
236258 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
259
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238260 		hideItem.addActionListener(this);
239261 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240262 		ungroupItem.addActionListener(this);
241263 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
264
+		randomItem = menu.add(new MenuItem("Switch node"));
243265 		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);
248266 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249267 		switchGeoItem.addActionListener(this);
250268 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251269 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
270
+		morphItem = menu.add(new MenuItem("Morph Group"));
253271 		morphItem.addActionListener(this);
272
+                
273
+        if (Globals.ADVANCED)
274
+        {
275
+		physicsItem = menu.add(new MenuItem("Physics"));
276
+		physicsItem.addActionListener(this);
277
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278
+		frameselectorItem.addActionListener(this);
254279 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255280 		scriptNodeItem.addActionListener(this);
256281 		cameraItem = menu.add(new MenuItem("Camera"));
257282 		cameraItem.addActionListener(this);
283
+        }
258284                 
259285 		oe.menuBar.add(menu = new Menu("Object"));
260286 		textureItem = menu.add(new MenuItem("Texture"));
....@@ -269,15 +295,18 @@
269295 		shadowYItem.addActionListener(this);
270296                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271297 		shadowZItem.addActionListener(this);
298
+        if (Globals.ADVANCED)
299
+        {
272300 		linkerItem = menu.add(new MenuItem("Linker"));
273301 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276302 		attributeItem = menu.add(new MenuItem("Attribute"));
277303 		attributeItem.addActionListener(this);
304
+		templateItem = menu.add(new MenuItem("Template"));
305
+		templateItem.addActionListener(this);
278306 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279307 		pointflowItem.addActionListener(this);
280308 		menu.add("-");
309
+        }
281310 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282311 		resetTransformItem.addActionListener(this);
283312 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
....@@ -294,8 +323,11 @@
294323 		genNormalsCADItem.addActionListener(this);
295324 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296325 		genNormalsMESHItem.addActionListener(this);
326
+        if (Globals.ADVANCED)
327
+        {
297328 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298329 		genNormalsMINEItem.addActionListener(this);
330
+        }
299331 		stripifyItem = menu.add(new MenuItem("Stripify"));
300332 		stripifyItem.addActionListener(this);
301333 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -317,10 +349,14 @@
317349 		reduce34MeshItem.addActionListener(this);
318350 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319351 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322352 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323353 		clipMeshItem.addActionListener(this);
354
+                
355
+        if (Globals.ADVANCED)
356
+        {
357
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
358
+		smoothMeshItem.addActionListener(this);
359
+        }
324360 
325361                 oe.menuBar.add(menu = new Menu("Attributes"));
326362 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
....@@ -330,10 +366,13 @@
330366 		liveleavesItem.addActionListener(this);
331367 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332368 		unliveleavesItem.addActionListener(this);
369
+        if (Globals.ADVANCED)
370
+        {
333371 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334372 		supportleavesItem.addActionListener(this);
335373 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336374 		unsupportleavesItem.addActionListener(this);
375
+        }
337376 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338377 		hideleavesItem.addActionListener(this);
339378 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -376,6 +415,8 @@
376415 		sortbysizeItem.addActionListener(this);
377416 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378417 		sortbynameItem.addActionListener(this);
418
+        if (Globals.ADVANCED)
419
+        {
379420 		menu.add("-");
380421 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381422 		extractGeometriesItem.addActionListener(this);
....@@ -385,11 +426,11 @@
385426 		shareGeometriesItem.addActionListener(this);
386427 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387428 		mergeGeometriesItem.addActionListener(this);
429
+        }
388430                 
389431 		oe.menuBar.add(menu = new Menu("Insert"));
390432 		buildCreateMenu(menu);
391433                 
392
-               
393434                 oe.menuBar.add(menu = new Menu("Include"));
394435 		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395436 		importGFDItem.addActionListener(this);
....@@ -440,6 +481,10 @@
440481                 liveCB.setToolTipText("Enabled animation");
441482                                 liveCB.addItemListener(this);
442483 
484
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
485
+                oneStepButton.setToolTipText("Animate one step forward");
486
+		oneStepButton.addActionListener(this);
487
+                
443488                 oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444489                 fastCB.setToolTipText("Fast mode");
445490                                 fastCB.addItemListener(this);
....@@ -454,17 +499,14 @@
454499 
455500 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456501 //		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;
462502 
463
-                //aConstraints.gridx = 0;
464
-                //aConstraints.gridy += 1;
465
-		oe.aConstraints.weighty = 0;
466
-		oe.aConstraints.gridwidth = 1;
467
-		
503
+                if (Globals.ADVANCED)
504
+                {
505
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
506
+                        snapobjectButton.addActionListener(this);
507
+                        snapobjectButton.setToolTipText("Snap Object");
508
+                }
509
+
468510 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469511                 flashSelectionButton.setToolTipText("Show selection");
470512 		flashSelectionButton.addActionListener(this);
....@@ -508,13 +550,13 @@
508550                 uneditButton.setToolTipText("Unedit selection");
509551 		uneditButton.addActionListener(this);
510552 
553
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554
+                allParamsButton.setToolTipText("Edit all params");
555
+		allParamsButton.addActionListener(this);
556
+
511557 		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512558                 clearPanelButton.setToolTipText("Clear edit panel");
513559 		clearPanelButton.addActionListener(this);
514
-
515
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
-                allParamsButton.setToolTipText("All params??");
517
-		allParamsButton.addActionListener(this);
518560 
519561 		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520562                 unselectButton.setToolTipText("Unselect");
....@@ -591,8 +633,18 @@
591633         
592634         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593635         {
636
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637
+                boxCB.setToolTipText("Display bounding boxes");
638
+                                boxCB.addItemListener(this);
639
+                                
640
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641
+                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642
+                                zoomBoxCB.addItemListener(this);
643
+
644
+        if (Globals.ADVANCED)
645
+        {
594646                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595
-                supportCB.setToolTipText("Enabled rigging");
647
+                supportCB.setToolTipText("Enable rigging");
596648                                 supportCB.addItemListener(this);
597649 
598650         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
....@@ -610,14 +662,6 @@
610662                 slowCB.setToolTipText("Smooth interpolation");
611663                                 slowCB.addItemListener(this);
612664                                 
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
-
621665 //        	constraints.gridy += 1;
622666 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623667 //                                speakerMocapCB.addItemListener(this);
....@@ -648,6 +692,8 @@
648692                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649693                 lookAtCB.setToolTipText("Look-at target");
650694                                 lookAtCB.addItemListener(this);
695
+                
696
+        }
651697                                 
652698                 cGridBag fill = new cGridBag();
653699                                 
....@@ -938,11 +984,11 @@
938984             {
939985                 loadClipboard(true);
940986                 objEditor.jTree.setSelectionPath(destinationPath);
941
-                pasteInto(false);
987
+                pasteInto(false, false);
942988             } else {
943989                 loadClipboard(false);
944990                 objEditor.jTree.setSelectionPath(destinationPath);
945
-                pasteInto(false); // true); // ???
991
+                pasteInto(false, false); // true); // ???
946992             }
947993 	}
948994 	public void	dropActionChanged(DropTargetDragEvent dtde) 
....@@ -1064,27 +1110,33 @@
10641110 		kleinItem.addActionListener(this);
10651111 		particleItem = menu.add(new MenuItem("Particle system"));
10661112 		particleItem.addActionListener(this);
1113
+        if (Globals.ADVANCED)
1114
+        {
10671115 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
10681116 		ragdollItem.addActionListener(this);
10691117 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10701118 		ragdoll2Item.addActionListener(this);
1119
+        }
10711120 		menu.add("-");
1072
-		meshItem = menu.add(new MenuItem("Mesh"));
1121
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10731122 		meshItem.addActionListener(this);
10741123 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10751124 	//	meshGroupItem.addActionListener(this);
1125
+        if (Globals.ADVANCED)
1126
+        {
10761127 		springItem = menu.add(new MenuItem("Spring"));
10771128 		springItem.addActionListener(this);
10781129 		flagItem = menu.add(new MenuItem("Flag"));
10791130 		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);
10841131 		blobItem = menu.add(new MenuItem("Blob"));
10851132 		blobItem.addActionListener(this);
10861133 		latheItem = menu.add(new MenuItem("Lathe"));
10871134 		latheItem.addActionListener(this);
1135
+        }
1136
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137
+		bezierItem.addActionListener(this);
1138
+		overlayItem = menu.add(new MenuItem("Overlay"));
1139
+		overlayItem.addActionListener(this);
10881140 		lightItem = menu.add(new MenuItem("Light"));
10891141 		lightItem.addActionListener(this);
10901142 		menu.add("-");
....@@ -1094,8 +1146,11 @@
10941146 		loopItem.addActionListener(this);
10951147 		doubleItem = menu.add(new MenuItem("Fork"));
10961148 		doubleItem.addActionListener(this);
1149
+        if (Globals.ADVANCED)
1150
+        {
10971151 		tripleItem = menu.add(new MenuItem("Trident"));
10981152 		tripleItem.addActionListener(this);
1153
+        }
10991154 	}
11001155         
11011156 	void buildToolsMenu(Menu menu)
....@@ -1109,10 +1164,8 @@
11091164 		parseverticesItem.addActionListener(this);
11101165 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
11111166 		textureFieldItem.addActionListener(this);
1112
-		alignItem = menu.add(new MenuItem("Align"));
1167
+		alignItem = menu.add(new MenuItem("Align Object"));
11131168 		alignItem.addActionListener(this);
1114
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115
-		mirrorItem.addActionListener(this);
11161169 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11171170 		reduceMorphItem.addActionListener(this);
11181171 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
....@@ -1120,8 +1173,12 @@
11201173                 
11211174 		menu.add(computeAOItem = new MenuItem("Compute AO"));
11221175 		computeAOItem.addActionListener(this);
1123
-		menu.add("-");
11241176                 
1177
+        if (Globals.ADVANCED)
1178
+        {
1179
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180
+		mirrorItem.addActionListener(this);
1181
+		menu.add("-");
11251182 		menu.add(memoryItem = new MenuItem("Memory Usage"));
11261183 		memoryItem.addActionListener(this);
11271184 		menu.add(analyzeItem = new MenuItem("Analyze"));
....@@ -1144,6 +1201,7 @@
11441201 		menu.add("-");
11451202 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
11461203 		editScriptItem.addActionListener(this);
1204
+        }
11471205         }
11481206         
11491207         void ScreenFit()
....@@ -1645,7 +1703,7 @@
16451703 		{
16461704 			makeSomething(new BezierSurface());
16471705 		} else
1648
-		if (source == checkerItem)
1706
+		if (source == overlayItem)
16491707 		{
16501708                     /*
16511709 			Object3D obj = new BezierSurface(5,8);
....@@ -1833,6 +1891,11 @@
18331891 		{
18341892                     DumpObject();
18351893 		} else
1894
+		if (source == oneStepButton)
1895
+		{
1896
+                    Globals.ONESTEP = true;
1897
+                    cameraView.repaint();
1898
+		} else
18361899 		if (source == screenfitButton)
18371900 		{
18381901 			//Reload(lastConverter, lastFilename, true);
....@@ -1905,13 +1968,17 @@
19051968 		{
19061969 			paste(false);
19071970 		} else
1971
+		if (source == pasteIntoItem)
1972
+		{
1973
+			pasteInto(true, false);
1974
+		} else
19081975 		if (source == pasteLinkItem)
19091976 		{
1910
-			pasteInto(false);
1977
+			pasteInto(false, false);
19111978 		} else
19121979 		if (source == pasteCloneItem)
19131980 		{
1914
-			pasteInto(true);
1981
+			pasteInto(true, true);
19151982 		} else
19161983 		if (source == pasteExpandItem)
19171984 		{
....@@ -2113,11 +2180,11 @@
21132180             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21142181                         for (int i=0; i<group.selection.size(); i++)
21152182                         {
2116
-                            boolean random = CameraPane.RANDOM;
2117
-                            CameraPane.RANDOM = false; // parse all random nodes
2183
+                            boolean random = CameraPane.SWITCH;
2184
+                            CameraPane.SWITCH = false; // parse all random nodes
21182185                             group.selection.get(i).linkVerticesThis(content);
21192186                       //      group.selection.get(i).setMasterThis(content); // should be identity
2120
-                            CameraPane.RANDOM = random;
2187
+                            CameraPane.SWITCH = random;
21212188                         }
21222189             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21232190 		refreshContents();
....@@ -2127,20 +2194,20 @@
21272194 		{
21282195                     for (int i=0; i<group.selection.size(); i++)
21292196                     {
2130
-                        boolean random = CameraPane.RANDOM;
2131
-                        CameraPane.RANDOM = false; // parse all random nodes
2197
+                        boolean random = CameraPane.SWITCH;
2198
+                        CameraPane.SWITCH = false; // parse all random nodes
21322199                         group.selection.get(i).linkVerticesThis(null);
2133
-                        CameraPane.RANDOM = random;
2200
+                        CameraPane.SWITCH = random;
21342201                     }
21352202 
21362203                     refreshContents();
21372204 		} else
21382205 		if (source == relinkverticesItem)
21392206 		{
2140
-                    boolean random = CameraPane.RANDOM;
2141
-                    CameraPane.RANDOM = false; // parse all random nodes
2207
+                    boolean random = CameraPane.SWITCH;
2208
+                    CameraPane.SWITCH = false; // parse all random nodes
21422209                     group.selection.RelinkToSupport();
2143
-                    CameraPane.RANDOM = random;
2210
+                    CameraPane.SWITCH = random;
21442211 
21452212                     refreshContents();
21462213 		} else
....@@ -2238,7 +2305,7 @@
22382305                         RandomNode random = new RandomNode();
22392306 			group(random);
22402307                         if (random.size() > 0)
2241
-                            random.name = random.get(0).name + "Rnd";
2308
+                            random.name = random.get(0).name + "Switch";
22422309 		} else
22432310 		if (source == physicsItem)
22442311                 {
....@@ -2895,7 +2962,7 @@
28952962                                 
28962963                                 child.editWindow = null; // ???????????
28972964 			}
2898
-			objEditor.ctrlPanel.validate();
2965
+			objEditor.ctrlPanel.FlushUI();
28992966 			//objEditor.jTree.clearSelection();
29002967 			//objEditor.ResetSliders();
29012968                     refreshContents(true);
....@@ -3614,11 +3681,11 @@
36143681 
36153682             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36163683 
3617
-            boolean random = CameraPane.RANDOM;
3618
-            CameraPane.RANDOM = false; // parse all random nodes
3684
+            boolean random = CameraPane.SWITCH;
3685
+            CameraPane.SWITCH = false; // parse all random nodes
36193686             lowres.linkVerticesThis(null);
36203687             lowres.linkVerticesThis(sn);
3621
-            CameraPane.RANDOM = random;
3688
+            CameraPane.SWITCH = random;
36223689 
36233690             System.err.flush();
36243691 
....@@ -4376,7 +4443,7 @@
43764443 		refreshContents();
43774444 	}
43784445 	
4379
-	void pasteInto(boolean copyit)
4446
+	void pasteInto(boolean copyit, boolean clone)
43804447 	{
43814448 //		if (GrafreeD.clipboard == null)
43824449 //			return;
....@@ -4405,7 +4472,14 @@
44054472 		if (copyit)
44064473 		{
44074474 		//	paste(false);
4408
-                    CloneClipboard(false); // sept 2014
4475
+                        if (clone)
4476
+                        {
4477
+                            CloneClipboard(false); // sept 2014
4478
+                        }
4479
+                        else
4480
+                        {
4481
+                            paste(false);
4482
+                        }
44094483 		}
44104484 		else
44114485 		{
....@@ -4949,10 +5023,12 @@
49495023 	cButton flashSelectionButton;
49505024 	cButton editButton;
49515025 	cButton uneditButton;
5026
+	JCheckBox allParamsButton;
49525027 	cButton clearpanelButton;
4953
-	cButton allParamsButton;
49545028 	cButton unselectButton;
49555029 	
5030
+	cButton oneStepButton;
5031
+        
49565032 	cButton screenfitButton;
49575033 	cButton screenfitpointButton;
49585034 	cButton snapobjectButton;
....@@ -5007,6 +5083,7 @@
50075083 	private MenuItem mergeGeometriesItem;
50085084 	private MenuItem copyItem;
50095085 	private MenuItem pasteItem;
5086
+	private MenuItem pasteIntoItem;
50105087 	private MenuItem pasteLinkItem;
50115088 	private MenuItem pasteCloneItem;
50125089 	private MenuItem pasteExpandItem;
....@@ -5104,7 +5181,7 @@
51045181 	private MenuItem blobItem;
51055182 	private MenuItem latheItem;
51065183 	private MenuItem bezierItem;
5107
-	private MenuItem checkerItem;
5184
+	private MenuItem overlayItem;
51085185 	private MenuItem meshItem;
51095186 //	private MenuItem meshGroupItem;
51105187 	private MenuItem springItem;