~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -150,6 +150,8 @@
150	150
151	151	void SetupMenu2(ObjEditor oe)
152	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
153	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,17 +163,21 @@
161	163	lookAtItem.addActionListener(this);
162	164	//lookFromItem.addActinoListener(this);
163	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
164	168	Menu menu;
165	169	oe.menuBar.add(menu = new Menu("Edit"));
166	170	//editItem = menu.add(new MenuItem("Edit"));
167	171	//editItem.addActionListener(this);
168	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
169	173	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	174	cloneItem = menu.add(new MenuItem("Clone"));
172	175	cloneItem.addActionListener(this);
	176	+ if (Globals.ADVANCED)
	177	+ {
173	178	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	179	cloneSupportItem.addActionListener(this);
	180	+ }
175	181	menu.add("-");
176	182	cutItem = menu.add(new MenuItem("Cut"));
177	183	cutItem.addActionListener(this);
..	..	@@ -179,18 +185,31 @@
179	185	copyItem.addActionListener(this);
180	186	pasteItem = menu.add(new MenuItem("Paste"));
181	187	pasteItem.addActionListener(this);
	188	+ menu.add("-");
	189	+
	190	+ menu.add("-");
	191	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	192	+ pasteIntoItem.addActionListener(this);
182	193	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	194	pasteLinkItem.addActionListener(this);
184	195	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	196	pasteCloneItem.addActionListener(this);
186	197	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	198	// pasteExpandItem.addActionListener(this);
	199	+ menu.add("-");
188	200	clearItem = menu.add(new MenuItem("Clear"));
189	201	clearItem.addActionListener(this);
	202	+
	203	+ if (Globals.ADVANCED)
	204	+ {
	205	+ // Deletes the cameras...
190	206	clearAllItem = menu.add(new MenuItem("Clear All"));
191	207	clearAllItem.addActionListener(this);
	208	+ }
192	209
193	210	oe.menuBar.add(menu = new Menu("Setting"));
	211	+ if (Globals.ADVANCED)
	212	+ {
194	213	resetMeshItem = menu.add(new MenuItem("Reset All"));
195	214	resetMeshItem.addActionListener(this);
196	215	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -200,6 +219,7 @@
200	219	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	220	resetreferencesItem.addActionListener(this);
202	221	menu.add("-");
	222	+ }
203	223	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	224	overwriteGeoItem.addActionListener(this);
205	225	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +231,26 @@
211	231	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	232	overwriteUVItem.addActionListener(this);
213	233	menu.add("-");
	234	+ if (Globals.ADVANCED)
	235	+ {
214	236	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	237	generateMeshItem.addActionListener(this);
216	238	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	239	poseMeshItem.addActionListener(this);
218	240	menu.add("-");
	241	+ }
219	242	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	243	resetsupportItem.addActionListener(this);
221	244	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	245	linkverticesItem.addActionListener(this);
223	246	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	247	relinkverticesItem.addActionListener(this);
	248	+
	249	+ if (Globals.ADVANCED)
	250	+ {
225	251	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	252	setMasterItem.addActionListener(this);
	253	+ }
227	254
228	255	oe.menuBar.add(menu = new Menu("Group"));
229	256	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,27 +261,32 @@
234	261	frontItem.addActionListener(this);
235	262	compositeItem = menu.add(new MenuItem("Composite"));
236	263	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	264	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	265	hideItem.addActionListener(this);
239	266	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	267	ungroupItem.addActionListener(this);
241	268	menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
	269	+ randomItem = menu.add(new MenuItem("Switch node"));
243	270	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);
248	271	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	272	switchGeoItem.addActionListener(this);
250	273	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	274	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	275	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	276	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);
254	285	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	286	scriptNodeItem.addActionListener(this);
256	287	cameraItem = menu.add(new MenuItem("Camera"));
257	288	cameraItem.addActionListener(this);
	289	+ }
