~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -80,10 +86,22 @@
80	86	SetupViews(objEditor);
81	87
82	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
83	97	}
84	98
85	99	void CloneSelection(boolean supports)
86	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
87	105	// Object3D keep = GrafreeD.clipboard;
88	106	//Object3D obj;
89	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +112,7 @@
94	112
95	113	makeSomething(clone, i==group.selection.size()-1);
96	114	}
	115	+ Globals.REPLACEONMAKE = keep;
97	116	}
98	117
99	118	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +169,8 @@
150	169
151	170	void SetupMenu2(GroupEditor oe)
152	171	{
	172	+ oe.jTree = new cTree();
	173	+
153	174	Menu menu;
154	175	oe.menuBar.add(menu = new Menu("Edit"));
155	176	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +181,7 @@
160	181	// redoItem = menu.add(new MenuItem("Redo"));
161	182	// redoItem.addActionListener(this);
162	183	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	184	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	185	duplicateItem.addActionListener(this);
165	186	cloneItem = menu.add(new MenuItem("Clone"));
166	187	cloneItem.addActionListener(this);
..	..	@@ -176,7 +197,6 @@
176	197	copyItem.addActionListener(this);
177	198	pasteItem = menu.add(new MenuItem("Paste"));
178	199	pasteItem.addActionListener(this);
179		- menu.add("-");
180	200
181	201	menu.add("-");
182	202	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +208,8 @@
188	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	209	// pasteExpandItem.addActionListener(this);
190	210	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
193	213
194	214	if (Globals.ADVANCED)
195	215	{
..	..	@@ -203,23 +223,23 @@
203	223	//zBufferItem.addActionListener(this);
204	224	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	225	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
208	228
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	241
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	243	toggleHandleItem.addItemListener(this);
224	244	toggleHandleItem.setState(CameraPane.HANDLES);
225	245
..	..	@@ -246,7 +266,7 @@
246	266
247	267	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	268	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
250	270
251	271	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	272	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +294,7 @@
274	294	{
275	295	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	296	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	298	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	299	oe.cameraMenu.add("-");
280	300	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +302,7 @@
282	302	editLeafItem.addActionListener(this);
283	303	lookAtItem.addActionListener(this);
284	304	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	305	+ //switchViewItem.addActionListener(this);
286	306	}
287	307
288	308	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +347,29 @@
327	347	}
328	348
329	349	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
332	352	backItem = menu.add(new MenuItem("Back"));
333	353	backItem.addActionListener(this);
334	354	frontItem = menu.add(new MenuItem("Front"));
335	355	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
338	361	hideItem = menu.add(new MenuItem("Hidden Group"));
339	362	hideItem.addActionListener(this);
	363	+ }
340	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	365	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
345	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	374	switchGeoItem.addActionListener(this);
347	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +377,6 @@
349	377	morphItem = menu.add(new MenuItem("Morph Group"));
350	378	morphItem.addActionListener(this);
351	379
352		- if (Globals.ADVANCED)
353		- {
354	380	menu.add("-");
355	381	physicsItem = menu.add(new MenuItem("Physics"));
356	382	physicsItem.addActionListener(this);
..	..	@@ -358,30 +384,29 @@
358	384	frameselectorItem.addActionListener(this);
359	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	386	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	387	}
364	388
365	389	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
368	392	billboardItem = menu.add(new MenuItem("Billboard"));
369	393	billboardItem.addActionListener(this);
370	394	csgItem = menu.add(new MenuItem("CSG"));
371	395	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	397	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	399	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
378	405	if (Globals.ADVANCED)
379	406	{
380	407	menu.add("-");
381	408	linkerItem = menu.add(new MenuItem("Linker"));
382	409	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	410	templateItem = menu.add(new MenuItem("Template"));
386	411	templateItem.addActionListener(this);
387	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +435,7 @@
410	435	genNormalsMESHItem.addActionListener(this);
411	436	if (Globals.ADVANCED)
412	437	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	439	genNormalsMINEItem.addActionListener(this);
415	440	}
416	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -470,6 +495,14 @@
470	495	markleavesItem.addActionListener(this);
471	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	497	unmarkleavesItem.addActionListener(this);
	498	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	499	+ rewindleavesItem.addActionListener(this);
	500	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	501	+ unrewindleavesItem.addActionListener(this);
	502	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	503	+ randomleavesItem.addActionListener(this);
	504	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	505	+ unrandomleavesItem.addActionListener(this);
473	506	menu.add("-");
474	507	flipVItem = menu.add(new MenuItem("Flip V"));
475	508	flipVItem.addActionListener(this);
..	..	@@ -495,10 +528,15 @@
495	528	attachBumpItem.addActionListener(this);
496	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
498	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	533	detachPigmentItem.addActionListener(this);
500	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
502	540	menu.add("-");
503	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	542	sortbysizeItem.addActionListener(this);
..	..	@@ -525,8 +563,21 @@
525	563	buildToolsMenu(menu);
526	564	}
527	565
	566	+
