~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,17 +163,21 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	174	cloneItem = menu.add(new MenuItem("Clone"));
171	175	cloneItem.addActionListener(this);
	176	+ if (Globals.ADVANCED)
	177	+ {
172	178	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	179	cloneSupportItem.addActionListener(this);
	180	+ }
174	181	menu.add("-");
175	182	cutItem = menu.add(new MenuItem("Cut"));
176	183	cutItem.addActionListener(this);
..	..	@@ -178,18 +185,31 @@
178	185	copyItem.addActionListener(this);
179	186	pasteItem = menu.add(new MenuItem("Paste"));
180	187	pasteItem.addActionListener(this);
	188	+ menu.add("-");
	189	+
	190	+ menu.add("-");
	191	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	192	+ pasteIntoItem.addActionListener(this);
181	193	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	194	pasteLinkItem.addActionListener(this);
183	195	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	196	pasteCloneItem.addActionListener(this);
185	197	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	198	// pasteExpandItem.addActionListener(this);
	199	+ menu.add("-");
187	200	clearItem = menu.add(new MenuItem("Clear"));
188	201	clearItem.addActionListener(this);
	202	+
	203	+ if (Globals.ADVANCED)
	204	+ {
	205	+ // Deletes the cameras...
189	206	clearAllItem = menu.add(new MenuItem("Clear All"));
190	207	clearAllItem.addActionListener(this);
	208	+ }
191	209
192	210	oe.menuBar.add(menu = new Menu("Setting"));
	211	+ if (Globals.ADVANCED)
	212	+ {
193	213	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	214	resetMeshItem.addActionListener(this);
195	215	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +219,7 @@
199	219	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	220	resetreferencesItem.addActionListener(this);
201	221	menu.add("-");
	222	+ }
202	223	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	224	overwriteGeoItem.addActionListener(this);
204	225	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +231,26 @@
210	231	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	232	overwriteUVItem.addActionListener(this);
212	233	menu.add("-");
	234	+ if (Globals.ADVANCED)
	235	+ {
213	236	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	237	generateMeshItem.addActionListener(this);
215	238	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	239	poseMeshItem.addActionListener(this);
217	240	menu.add("-");
	241	+ }
218	242	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	243	resetsupportItem.addActionListener(this);
220	244	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	245	linkverticesItem.addActionListener(this);
222	246	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	247	relinkverticesItem.addActionListener(this);
	248	+
	249	+ if (Globals.ADVANCED)
	250	+ {
224	251	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	252	setMasterItem.addActionListener(this);
	253	+ }
226	254
227	255	oe.menuBar.add(menu = new Menu("Group"));
228	256	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +261,32 @@
233	261	frontItem.addActionListener(this);
234	262	compositeItem = menu.add(new MenuItem("Composite"));
235	263	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	264	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	265	hideItem.addActionListener(this);
238	266	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	267	ungroupItem.addActionListener(this);
240	268	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	269	+ randomItem = menu.add(new MenuItem("Switch node"));
242	270	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	271	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	272	switchGeoItem.addActionListener(this);
249	273	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	274	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	275	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	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);
253	285	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	286	scriptNodeItem.addActionListener(this);
255	287	cameraItem = menu.add(new MenuItem("Camera"));
256	288	cameraItem.addActionListener(this);
	289	+ }
257	290
258	291	oe.menuBar.add(menu = new Menu("Object"));
259	292	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,14 +301,18 @@
268	301	shadowYItem.addActionListener(this);
269	302	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	303	shadowZItem.addActionListener(this);
	304	+ if (Globals.ADVANCED)
	305	+ {
	306	+ menu.add("-");
271	307	linkerItem = menu.add(new MenuItem("Linker"));
272	308	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	309	attributeItem = menu.add(new MenuItem("Attribute"));
276	310	attributeItem.addActionListener(this);
	311	+ templateItem = menu.add(new MenuItem("Template"));
	312	+ templateItem.addActionListener(this);
277	313	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	314	pointflowItem.addActionListener(this);
	315	+ }
279	316	menu.add("-");
280	317	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	318	resetTransformItem.addActionListener(this);
..	..	@@ -293,8 +330,11 @@
293	330	genNormalsCADItem.addActionListener(this);
294	331	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	332	genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
296	335	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	336	genNormalsMINEItem.addActionListener(this);
	337	+ }