258	290
259	291	oe.menuBar.add(menu = new Menu("Object"));
260	292	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -269,14 +301,18 @@
269	301	shadowYItem.addActionListener(this);
270	302	shadowZItem = menu.add(new MenuItem("Shadow Z"));
271	303	shadowZItem.addActionListener(this);
	304	+ if (Globals.ADVANCED)
	305	+ {
	306	+ menu.add("-");
272	307	linkerItem = menu.add(new MenuItem("Linker"));
273	308	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	309	attributeItem = menu.add(new MenuItem("Attribute"));
277	310	attributeItem.addActionListener(this);
	311	+ templateItem = menu.add(new MenuItem("Template"));
	312	+ templateItem.addActionListener(this);
278	313	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	314	pointflowItem.addActionListener(this);
	315	+ }
280	316	menu.add("-");
281	317	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	318	resetTransformItem.addActionListener(this);
..	..	@@ -294,8 +330,11 @@
294	330	genNormalsCADItem.addActionListener(this);
295	331	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	332	genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
297	335	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	336	genNormalsMINEItem.addActionListener(this);
	337	+ }
299	338	stripifyItem = menu.add(new MenuItem("Stripify"));
300	339	stripifyItem.addActionListener(this);
301	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,10 +356,14 @@
317	356	reduce34MeshItem.addActionListener(this);
318	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	358	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
324	367
325	368	oe.menuBar.add(menu = new Menu("Attributes"));
326	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -330,10 +373,13 @@
330	373	liveleavesItem.addActionListener(this);
331	374	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	375	unliveleavesItem.addActionListener(this);
	376	+ if (Globals.ADVANCED)
	377	+ {
333	378	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	379	supportleavesItem.addActionListener(this);
335	380	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	381	unsupportleavesItem.addActionListener(this);
	382	+ }
337	383	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	384	hideleavesItem.addActionListener(this);
339	385	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,6 +422,8 @@
376	422	sortbysizeItem.addActionListener(this);
377	423	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	424	sortbynameItem.addActionListener(this);
	425	+ if (Globals.ADVANCED)
	426	+ {
379	427	menu.add("-");
380	428	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	429	extractGeometriesItem.addActionListener(this);
..	..	@@ -385,20 +433,23 @@
385	433	shareGeometriesItem.addActionListener(this);
386	434	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387	435	mergeGeometriesItem.addActionListener(this);
	436	+ }
388	437
389	438	oe.menuBar.add(menu = new Menu("Insert"));
390	439	buildCreateMenu(menu);
391	440
392		-
393	441	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..."));
399	443	importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	444	+ menu.add("-");
	445	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
401	446	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);
402	453
403	454	oe.menuBar.add(menu = new Menu("Tools"));
404	455	buildToolsMenu(menu);
..	..	@@ -436,96 +487,96 @@
436	487	*/
437	488	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	489
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	490	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440	491	liveCB.setToolTipText("Enabled animation");
441	492	liveCB.addItemListener(this);
442	493
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	494	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	495	+ oneStepButton.setToolTipText("Animate one step forward");
	496	+ oneStepButton.addActionListener(this);
	497	+
	498	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	499	+ fastCB.setToolTipText("Fast mode");
	500	+ fastCB.addItemListener(this);
	501	+
	502	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444	503	trackCB.setToolTipText("Enable tracking");
445	504	trackCB.addItemListener(this);
446	505
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	506	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	507	screenfitButton.setToolTipText("Screen fit");
449	508	screenfitButton.addActionListener(this);
450	509
451	510	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	511	// 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;
458	512
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	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	+
	520	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465	521	flashSelectionButton.setToolTipText("Show selection");
