~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	}
..	..	@@ -74,6 +80,12 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
77	89	SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +110,7 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +167,8 @@
150	167
151	168	void SetupMenu2(GroupEditor oe)
152	169	{
	170	+ oe.jTree = new cTree();
	171	+
153	172	Menu menu;
154	173	oe.menuBar.add(menu = new Menu("Edit"));
155	174	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +179,7 @@
160	179	// redoItem = menu.add(new MenuItem("Redo"));
161	180	// redoItem.addActionListener(this);
162	181	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	183	duplicateItem.addActionListener(this);
165	184	cloneItem = menu.add(new MenuItem("Clone"));
166	185	cloneItem.addActionListener(this);
..	..	@@ -176,7 +195,6 @@
176	195	copyItem.addActionListener(this);
177	196	pasteItem = menu.add(new MenuItem("Paste"));
178	197	pasteItem.addActionListener(this);
179		- menu.add("-");
180	198
181	199	menu.add("-");
182	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +206,8 @@
188	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	207	// pasteExpandItem.addActionListener(this);
190	208	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
193	211
194	212	if (Globals.ADVANCED)
195	213	{
..	..	@@ -203,23 +221,23 @@
203	221	//zBufferItem.addActionListener(this);
204	222	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	223	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
208	226
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	239
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"));
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	241	toggleHandleItem.addItemListener(this);
224	242	toggleHandleItem.setState(CameraPane.HANDLES);
225	243
..	..	@@ -246,7 +264,7 @@
246	264
247	265	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	266	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
250	268
251	269	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	270	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +292,7 @@
274	292	{
275	293	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	294	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	296	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	297	oe.cameraMenu.add("-");
280	298	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +300,7 @@
282	300	editLeafItem.addActionListener(this);
283	301	lookAtItem.addActionListener(this);
284	302	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	303	+ //switchViewItem.addActionListener(this);
286	304	}
287	305
288	306	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +345,29 @@
327	345	}
328	346
329	347	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
332	350	backItem = menu.add(new MenuItem("Back"));
333	351	backItem.addActionListener(this);
334	352	frontItem = menu.add(new MenuItem("Front"));
335	353	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
338	359	hideItem = menu.add(new MenuItem("Hidden Group"));
339	360	hideItem.addActionListener(this);
	361	+ }
340	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	363	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
345	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	372	switchGeoItem.addActionListener(this);
347	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +375,6 @@
349	375	morphItem = menu.add(new MenuItem("Morph Group"));
350	376	morphItem.addActionListener(this);
351	377
352		- if (Globals.ADVANCED)
353		- {
354	378	menu.add("-");
355	379	physicsItem = menu.add(new MenuItem("Physics"));
356	380	physicsItem.addActionListener(this);
..	..	@@ -358,30 +382,29 @@
358	382	frameselectorItem.addActionListener(this);
359	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	384	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	385	}
364	386
365	387	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
368	390	billboardItem = menu.add(new MenuItem("Billboard"));
369	391	billboardItem.addActionListener(this);
370	392	csgItem = menu.add(new MenuItem("CSG"));
371	393	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	395	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	397	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
378	403	if (Globals.ADVANCED)
379	404	{
380	405	menu.add("-");
381	406	linkerItem = menu.add(new MenuItem("Linker"));
382	407	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	408	templateItem = menu.add(new MenuItem("Template"));
386	409	templateItem.addActionListener(this);
387	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +433,7 @@
410	433	genNormalsMESHItem.addActionListener(this);
411	434	if (Globals.ADVANCED)
412	435	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	437	genNormalsMINEItem.addActionListener(this);
415	438	}
416	439	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -470,6 +493,14 @@
470	493	markleavesItem.addActionListener(this);
471	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
473	504	menu.add("-");
474	505	flipVItem = menu.add(new MenuItem("Flip V"));
475	506	flipVItem.addActionListener(this);
..	..	@@ -525,8 +556,21 @@
525	556	buildToolsMenu(menu);
526	557	}
527	558
	559	+
528	560	void SetupUI2(ObjEditor oe)
529	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
530	574	//new Exception().printStackTrace();
531	575
532	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +599,79 @@
555	599	oe.radioPanel.add(dummyButton);
556	600	oe.buttonGroup.add(dummyButton);
557	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
558	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	607
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
563	611
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
567	618
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
570	633	saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
571	639
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	659	liveCB.setToolTipText("Enable animation");
574	660	liveCB.addItemListener(this);
575	661
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	663	oneStepButton.setToolTipText("Animate one step forward");
578	664	oneStepButton.addActionListener(this);
579	665
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	667	fastCB.setToolTipText("Fast mode");
582	668	fastCB.addItemListener(this);
583	669
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);
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
591	675
592	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	677	// screenfitpointButton.addActionListener(this);
..	..	@@ -599,65 +683,146 @@
599	683	snapobjectButton.setToolTipText("Snap Object");
600	684	}
601	685
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	687
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");
610		- twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	689	fourButton.addActionListener(this);
613	690	fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
	697	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ sixButton.setToolTipText("Show left and right");