528	567	void SetupUI2(ObjEditor oe)
529	568	{
	569	+ // June 2019
	570	+ if (oe == null)
	571	+ {
	572	+ //super.SetupUI2(this);
	573	+ //return;
	574	+ }
	575	+
	576	+ if (copy != group)
	577	+ {
	578	+ //super.SetupUI2(this);
	579	+ }
	580	+
530	581	//new Exception().printStackTrace();
531	582
532	583	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +606,79 @@
555	606	oe.radioPanel.add(dummyButton);
556	607	oe.buttonGroup.add(dummyButton);
557	608	*/
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
	612	+
558	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	614
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	615	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ //minButton.setToolTipText("Minimize window");
	617	+ //minButton.addActionListener(this);
563	618
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
567	625
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
	626	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ fullButton.setToolTipText("Full-screen window");
	628	+ fullButton.addActionListener(this);
	629	+
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
	634	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	636	+ restoreCameraButton.addActionListener(this);
	637	+
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
570	640	saveButton.addActionListener(this);
	641	+
	642	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	643	+ undoButton.setToolTipText("Previous version");
	644	+ undoButton.addActionListener(this);
	645	+ undoButton.setEnabled(false);
571	646
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
	660	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ redoButton.setToolTipText("Next version");
	662	+ redoButton.addActionListener(this);
	663	+ redoButton.setEnabled(false);
	664	+
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	666	liveCB.setToolTipText("Enable animation");
574	667	liveCB.addItemListener(this);
575	668
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	670	oneStepButton.setToolTipText("Animate one step forward");
578	671	oneStepButton.addActionListener(this);
579	672
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	674	fastCB.setToolTipText("Fast mode");
582	675	fastCB.addItemListener(this);
583	676
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	677	+ //oe.toolboxPanel.Return();
	678	+
	679	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	680	+// trackCB.setToolTipText("Enable tracking");
	681	+// trackCB.addItemListener(this);
591	682
592	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	684	// screenfitpointButton.addActionListener(this);
..	..	@@ -597,67 +688,148 @@
597	688	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	689	snapobjectButton.addActionListener(this);
599	690	snapobjectButton.setToolTipText("Snap Object");
	691	+
	692	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ fourButton.addActionListener(this);
	694	+ fourButton.setToolTipText("Show control panel only");
600	695	}
601	696
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	697	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	698
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
	699	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show 3D view only");
610	701	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
	702	+ this.fullscreenLayout = twoButton;
	703	+
	704	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ threeButton.setToolTipText("Show controls and 3D view");
619	706	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
	707	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ sixButton.setToolTipText("Show 3D view and controls");
	709	+ sixButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
623	713	//
624	714
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
627	717	rootButton.addActionListener(this);
628	718
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	720	closeButton.setToolTipText("Close tab");
631	721	closeButton.addActionListener(this);
632	722	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	723	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	724	+
	725	+ // INSERT
	726	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ gridButton.setToolTipText("Create grid");
	728	+ gridButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ boxButton.setToolTipText("Create box");
	732	+ boxButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ sphereButton.setToolTipText("Create sphere");
	736	+ sphereButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ coneButton.setToolTipText("Create cone");
	740	+ coneButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ torusButton.setToolTipText("Create torus");
	744	+ torusButton.addActionListener(this);
	745	+
	746	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	747	+ superButton.setToolTipText("Create superellipsoid");
	748	+ superButton.addActionListener(this);
	749	+
	750	+ if (Globals.ADVANCED)
	751	+ {
	752	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ kleinButton.setToolTipText("Create Klein bottle");
	754	+ kleinButton.addActionListener(this);
	755	+ }
636	756
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	757	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ particlesButton.setToolTipText("Create particle system");
	759	+ particlesButton.addActionListener(this);
	760	+
	761	+ oe.toolboxPanel.Return();
	762	+
	763	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ groupButton.setToolTipText("Create group");
	765	+ groupButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ compositeButton.setToolTipText("Create composite");
	769	+ compositeButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ switchButton.setToolTipText("Create item switcher");
	773	+ switchButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ loopButton.setToolTipText("Create loop");
	777	+ loopButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ textureButton.setToolTipText("Create texture");
	781	+ textureButton.addActionListener(this);
	782	+
	783	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ overlayButton.setToolTipText("Create overlay");
	785	+ overlayButton.addActionListener(this);
	786	+
	787	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	788	+ lightButton.setToolTipText("Create light");
	789	+ lightButton.addActionListener(this);
	790	+
	791	+ for (int i=6; --i>=0;)
	792	+ {
	793	+ oe.toolboxPanel.Return();
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ oe.toolboxPanel.add(new cGridBag());
	797	+ oe.toolboxPanel.add(new cGridBag());
	798	+ oe.toolboxPanel.add(new cGridBag());
	799	+ oe.toolboxPanel.add(new cGridBag());
	800	+ oe.toolboxPanel.add(new cGridBag());
	801	+ }
	802	+
	803	+ // EDIT panel
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
639	806	editButton.addActionListener(this);
640	807
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
643	810	uneditButton.addActionListener(this);
644	811
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	812	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	813	+ allParamsButton.setToolTipText("Show all controle");
647	814	allParamsButton.addActionListener(this);
648	815
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	816	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	817	clearPanelButton.setToolTipText("Clear edit panel");
651	818	clearPanelButton.addActionListener(this);
652	819
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	820	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	821	unselectButton.setToolTipText("Unselect");
655	822	unselectButton.addActionListener(this);
656	823
657		- commandsPanel.preferredHeight = 1;
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
658	827
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	828	+ editCommandsPanel.preferredHeight = 1;
	829	+
	830	+ SetPinStates(false);
	831	+// oe.treePanel.add(commandsPanel);
	832	+// oe.treePanel.Return();