466	522	flashSelectionButton.addActionListener(this);
467	523
468	524	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469	525
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	526	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	527	twoButton.setToolTipText("Show center view only");
472	528	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	530	fourButton.addActionListener(this);
475	531	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	532	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	533	sixButton.setToolTipText("2-column layout left");
478	534	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	536	threeButton.setToolTipText("2-column layout right");
481	537	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	538	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	539	sevenButton.setToolTipText("3-column layout");
484	540	sevenButton.addActionListener(this);
485	541	//
486	542
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit object in new tab");
	543	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	544	+ rootButton.setToolTipText("Edit selection in new tab");
489	545	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	546	+
	547	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	548	closeButton.setToolTipText("Close tab");
493	549	closeButton.addActionListener(this);
494	550	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	551	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497	552
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	553	+ cGridBag commandsPanel = new cGridBag();
	554	+
	555	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	556	+ editButton.setToolTipText("Edit selection");
500	557	editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	558
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	559	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	560	+ uneditButton.setToolTipText("Unedit selection");
506	561	uneditButton.addActionListener(this);
507	562
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	563	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	564	+ allParamsButton.setToolTipText("Edit all params");
520	565	allParamsButton.addActionListener(this);
521	566
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	567	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	568	+ clearPanelButton.setToolTipText("Clear edit panel");
	569	+ clearPanelButton.addActionListener(this);
	570	+
	571	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	572	+ unselectButton.setToolTipText("Unselect");
527	573	unselectButton.addActionListener(this);
528	574
	575	+ commandsPanel.preferredHeight = 1;
	576	+
	577	+ oe.treePanel.add(commandsPanel);
	578	+ oe.treePanel.Return();
	579	+
529	580	// oe.aConstraints.gridx += 1;
530	581	// oe.aConstraints.weighty = 0;
531	582	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +588,37 @@
537	588	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	589	// gcButton.addActionListener(this);
539	590
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	591	+ cGridBag jSPPanel = new cGridBag();
	592	+
	593	+ JScrollPane jSP;
551	594	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	595	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553	596	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
	597	+
	598	+ oe.treePanel.add(jSPPanel);
	599	+ oe.treePanel.Return();
558	600
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	601	+ cGridBag copyOptionsPanel = new cGridBag();
	602	+
	603	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	604	+ colorCB.setToolTipText("Copy color when dropped");
563	605	colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	606	+
	607	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	608	+ materialCB.setToolTipText("Copy material when dropped");
566	609	materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	610	+
	611	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	612	+ textureCB.setToolTipText("Copy texture when dropped");
569	613	textureCB.addItemListener(this);
570	614
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
	615	+ copyOptionsPanel.preferredHeight = 1;
	616	+ oe.treePanel.add(copyOptionsPanel);
	617	+ oe.treePanel.Return();
573	618
	619	+// mainPanel.setDividerLocation(0.5); //1.0);
	620	+// mainPanel.setResizeWeight(0.5);
	621	+
574	622	//jList.addListSelectionListener(this);
575	623	oe.jTree.addTreeSelectionListener(this);
576	624	//jTree.setRootVisible(false);
..	..	@@ -595,43 +643,35 @@
595	643
596	644	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	645	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- supportCB.addItemListener(this);
607		-
608		- // constraints.gridy += 1;
609		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610		- // localCB.addItemListener(this);
611		-
612		- //constraints.gridy += 1;
613		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614		- crowdCB.setToolTipText("Used for crowds");
615		- crowdCB.addItemListener(this);
616		-
617		- //constraints.gridy += 1;
618		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619		- smoothCB.setToolTipText("Snapping delay");
620		- smoothCB.addItemListener(this);
621		-
622		- //constraints.gridy += 1;
623		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624		- slowCB.setToolTipText("Smooth interpolation");
625		- slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627	646	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628	647	boxCB.setToolTipText("Display bounding boxes");
629	648	boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
	649	+