616	699	sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
619		- threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
623	706	//
624	707
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
627	710	rootButton.addActionListener(this);
628	711
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	713	closeButton.setToolTipText("Close tab");
631	714	closeButton.addActionListener(this);
632	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	716	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	717	+
	718	+ // INSERT
	719	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ gridButton.setToolTipText("Create grid");
	721	+ gridButton.addActionListener(this);
	722	+
	723	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ boxButton.setToolTipText("Create box");
	725	+ boxButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ sphereButton.setToolTipText("Create sphere");
	729	+ sphereButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ coneButton.setToolTipText("Create cone");
	733	+ coneButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ torusButton.setToolTipText("Create torus");
	737	+ torusButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ superButton.setToolTipText("Create superellipsoid");
	741	+ superButton.addActionListener(this);
	742	+
	743	+ if (Globals.ADVANCED)
	744	+ {
	745	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ kleinButton.setToolTipText("Create Klein bottle");
	747	+ kleinButton.addActionListener(this);
	748	+ }
636	749
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	750	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ particlesButton.setToolTipText("Create particle system");
	752	+ particlesButton.addActionListener(this);
	753	+
	754	+ oe.toolboxPanel.Return();
	755	+
	756	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ groupButton.setToolTipText("Create group");
	758	+ groupButton.addActionListener(this);
	759	+
	760	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ compositeButton.setToolTipText("Create composite");
	762	+ compositeButton.addActionListener(this);
	763	+
	764	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ switchButton.setToolTipText("Create item switcher");
	766	+ switchButton.addActionListener(this);
	767	+
	768	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ loopButton.setToolTipText("Create loop");
	770	+ loopButton.addActionListener(this);
	771	+
	772	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ textureButton.setToolTipText("Create texture");
	774	+ textureButton.addActionListener(this);
	775	+
	776	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ overlayButton.setToolTipText("Create overlay");
	778	+ overlayButton.addActionListener(this);
	779	+
	780	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ lightButton.setToolTipText("Create light");
	782	+ lightButton.addActionListener(this);
	783	+
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
	796	+ // EDIT panel
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
639	799	editButton.addActionListener(this);
640	800
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
643	803	uneditButton.addActionListener(this);
644	804
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
647	807	allParamsButton.addActionListener(this);
648	808
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	810	clearPanelButton.setToolTipText("Clear edit panel");
651	811	clearPanelButton.addActionListener(this);
652	812
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	814	unselectButton.setToolTipText("Unselect");
655	815	unselectButton.addActionListener(this);
656	816
657		- commandsPanel.preferredHeight = 1;
	817	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	818	+ flashSelectionButton.setToolTipText("Highlight selection");
	819	+ flashSelectionButton.addActionListener(this);