661	833
662	834	// oe.aConstraints.gridx += 1;
663	835	// oe.aConstraints.weighty = 0;
..	..	@@ -674,29 +846,17 @@
674	846
675	847	JScrollPane jSP;
676	848	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	849	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	850	ResetModel();
679	851
680	852	oe.treePanel.add(jSPPanel);
681	853	oe.treePanel.Return();
682	854
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	855	oe.treePanel.add(copyOptionsPanel);
699	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
700	860
701	861	// mainPanel.setDividerLocation(0.5); //1.0);
702	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -719,29 +879,49 @@
719	879	dgr.addDragGestureListener(this);
720	880	}catch(Exception e) {}
721	881	*/
722		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
723	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	884	}
725	885
726	886	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	887	{
	888	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	889	+ colorCB.setToolTipText("Copy color when dropped");
	890	+ colorCB.addItemListener(this);
	891	+
	892	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	893	+ materialCB.setToolTipText("Copy material when dropped");
	894	+ materialCB.addItemListener(this);
	895	+
	896	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	897	+ textureCB.setToolTipText("Copy texture when dropped");
	898	+ textureCB.addItemListener(this);
	899	+
	900	+ panel.Return();
	901	+
728	902	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	903	boxCB.setToolTipText("Display bounding boxes");
730	904	boxCB.addItemListener(this);
731	905
732	906	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	908	zoomBoxCB.addItemListener(this);
735	909
736	910	if (true) // Globals.ADVANCED)
737	911	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
741	919
742	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	921	// localCB.addItemListener(this);
744	922
	923	+ panel.Return();
	924	+
745	925	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	926	crowdCB.setToolTipText("Used for crowds");
747	927	crowdCB.addItemListener(this);
..	..	@@ -758,6 +938,8 @@
758	938	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	939	// speakerMocapCB.addItemListener(this);
760	940
	941	+ panel.Return();
	942	+
761	943	if (false)
762	944	{
763	945	// handled in scripts
..	..	@@ -772,34 +954,74 @@
772	954	//constraints.gridy += 1;
773	955	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	956	smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
775	958	}
776	959
777	960	//constraints.gridx += 1;
778	961	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	962	// debugCB.addItemListener(this);
780	963
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
781	968	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	969	+ oeilCB.setToolTipText("Move camera when tracking");
782	970	oeilCB.addItemListener(this);
783	971
	972	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	973	+ shadowCB.setToolTipText("When live compute shadows");
	974	+ shadowCB.addItemListener(this);
	975	+
	976	+ panel.Return();
	977	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	978	+ toggleTextureCB.setToolTipText("Load textures");
	979	+ toggleTextureCB.addItemListener(this);
	980	+
	981	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
	983	+ toggleSwitchCB.addItemListener(this);
	984	+
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
	988	+
	989	+ panel.Return();
	990	+ if (Globals.ADVANCED)
	991	+ {
784	992	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	993	lookAtCB.setToolTipText("Look-at target");
786	994	lookAtCB.addItemListener(this);
	995	+ }
787	996
788	997	}
789	998
790	999	cGridBag fill = new cGridBag();
791		-
792	1000	fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
793	1005
794	1006	panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
795	1009
796	1010	}
797	1011
798	1012	void EditObject(Object3D obj)
799	1013	{
800	1014	cRadio radioButton = new cRadio(obj.name);
	1015	+
	1016	+ // June 2019. Patch to avoid bug with transparency.
	1017	+ radioButton.hadMaterial = obj.material != null;
	1018	+ if (!radioButton.hadMaterial)
	1019	+ {
	1020	+ obj.material = new cMaterial();
	1021	+ }
	1022	+
801	1023	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
803	1025	radioButton.SetCamera(cameraView.renderCamera, false);
804	1026	radioButton.addActionListener(this);
805	1027	radioPanel.add(radioButton);
..	..	@@ -809,6 +1031,8 @@
809	1031
810	1032	void SetupViews(ObjEditor oe)
811	1033	{
	1034	+ theFrame = this;
	1035	+
812	1036	oe.SetupViews();
813	1037
814	1038	System.out.println("SetupViews");
..	..	@@ -817,23 +1041,28 @@
817	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1042	}
819	1043
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1044	+ cToggleButton liveCB;
	1045	+ cCheckBox supportCB;
	1046	+ cCheckBox localCB;
	1047	+ cCheckBox crowdCB;
	1048	+ cCheckBox smoothCB;
	1049	+ cToggleButton fastCB;
	1050	+ cCheckBox slowCB;
	1051	+ cCheckBox boxCB;
	1052	+ cCheckBox zoomBoxCB;
	1053	+ cCheckBox freezeCB;
	1054	+ //cToggleButton trackCB;
	1055	+ cCheckBox trackCB;
	1056	+ cCheckBox smoothfocusCB;
831	1057	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
837	1066
838	1067	// static int COLOR = 1;
839	1068	// static int MATERIAL = 2;
..	..	@@ -841,9 +1070,9 @@
841	1070
842	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1072
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
847	1076
848	1077	public void itemStateChanged(ItemEvent e)
849	1078	{
..	..	@@ -936,6 +1165,18 @@
936	1165	{
937	1166	cameraView.ToggleOeil();
938	1167	}
	1168	+ else if(e.getSource() == shadowCB)
	1169	+ {
	1170	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1171	+ }
	1172	+ else if(e.getSource() == freezeCB)
	1173	+ {
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
	1179	+ }
939	1180	else if(e.getSource() == lookAtCB)
940	1181	{
941	1182	cameraView.ToggleLookAt();
..	..	@@ -952,7 +1193,8 @@
952	1193
953	1194	/**/
954	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
955		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
956	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
957	1199	// We can't move the root node or an empty selection
958	1200	return;
..	..	@@ -1015,8 +1257,6 @@
1015	1257	}
1016	1258	}
1017	1259
1018		- String string = (String) object;
1019		-
1020	1260	System.out.println("Transfer = " + object + "; drop : " + target);
1021	1261	// if( object instanceof java.io.File[])
1022	1262	// {
..	..	@@ -1024,6 +1264,8 @@
1024	1264	// objEditor.DropFile((java.io.File[]) object, true);
1025	1265	// return;
1026	1266	// }
	1267	+
	1268	+ String string = object.toString();
1027	1269
1028	1270	// File path for Mac and Windows
1029	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1069,23 +1311,33 @@
1069	1311
1070	1312	assert target == objEditor.jTree;
1071	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
1072	1315	try {
1073		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1074	1317	} catch (Exception e) {
1075	1318	System.out.println("destinationPath : " + destinationPath);
1076	1319	return;
1077	1320	}
1078	1321
1079		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
1080	1323	{
	1324	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1325	+
	1326	+ // Cannot move into itself
	1327	+ if (child == destinationLeaf)
	1328	+ return;
	1329	+ }
	1330	+
	1331	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1332	+// {
1081	1333	loadClipboard(true);
1082	1334	objEditor.jTree.setSelectionPath(destinationPath);
1083	1335	pasteInto(false, false);
1084		- } else {
1085		- loadClipboard(false);
1086		- objEditor.jTree.setSelectionPath(destinationPath);
1087		- pasteInto(false, false); // true); // ???
1088		- }
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
1089	1341	}
1090	1342	public void dropActionChanged(DropTargetDragEvent dtde)
1091	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1190,22 +1442,30 @@
1190	1442	{
1191	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1192	1444	//heightFieldItem.addActionListener(this);
1193		- gridItem = menu.add(new MenuItem("Grid"));
1194		- gridItem.addActionListener(this);
1195		- rectoidItem = menu.add(new MenuItem("Box"));
1196		- rectoidItem.addActionListener(this);
1197		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1198		- ellipsoidItem.addActionListener(this);
1199		- coneItem = menu.add(new MenuItem("Cone"));
1200		- coneItem.addActionListener(this);
1201		- torusItem = menu.add(new MenuItem("Torus"));
1202		- torusItem.addActionListener(this);
1203		- superItem = menu.add(new MenuItem("Superellipsoid"));
1204		- superItem.addActionListener(this);
	1445	+// gridItem = menu.add(new MenuItem("Grid"));
	1446	+// gridItem.addActionListener(this);
	1447	+// rectoidItem = menu.add(new MenuItem("Box"));
	1448	+// rectoidItem.addActionListener(this);
	1449	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1450	+// ellipsoidItem.addActionListener(this);
	1451	+// coneItem = menu.add(new MenuItem("Cone"));
	1452	+// coneItem.addActionListener(this);
	1453	+// torusItem = menu.add(new MenuItem("Torus"));
	1454	+// torusItem.addActionListener(this);
	1455	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1456	+// superItem.addActionListener(this);
	1457	+
	1458	+ cameraItem = menu.add(new MenuItem("Camera"));
	1459	+ cameraItem.addActionListener(this);
	1460	+
	1461	+ if (!Globals.ADVANCED)
	1462	+ {
1205	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1206	1464	kleinItem.addActionListener(this);
1207		- particleItem = menu.add(new MenuItem("Particle system"));
1208		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
1209	1469	if (Globals.ADVANCED)
1210	1470	{
1211	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1231,15 +1491,15 @@
1231	1491	}
1232	1492	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1233	1493	bezierItem.addActionListener(this);
1234		- overlayItem = menu.add(new MenuItem("Overlay"));
1235		- overlayItem.addActionListener(this);
1236		- lightItem = menu.add(new MenuItem("Light"));
1237		- lightItem.addActionListener(this);
	1494	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1495	+// overlayItem.addActionListener(this);
	1496	+// lightItem = menu.add(new MenuItem("Light"));
	1497	+// lightItem.addActionListener(this);
1238	1498	menu.add("-");
1239	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1240	1500	//superLoopItem.addActionListener(this);
1241		- loopItem = menu.add(new MenuItem("Loop"));
1242		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1243	1503	doubleItem = menu.add(new MenuItem("Fork"));
1244	1504	doubleItem.addActionListener(this);
1245	1505	if (Globals.ADVANCED)
..	..	@@ -1255,6 +1515,9 @@
1255	1515	animationItem.addItemListener(this);
1256	1516	animationItem.setState(Globals.ANIMATION);
1257	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1258	1521	menu.add("-");
1259	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1260	1523	parseverticesItem.addActionListener(this);
..	..	@@ -1267,6 +1530,8 @@
1267	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1268	1531	reduce34MorphItem.addActionListener(this);
1269	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1270	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1271	1536	computeAOItem.addActionListener(this);
1272	1537
..	..	@@ -1275,8 +1540,6 @@
1275	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1276	1541	mirrorItem.addActionListener(this);
1277	1542	menu.add("-");
1278		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1279		- memoryItem.addActionListener(this);
1280	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1281	1544	analyzeItem.addActionListener(this);
1282	1545	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1420,9 +1683,34 @@
1420	1683	shadow.material = new cMaterial(obj.material);
1421	1684	shadow.material.diffuse = 0.0001f;
1422	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1423	1687
1424	1688	makeSomething(shadow);
1425	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1426	1714
1427	1715	/**
1428	1716	* applyExample
..	..	@@ -1667,7 +1955,7 @@
1667	1955	{
1668	1956	ScreenFit();
1669	1957	} else
1670		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1671	1959	{
1672	1960	cVector v1 = new cVector();
1673	1961	cVector v2 = new cVector();
..	..	@@ -1676,11 +1964,11 @@
1676	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1677	1965	objEditor.cameraView.repaint();
1678	1966	} else
1679		- if (source == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1680	1968	{
1681	1969	makeSomething(new Box());
1682	1970	} else
1683		- if (source == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1684	1972	{
1685	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1686	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1759,27 +2047,27 @@
1759	2047
1760	2048	makeSomething(obj);
1761	2049	} else
1762		- if (source == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1763	2051	{
1764	2052	makeSomething(new Grid());
1765	2053	} else
1766		- if (source == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1767	2055	{
1768	2056	makeSomething(new Sphere());
1769	2057	} else
1770		- if (source == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1771	2059	{
1772	2060	makeSomething(new Cone());
1773	2061	} else
1774		- if (source == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1775	2063	{
1776	2064	makeSomething(new Torus());
1777	2065	} else
1778		- if (source == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1779	2067	{
1780	2068	makeSomething(new Superellipsoid());
1781	2069	} else
1782		- if (source == kleinItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
1783	2071	{
1784	2072	makeSomething(new Klein());
1785	2073	} else
..	..	@@ -1799,7 +2087,7 @@
1799	2087	{
1800	2088	makeSomething(new BezierSurface());
1801	2089	} else
1802		- if (source == overlayItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1803	2091	{
1804	2092	/*
1805	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1847,7 +2135,7 @@
1847	2135	s.setup();
1848	2136	makeSomething(s);
1849	2137	} else
1850		- if (source == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1851	2139	{
1852	2140	makeSomething(new Light());
1853	2141	} else
..	..	@@ -1897,30 +2185,30 @@
1897	2185
1898	2186	group(g);
1899	2187	} else
1900		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1901	2189	{
1902	2190	Composite csg = new GroupLeaf();
1903	2191	csg.count = 5;
1904	2192	group(csg);
1905		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1906	2194	csg.addChild(child);
1907	2195	child.addChild(csg);
1908	2196	} else
1909	2197	if (source == doubleItem)
1910	2198	{
1911		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1912	2200	csg.count = 5;
1913	2201	group(csg);
1914		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1915	2203	csg.addChild(child);
1916	2204	child.addChild(csg);
1917		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1918	2206	csg.addChild(child);
1919	2207	child.addChild(csg);
1920	2208	} else
1921	2209	if (source == tripleItem)
1922	2210	{
1923		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1924	2212	csg.count = 4;
1925	2213	group(csg);
1926	2214	Composite child = new cGroup();
..	..	@@ -1970,17 +2258,45 @@
1970	2258	{
1971	2259	DumpObject();
1972	2260	} else
	2261	+ if (source == minButton)
	2262	+ {
	2263	+ Minimize();
	2264	+ } else
	2265	+ if (source == maxButton)
	2266	+ {
	2267	+ Maximize();
	2268	+ } else
	2269	+ if (source == fullButton)
	2270	+ {
	2271	+ ToggleFullScreen();
	2272	+ } else
1973	2273	if (source == undoButton)
1974	2274	{
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
1975	2278	Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
1976	2289	} else
1977	2290	if (source == redoButton)
1978	2291	{
	2292	+ // Go to next version
1979	2293	Redo();
1980	2294	} else
1981	2295	if (source == saveButton)
1982	2296	{
1983		- Save();
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
1984	2300	} else
1985	2301	if (source == oneStepButton)
1986	2302	{
..	..	@@ -1989,17 +2305,14 @@
1989	2305	} else
1990	2306	if (source == screenfitButton)
1991	2307	{
1992		- //Reload(lastConverter, lastFilename, true);
1993	2308	ScreenFit();
1994	2309	} else
1995	2310	if (source == screenfitpointButton)
1996	2311	{
1997		- //Reload(lastConverter, lastFilename, true);
1998	2312	ScreenFitPoint();
1999	2313	} else
2000	2314	if (source == snapobjectButton)
2001	2315	{
2002		- //Reload(lastConverter, lastFilename, true);
2003	2316	SnapObject();
2004	2317	} else
2005	2318	// if (event.getSource() == recompileButton)
..	..	@@ -2363,7 +2676,7 @@
2363	2676	{
2364	2677	StepAll();
2365	2678	} else
2366		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2367	2680	{
2368	2681	//int indices[] = jList.getSelectedIndices();
2369	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2375,9 +2688,9 @@
2375	2688	{
2376	2689	ClearSelection(true);
2377	2690	} else
2378		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2379	2692	{
2380		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2381	2694	} else
2382	2695	if (source == hideItem)
2383	2696	{
..	..	@@ -2395,11 +2708,11 @@
2395	2708	{
2396	2709	makeSomething(new Camera());
2397	2710	} else
2398		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2399	2712	{
2400	2713	group(new Composite());
2401	2714	} else
2402		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2403	2716	{
2404	2717	RandomNode random = new RandomNode();
2405	2718	group(random);
..	..	@@ -2501,7 +2814,7 @@
2501	2814	{
2502	2815	group(new cLinker());
2503	2816	} else
2504		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2505	2818	{
2506	2819	group(new TextureNode());
2507	2820	} else
..	..	@@ -2521,17 +2834,30 @@
2521	2834	{
2522	2835	CastShadow(2);
2523	2836	} else
2524		- if (source == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2525	2838	{
2526		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2527	2841	for (int i=0; i<group.selection.size(); i++)
2528	2842	{
2529		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2530	2848	}
2531	2849
2532		- ClearSelection(false);
2533		-
2534		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2535	2861	} else
2536	2862	if (source == genUVItem)
2537	2863	{
..	..	@@ -2608,6 +2934,22 @@
2608	2934	if (source == unmarkleavesItem)
2609	2935	{
2610	2936	MarkLeaves(false);
	2937	+ } else
	2938	+ if (source == rewindleavesItem)
	2939	+ {
	2940	+ RewindLeaves(true);
	2941	+ } else
	2942	+ if (source == unrewindleavesItem)
	2943	+ {
	2944	+ RewindLeaves(false);
	2945	+ } else
	2946	+ if (source == randomleavesItem)
	2947	+ {
	2948	+ RandomLeaves(true);
	2949	+ } else
	2950	+ if (source == unrandomleavesItem)
	2951	+ {
	2952	+ RandomLeaves(false);
2611	2953	} else
2612	2954	if (source == flipVItem)
2613	2955	{
..	..	@@ -2816,7 +3158,7 @@
2816	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2817	3159	{
2818	3160	obj = (Object3D)e.nextElement();
2819		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2820	3162	}
2821	3163
2822	3164	refreshContents();
..	..	@@ -2832,6 +3174,31 @@
2832	3174
2833	3175	refreshContents();
2834	3176	} else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
	3200	+ refreshContents();
	3201	+ } else
2835	3202	if (source == flashSelectionButton)
2836	3203	{
2837	3204	CameraPane.flash = true;
..	..	@@ -2843,6 +3210,10 @@
2843	3210	if (source == twoButton)
2844	3211	{
2845	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2846	3217	// bug
2847	3218	//gridPanel.setDividerLocation(1.0);
2848	3219	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2875,10 +3246,31 @@
2875	3246	bigThree.ClearUI();
2876	3247	bigThree.add(centralPanel);
2877	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
	3251	+
	3252	+// refreshContents(true);
	3253	+//
	3254	+// try
	3255	+// {
	3256	+// java.awt.Robot bot = new java.awt.Robot();
	3257	+// int mask = InputEvent.BUTTON1_MASK;
	3258	+// bot.mouseMove(100, 100);
	3259	+// bot.mousePress(mask);
	3260	+// bot.mouseRelease(mask);
	3261	+// }
	3262	+// catch (Exception e)
	3263	+// {
	3264	+//
	3265	+// }
	3266	+
2878	3267	} else
2879	3268	if (source == threeButton)
2880	3269	{
2881	3270	radio.layout = threeButton;
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
2882	3274
2883	3275	// bigThree.remove(scenePanel);
2884	3276	// bigThree.remove(centralPanel);
..	..	@@ -2908,13 +3300,18 @@
2908	3300	// centralPanel.setVisible(true);
2909	3301	// XYZPanel.setVisible(true);
2910	3302	bigThree.ClearUI();
	3303	+ bigThree.add(scenePanel);
2911	3304	bigThree.add(centralPanel);
2912		- bigThree.add(XYZPanel);
2913	3305	bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2914	3308	} else
2915	3309	if (source == fourButton)
2916	3310	{
2917	3311	radio.layout = fourButton;
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
2918	3315
2919	3316	// bigThree.remove(scenePanel);
2920	3317	// bigThree.remove(centralPanel);
..	..	@@ -2946,10 +3343,15 @@
2946	3343	bigThree.ClearUI();
2947	3344	bigThree.add(scenePanel);
2948	3345	bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2949	3348	} else
2950	3349	if (source == sixButton)
2951	3350	{
2952	3351	radio.layout = sixButton;
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
2953	3355
2954	3356	// bigThree.remove(scenePanel);
2955	3357	// bigThree.remove(centralPanel);
..	..	@@ -2979,13 +3381,18 @@
2979	3381	// centralPanel.setVisible(true);
2980	3382	// XYZPanel.setVisible(false);
2981	3383	bigThree.ClearUI();
2982		- bigThree.add(scenePanel);
2983	3384	bigThree.add(centralPanel);
	3385	+ bigThree.add(scenePanel);
2984	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2985	3389	} else
2986	3390	if (source == sevenButton)
2987	3391	{
2988	3392	radio.layout = sevenButton;
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
2989	3396
2990	3397	// bigThree.remove(scenePanel);
2991	3398	// bigThree.remove(centralPanel);
..	..	@@ -3019,6 +3426,8 @@
3019	3426	bigThree.add(centralPanel);
3020	3427	bigThree.add(XYZPanel);
3021	3428	bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
3022	3431	} else
3023	3432	if (source == rootButton)
3024	3433	{
..	..	@@ -3030,6 +3439,7 @@
3030	3439	EditObject(obj);
3031	3440	}
3032	3441
	3442	+ cameraView.requestFocusInWindow();
3033	3443	refreshContents(true);
3034	3444	} else
3035	3445	if (source == closeButton)
..	..	@@ -3039,22 +3449,37 @@
3039	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3040	3450	{
3041	3451	ab = (cRadio)e.nextElement();
3042		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3043	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
3044	3460	buttonGroup.remove(ab);
3045	3461	radioPanel.remove(ab);
3046	3462
3047		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
3048	3465	// ab.GetObject().objectUI = null; // ?????????
3049	3466
3050	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3051	3468	break;
3052	3469	}
3053	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
3054	3473	refreshContents(true);
3055	3474	} else
3056	3475	if (source == editItem \|\| source == editButton)
3057	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
3058	3483	EditSelection(false);
3059	3484	} else
3060	3485	if (source == uneditButton)
..	..	@@ -3064,6 +3489,7 @@
3064	3489	Object3D child = (Object3D)e.nextElement();
3065	3490	if(child.editWindow != null)
3066	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
3067	3493	child.CloseUI();
3068	3494	listUI.remove(child);
3069	3495
..	..	@@ -3080,6 +3506,7 @@
3080	3506	//copy.ClearUI();
3081	3507	for (Object3D obj : listUI)
3082	3508	{
	3509	+ obj.pinned = false;
3083	3510	obj.CloseUI();
3084	3511	}
3085	3512	listUI.clear();
..	..	@@ -3089,7 +3516,7 @@
3089	3516	{
3090	3517	assert(copy == group);
3091	3518
3092		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	3520
3094	3521	for (Object3D obj : listUI)
3095	3522	{
..	..	@@ -3138,6 +3565,9 @@
3138	3565	}
3139	3566
3140	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3141	3571	//Globals.theRenderer.object = group;
3142	3572	if(!useclient)
3143	3573	{
..	..	@@ -3155,7 +3585,8 @@
3155	3585	}
3156	3586
3157	3587	// fix "+" issue
3158		- group.editWindow = this;
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
3159	3590
3160	3591	/*
3161	3592	currentLayout = radio.layout;
..	..	@@ -3163,18 +3594,27 @@
3163	3594	currentLayout = sevenButton;
3164	3595	*/
3165	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
3166	3604	keepparent = group.parent;
3167	3605	// PARENT = NULL or not???
3168	3606	//group.parent = null; // ROOT
3169	3607	//group.attributes = -1;
3170	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3171	3611	refreshContents(true);
3172	3612	} else if (event.getSource() == editCameraItem)
3173	3613	{
3174	3614	cameraView.ProtectCamera();
3175	3615	cameraView.repaint();
3176	3616	return;
3177		- } else if (event.getSource() == revertCameraItem)
	3617	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3178	3618	{
3179	3619	cameraView.RevertCamera();
3180	3620	cameraView.repaint();
..	..	@@ -3191,7 +3631,6 @@
3191	3631	}
3192	3632
3193	3633	boolean useclient = false;
3194		- cRadio radio;
3195	3634
3196	3635	void ToggleRoot()
3197	3636	{
..	..	@@ -3754,7 +4193,7 @@
3754	4193
3755	4194	try
3756	4195	{
3757		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3758	4197	}
3759	4198	catch (Exception e)
3760	4199	{
..	..	@@ -4146,6 +4585,18 @@
4146	4585	refreshContents();
4147	4586	}
4148	4587
	4588	+ void RewindLeaves(boolean hide)
	4589	+ {
	4590	+ group.selection.RewindLeaves(hide);
	4591	+ refreshContents();
	4592	+ }
	4593	+
	4594	+ void RandomLeaves(boolean hide)
	4595	+ {
	4596	+ group.selection.RandomLeaves(hide);
	4597	+ refreshContents();
	4598	+ }
	4599	+
4149	4600	void SetTexRes(int tr)
4150	4601	{
4151	4602	group.selection.SetTexRes(tr);
..	..	@@ -4217,28 +4668,25 @@
4217	4668	// }
4218	4669	// }
4219	4670
4220		- static boolean allparams = true;
4221		-
4222		- static Vector<Object3D> listUI = new Vector<Object3D>();
4223		-
4224	4671	void EditSelection(boolean newWindow)
4225	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4226	4679	// aConstraints.gridy = 0;
4227	4680	for (int i=0; i<group.selection.size(); i++)
4228	4681	{
4229	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4230	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4231		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4232	4685
4233	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4234	4687	if(elem != group \|\| !newWindow)
4235	4688	{
4236		- // if (!(elem instanceof Composite))
4237		- // newWindow = false;
4238		- listUI.add(elem);
4239		- elem.openEditWindow(this, newWindow); //, false);
4240		- System.out.println("edit : " + elem);
4241		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4242	4690	}
4243	4691	}
4244	4692	}
..	..	@@ -4313,7 +4761,8 @@
4313	4761	//new Exception().printStackTrace();
4314	4762
4315	4763	freezemodel = true;
4316		-
	4764	+ ClearUnpinned();
	4765	+
4317	4766	/**/
4318	4767	//switch (event.id)
4319	4768	{
..	..	@@ -4329,6 +4778,7 @@
4329	4778
4330	4779	//if (child.parent != null)
4331	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
4332	4782	group.addSelectee(child);
4333	4783	}
4334	4784	}
..	..	@@ -4345,7 +4795,7 @@
4345	4795	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4346	4796	// a camera
4347	4797	{
4348		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4798	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4349	4799	{
4350	4800	CameraPane.camerachangeframe = 0; // don't refuse it
4351	4801	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4354,6 +4804,13 @@
4354	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4355	4805	}
4356	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4357	4814	refreshContents();
4358	4815	//return true;
4359	4816	}
..	..	@@ -4363,21 +4820,27 @@
4363	4820	freezemodel = false;
4364	4821	}
4365	4822
	4823	+ void SetPinStates(boolean enabled)
	4824	+ {
	4825	+ editButton.setEnabled(enabled);
	4826	+ uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
	4829	+ }
	4830	+