631	650	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632	651	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633	652	zoomBoxCB.addItemListener(this);
634	653
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	657	+ supportCB.setToolTipText("Enable rigging");
	658	+ supportCB.addItemListener(this);
	659	+
	660	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	661	+ // localCB.addItemListener(this);
	662	+
	663	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	664	+ crowdCB.setToolTipText("Used for crowds");
	665	+ crowdCB.addItemListener(this);
	666	+
	667	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	668	+ smoothCB.setToolTipText("Snapping delay");
	669	+ smoothCB.addItemListener(this);
	670	+
	671	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	672	+ slowCB.setToolTipText("Smooth interpolation");
	673	+ slowCB.addItemListener(this);
	674	+
635	675	// constraints.gridy += 1;
636	676	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	677	// speakerMocapCB.addItemListener(this);
..	..	@@ -656,14 +696,20 @@
656	696	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	697	// debugCB.addItemListener(this);
658	698
659		- //constraints.gridy += 1;
660	699	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
661	700	oeilCB.addItemListener(this);
662	701
663		- //constraints.gridy += 1;
664	702	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	703	lookAtCB.setToolTipText("Look-at target");
666	704	lookAtCB.addItemListener(this);
	705	+
	706	+ }
	707	+
	708	+ cGridBag fill = new cGridBag();
	709	+
	710	+ fill.preferredHeight = 200;
	711	+
	712	+ panel.add(fill);
667	713
668	714	}
669	715
..	..	@@ -894,7 +940,9 @@
894	940	// objEditor.DropFile((java.io.File[]) object, true);
895	941	// return;
896	942	// }
897		- if (string.charAt(0) == '/')
	943	+
	944	+ // File path for Mac and Windows
	945	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	946	{
899	947	// file(s)
900	948	String[] names = string.split("\n");
..	..	@@ -921,7 +969,7 @@
921	969
922	970	flashIt = false;
923	971	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	972	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	973	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	974
927	975	if (group.selection.size() == 1)
..	..	@@ -948,11 +996,11 @@
948	996	{
949	997	loadClipboard(true);
950	998	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
	999	+ pasteInto(false, false);
952	1000	} else {
953	1001	loadClipboard(false);
954	1002	objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
	1003	+ pasteInto(false, false); // true); // ???
956	1004	}
957	1005	}
958	1006	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1074,27 +1122,33 @@
1074	1122	kleinItem.addActionListener(this);
1075	1123	particleItem = menu.add(new MenuItem("Particle system"));
1076	1124	particleItem.addActionListener(this);
	1125	+ if (Globals.ADVANCED)
	1126	+ {
1077	1127	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1128	ragdollItem.addActionListener(this);
1079	1129	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1130	ragdoll2Item.addActionListener(this);
	1131	+ }
1081	1132	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1133	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1134	meshItem.addActionListener(this);
1084	1135	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1136	// meshGroupItem.addActionListener(this);
	1137	+ if (Globals.ADVANCED)
	1138	+ {
1086	1139	springItem = menu.add(new MenuItem("Spring"));
1087	1140	springItem.addActionListener(this);
1088	1141	flagItem = menu.add(new MenuItem("Flag"));
1089	1142	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1143	blobItem = menu.add(new MenuItem("Blob"));
1095	1144	blobItem.addActionListener(this);
1096	1145	latheItem = menu.add(new MenuItem("Lathe"));
1097	1146	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);
1098	1152	lightItem = menu.add(new MenuItem("Light"));
1099	1153	lightItem.addActionListener(this);
1100	1154	menu.add("-");
..	..	@@ -1104,34 +1158,39 @@
1104	1158	loopItem.addActionListener(this);
1105	1159	doubleItem = menu.add(new MenuItem("Fork"));
1106	1160	doubleItem.addActionListener(this);
	1161	+ if (Globals.ADVANCED)
	1162	+ {
1107	1163	tripleItem = menu.add(new MenuItem("Trident"));
1108	1164	tripleItem.addActionListener(this);
	1165	+ }
