blame | history | patch | commit | commitdiff
Normand Briere
2019-05-02 a7277e6c6381e55761f7fa87276260fac1c94d5e 
 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,11 +433,11 @@
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"));
394442 		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395443 		importGFDItem.addActionListener(this);
....@@ -440,6 +488,14 @@
440488                 liveCB.setToolTipText("Enabled animation");
441489                                 liveCB.addItemListener(this);
442490 
491
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
+                oneStepButton.setToolTipText("Animate one step forward");
493
+		oneStepButton.addActionListener(this);
494
+                
495
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
496
+                fastCB.setToolTipText("Fast mode");
497
+                                fastCB.addItemListener(this);
498
+                                
443499                 oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444500                 trackCB.setToolTipText("Enable tracking");
445501                                 trackCB.addItemListener(this);
....@@ -450,17 +506,14 @@
450506 
451507 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452508 //		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;
458509 
459
-                //aConstraints.gridx = 0;
460
-                //aConstraints.gridy += 1;
461
-		oe.aConstraints.weighty = 0;
462
-		oe.aConstraints.gridwidth = 1;
463
-		
510
+                if (Globals.ADVANCED)
511
+                {
512
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513
+                        snapobjectButton.addActionListener(this);
514
+                        snapobjectButton.setToolTipText("Snap Object");
515
+                }
516
+
464517 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465518                 flashSelectionButton.setToolTipText("Show selection");
466519 		flashSelectionButton.addActionListener(this);
....@@ -504,13 +557,13 @@
504557                 uneditButton.setToolTipText("Unedit selection");
505558 		uneditButton.addActionListener(this);
506559 
560
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561
+                allParamsButton.setToolTipText("Edit all params");
562
+		allParamsButton.addActionListener(this);
563
+
507564 		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508565                 clearPanelButton.setToolTipText("Clear edit panel");
509566 		clearPanelButton.addActionListener(this);
510
-
511
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
-                allParamsButton.setToolTipText("All params??");
513
-		allParamsButton.addActionListener(this);
514567 
515568 		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516569                 unselectButton.setToolTipText("Unselect");
....@@ -587,43 +640,35 @@
587640         
588641         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589642         {
590
-        	//constraints.gridx = 0;
591
-        	//constraints.gridy = 0;
592
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593
-                fastCB.setToolTipText("Fast mode");
594
-                                fastCB.addItemListener(this);
595
-        	//constraints.gridy += 1;
596
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597
-                supportCB.setToolTipText("Enabled rigging");
598
-                                supportCB.addItemListener(this);
599
-
600
-        //	constraints.gridy += 1;
601
-        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
602
-        //                        localCB.addItemListener(this);
603
-
604
-        	//constraints.gridy += 1;
605
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
606
-                crowdCB.setToolTipText("Used for crowds");
607
-                                crowdCB.addItemListener(this);
608
-
609
-        	//constraints.gridy += 1;
610
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
611
-                smoothCB.setToolTipText("Snapping delay");
612
-                                smoothCB.addItemListener(this);
613
-
614
-        	//constraints.gridy += 1;
615
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616
-                slowCB.setToolTipText("Smooth interpolation");
617
-                                slowCB.addItemListener(this);
618
-        	//constraints.gridy += 1;
619643                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620644                 boxCB.setToolTipText("Display bounding boxes");
621645                                 boxCB.addItemListener(this);
622
-        	//constraints.gridy += 1;
646
+                                
623647                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624648                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625649                                 zoomBoxCB.addItemListener(this);
626650 
651
+        if (Globals.ADVANCED)
652
+        {
653
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654
+                supportCB.setToolTipText("Enable rigging");
655
+                                supportCB.addItemListener(this);
656
+
657
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658
+        //                        localCB.addItemListener(this);
659
+
660
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661
+                crowdCB.setToolTipText("Used for crowds");
662
+                                crowdCB.addItemListener(this);
663
+
664
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
665
+                smoothCB.setToolTipText("Snapping delay");
666
+                                smoothCB.addItemListener(this);
667
+
668
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
669
+                slowCB.setToolTipText("Smooth interpolation");
670
+                                slowCB.addItemListener(this);
671
+                                
627672 //        	constraints.gridy += 1;
628673 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629674 //                                speakerMocapCB.addItemListener(this);
....@@ -648,14 +693,14 @@
648693 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649694 //                debugCB.addItemListener(this);
650695 
651
-        	//constraints.gridy += 1;
652696                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
653697                                 oeilCB.addItemListener(this);
654698 
655
-        	//constraints.gridy += 1;
656699                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657700                 lookAtCB.setToolTipText("Look-at target");
658701                                 lookAtCB.addItemListener(this);
702
+                
703
+        }
659704                                 
660705                 cGridBag fill = new cGridBag();
661706                                 
....@@ -946,11 +991,11 @@
946991             {
947992                 loadClipboard(true);
948993                 objEditor.jTree.setSelectionPath(destinationPath);
949
-                pasteInto(false);
994
+                pasteInto(false, false);
950995             } else {
951996                 loadClipboard(false);
952997                 objEditor.jTree.setSelectionPath(destinationPath);
953
-                pasteInto(false); // true); // ???
998
+                pasteInto(false, false); // true); // ???
954999             }
9551000 	}
9561001 	public void	dropActionChanged(DropTargetDragEvent dtde) 
....@@ -1072,27 +1117,33 @@
10721117 		kleinItem.addActionListener(this);
10731118 		particleItem = menu.add(new MenuItem("Particle system"));
10741119 		particleItem.addActionListener(this);
1120
+        if (Globals.ADVANCED)
1121
+        {
10751122 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
10761123 		ragdollItem.addActionListener(this);
10771124 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10781125 		ragdoll2Item.addActionListener(this);
1126
+        }
10791127 		menu.add("-");
1080
-		meshItem = menu.add(new MenuItem("Mesh"));
1128
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10811129 		meshItem.addActionListener(this);
10821130 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10831131 	//	meshGroupItem.addActionListener(this);
1132
+        if (Globals.ADVANCED)
1133
+        {
10841134 		springItem = menu.add(new MenuItem("Spring"));
10851135 		springItem.addActionListener(this);
10861136 		flagItem = menu.add(new MenuItem("Flag"));
10871137 		flagItem.addActionListener(this);
1088
-		bezierItem = menu.add(new MenuItem("Patch"));
1089
-		bezierItem.addActionListener(this);
1090
-		checkerItem = menu.add(new MenuItem("Checker"));
1091
-		checkerItem.addActionListener(this);
10921138 		blobItem = menu.add(new MenuItem("Blob"));
10931139 		blobItem.addActionListener(this);
10941140 		latheItem = menu.add(new MenuItem("Lathe"));
10951141 		latheItem.addActionListener(this);
1142
+        }
1143
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144
+		bezierItem.addActionListener(this);
1145
+		overlayItem = menu.add(new MenuItem("Overlay"));
1146
+		overlayItem.addActionListener(this);
10961147 		lightItem = menu.add(new MenuItem("Light"));
10971148 		lightItem.addActionListener(this);
10981149 		menu.add("-");
....@@ -1102,34 +1153,39 @@
11021153 		loopItem.addActionListener(this);
11031154 		doubleItem = menu.add(new MenuItem("Fork"));
11041155 		doubleItem.addActionListener(this);
1156
+        if (Globals.ADVANCED)
1157
+        {
11051158 		tripleItem = menu.add(new MenuItem("Trident"));
11061159 		tripleItem.addActionListener(this);
1160
+        }
11071161 	}
11081162         
11091163 	void buildToolsMenu(Menu menu)
11101164 	{
11111165 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
11121166 		animationItem.addItemListener(this);
1113
-                animationItem.setState(CameraPane.ANIMATION);
1167
+                animationItem.setState(Globals.ANIMATION);
11141168                 
11151169 		menu.add("-");
11161170 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
11171171 		parseverticesItem.addActionListener(this);
11181172 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
11191173 		textureFieldItem.addActionListener(this);
1120
-		alignItem = menu.add(new MenuItem("Align"));
1174
+		alignItem = menu.add(new MenuItem("Align Objects"));
11211175 		alignItem.addActionListener(this);
1122
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123
-		mirrorItem.addActionListener(this);
11241176 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11251177 		reduceMorphItem.addActionListener(this);
11261178 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11271179 		reduce34MorphItem.addActionListener(this);
1128
-                
1180
+		menu.add("-");
11291181 		menu.add(computeAOItem = new MenuItem("Compute AO"));
11301182 		computeAOItem.addActionListener(this);
1131
-		menu.add("-");
11321183                 
1184
+        if (Globals.ADVANCED)
1185
+        {
1186
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187
+		mirrorItem.addActionListener(this);
1188
+		menu.add("-");
11331189 		menu.add(memoryItem = new MenuItem("Memory Usage"));
11341190 		memoryItem.addActionListener(this);
11351191 		menu.add(analyzeItem = new MenuItem("Analyze"));
....@@ -1152,6 +1208,7 @@
11521208 		menu.add("-");
11531209 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
11541210 		editScriptItem.addActionListener(this);
1211
+        }
11551212         }
11561213         
11571214         void ScreenFit()
....@@ -1653,7 +1710,7 @@
16531710 		{
16541711 			makeSomething(new BezierSurface());
16551712 		} else
1656
-		if (source == checkerItem)
1713
+		if (source == overlayItem)
16571714 		{
16581715                     /*
16591716 			Object3D obj = new BezierSurface(5,8);
....@@ -1841,6 +1898,11 @@
18411898 		{
18421899                     DumpObject();
18431900 		} else
1901
+		if (source == oneStepButton)
1902
+		{
1903
+                    Globals.ONESTEP = true;
1904
+                    cameraView.repaint();
1905
+		} else
18441906 		if (source == screenfitButton)
18451907 		{
18461908 			//Reload(lastConverter, lastFilename, true);
....@@ -1913,13 +1975,17 @@
19131975 		{
19141976 			paste(false);
19151977 		} else
1978
+		if (source == pasteIntoItem)
1979
+		{
1980
+			pasteInto(true, false);
1981
+		} else
19161982 		if (source == pasteLinkItem)
19171983 		{
1918
-			pasteInto(false);
1984
+			pasteInto(false, false);
19191985 		} else
19201986 		if (source == pasteCloneItem)
19211987 		{
1922
-			pasteInto(true);
1988
+			pasteInto(true, true);
19231989 		} else
19241990 		if (source == pasteExpandItem)
19251991 		{
....@@ -2121,11 +2187,11 @@
21212187             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
21222188                         for (int i=0; i<group.selection.size(); i++)
21232189                         {
2124
-                            boolean random = CameraPane.RANDOM;
2125
-                            CameraPane.RANDOM = false; // parse all random nodes
2190
+                            boolean random = CameraPane.SWITCH;
2191
+                            CameraPane.SWITCH = false; // parse all random nodes
21262192                             group.selection.get(i).linkVerticesThis(content);
21272193                       //      group.selection.get(i).setMasterThis(content); // should be identity
2128
-                            CameraPane.RANDOM = random;
2194
+                            CameraPane.SWITCH = random;
21292195                         }
21302196             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21312197 		refreshContents();
....@@ -2135,20 +2201,20 @@
21352201 		{
21362202                     for (int i=0; i<group.selection.size(); i++)
21372203                     {
2138
-                        boolean random = CameraPane.RANDOM;
2139
-                        CameraPane.RANDOM = false; // parse all random nodes
2204
+                        boolean random = CameraPane.SWITCH;
2205
+                        CameraPane.SWITCH = false; // parse all random nodes
21402206                         group.selection.get(i).linkVerticesThis(null);
2141
-                        CameraPane.RANDOM = random;
2207
+                        CameraPane.SWITCH = random;
21422208                     }
21432209 
21442210                     refreshContents();
21452211 		} else
21462212 		if (source == relinkverticesItem)
21472213 		{
2148
-                    boolean random = CameraPane.RANDOM;
2149
-                    CameraPane.RANDOM = false; // parse all random nodes
2214
+                    boolean random = CameraPane.SWITCH;
2215
+                    CameraPane.SWITCH = false; // parse all random nodes
21502216                     group.selection.RelinkToSupport();
2151
-                    CameraPane.RANDOM = random;
2217
+                    CameraPane.SWITCH = random;
21522218 
21532219                     refreshContents();
21542220 		} else
....@@ -2246,7 +2312,7 @@
22462312                         RandomNode random = new RandomNode();
22472313 			group(random);
22482314                         if (random.size() > 0)
2249
-                            random.name = random.get(0).name + "Rnd";
2315
+                            random.name = random.get(0).name + "Switch";
22502316 		} else
22512317 		if (source == physicsItem)
22522318                 {
....@@ -2903,7 +2969,7 @@
29032969                                 
29042970                                 child.editWindow = null; // ???????????
29052971 			}
2906
-			objEditor.ctrlPanel.validate();
2972
+			objEditor.ctrlPanel.FlushUI();
29072973 			//objEditor.jTree.clearSelection();
29082974 			//objEditor.ResetSliders();
29092975                     refreshContents(true);
....@@ -3622,11 +3688,11 @@
36223688 
36233689             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
36243690 
3625
-            boolean random = CameraPane.RANDOM;
3626
-            CameraPane.RANDOM = false; // parse all random nodes
3691
+            boolean random = CameraPane.SWITCH;
3692
+            CameraPane.SWITCH = false; // parse all random nodes
36273693             lowres.linkVerticesThis(null);
36283694             lowres.linkVerticesThis(sn);
3629
-            CameraPane.RANDOM = random;
3695
+            CameraPane.SWITCH = random;
36303696 
36313697             System.err.flush();
36323698 
....@@ -4384,7 +4450,7 @@
43844450 		refreshContents();
43854451 	}
43864452 	
4387
-	void pasteInto(boolean copyit)
4453
+	void pasteInto(boolean copyit, boolean clone)
43884454 	{
43894455 //		if (GrafreeD.clipboard == null)
43904456 //			return;
....@@ -4413,7 +4479,14 @@
44134479 		if (copyit)
44144480 		{
44154481 		//	paste(false);
4416
-                    CloneClipboard(false); // sept 2014
4482
+                        if (clone)
4483
+                        {
4484
+                            CloneClipboard(false); // sept 2014
4485
+                        }
4486
+                        else
4487
+                        {
4488
+                            paste(false);
4489
+                        }
44174490 		}
44184491 		else
44194492 		{
....@@ -4957,10 +5030,12 @@
49575030 	cButton flashSelectionButton;
49585031 	cButton editButton;
49595032 	cButton uneditButton;
5033
+	JCheckBox allParamsButton;
49605034 	cButton clearpanelButton;
4961
-	cButton allParamsButton;
49625035 	cButton unselectButton;
49635036 	
5037
+	cButton oneStepButton;
5038
+        
49645039 	cButton screenfitButton;
49655040 	cButton screenfitpointButton;
49665041 	cButton snapobjectButton;
....@@ -5015,6 +5090,7 @@
50155090 	private MenuItem mergeGeometriesItem;
50165091 	private MenuItem copyItem;
50175092 	private MenuItem pasteItem;
5093
+	private MenuItem pasteIntoItem;
50185094 	private MenuItem pasteLinkItem;
50195095 	private MenuItem pasteCloneItem;
50205096 	private MenuItem pasteExpandItem;
....@@ -5112,7 +5188,7 @@
51125188 	private MenuItem blobItem;
51135189 	private MenuItem latheItem;
51145190 	private MenuItem bezierItem;
5115
-	private MenuItem checkerItem;
5191
+	private MenuItem overlayItem;
51165192 	private MenuItem meshItem;
51175193 //	private MenuItem meshGroupItem;
51185194 	private MenuItem springItem;