658	820
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
661	826
662	827	// oe.aConstraints.gridx += 1;
663	828	// oe.aConstraints.weighty = 0;
..	..	@@ -674,29 +839,17 @@
674	839
675	840	JScrollPane jSP;
676	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	843	ResetModel();
679	844
680	845	oe.treePanel.add(jSPPanel);
681	846	oe.treePanel.Return();
682	847
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	848	oe.treePanel.add(copyOptionsPanel);
699	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
700	853
701	854	// mainPanel.setDividerLocation(0.5); //1.0);
702	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -719,29 +872,49 @@
719	872	dgr.addDragGestureListener(this);
720	873	}catch(Exception e) {}
721	874	*/
722		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
723	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	877	}
725	878
726	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	880	{
	881	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	882	+ colorCB.setToolTipText("Copy color when dropped");
	883	+ colorCB.addItemListener(this);
	884	+
	885	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	886	+ materialCB.setToolTipText("Copy material when dropped");
	887	+ materialCB.addItemListener(this);
	888	+
	889	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	890	+ textureCB.setToolTipText("Copy texture when dropped");
	891	+ textureCB.addItemListener(this);
	892	+
	893	+ panel.Return();
	894	+
728	895	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	896	boxCB.setToolTipText("Display bounding boxes");
730	897	boxCB.addItemListener(this);
731	898
732	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	901	zoomBoxCB.addItemListener(this);
735	902
736	903	if (true) // Globals.ADVANCED)
737	904	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
741	912
742	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	914	// localCB.addItemListener(this);
744	915
	916	+ panel.Return();
	917	+
745	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	919	crowdCB.setToolTipText("Used for crowds");
747	920	crowdCB.addItemListener(this);
..	..	@@ -758,6 +931,8 @@
758	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	932	// speakerMocapCB.addItemListener(this);
760	933
	934	+ panel.Return();
	935	+
761	936	if (false)
762	937	{
763	938	// handled in scripts
..	..	@@ -772,34 +947,74 @@
772	947	//constraints.gridy += 1;
773	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
775	951	}
776	952
777	953	//constraints.gridx += 1;
778	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	955	// debugCB.addItemListener(this);
780	956
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
781	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
782	963	oeilCB.addItemListener(this);
783	964
	965	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	966	+ shadowCB.setToolTipText("When live compute shadows");
	967	+ shadowCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	971	+ toggleTextureCB.setToolTipText("Load textures");
	972	+ toggleTextureCB.addItemListener(this);
	973	+
	974	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
	976	+ toggleSwitchCB.addItemListener(this);
	977	+
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
	981	+
	982	+ panel.Return();
	983	+ if (Globals.ADVANCED)
	984	+ {
784	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	986	lookAtCB.setToolTipText("Look-at target");
786	987	lookAtCB.addItemListener(this);
	988	+ }
787	989
788	990	}
789	991
790	992	cGridBag fill = new cGridBag();
791		-
792	993	fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
793	998
794	999	panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
795	1002
796	1003	}
797	1004
798	1005	void EditObject(Object3D obj)
799	1006	{
800	1007	cRadio radioButton = new cRadio(obj.name);
	1008	+
	1009	+ // June 2019. Patch to avoid bug with transparency.
	1010	+ radioButton.hadMaterial = obj.material != null;
	1011	+ if (!radioButton.hadMaterial)
	1012	+ {
	1013	+ obj.material = new cMaterial();
	1014	+ }
	1015	+
801	1016	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
803	1018	radioButton.SetCamera(cameraView.renderCamera, false);
804	1019	radioButton.addActionListener(this);
805	1020	radioPanel.add(radioButton);
..	..	@@ -809,6 +1024,8 @@
809	1024
810	1025	void SetupViews(ObjEditor oe)
811	1026	{
	1027	+ theFrame = this;
	1028	+
812	1029	oe.SetupViews();
813	1030
814	1031	System.out.println("SetupViews");
..	..	@@ -817,23 +1034,28 @@
817	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1035	}
819	1036
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;
	1037	+ cToggleButton liveCB;
	1038	+ cCheckBox supportCB;
	1039	+ cCheckBox localCB;
	1040	+ cCheckBox crowdCB;
	1041	+ cCheckBox smoothCB;
	1042	+ cToggleButton fastCB;
	1043	+ cCheckBox slowCB;
	1044	+ cCheckBox boxCB;
	1045	+ cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
	1047	+ //cToggleButton trackCB;
	1048	+ cCheckBox trackCB;
	1049	+ cCheckBox smoothfocusCB;
831	1050	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
837	1059
838	1060	// static int COLOR = 1;
839	1061	// static int MATERIAL = 2;
..	..	@@ -841,9 +1063,9 @@
841	1063
842	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1065
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
847	1069
848	1070	public void itemStateChanged(ItemEvent e)
849	1071	{
..	..	@@ -936,6 +1158,18 @@
936	1158	{
937	1159	cameraView.ToggleOeil();
938	1160	}
	1161	+ else if(e.getSource() == shadowCB)
	1162	+ {
	1163	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1164	+ }
	1165	+ else if(e.getSource() == freezeCB)
	1166	+ {
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
	1172	+ }
939	1173	else if(e.getSource() == lookAtCB)
940	1174	{
941	1175	cameraView.ToggleLookAt();
..	..	@@ -952,7 +1186,8 @@
952	1186
953	1187	/**/
954	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
955		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
956	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
957	1192	// We can't move the root node or an empty selection
958	1193	return;
..	..	@@ -1015,8 +1250,6 @@
1015	1250	}
1016	1251	}
1017	1252
1018		- String string = (String) object;
1019		-
1020	1253	System.out.println("Transfer = " + object + "; drop : " + target);
1021	1254	// if( object instanceof java.io.File[])
1022	1255	// {
..	..	@@ -1024,6 +1257,8 @@
1024	1257	// objEditor.DropFile((java.io.File[]) object, true);
1025	1258	// return;
1026	1259	// }
	1260	+
	1261	+ String string = object.toString();
1027	1262
1028	1263	// File path for Mac and Windows
1029	1264	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1069,23 +1304,33 @@
1069	1304
1070	1305	assert target == objEditor.jTree;
1071	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
1072	1308	try {
1073		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1074	1310	} catch (Exception e) {
1075	1311	System.out.println("destinationPath : " + destinationPath);
1076	1312	return;
1077	1313	}
1078	1314
1079		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
1080	1316	{
	1317	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1318	+
	1319	+ // Cannot move into itself
	1320	+ if (child == destinationLeaf)
	1321	+ return;
	1322	+ }
	1323	+
	1324	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1325	+// {
1081	1326	loadClipboard(true);
1082	1327	objEditor.jTree.setSelectionPath(destinationPath);
1083	1328	pasteInto(false, false);
1084		- } else {
1085		- loadClipboard(false);
1086		- objEditor.jTree.setSelectionPath(destinationPath);
1087		- pasteInto(false, false); // true); // ???
1088		- }
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
1089	1334	}
1090	1335	public void dropActionChanged(DropTargetDragEvent dtde)
1091	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1190,22 +1435,30 @@
1190	1435	{
1191	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1192	1437	//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);
	1438	+// gridItem = menu.add(new MenuItem("Grid"));
	1439	+// gridItem.addActionListener(this);
	1440	+// rectoidItem = menu.add(new MenuItem("Box"));
	1441	+// rectoidItem.addActionListener(this);
	1442	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1443	+// ellipsoidItem.addActionListener(this);
	1444	+// coneItem = menu.add(new MenuItem("Cone"));
	1445	+// coneItem.addActionListener(this);
	1446	+// torusItem = menu.add(new MenuItem("Torus"));
	1447	+// torusItem.addActionListener(this);
	1448	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1449	+// superItem.addActionListener(this);
	1450	+
	1451	+ cameraItem = menu.add(new MenuItem("Camera"));
	1452	+ cameraItem.addActionListener(this);
	1453	+
	1454	+ if (!Globals.ADVANCED)
	1455	+ {
1205	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1206	1457	kleinItem.addActionListener(this);
1207		- particleItem = menu.add(new MenuItem("Particle system"));
1208		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
1209	1462	if (Globals.ADVANCED)
1210	1463	{
1211	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1231,15 +1484,15 @@
1231	1484	}
1232	1485	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1233	1486	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);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1238	1491	menu.add("-");
1239	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1240	1493	//superLoopItem.addActionListener(this);
1241		- loopItem = menu.add(new MenuItem("Loop"));
1242		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1243	1496	doubleItem = menu.add(new MenuItem("Fork"));
1244	1497	doubleItem.addActionListener(this);
1245	1498	if (Globals.ADVANCED)
..	..	@@ -1255,6 +1508,9 @@
1255	1508	animationItem.addItemListener(this);
1256	1509	animationItem.setState(Globals.ANIMATION);
1257	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1258	1514	menu.add("-");
1259	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1260	1516	parseverticesItem.addActionListener(this);
..	..	@@ -1267,6 +1523,8 @@
1267	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1268	1524	reduce34MorphItem.addActionListener(this);
1269	1525	menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1270	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1271	1529	computeAOItem.addActionListener(this);
1272	1530
..	..	@@ -1275,8 +1533,6 @@
1275	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1276	1534	mirrorItem.addActionListener(this);
1277	1535	menu.add("-");
1278		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1279		- memoryItem.addActionListener(this);
1280	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1281	1537	analyzeItem.addActionListener(this);
1282	1538	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1420,9 +1676,34 @@
1420	1676	shadow.material = new cMaterial(obj.material);
1421	1677	shadow.material.diffuse = 0.0001f;
1422	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1423	1680
1424	1681	makeSomething(shadow);
1425	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1426	1707
1427	1708	/**
1428	1709	* applyExample
..	..	@@ -1667,7 +1948,7 @@
1667	1948	{
1668	1949	ScreenFit();
1669	1950	} else
1670		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1671	1952	{
1672	1953	cVector v1 = new cVector();
1673	1954	cVector v2 = new cVector();
..	..	@@ -1676,11 +1957,11 @@
1676	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1677	1958	objEditor.cameraView.repaint();
1678	1959	} else
1679		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1680	1961	{
1681	1962	makeSomething(new Box());
1682	1963	} else
1683		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1684	1965	{
1685	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1686	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1759,27 +2040,27 @@
1759	2040
1760	2041	makeSomething(obj);
1761	2042	} else
1762		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1763	2044	{
1764	2045	makeSomething(new Grid());
1765	2046	} else
1766		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1767	2048	{
1768	2049	makeSomething(new Sphere());
1769	2050	} else
1770		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1771	2052	{
1772	2053	makeSomething(new Cone());
1773	2054	} else
1774		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1775	2056	{
1776	2057	makeSomething(new Torus());
1777	2058	} else
1778		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1779	2060	{
1780	2061	makeSomething(new Superellipsoid());
1781	2062	} else
1782		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1783	2064	{
1784	2065	makeSomething(new Klein());
1785	2066	} else
..	..	@@ -1799,7 +2080,7 @@
1799	2080	{
1800	2081	makeSomething(new BezierSurface());
1801	2082	} else
1802		- if (source == overlayItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1803	2084	{
1804	2085	/*
1805	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1847,7 +2128,7 @@
1847	2128	s.setup();
1848	2129	makeSomething(s);
1849	2130	} else
1850		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1851	2132	{
1852	2133	makeSomething(new Light());
1853	2134	} else
..	..	@@ -1897,30 +2178,30 @@
1897	2178
1898	2179	group(g);
1899	2180	} else
1900		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1901	2182	{
1902	2183	Composite csg = new GroupLeaf();
1903	2184	csg.count = 5;
1904	2185	group(csg);
1905		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1906	2187	csg.addChild(child);
1907	2188	child.addChild(csg);
1908	2189	} else
1909	2190	if (source == doubleItem)
1910	2191	{
1911		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1912	2193	csg.count = 5;
1913	2194	group(csg);
1914		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1915	2196	csg.addChild(child);
1916	2197	child.addChild(csg);
1917		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1918	2199	csg.addChild(child);
1919	2200	child.addChild(csg);
1920	2201	} else
1921	2202	if (source == tripleItem)
1922	2203	{
1923		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1924	2205	csg.count = 4;
1925	2206	group(csg);
1926	2207	Composite child = new cGroup();
..	..	@@ -1970,17 +2251,45 @@
1970	2251	{
1971	2252	DumpObject();
1972	2253	} else
	2254	+ if (source == minButton)
	2255	+ {
	2256	+ Minimize();
	2257	+ } else
	2258	+ if (source == maxButton)
	2259	+ {
	2260	+ Maximize();
	2261	+ } else
	2262	+ if (source == fullButton)
	2263	+ {
	2264	+ ToggleFullScreen();
	2265	+ } else
1973	2266	if (source == undoButton)
1974	2267	{
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
1975	2271	Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
1976	2282	} else
1977	2283	if (source == redoButton)
1978	2284	{
	2285	+ // Go to next version
1979	2286	Redo();
1980	2287	} else
1981	2288	if (source == saveButton)
1982	2289	{
1983		- Save();
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
1984	2293	} else
1985	2294	if (source == oneStepButton)
1986	2295	{
..	..	@@ -1989,17 +2298,14 @@
1989	2298	} else
1990	2299	if (source == screenfitButton)
1991	2300	{
1992		- //Reload(lastConverter, lastFilename, true);
1993	2301	ScreenFit();
1994	2302	} else
1995	2303	if (source == screenfitpointButton)
1996	2304	{
1997		- //Reload(lastConverter, lastFilename, true);
1998	2305	ScreenFitPoint();
1999	2306	} else
2000	2307	if (source == snapobjectButton)
2001	2308	{
2002		- //Reload(lastConverter, lastFilename, true);
2003	2309	SnapObject();
2004	2310	} else
2005	2311	// if (event.getSource() == recompileButton)
..	..	@@ -2363,7 +2669,7 @@
2363	2669	{
2364	2670	StepAll();
2365	2671	} else
2366		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2367	2673	{
2368	2674	//int indices[] = jList.getSelectedIndices();
2369	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2375,9 +2681,9 @@
2375	2681	{
2376	2682	ClearSelection(true);
2377	2683	} else
2378		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2379	2685	{
2380		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2381	2687	} else
2382	2688	if (source == hideItem)
2383	2689	{
..	..	@@ -2395,11 +2701,11 @@
2395	2701	{
2396	2702	makeSomething(new Camera());
2397	2703	} else
2398		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2399	2705	{
2400	2706	group(new Composite());
2401	2707	} else
2402		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2403	2709	{
2404	2710	RandomNode random = new RandomNode();
2405	2711	group(random);
..	..	@@ -2501,7 +2807,7 @@
2501	2807	{
2502	2808	group(new cLinker());
2503	2809	} else
2504		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2505	2811	{
2506	2812	group(new TextureNode());
2507	2813	} else
..	..	@@ -2521,17 +2827,30 @@
2521	2827	{
2522	2828	CastShadow(2);
2523	2829	} else
2524		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2525	2831	{
2526		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2527	2834	for (int i=0; i<group.selection.size(); i++)
2528	2835	{
2529		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2530	2841	}
2531	2842
2532		- ClearSelection(false);
2533		-
2534		- refreshContents();
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2535	2854	} else
2536	2855	if (source == genUVItem)
2537	2856	{
..	..	@@ -2608,6 +2927,22 @@
2608	2927	if (source == unmarkleavesItem)
2609	2928	{
2610	2929	MarkLeaves(false);
	2930	+ } else
	2931	+ if (source == rewindleavesItem)
	2932	+ {
	2933	+ RewindLeaves(true);
	2934	+ } else
	2935	+ if (source == unrewindleavesItem)
	2936	+ {
	2937	+ RewindLeaves(false);
	2938	+ } else
	2939	+ if (source == randomleavesItem)
	2940	+ {
	2941	+ RandomLeaves(true);
	2942	+ } else
	2943	+ if (source == unrandomleavesItem)
	2944	+ {
	2945	+ RandomLeaves(false);
2611	2946	} else
2612	2947	if (source == flipVItem)
2613	2948	{
..	..	@@ -2843,6 +3178,10 @@
2843	3178	if (source == twoButton)
2844	3179	{
2845	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2846	3185	// bug
2847	3186	//gridPanel.setDividerLocation(1.0);
2848	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2875,10 +3214,31 @@
2875	3214	bigThree.ClearUI();
2876	3215	bigThree.add(centralPanel);
2877	3216	bigThree.FlushUI();
	3217	+
	3218	+ cameraView.requestFocusInWindow();
	3219	+
	3220	+// refreshContents(true);
	3221	+//
	3222	+// try
	3223	+// {
	3224	+// java.awt.Robot bot = new java.awt.Robot();
	3225	+// int mask = InputEvent.BUTTON1_MASK;
	3226	+// bot.mouseMove(100, 100);
	3227	+// bot.mousePress(mask);
	3228	+// bot.mouseRelease(mask);
	3229	+// }
	3230	+// catch (Exception e)
	3231	+// {
	3232	+//
	3233	+// }
	3234	+
2878	3235	} else
2879	3236	if (source == threeButton)
2880	3237	{
2881	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2882	3242
2883	3243	// bigThree.remove(scenePanel);
2884	3244	// bigThree.remove(centralPanel);
..	..	@@ -2911,10 +3271,15 @@
2911	3271	bigThree.add(centralPanel);
2912	3272	bigThree.add(XYZPanel);
2913	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2914	3276	} else
2915	3277	if (source == fourButton)
2916	3278	{
2917	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2918	3283
2919	3284	// bigThree.remove(scenePanel);
2920	3285	// bigThree.remove(centralPanel);
..	..	@@ -2946,10 +3311,15 @@
2946	3311	bigThree.ClearUI();
2947	3312	bigThree.add(scenePanel);
2948	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2949	3316	} else
2950	3317	if (source == sixButton)
2951	3318	{
2952	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2953	3323
2954	3324	// bigThree.remove(scenePanel);
2955	3325	// bigThree.remove(centralPanel);
..	..	@@ -2982,10 +3352,15 @@
2982	3352	bigThree.add(scenePanel);
2983	3353	bigThree.add(centralPanel);
2984	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2985	3357	} else
2986	3358	if (source == sevenButton)
2987	3359	{
2988	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
2989	3364
2990	3365	// bigThree.remove(scenePanel);
2991	3366	// bigThree.remove(centralPanel);
..	..	@@ -3019,6 +3394,8 @@
3019	3394	bigThree.add(centralPanel);
3020	3395	bigThree.add(XYZPanel);
3021	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
3022	3399	} else
3023	3400	if (source == rootButton)
3024	3401	{
..	..	@@ -3030,6 +3407,7 @@
3030	3407	EditObject(obj);
3031	3408	}
3032	3409
	3410	+ cameraView.requestFocusInWindow();
3033	3411	refreshContents(true);
3034	3412	} else
3035	3413	if (source == closeButton)
..	..	@@ -3039,22 +3417,37 @@
3039	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3040	3418	{
3041	3419	ab = (cRadio)e.nextElement();
3042		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3043	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
3044	3428	buttonGroup.remove(ab);
3045	3429	radioPanel.remove(ab);
3046	3430
3047		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
3048	3433	// ab.GetObject().objectUI = null; // ?????????
3049	3434
3050	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3051	3436	break;
3052	3437	}
3053	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
3054	3441	refreshContents(true);
3055	3442	} else
3056	3443	if (source == editItem \|\| source == editButton)
3057	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
3058	3451	EditSelection(false);
3059	3452	} else
3060	3453	if (source == uneditButton)
..	..	@@ -3064,6 +3457,7 @@
3064	3457	Object3D child = (Object3D)e.nextElement();
3065	3458	if(child.editWindow != null)
3066	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
3067	3461	child.CloseUI();
3068	3462	listUI.remove(child);
3069	3463
..	..	@@ -3080,6 +3474,7 @@
3080	3474	//copy.ClearUI();
3081	3475	for (Object3D obj : listUI)
3082	3476	{
	3477	+ obj.pinned = false;
3083	3478	obj.CloseUI();
3084	3479	}
3085	3480	listUI.clear();
..	..	@@ -3089,7 +3484,7 @@
3089	3484	{
3090	3485	assert(copy == group);
3091	3486
3092		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	3488
3094	3489	for (Object3D obj : listUI)
3095	3490	{
..	..	@@ -3138,6 +3533,9 @@
3138	3533	}
3139	3534
3140	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3141	3539	//Globals.theRenderer.object = group;
3142	3540	if(!useclient)
3143	3541	{
..	..	@@ -3155,7 +3553,8 @@
3155	3553	}
3156	3554
3157	3555	// fix "+" issue
3158		- group.editWindow = this;
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
3159	3558
3160	3559	/*
3161	3560	currentLayout = radio.layout;
..	..	@@ -3163,18 +3562,27 @@
3163	3562	currentLayout = sevenButton;
3164	3563	*/
3165	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
3166	3572	keepparent = group.parent;
3167	3573	// PARENT = NULL or not???
3168	3574	//group.parent = null; // ROOT
3169	3575	//group.attributes = -1;
3170	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3171	3579	refreshContents(true);
3172	3580	} else if (event.getSource() == editCameraItem)
3173	3581	{
3174	3582	cameraView.ProtectCamera();
3175	3583	cameraView.repaint();
3176	3584	return;
3177		- } else if (event.getSource() == revertCameraItem)
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3178	3586	{
3179	3587	cameraView.RevertCamera();
3180	3588	cameraView.repaint();
..	..	@@ -3191,7 +3599,6 @@
3191	3599	}
3192	3600
3193	3601	boolean useclient = false;
3194		- cRadio radio;
3195	3602
3196	3603	void ToggleRoot()
3197	3604	{
..	..	@@ -4146,6 +4553,18 @@
4146	4553	refreshContents();
4147	4554	}
4148	4555
	4556	+ void RewindLeaves(boolean hide)
	4557	+ {
	4558	+ group.selection.RewindLeaves(hide);
	4559	+ refreshContents();
	4560	+ }
	4561	+
	4562	+ void RandomLeaves(boolean hide)
	4563	+ {
	4564	+ group.selection.RandomLeaves(hide);
	4565	+ refreshContents();
	4566	+ }
	4567	+