1109	1166	}
1110	1167
1111	1168	void buildToolsMenu(Menu menu)
1112	1169	{
1113	1170	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1171	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1172	+ animationItem.setState(Globals.ANIMATION);
1116	1173
1117	1174	menu.add("-");
1118	1175	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1176	parseverticesItem.addActionListener(this);
1120	1177	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1178	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1179	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1180	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1181	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1182	reduceMorphItem.addActionListener(this);
1128	1183	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1184	reduce34MorphItem.addActionListener(this);
1130		-
	1185	+ menu.add("-");
1131	1186	menu.add(computeAOItem = new MenuItem("Compute AO"));
1132	1187	computeAOItem.addActionListener(this);
1133		- menu.add("-");
1134	1188
	1189	+ if (Globals.ADVANCED)
	1190	+ {
	1191	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1192	+ mirrorItem.addActionListener(this);
	1193	+ menu.add("-");
1135	1194	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	1195	memoryItem.addActionListener(this);
1137	1196	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1154,6 +1213,7 @@
1154	1213	menu.add("-");
1155	1214	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1215	editScriptItem.addActionListener(this);
	1216	+ }
1157	1217	}
1158	1218
1159	1219	void ScreenFit()
..	..	@@ -1482,9 +1542,9 @@
1482	1542
1483	1543	void Overwrite(int mask)
1484	1544	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1545	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1546	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1547	+ Object3D content = Grafreed.clipboard.get(0);
1488	1548
1489	1549	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1550	content = ((cGroup)content).get(0);
..	..	@@ -1655,7 +1715,7 @@
1655	1715	{
1656	1716	makeSomething(new BezierSurface());
1657	1717	} else
1658		- if (source == checkerItem)
	1718	+ if (source == overlayItem)