298	338	stripifyItem = menu.add(new MenuItem("Stripify"));
299	339	stripifyItem.addActionListener(this);
300	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,10 +356,14 @@
316	356	reduce34MeshItem.addActionListener(this);
317	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	358	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
323	367
324	368	oe.menuBar.add(menu = new Menu("Attributes"));
325	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -329,10 +373,13 @@
329	373	liveleavesItem.addActionListener(this);
330	374	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	375	unliveleavesItem.addActionListener(this);
	376	+ if (Globals.ADVANCED)
	377	+ {
332	378	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	379	supportleavesItem.addActionListener(this);
334	380	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	381	unsupportleavesItem.addActionListener(this);
	382	+ }
336	383	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	384	hideleavesItem.addActionListener(this);
338	385	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -375,6 +422,8 @@
375	422	sortbysizeItem.addActionListener(this);
376	423	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	424	sortbynameItem.addActionListener(this);
	425	+ if (Globals.ADVANCED)
	426	+ {
378	427	menu.add("-");
379	428	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	429	extractGeometriesItem.addActionListener(this);
..	..	@@ -384,11 +433,11 @@
384	433	shareGeometriesItem.addActionListener(this);
385	434	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386	435	mergeGeometriesItem.addActionListener(this);
	436	+ }
387	437
388	438	oe.menuBar.add(menu = new Menu("Insert"));
389	439	buildCreateMenu(menu);
390	440
391		-
392	441	oe.menuBar.add(menu = new Menu("Include"));
393	442	importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394	443	importGFDItem.addActionListener(this);
..	..	@@ -433,110 +482,98 @@
433	482	oe.radioPanel.add(dummyButton);
434	483	oe.buttonGroup.add(dummyButton);
435	484	*/
436		- aConstraints.gridy += 1;
437		-
438	485	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	486
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
442		-
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	487	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
444	488	liveCB.setToolTipText("Enabled animation");
445	489	liveCB.addItemListener(this);
446	490
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	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	+
	499	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449	500	trackCB.setToolTipText("Enable tracking");
450	501	trackCB.addItemListener(this);
451	502
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	503	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
454	504	screenfitButton.setToolTipText("Screen fit");
455	505	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	506	+
457	507	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	508	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	509
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	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	+
	517	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471	518	flashSelectionButton.setToolTipText("Show selection");
472	519	flashSelectionButton.addActionListener(this);
473	520
474		- oe.toolbarPanel.add(new cButton(" ", false));
	521	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	522
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	523	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
482	524	twoButton.setToolTipText("Show center view only");
483	525	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	526	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
485	527	fourButton.addActionListener(this);
486	528	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488	530	sixButton.setToolTipText("2-column layout left");
489	531	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	532	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
491	533	threeButton.setToolTipText("2-column layout right");
492	534	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
494	536	sevenButton.setToolTipText("3-column layout");
495	537	sevenButton.addActionListener(this);
496	538	//
497	539
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	540	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	541	+ rootButton.setToolTipText("Edit selection in new tab");
500	542	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	543	+
	544	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
503	545	closeButton.setToolTipText("Close tab");
504	546	closeButton.addActionListener(this);
505	547	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	548	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	549
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	550	+ cGridBag commandsPanel = new cGridBag();
	551	+
	552	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	553	+ editButton.setToolTipText("Edit selection");
511	554	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	555
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	556	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	557	+ uneditButton.setToolTipText("Unedit selection");
517	558	uneditButton.addActionListener(this);
518	559
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	560	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	561	+ allParamsButton.setToolTipText("Edit all params");
531	562	allParamsButton.addActionListener(this);
532	563
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	564	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	565	+ clearPanelButton.setToolTipText("Clear edit panel");
	566	+ clearPanelButton.addActionListener(this);
	567	+
	568	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	569	+ unselectButton.setToolTipText("Unselect");
538	570	unselectButton.addActionListener(this);
539	571
	572	+ commandsPanel.preferredHeight = 1;
	573	+
	574	+ oe.treePanel.add(commandsPanel);
	575	+ oe.treePanel.Return();
	576	+
540	577	// oe.aConstraints.gridx += 1;
541	578	// oe.aConstraints.weighty = 0;
542	579	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +585,37 @@
548	585	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	586	// gcButton.addActionListener(this);
550	587
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	588	+ cGridBag jSPPanel = new cGridBag();
	589	+
	590	+ JScrollPane jSP;
562	591	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	592	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	593	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	594	+
	595	+ oe.treePanel.add(jSPPanel);
	596	+ oe.treePanel.Return();