4366	4831	void refreshContents(boolean cp)
4367	4832	{
4368		- if (!Globals.MOUSEDRAGGED)
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4369	4835	{
4370	4836	objEditor.ClearInfo(); // .GetMaterial());
4371	4837
4372		- for (int i=0; i < group.selection.size(); i++)
	4838	+ for (int i=0; i < group.selection.Size(); i++)
4373	4839	{
4374		- Object3D child = (Object3D) group.selection.reserve(i);
	4840	+ Object3D child = (Object3D) group.selection.get(i);
4375	4841
4376		- objEditor.SetMaterial(child);
4377	4842	objEditor.AddInfo(child, this, true);
4378	4843	System.err.println("info : " + child.GetPath());
4379		-
4380		- group.selection.release(i);
4381	4844	}
4382	4845
4383	4846	objEditor.SetText(); // jan 2014
..	..	@@ -4467,7 +4930,8 @@
4467	4930
4468	4931	if (cut)
4469	4932	{
4470		- Save();
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4471	4935	//int indices[] = jList.getSelectedIndices();
4472	4936	//for (int i = indices.length - 1; i >= 0; i--)
4473	4937	//jList.remove(indices[i]);
..	..	@@ -4570,6 +5034,10 @@
4570	5034
4571	5035	void paste(boolean expand)
4572	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4573	5041	// if (GrafreeD.clipboard == null)
4574	5042	// return;
4575	5043	boolean first = true;
..	..	@@ -4629,6 +5097,7 @@
4629	5097	Grafreed.clipboard.get(0).parent = keepparent;
4630	5098	}
4631	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4632	5101	ResetModel();
4633	5102	refreshContents();
4634	5103	}
..	..	@@ -4764,6 +5233,10 @@
4764	5233
4765	5234	void group(Object3D csg, boolean grab)
4766	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4767	5240	if (//false) // why??
4768	5241	!group.selection.isEmpty())
4769	5242	{
..	..	@@ -4877,10 +5350,15 @@
4877	5350	//node.add(csg);
4878	5351	//makeSomething(node);
4879	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4880	5354	}
4881	5355
4882	5356	void Ungroup(Object3D g)
4883	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4884	5362	if (g instanceof HiddenObject)
4885	5363	{
4886	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -4897,6 +5375,7 @@
4897	5375	objEditor.makeSomething(g.get(i), false);
4898	5376	}
4899	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
4900	5379	}
4901	5380
4902	5381	void ungroup()
..	..	@@ -5185,10 +5664,28 @@
5185	5664	cButton clearpanelButton;
5186	5665	cButton unselectButton;
5187	5666
	5667	+ cButton restoreCameraButton;
	5668	+