1659	1719	{
1660	1720	/*
1661	1721	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1804,7 +1864,15 @@
1804	1864	} else
1805	1865	if (source == importOBJItem)
1806	1866	{
1807		- 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	+ }
1808	1876	} else
1809	1877	if (source == computeAOItem)
1810	1878	{
..	..	@@ -1824,7 +1892,7 @@
1824	1892	if (source == invariantsItem)
1825	1893	{
1826	1894	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	1895	+ Grafreed.grafreeD.universe.invariants();
1828	1896	} else
1829	1897	if (source == memoryItem)
1830	1898	{
..	..	@@ -1842,6 +1910,11 @@
1842	1910	if (source == dumpItem)
1843	1911	{
1844	1912	DumpObject();
	1913	+ } else
	1914	+ if (source == oneStepButton)
	1915	+ {
	1916	+ Globals.ONESTEP = true;
	1917	+ cameraView.repaint();
1845	1918	} else
1846	1919	if (source == screenfitButton)
1847	1920	{
..	..	@@ -1894,10 +1967,10 @@
1894	1967	} else
1895	1968	if (source == duplicateItem)
1896	1969	{
1897		- Object3D keep = GrafreeD.clipboard;
	1970	+ Object3D keep = Grafreed.clipboard;
1898	1971	loadClipboard(false);
1899	1972	paste(false);
1900		- GrafreeD.clipboard = keep;
	1973	+ Grafreed.clipboard = keep;
1901	1974	} else
1902	1975	if (source == cloneItem)
1903	1976	{
..	..	@@ -1915,13 +1988,17 @@
1915	1988	{
1916	1989	paste(false);
1917	1990	} else
	1991	+ if (source == pasteIntoItem)
	1992	+ {
	1993	+ pasteInto(true, false);
	1994	+ } else
1918	1995	if (source == pasteLinkItem)
1919	1996	{
1920		- pasteInto(false);
	1997	+ pasteInto(false, false);
1921	1998	} else
1922	1999	if (source == pasteCloneItem)
1923	2000	{
1924		- pasteInto(true);
	2001	+ pasteInto(true, true);
1925	2002	} else
1926	2003	if (source == pasteExpandItem)
1927	2004	{
..	..	@@ -2113,9 +2190,9 @@
2113	2190	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2191	// refreshContents();
2115	2192	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2193	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2194	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2195	+ Object3D content = Grafreed.clipboard.get(0);
2119	2196
2120	2197	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2198	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2200,11 @@
2123	2200	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2201	for (int i=0; i<group.selection.size(); i++)
2125	2202	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2203	+ boolean random = CameraPane.SWITCH;
	2204	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2205	group.selection.get(i).linkVerticesThis(content);
2129	2206	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2207	+ CameraPane.SWITCH = random;
2131	2208	}
2132	2209	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2210	refreshContents();
..	..	@@ -2137,20 +2214,20 @@
2137	2214	{
2138	2215	for (int i=0; i<group.selection.size(); i++)
2139	2216	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2217	+ boolean random = CameraPane.SWITCH;
	2218	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2219	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2220	+ CameraPane.SWITCH = random;
2144	2221	}
2145	2222
2146	2223	refreshContents();
2147	2224	} else
2148	2225	if (source == relinkverticesItem)
2149	2226	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2227	+ boolean random = CameraPane.SWITCH;
	2228	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2229	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2230	+ CameraPane.SWITCH = random;
2154	2231
2155	2232	refreshContents();
2156	2233	} else
..	..	@@ -2165,9 +2242,9 @@
2165	2242	} else
2166	2243	if (source == setMasterItem)
2167	2244	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2245	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2246	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2247	+ Object3D content = Grafreed.clipboard.get(0);
2171	2248
2172	2249	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2250	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2257,9 @@
2180	2257	{
2181	2258	if (group.selection.size() == 1)
2182	2259	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2260	+ if (Grafreed.clipboard.size() == 1)
2184	2261	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2262	+ Object3D content = Grafreed.clipboard.get(0);
2186	2263
2187	2264	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2265	content = ((cGroup)content).get(0);
..	..	@@ -2248,7 +2325,7 @@
2248	2325	RandomNode random = new RandomNode();
2249	2326	group(random);
2250	2327	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2328	+ random.name = random.get(0).name + "Switch";
2252	2329	} else
2253	2330	if (source == physicsItem)
2254	2331	{
..	..	@@ -2905,7 +2982,7 @@
2905	2982
2906	2983	child.editWindow = null; // ???????????
2907	2984	}
2908		- objEditor.ctrlPanel.validate();
	2985	+ objEditor.ctrlPanel.FlushUI();
2909	2986	//objEditor.jTree.clearSelection();
2910	2987	//objEditor.ResetSliders();
2911	2988	refreshContents(true);
..	..	@@ -3261,9 +3338,9 @@
3261	3338	obj = (Object3D)e.nextElement();
3262	3339
3263	3340	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3341	+ Grafreed.AnalyzeObject(obj);
3265	3342	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3343	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3344
3268	3345	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3346	}
..	..	@@ -3477,8 +3554,8 @@
3477	3554
3478	3555	void ParseVertices()
3479	3556	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	3557	+ boolean epsequal = Grafreed.epsequal;
	3558	+ Grafreed.epsequal = true;
3482	3559
3483	3560	for (int i=0; i<group.selection.size(); i++)
3484	3561	{
..	..	@@ -3503,7 +3580,7 @@
3503	3580	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	3581	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	3582
3506		- g.add(GrafreeD.clipboard);
	3583	+ g.add(Grafreed.clipboard);
3507	3584
3508	3585	buffer.add(g);
3509	3586	}
..	..	@@ -3518,7 +3595,7 @@
3518	3595	makeSomething(buffer, i==group.selection.size()-1);
3519	3596	}
3520	3597
3521		- GrafreeD.epsequal = epsequal;
	3598	+ Grafreed.epsequal = epsequal;
3522	3599
3523	3600	refreshContents();
3524	3601	}
..	..	@@ -3624,11 +3701,11 @@
3624	3701
3625	3702	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	3703
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	3704	+ boolean random = CameraPane.SWITCH;
	3705	+ CameraPane.SWITCH = false; // parse all random nodes
3629	3706	lowres.linkVerticesThis(null);
3630	3707	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	3708	+ CameraPane.SWITCH = random;
3632	3709
3633	3710	System.err.flush();
3634	3711
..	..	@@ -3668,7 +3745,7 @@
3668	3745	return;
3669	3746
3670	3747	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	3748	+ Object3D ref = Grafreed.clipboard.get(0);
3672	3749
3673	3750	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	3751
..	..	@@ -3862,9 +3939,9 @@
3862	3939
3863	3940	void ClipMesh()
3864	3941	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3942	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	3943	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	3944	+ Object3D content = Grafreed.clipboard.get(0);
3868	3945
3869	3946	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	3947	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +3950,7 @@
3873	3950	// {
3874	3951	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	3952	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	3953	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	3954	}
3878	3955	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	3956	System.out.println("DONE.");
..	..	@@ -4113,12 +4190,12 @@
4113	4190	System.err.println("info : " + child.GetPath());
4114	4191	}
4115	4192	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4193	+// else
	4194	+// {
	4195	+// objEditor.SetMaterial(group); // .GetMaterial());
	4196	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4197	+// System.err.println("info : " + group.GetPath());
	4198	+// }
4122	4199
4123	4200	objEditor.SetText(); // jan 2014
4124	4201
..	..	@@ -4213,12 +4290,12 @@
4213	4290	{
4214	4291	if (group.selection.isEmpty())
4215	4292	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4293	+ Grafreed.clipboardIsTempGroup = false;
4217	4294	Composite tGroup = null;
4218	4295	if (group.selection.size() > 0) // 1)
4219	4296	{
4220	4297	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4298	+ Grafreed.clipboardIsTempGroup = true;
4222	4299	}
4223	4300
4224	4301	if (cut)
..	..	@@ -4258,16 +4335,16 @@
4258	4335	//System.out.println("cut " + child);
4259	4336	//System.out.println("parent = " + child.parent);
4260	4337	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4338	+ if (Grafreed.clipboardIsTempGroup)
4262	4339	tGroup.add/Child/(tmp);
4263	4340	else
4264		- GrafreeD.clipboard = tmp;
	4341	+ Grafreed.clipboard = tmp;
4265	4342	}
4266	4343	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4344	+ if (Grafreed.clipboardIsTempGroup)
4268	4345	tGroup.add/Child/(child);
4269	4346	else
4270		- GrafreeD.clipboard = child;
	4347	+ Grafreed.clipboard = child;
4271	4348	}
4272	4349
4273	4350	//ResetModel();
..	..	@@ -4299,21 +4376,21 @@
4299	4376	//System.out.println("cut " + elem);
4300	4377	//System.out.println("parent = " + elem.parent);
4301	4378	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4379	+ if (Grafreed.clipboardIsTempGroup)
4303	4380	tGroup.add/Child/(tmp);
4304	4381	else
4305		- GrafreeD.clipboard = tmp;
	4382	+ Grafreed.clipboard = tmp;
4306	4383	}
4307	4384	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4385	+ if (Grafreed.clipboardIsTempGroup)
4309	4386	tGroup.add/Child/(child);
4310	4387	else
4311		- GrafreeD.clipboard = child;
	4388	+ Grafreed.clipboard = child;
4312	4389	}
4313	4390
4314	4391	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4392	+ if (Grafreed.clipboardIsTempGroup)
	4393	+ Grafreed.clipboard = tGroup;
4317	4394	if (cut)
4318	4395	{
4319	4396	ResetModel();
..	..	@@ -4327,7 +4404,7 @@
4327	4404	// return;
4328	4405	boolean first = true;
4329	4406
4330		- if (GrafreeD.clipboardIsTempGroup)
	4407	+ if (Grafreed.clipboardIsTempGroup)
4331	4408	{
4332	4409	Composite temp;
4333	4410
..	..	@@ -4338,7 +4415,7 @@
4338	4415	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	4416	*/
4340	4417	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4418	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	4419	{
4343	4420	Object3D child = (Object3D)e.nextElement();
4344	4421
..	..	@@ -4372,21 +4449,21 @@
4372	4449	//Object3D cb = Applet3D.clipboard;
4373	4450	//temp.addChild(cb);
4374	4451	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4452	+ assert(Grafreed.clipboard.parent == null);
	4453	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4454	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4455	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4456	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	4457	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	4458	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4459	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	4460	}
4384	4461
4385	4462	ResetModel();
4386	4463	refreshContents();
4387	4464	}
4388	4465
4389		- void pasteInto(boolean copyit)
	4466	+ void pasteInto(boolean copyit, boolean clone)