569	597
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	598	+ cGridBag copyOptionsPanel = new cGridBag();
	599	+
	600	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	601	+ colorCB.setToolTipText("Copy color when dropped");
574	602	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	603	+
	604	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	605	+ materialCB.setToolTipText("Copy material when dropped");
577	606	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	607	+
	608	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	609	+ textureCB.setToolTipText("Copy texture when dropped");
580	610	textureCB.addItemListener(this);
581	611
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	612	+ copyOptionsPanel.preferredHeight = 1;
	613	+ oe.treePanel.add(copyOptionsPanel);
	614	+ oe.treePanel.Return();
584	615
	616	+// mainPanel.setDividerLocation(0.5); //1.0);
	617	+// mainPanel.setResizeWeight(0.5);
	618	+
585	619	//jList.addListSelectionListener(this);
586	620	oe.jTree.addTreeSelectionListener(this);
587	621	//jTree.setRootVisible(false);
..	..	@@ -604,45 +638,37 @@
604	638	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	639	}
606	640
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	641	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	642	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
618		-
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
622		-
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	643	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	644	boxCB.setToolTipText("Display bounding boxes");
640	645	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	646	+
	647	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	648	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	649	zoomBoxCB.addItemListener(this);
645	650
	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	+
646	672	// constraints.gridy += 1;
647	673	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	674	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +676,16 @@
650	676	if (false)
651	677	{
652	678	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	679	+ //constraints.gridy += 1;
	680	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	681	speakerCameraCB.addItemListener(this);
656	682
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	683	+ //constraints.gridy += 1;
	684	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	685	speakerFocusCB.addItemListener(this);
660	686
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	687	+ //constraints.gridy += 1;
	688	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	689	smoothfocusCB.addItemListener(this);
664	690	}
665	691
..	..	@@ -667,14 +693,20 @@
667	693	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	694	// debugCB.addItemListener(this);
669	695
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	696	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	697	oeilCB.addItemListener(this);
673	698
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	699	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	700	lookAtCB.setToolTipText("Look-at target");
677	701	lookAtCB.addItemListener(this);
	702	+
	703	+ }
	704	+
	705	+ cGridBag fill = new cGridBag();
	706	+
	707	+ fill.preferredHeight = 200;
	708	+
	709	+ panel.add(fill);
678	710
679	711	}
680	712
..	..	@@ -959,11 +991,11 @@
959	991	{
960	992	loadClipboard(true);
961	993	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	994	+ pasteInto(false, false);
963	995	} else {
964	996	loadClipboard(false);
965	997	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	998	+ pasteInto(false, false); // true); // ???
967	999	}
968	1000	}
969	1001	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1117,33 @@
1085	1117	kleinItem.addActionListener(this);
1086	1118	particleItem = menu.add(new MenuItem("Particle system"));
1087	1119	particleItem.addActionListener(this);
	1120	+ if (Globals.ADVANCED)
	1121	+ {
1088	1122	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1123	ragdollItem.addActionListener(this);
1090	1124	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1125	ragdoll2Item.addActionListener(this);
	1126	+ }
1092	1127	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1128	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1129	meshItem.addActionListener(this);
1095	1130	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1131	// meshGroupItem.addActionListener(this);
	1132	+ if (Globals.ADVANCED)
	1133	+ {
1097	1134	springItem = menu.add(new MenuItem("Spring"));
1098	1135	springItem.addActionListener(this);
1099	1136	flagItem = menu.add(new MenuItem("Flag"));
1100	1137	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1138	blobItem = menu.add(new MenuItem("Blob"));
1106	1139	blobItem.addActionListener(this);
1107	1140	latheItem = menu.add(new MenuItem("Lathe"));
1108	1141	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);
1109	1147	lightItem = menu.add(new MenuItem("Light"));
1110	1148	lightItem.addActionListener(this);
1111	1149	menu.add("-");
..	..	@@ -1115,34 +1153,39 @@
1115	1153	loopItem.addActionListener(this);
1116	1154	doubleItem = menu.add(new MenuItem("Fork"));
1117	1155	doubleItem.addActionListener(this);
	1156	+ if (Globals.ADVANCED)
	1157	+ {
1118	1158	tripleItem = menu.add(new MenuItem("Trident"));
1119	1159	tripleItem.addActionListener(this);
	1160	+ }