5188	5669	cButton saveButton;
5189		- cButton undoButton;
5190		- cButton redoButton;
5191	5670	cButton oneStepButton;
	5671	+
	5672	+ cButton groupButton;
	5673	+ cButton ungroupButton;
	5674	+ cButton compositeButton;
	5675	+ cButton switchButton;
	5676	+ cButton loopButton;
	5677	+ cButton textureButton;
	5678	+
	5679	+ cButton gridButton;
	5680	+ cButton boxButton;
	5681	+ cButton sphereButton;
	5682	+ cButton coneButton;
	5683	+ cButton torusButton;
	5684	+ cButton superButton;
	5685	+ cButton kleinButton;
	5686	+ cButton particlesButton;
	5687	+ cButton overlayButton;
	5688	+ cButton lightButton;
5192	5689
5193	5690	cButton screenfitButton;
5194	5691	cButton screenfitpointButton;
..	..	@@ -5201,14 +5698,6 @@
5201	5698
5202	5699	cButton setsupportButton;
5203	5700
5204		- cButton twoButton;
5205		- cButton sixButton;
5206		- cButton threeButton;
5207		- cButton sevenButton;
5208		- cButton fourButton; // full panel
5209		- cButton oneButton; // full XYZ
5210		- //cButton currentLayout;
5211		-
5212	5701	//
5213	5702	//Composite
5214	5703	Object3D // to do !!
..	..	@@ -5218,11 +5707,11 @@
5218	5707	//JTree jTree;
5219	5708	private MenuItem lookAtItem;
5220	5709	private MenuItem lookFromItem;
5221		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
5222	5711	private MenuItem cutItem;
5223	5712	private MenuItem undoItem;
5224	5713	private MenuItem redoItem;
5225		- private MenuItem duplicateItem;
	5714	+ private JMenuItem duplicateItem;