4390	4467	{
4391	4468	// if (GrafreeD.clipboard == null)
4392	4469	// return;
..	..	@@ -4415,15 +4492,22 @@
4415	4492	if (copyit)
4416	4493	{
4417	4494	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	4495	+ if (clone)
	4496	+ {
	4497	+ CloneClipboard(false); // sept 2014
	4498	+ }
	4499	+ else
	4500	+ {
	4501	+ paste(false);
	4502	+ }
4419	4503	}
4420	4504	else
4421	4505	{
4422	4506	boolean first = true;
4423	4507
4424		- if (GrafreeD.clipboardIsTempGroup)
	4508	+ if (Grafreed.clipboardIsTempGroup)
4425	4509	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	4510	+ Composite temp = (Composite)Grafreed.clipboard;
4427	4511	Object3D copy;
4428	4512	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	4513	{
..	..	@@ -4433,7 +4517,7 @@
4433	4517	}
4434	4518	} else
4435	4519	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	4520	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	4521	}
4438	4522	}
4439	4523	}
..	..	@@ -4878,7 +4962,7 @@
4878	4962
4879	4963	void ImportVRMLX3D()
4880	4964	{
4881		- if (GrafreeD.standAlone)
	4965	+ if (Grafreed.standAlone)
4882	4966	{
4883	4967	/**/
4884	4968	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4895,7 +4979,7 @@
4895	4979
4896	4980	String GetFile(String dialogName)
4897	4981	{
4898		- if (GrafreeD.standAlone)
	4982	+ if (Grafreed.standAlone)
4899	4983	{
4900	4984	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	4985	browser.show();
..	..	@@ -4959,10 +5043,12 @@
4959	5043	cButton flashSelectionButton;
4960	5044	cButton editButton;
4961	5045	cButton uneditButton;
	5046	+ JCheckBox allParamsButton;
4962	5047	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5048	cButton unselectButton;
4965	5049
	5050	+ cButton oneStepButton;
	5051	+
4966	5052	cButton screenfitButton;
4967	5053	cButton screenfitpointButton;
4968	5054	cButton snapobjectButton;
..	..	@@ -5017,6 +5103,7 @@
5017	5103	private MenuItem mergeGeometriesItem;
5018	5104	private MenuItem copyItem;
5019	5105	private MenuItem pasteItem;
	5106	+ private MenuItem pasteIntoItem;
5020	5107	private MenuItem pasteLinkItem;
5021	5108	private MenuItem pasteCloneItem;
5022	5109	private MenuItem pasteExpandItem;
..	..	@@ -5114,7 +5201,7 @@
5114	5201	private MenuItem blobItem;
5115	5202	private MenuItem latheItem;
5116	5203	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5204	+ private MenuItem overlayItem;
5118	5205	private MenuItem meshItem;
5119	5206	// private MenuItem meshGroupItem;
5120	5207	private MenuItem springItem;