4149	4568	void SetTexRes(int tr)
4150	4569	{
4151	4570	group.selection.SetTexRes(tr);
..	..	@@ -4217,28 +4636,25 @@
4217	4636	// }
4218	4637	// }
4219	4638
4220		- static boolean allparams = true;
4221		-
4222		- static Vector<Object3D> listUI = new Vector<Object3D>();
4223		-
4224	4639	void EditSelection(boolean newWindow)
4225	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4226	4647	// aConstraints.gridy = 0;
4227	4648	for (int i=0; i<group.selection.size(); i++)
4228	4649	{
4229	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4230	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4231		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4232	4653
4233	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4234	4655	if(elem != group \|\| !newWindow)
4235	4656	{
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
	4657	+ EditElement(elem, newWindow); // ? new
4242	4658	}
4243	4659	}
4244	4660	}
..	..	@@ -4313,7 +4729,8 @@
4313	4729	//new Exception().printStackTrace();
4314	4730
4315	4731	freezemodel = true;
4316		-
	4732	+ ClearUnpinned();
	4733	+
4317	4734	/**/
4318	4735	//switch (event.id)
4319	4736	{
..	..	@@ -4329,6 +4746,7 @@
4329	4746
4330	4747	//if (child.parent != null)
4331	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
4332	4750	group.addSelectee(child);
4333	4751	}
4334	4752	}
..	..	@@ -4345,7 +4763,7 @@
4345	4763	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4346	4764	// a camera
4347	4765	{
4348		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4349	4767	{
4350	4768	CameraPane.camerachangeframe = 0; // don't refuse it
4351	4769	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4354,6 +4772,13 @@
4354	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4355	4773	}
4356	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4357	4782	refreshContents();
4358	4783	//return true;
4359	4784	}
..	..	@@ -4363,21 +4788,27 @@
4363	4788	freezemodel = false;
4364	4789	}
4365	4790
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
4366	4799	void refreshContents(boolean cp)
4367	4800	{
4368		- if (!Globals.MOUSEDRAGGED)
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4369	4803	{
4370	4804	objEditor.ClearInfo(); // .GetMaterial());
4371	4805
4372		- for (int i=0; i < group.selection.size(); i++)
	4806	+ for (int i=0; i < group.selection.Size(); i++)
4373	4807	{
4374		- Object3D child = (Object3D) group.selection.reserve(i);
	4808	+ Object3D child = (Object3D) group.selection.get(i);
4375	4809
4376		- objEditor.SetMaterial(child);
4377	4810	objEditor.AddInfo(child, this, true);
4378	4811	System.err.println("info : " + child.GetPath());
4379		-
4380		- group.selection.release(i);
4381	4812	}
4382	4813
4383	4814	objEditor.SetText(); // jan 2014
..	..	@@ -4467,7 +4898,8 @@
4467	4898
4468	4899	if (cut)
4469	4900	{
4470		- Save();
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4471	4903	//int indices[] = jList.getSelectedIndices();
4472	4904	//for (int i = indices.length - 1; i >= 0; i--)
4473	4905	//jList.remove(indices[i]);
..	..	@@ -4570,6 +5002,10 @@
4570	5002
4571	5003	void paste(boolean expand)
4572	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4573	5009	// if (GrafreeD.clipboard == null)
4574	5010	// return;
4575	5011	boolean first = true;
..	..	@@ -4629,6 +5065,7 @@
4629	5065	Grafreed.clipboard.get(0).parent = keepparent;
4630	5066	}
4631	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4632	5069	ResetModel();
4633	5070	refreshContents();
4634	5071	}
..	..	@@ -4764,6 +5201,10 @@
4764	5201
4765	5202	void group(Object3D csg, boolean grab)
4766	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4767	5208	if (//false) // why??
4768	5209	!group.selection.isEmpty())
4769	5210	{
..	..	@@ -4877,10 +5318,15 @@
4877	5318	//node.add(csg);
4878	5319	//makeSomething(node);
4879	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4880	5322	}
4881	5323
4882	5324	void Ungroup(Object3D g)
4883	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4884	5330	if (g instanceof HiddenObject)
4885	5331	{
4886	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4897,6 +5343,7 @@
4897	5343	objEditor.makeSomething(g.get(i), false);
4898	5344	}
4899	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4900	5347	}
4901	5348
4902	5349	void ungroup()
..	..	@@ -5185,10 +5632,28 @@
5185	5632	cButton clearpanelButton;
5186	5633	cButton unselectButton;
5187	5634
	5635	+ cButton restoreCameraButton;
	5636	+