1120	1161	}
1121	1162
1122	1163	void buildToolsMenu(Menu menu)
1123	1164	{
1124	1165	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1166	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1167	+ animationItem.setState(Globals.ANIMATION);
1127	1168
1128	1169	menu.add("-");
1129	1170	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1171	parseverticesItem.addActionListener(this);
1131	1172	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1173	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1174	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1175	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1176	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1177	reduceMorphItem.addActionListener(this);
1139	1178	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1179	reduce34MorphItem.addActionListener(this);
1141		-
	1180	+ menu.add("-");
1142	1181	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1182	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1183
	1184	+ if (Globals.ADVANCED)
	1185	+ {
	1186	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1187	+ mirrorItem.addActionListener(this);
	1188	+ menu.add("-");
1146	1189	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1190	memoryItem.addActionListener(this);
1148	1191	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1165,6 +1208,7 @@
1165	1208	menu.add("-");
1166	1209	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1210	editScriptItem.addActionListener(this);
	1211	+ }
1168	1212	}
1169	1213
1170	1214	void ScreenFit()
..	..	@@ -1666,7 +1710,7 @@
1666	1710	{
1667	1711	makeSomething(new BezierSurface());
1668	1712	} else
1669		- if (source == checkerItem)
	1713	+ if (source == overlayItem)