5226	5715	private MenuItem cloneItem;
5227	5716	private MenuItem cloneSupportItem;
5228	5717	private MenuItem overwriteGeoItem;
..	..	@@ -5250,7 +5739,7 @@
5250	5739	private MenuItem pasteLinkItem;
5251	5740	private MenuItem pasteCloneItem;
5252	5741	private MenuItem pasteExpandItem;
5253		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5254	5743	private MenuItem clearAllItem;
5255	5744	private MenuItem genUVItem;
5256	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5285,6 +5774,10 @@
5285	5774	private MenuItem showleavesItem;
5286	5775	private MenuItem markleavesItem;
5287	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
5288	5781
5289	5782	private MenuItem flipVItem;
5290	5783	private MenuItem unflipVItem;
..	..	@@ -5306,7 +5799,7 @@
5306	5799	private MenuItem frontItem;
5307	5800	private MenuItem cameraItem;
5308	5801	private MenuItem compositeItem;
5309		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5310	5803	private MenuItem physicsItem;
5311	5804	private MenuItem frameselectorItem;
5312	5805	private MenuItem scriptNodeItem;
..	..	@@ -5330,6 +5823,8 @@
5330	5823	private MenuItem attachBumpItem;
5331	5824	private MenuItem detachBumpItem;
5332	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5333	5828
5334	5829	private MenuItem particleItem;
5335	5830	private MenuItem ragdollItem;
..	..	@@ -5380,5 +5875,5 @@
5380	5875
5381	5876	Menu cameraMenu;
5382	5877	MenuItem editCameraItem;
5383		- MenuItem revertCameraItem;
	5878	+ MenuItem restoreCameraItem;
5384	5879	}