5188	5637	cButton saveButton;
5189		- cButton undoButton;
5190		- cButton redoButton;
5191	5638	cButton oneStepButton;
	5639	+
	5640	+ cButton groupButton;
	5641	+ cButton ungroupButton;
	5642	+ cButton compositeButton;
	5643	+ cButton switchButton;
	5644	+ cButton loopButton;
	5645	+ cButton textureButton;
	5646	+
	5647	+ cButton gridButton;
	5648	+ cButton boxButton;
	5649	+ cButton sphereButton;
	5650	+ cButton coneButton;
	5651	+ cButton torusButton;
	5652	+ cButton superButton;
	5653	+ cButton kleinButton;
	5654	+ cButton particlesButton;
	5655	+ cButton overlayButton;
	5656	+ cButton lightButton;
5192	5657
5193	5658	cButton screenfitButton;
5194	5659	cButton screenfitpointButton;
..	..	@@ -5201,14 +5666,6 @@
5201	5666
5202	5667	cButton setsupportButton;
5203	5668
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	5669	//
5213	5670	//Composite
5214	5671	Object3D // to do !!
..	..	@@ -5218,11 +5675,11 @@
5218	5675	//JTree jTree;
5219	5676	private MenuItem lookAtItem;
5220	5677	private MenuItem lookFromItem;
5221		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5222	5679	private MenuItem cutItem;
5223	5680	private MenuItem undoItem;
5224	5681	private MenuItem redoItem;
5225		- private MenuItem duplicateItem;
	5682	+ private JMenuItem duplicateItem;