1670	1714	{
1671	1715	/*
1672	1716	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1854,6 +1898,11 @@
1854	1898	{
1855	1899	DumpObject();
1856	1900	} else
	1901	+ if (source == oneStepButton)
	1902	+ {
	1903	+ Globals.ONESTEP = true;
	1904	+ cameraView.repaint();
	1905	+ } else
1857	1906	if (source == screenfitButton)
1858	1907	{
1859	1908	//Reload(lastConverter, lastFilename, true);
..	..	@@ -1926,13 +1975,17 @@
1926	1975	{
1927	1976	paste(false);
1928	1977	} else
	1978	+ if (source == pasteIntoItem)
	1979	+ {
	1980	+ pasteInto(true, false);
	1981	+ } else
1929	1982	if (source == pasteLinkItem)
1930	1983	{
1931		- pasteInto(false);
	1984	+ pasteInto(false, false);
1932	1985	} else
1933	1986	if (source == pasteCloneItem)
1934	1987	{
1935		- pasteInto(true);
	1988	+ pasteInto(true, true);
1936	1989	} else
1937	1990	if (source == pasteExpandItem)
1938	1991	{
..	..	@@ -2134,11 +2187,11 @@
2134	2187	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2188	for (int i=0; i<group.selection.size(); i++)
2136	2189	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2190	+ boolean random = CameraPane.SWITCH;
	2191	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2192	group.selection.get(i).linkVerticesThis(content);
2140	2193	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2194	+ CameraPane.SWITCH = random;
2142	2195	}
2143	2196	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2197	refreshContents();
..	..	@@ -2148,20 +2201,20 @@
2148	2201	{
2149	2202	for (int i=0; i<group.selection.size(); i++)
2150	2203	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2204	+ boolean random = CameraPane.SWITCH;
	2205	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2206	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2207	+ CameraPane.SWITCH = random;
2155	2208	}
2156	2209
2157	2210	refreshContents();
2158	2211	} else
2159	2212	if (source == relinkverticesItem)
2160	2213	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2214	+ boolean random = CameraPane.SWITCH;
	2215	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2216	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2217	+ CameraPane.SWITCH = random;
2165	2218
2166	2219	refreshContents();
2167	2220	} else
..	..	@@ -2259,7 +2312,7 @@
2259	2312	RandomNode random = new RandomNode();
2260	2313	group(random);
2261	2314	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2315	+ random.name = random.get(0).name + "Switch";
2263	2316	} else
2264	2317	if (source == physicsItem)
2265	2318	{
..	..	@@ -2720,7 +2773,7 @@
2720	2773	// centralPanel.setVisible(true);
2721	2774	// XYZPanel.setVisible(false);
2722	2775	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	2776	+ bigThree.add(centralPanel);
2724	2777	bigThree.FlushUI();
2725	2778	} else
2726	2779	if (source == threeButton)
..	..	@@ -2755,8 +2808,8 @@
2755	2808	// centralPanel.setVisible(true);
2756	2809	// XYZPanel.setVisible(true);
2757	2810	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	2811	+ bigThree.add(centralPanel);
	2812	+ bigThree.add(XYZPanel);
2760	2813	bigThree.FlushUI();
2761	2814	} else
2762	2815	if (source == fourButton)
..	..	@@ -2791,7 +2844,7 @@
2791	2844	// centralPanel.setVisible(false);
2792	2845	// XYZPanel.setVisible(false);
2793	2846	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	2847	+ bigThree.add(scenePanel);
2795	2848	bigThree.FlushUI();
2796	2849	} else
2797	2850	if (source == sixButton)
..	..	@@ -2826,8 +2879,8 @@
2826	2879	// centralPanel.setVisible(true);
2827	2880	// XYZPanel.setVisible(false);
2828	2881	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	2882	+ bigThree.add(scenePanel);
	2883	+ bigThree.add(centralPanel);
2831	2884	bigThree.FlushUI();
2832	2885	} else
2833	2886	if (source == sevenButton)
..	..	@@ -2862,9 +2915,9 @@
2862	2915	// centralPanel.setVisible(true);
2863	2916	// XYZPanel.setVisible(true);
2864	2917	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	2918	+ bigThree.add(scenePanel);
	2919	+ bigThree.add(centralPanel);
	2920	+ bigThree.add(XYZPanel);
2868	2921	bigThree.FlushUI();
2869	2922	} else
2870	2923	if (source == rootButton)
..	..	@@ -2916,7 +2969,7 @@
2916	2969
2917	2970	child.editWindow = null; // ???????????
2918	2971	}
2919		- objEditor.ctrlPanel.revalidate();
	2972	+ objEditor.ctrlPanel.FlushUI();
2920	2973	//objEditor.jTree.clearSelection();
2921	2974	//objEditor.ResetSliders();
2922	2975	refreshContents(true);
..	..	@@ -3635,11 +3688,11 @@
3635	3688
3636	3689	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	3690
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	3691	+ boolean random = CameraPane.SWITCH;
	3692	+ CameraPane.SWITCH = false; // parse all random nodes
3640	3693	lowres.linkVerticesThis(null);
3641	3694	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	3695	+ CameraPane.SWITCH = random;
3643	3696
3644	3697	System.err.flush();
3645	3698
..	..	@@ -4124,12 +4177,12 @@
4124	4177	System.err.println("info : " + child.GetPath());
4125	4178	}
4126	4179	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4180	+// else
	4181	+// {
	4182	+// objEditor.SetMaterial(group); // .GetMaterial());
	4183	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4184	+// System.err.println("info : " + group.GetPath());
	4185	+// }
4133	4186
4134	4187	objEditor.SetText(); // jan 2014
4135	4188
..	..	@@ -4397,7 +4450,7 @@
4397	4450	refreshContents();
4398	4451	}
4399	4452
4400		- void pasteInto(boolean copyit)
	4453	+ void pasteInto(boolean copyit, boolean clone)
4401	4454	{
4402	4455	// if (GrafreeD.clipboard == null)
4403	4456	// return;
..	..	@@ -4426,7 +4479,14 @@
4426	4479	if (copyit)
4427	4480	{
4428	4481	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4482	+ if (clone)
	4483	+ {
	4484	+ CloneClipboard(false); // sept 2014
	4485	+ }
	4486	+ else
	4487	+ {
	4488	+ paste(false);
	4489	+ }
4430	4490	}
4431	4491	else
4432	4492	{
..	..	@@ -4970,10 +5030,12 @@
4970	5030	cButton flashSelectionButton;
4971	5031	cButton editButton;
4972	5032	cButton uneditButton;
	5033	+ JCheckBox allParamsButton;
4973	5034	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5035	cButton unselectButton;
4976	5036
	5037	+ cButton oneStepButton;
	5038	+
4977	5039	cButton screenfitButton;
4978	5040	cButton screenfitpointButton;
4979	5041	cButton snapobjectButton;
..	..	@@ -5028,6 +5090,7 @@
5028	5090	private MenuItem mergeGeometriesItem;
5029	5091	private MenuItem copyItem;
5030	5092	private MenuItem pasteItem;
	5093	+ private MenuItem pasteIntoItem;
5031	5094	private MenuItem pasteLinkItem;
5032	5095	private MenuItem pasteCloneItem;
5033	5096	private MenuItem pasteExpandItem;
..	..	@@ -5125,7 +5188,7 @@
5125	5188	private MenuItem blobItem;
5126	5189	private MenuItem latheItem;
5127	5190	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5191	+ private MenuItem overlayItem;
5129	5192	private MenuItem meshItem;
5130	5193	// private MenuItem meshGroupItem;
5131	5194	private MenuItem springItem;