5226	5683	private MenuItem cloneItem;
5227	5684	private MenuItem cloneSupportItem;
5228	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5250,7 +5707,7 @@
5250	5707	private MenuItem pasteLinkItem;
5251	5708	private MenuItem pasteCloneItem;
5252	5709	private MenuItem pasteExpandItem;
5253		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5254	5711	private MenuItem clearAllItem;
5255	5712	private MenuItem genUVItem;
5256	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5285,6 +5742,10 @@
5285	5742	private MenuItem showleavesItem;
5286	5743	private MenuItem markleavesItem;
5287	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
5288	5749
5289	5750	private MenuItem flipVItem;
5290	5751	private MenuItem unflipVItem;
..	..	@@ -5306,7 +5767,7 @@
5306	5767	private MenuItem frontItem;
5307	5768	private MenuItem cameraItem;
5308	5769	private MenuItem compositeItem;
5309		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5310	5771	private MenuItem physicsItem;
5311	5772	private MenuItem frameselectorItem;
5312	5773	private MenuItem scriptNodeItem;
..	..	@@ -5380,5 +5841,5 @@
5380	5841
5381	5842	Menu cameraMenu;
5382	5843	MenuItem editCameraItem;
5383		- MenuItem revertCameraItem;
	5844	+ MenuItem restoreCameraItem;
5384	5845	}