~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,11 +167,19 @@
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"));
156	175	//editItem.addActionListener(this);
157		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158	183	duplicateItem.addActionListener(this);
159	184	cloneItem = menu.add(new MenuItem("Clone"));
160	185	cloneItem.addActionListener(this);
..	..	@@ -170,7 +195,6 @@
170	195	copyItem.addActionListener(this);
171	196	pasteItem = menu.add(new MenuItem("Paste"));
172	197	pasteItem.addActionListener(this);
173		- menu.add("-");
174	198
175	199	menu.add("-");
176	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -182,8 +206,8 @@
182	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183	207	// pasteExpandItem.addActionListener(this);
184	208	menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
187	211
188	212	if (Globals.ADVANCED)
189	213	{
..	..	@@ -197,23 +221,23 @@
197	221	//zBufferItem.addActionListener(this);
198	222	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	223	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
202	226
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- 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);
207	239
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	241	toggleHandleItem.addItemListener(this);
218	242	toggleHandleItem.setState(CameraPane.HANDLES);
219	243
..	..	@@ -240,7 +264,7 @@
240	264
241	265	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	266	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
244	268
245	269	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	270	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +285,14 @@
261	285	// animationItem.addItemListener(this);
262	286	// animationItem.setState(CameraPane.ANIMATION);
263	287	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	289	editCameraItem.addActionListener(this);
266	290
267	291	if (Globals.ADVANCED)
268	292	{
269	293	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	294	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	296	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	297	oe.cameraMenu.add("-");
274	298	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +300,7 @@
276	300	editLeafItem.addActionListener(this);
277	301	lookAtItem.addActionListener(this);
278	302	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	303	+ //switchViewItem.addActionListener(this);
280	304	}
281	305
282	306	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +345,29 @@
321	345	}
322	346
323	347	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
326	350	backItem = menu.add(new MenuItem("Back"));
327	351	backItem.addActionListener(this);
328	352	frontItem = menu.add(new MenuItem("Front"));
329	353	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
332	359	hideItem = menu.add(new MenuItem("Hidden Group"));
333	360	hideItem.addActionListener(this);
	361	+ }
334	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	363	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	372	switchGeoItem.addActionListener(this);
341	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +375,6 @@
343	375	morphItem = menu.add(new MenuItem("Morph Group"));
344	376	morphItem.addActionListener(this);
345	377
346		- if (Globals.ADVANCED)
347		- {
348	378	menu.add("-");
349	379	physicsItem = menu.add(new MenuItem("Physics"));
350	380	physicsItem.addActionListener(this);
..	..	@@ -352,30 +382,29 @@
352	382	frameselectorItem.addActionListener(this);
353	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	384	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	385	}
358	386
359	387	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
362	390	billboardItem = menu.add(new MenuItem("Billboard"));
363	391	billboardItem.addActionListener(this);
364	392	csgItem = menu.add(new MenuItem("CSG"));
365	393	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	395	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	397	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
372	403	if (Globals.ADVANCED)
373	404	{
374	405	menu.add("-");
375	406	linkerItem = menu.add(new MenuItem("Linker"));
376	407	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	408	templateItem = menu.add(new MenuItem("Template"));
380	409	templateItem.addActionListener(this);
381	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -404,7 +433,7 @@
404	433	genNormalsMESHItem.addActionListener(this);
405	434	if (Globals.ADVANCED)
406	435	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	437	genNormalsMINEItem.addActionListener(this);
409	438	}
410	439	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -464,6 +493,14 @@
464	493	markleavesItem.addActionListener(this);
465	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	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);
467	504	menu.add("-");
468	505	flipVItem = menu.add(new MenuItem("Flip V"));
469	506	flipVItem.addActionListener(this);
..	..	@@ -519,8 +556,21 @@
519	556	buildToolsMenu(menu);
520	557	}
521	558
	559	+
522	560	void SetupUI2(ObjEditor oe)
523	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	+
524	574	//new Exception().printStackTrace();
525	575
526	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +599,79 @@
549	599	oe.radioPanel.add(dummyButton);
550	600	oe.buttonGroup.add(dummyButton);
551	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
552	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	607
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	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	+ }
	618	+
	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");
	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);
	639	+
	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);
555	659	liveCB.setToolTipText("Enable animation");
556	660	liveCB.addItemListener(this);
557	661
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	663	oneStepButton.setToolTipText("Animate one step forward");
560	664	oneStepButton.addActionListener(this);
561	665
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	667	fastCB.setToolTipText("Fast mode");
564	668	fastCB.addItemListener(this);
565	669
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- 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);
573	675
574	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	677	// screenfitpointButton.addActionListener(this);
..	..	@@ -581,65 +683,146 @@
581	683	snapobjectButton.setToolTipText("Snap Object");
582	684	}
583	685
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	687
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- twoButton.setToolTipText("Show center view only");
592		- twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594	689	fourButton.addActionListener(this);
595	690	fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- 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");
598	699	sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- threeButton.setToolTipText("2-column layout right");
601		- threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- 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);
605	706	//
606	707
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- 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");
609	710	rootButton.addActionListener(this);
610	711
611		- 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);
612	713	closeButton.setToolTipText("Close tab");
613	714	closeButton.addActionListener(this);
614	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	716	//clearButton.addActionListener(this);
616		-
617		- 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	+ }
618	749
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- 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");
621	799	editButton.addActionListener(this);
622	800
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
625	803	uneditButton.addActionListener(this);
626	804
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
629	807	allParamsButton.addActionListener(this);
630	808
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	810	clearPanelButton.setToolTipText("Clear edit panel");
633	811	clearPanelButton.addActionListener(this);
634	812
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	814	unselectButton.setToolTipText("Unselect");
637	815	unselectButton.addActionListener(this);
638	816
639		- 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);
640	820
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
643	826
644	827	// oe.aConstraints.gridx += 1;
645	828	// oe.aConstraints.weighty = 0;
..	..	@@ -656,29 +839,17 @@
656	839
657	840	JScrollPane jSP;
658	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	843	ResetModel();
661	844
662	845	oe.treePanel.add(jSPPanel);
663	846	oe.treePanel.Return();
664	847
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	848	oe.treePanel.add(copyOptionsPanel);
681	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
682	853
683	854	// mainPanel.setDividerLocation(0.5); //1.0);
684	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -701,29 +872,49 @@
701	872	dgr.addDragGestureListener(this);
702	873	}catch(Exception e) {}
703	874	*/
704		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
705	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	877	}
707	878
708	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	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	+
710	895	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	896	boxCB.setToolTipText("Display bounding boxes");
712	897	boxCB.addItemListener(this);
713	898
714	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	901	zoomBoxCB.addItemListener(this);
717	902
718	903	if (true) // Globals.ADVANCED)
719	904	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- 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);
723	912
724	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	914	// localCB.addItemListener(this);
726	915
	916	+ panel.Return();
	917	+
727	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	919	crowdCB.setToolTipText("Used for crowds");
729	920	crowdCB.addItemListener(this);
..	..	@@ -740,6 +931,8 @@
740	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	932	// speakerMocapCB.addItemListener(this);
742	933
	934	+ panel.Return();
	935	+
743	936	if (false)
744	937	{
745	938	// handled in scripts
..	..	@@ -754,34 +947,74 @@
754	947	//constraints.gridy += 1;
755	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
757	951	}
758	952
759	953	//constraints.gridx += 1;
760	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	955	// debugCB.addItemListener(this);
762	956
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
763	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
764	963	oeilCB.addItemListener(this);
765	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	+ {
766	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	986	lookAtCB.setToolTipText("Look-at target");
768	987	lookAtCB.addItemListener(this);
	988	+ }
769	989
770	990	}
771	991
772	992	cGridBag fill = new cGridBag();
773		-
774	993	fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
775	998
776	999	panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
777	1002
778	1003	}
779	1004
780	1005	void EditObject(Object3D obj)
781	1006	{
782	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	+
783	1016	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
785	1018	radioButton.SetCamera(cameraView.renderCamera, false);
786	1019	radioButton.addActionListener(this);
787	1020	radioPanel.add(radioButton);
..	..	@@ -791,6 +1024,8 @@
791	1024
792	1025	void SetupViews(ObjEditor oe)
793	1026	{
	1027	+ theFrame = this;
	1028	+
794	1029	oe.SetupViews();
795	1030
796	1031	System.out.println("SetupViews");
..	..	@@ -799,23 +1034,28 @@
799	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1035	}
801	1036
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- 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;
813	1050	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
819	1059
820	1060	// static int COLOR = 1;
821	1061	// static int MATERIAL = 2;
..	..	@@ -823,9 +1063,9 @@
823	1063
824	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1065
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
829	1069
830	1070	public void itemStateChanged(ItemEvent e)
831	1071	{
..	..	@@ -853,6 +1093,7 @@
853	1093	} else if(e.getSource() == liveCB)
854	1094	{
855	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
856	1097	}
857	1098	else if(e.getSource() == supportCB)
858	1099	{
..	..	@@ -917,6 +1158,18 @@
917	1158	{
918	1159	cameraView.ToggleOeil();
919	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	+ }
920	1173	else if(e.getSource() == lookAtCB)
921	1174	{
922	1175	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1186,8 @@
933	1186
934	1187	/**/
935	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1192	// We can't move the root node or an empty selection
939	1193	return;
..	..	@@ -996,8 +1250,6 @@
996	1250	}
997	1251	}
998	1252
999		- String string = (String) object;
1000		-
1001	1253	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1254	// if( object instanceof java.io.File[])
1003	1255	// {
..	..	@@ -1005,6 +1257,8 @@
1005	1257	// objEditor.DropFile((java.io.File[]) object, true);
1006	1258	// return;
1007	1259	// }
	1260	+
	1261	+ String string = object.toString();
1008	1262
1009	1263	// File path for Mac and Windows
1010	1264	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1304,33 @@
1050	1304
1051	1305	assert target == objEditor.jTree;
1052	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
1053	1308	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1310	} catch (Exception e) {
1056	1311	System.out.println("destinationPath : " + destinationPath);
1057	1312	return;
1058	1313	}
1059	1314
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
1061	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	+// {
1062	1326	loadClipboard(true);
1063	1327	objEditor.jTree.setSelectionPath(destinationPath);
1064	1328	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
1070	1334	}
1071	1335	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1435,30 @@
1171	1435	{
1172	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1437	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- 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	+ {
1186	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1457	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
1190	1462	if (Globals.ADVANCED)
1191	1463	{
1192	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1484,15 @@
1212	1484	}
1213	1485	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1486	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- 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);
1219	1491	menu.add("-");
1220	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1493	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1224	1496	doubleItem = menu.add(new MenuItem("Fork"));
1225	1497	doubleItem.addActionListener(this);
1226	1498	if (Globals.ADVANCED)
..	..	@@ -1236,6 +1508,9 @@
1236	1508	animationItem.addItemListener(this);
1237	1509	animationItem.setState(Globals.ANIMATION);
1238	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1239	1514	menu.add("-");
1240	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	1516	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +1523,8 @@
1248	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	1524	reduce34MorphItem.addActionListener(this);
1250	1525	menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1251	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	1529	computeAOItem.addActionListener(this);
1253	1530
..	..	@@ -1256,11 +1533,9 @@
1256	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	1534	mirrorItem.addActionListener(this);
1258	1535	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1537	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1539	dumpItem.addActionListener(this);
1265	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1541	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1676,34 @@
1401	1676	shadow.material = new cMaterial(obj.material);
1402	1677	shadow.material.diffuse = 0.0001f;
1403	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1404	1680
1405	1681	makeSomething(shadow);
1406	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	+ }
1407	1707
1408	1708	/**
1409	1709	* applyExample
..	..	@@ -1648,7 +1948,7 @@
1648	1948	{
1649	1949	ScreenFit();
1650	1950	} else
1651		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1652	1952	{
1653	1953	cVector v1 = new cVector();
1654	1954	cVector v2 = new cVector();
..	..	@@ -1657,11 +1957,11 @@
1657	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	1958	objEditor.cameraView.repaint();
1659	1959	} else
1660		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1661	1961	{
1662	1962	makeSomething(new Box());
1663	1963	} else
1664		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1665	1965	{
1666	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2040,27 @@
1740	2040
1741	2041	makeSomething(obj);
1742	2042	} else
1743		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1744	2044	{
1745	2045	makeSomething(new Grid());
1746	2046	} else
1747		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2048	{
1749	2049	makeSomething(new Sphere());
1750	2050	} else
1751		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1752	2052	{
1753	2053	makeSomething(new Cone());
1754	2054	} else
1755		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1756	2056	{
1757	2057	makeSomething(new Torus());
1758	2058	} else
1759		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1760	2060	{
1761	2061	makeSomething(new Superellipsoid());
1762	2062	} else
1763		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1764	2064	{
1765	2065	makeSomething(new Klein());
1766	2066	} else
..	..	@@ -1780,7 +2080,7 @@
1780	2080	{
1781	2081	makeSomething(new BezierSurface());
1782	2082	} else
1783		- if (source == overlayItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1784	2084	{
1785	2085	/*
1786	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,7 +2128,7 @@
1828	2128	s.setup();
1829	2129	makeSomething(s);
1830	2130	} else
1831		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1832	2132	{
1833	2133	makeSomething(new Light());
1834	2134	} else
..	..	@@ -1878,30 +2178,30 @@
1878	2178
1879	2179	group(g);
1880	2180	} else
1881		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1882	2182	{
1883	2183	Composite csg = new GroupLeaf();
1884	2184	csg.count = 5;
1885	2185	group(csg);
1886		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1887	2187	csg.addChild(child);
1888	2188	child.addChild(csg);
1889	2189	} else
1890	2190	if (source == doubleItem)
1891	2191	{
1892		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1893	2193	csg.count = 5;
1894	2194	group(csg);
1895		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1896	2196	csg.addChild(child);
1897	2197	child.addChild(csg);
1898		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1899	2199	csg.addChild(child);
1900	2200	child.addChild(csg);
1901	2201	} else
1902	2202	if (source == tripleItem)
1903	2203	{
1904		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1905	2205	csg.count = 4;
1906	2206	group(csg);
1907	2207	Composite child = new cGroup();
..	..	@@ -1951,6 +2251,46 @@
1951	2251	{
1952	2252	DumpObject();
1953	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
	2266	+ if (source == undoButton)
	2267	+ {
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	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();
	2282	+ } else
	2283	+ if (source == redoButton)
	2284	+ {
	2285	+ // Go to next version
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == saveButton)
	2289	+ {
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2293	+ } else
1954	2294	if (source == oneStepButton)
1955	2295	{
1956	2296	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2298,14 @@
1958	2298	} else
1959	2299	if (source == screenfitButton)
1960	2300	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2301	ScreenFit();
1963	2302	} else
1964	2303	if (source == screenfitpointButton)
1965	2304	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2305	ScreenFitPoint();
1968	2306	} else
1969	2307	if (source == snapobjectButton)
1970	2308	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2309	SnapObject();
1973	2310	} else
1974	2311	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2341,14 @@
2004	2341	if (source == cutItem \|\| source == clearButton)
2005	2342	{
2006	2343	loadClipboard(true);
	2344	+ } else
	2345	+ if (source == undoItem)
	2346	+ {
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
2007	2352	} else
2008	2353	if (source == duplicateItem)
2009	2354	{
..	..	@@ -2324,7 +2669,7 @@
2324	2669	{
2325	2670	StepAll();
2326	2671	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	2673	{
2329	2674	//int indices[] = jList.getSelectedIndices();
2330	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +2681,9 @@
2336	2681	{
2337	2682	ClearSelection(true);
2338	2683	} else
2339		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2340	2685	{
2341		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2342	2687	} else
2343	2688	if (source == hideItem)
2344	2689	{
..	..	@@ -2356,11 +2701,11 @@
2356	2701	{
2357	2702	makeSomething(new Camera());
2358	2703	} else
2359		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2360	2705	{
2361	2706	group(new Composite());
2362	2707	} else
2363		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2364	2709	{
2365	2710	RandomNode random = new RandomNode();
2366	2711	group(random);
..	..	@@ -2462,7 +2807,7 @@
2462	2807	{
2463	2808	group(new cLinker());
2464	2809	} else
2465		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2466	2811	{
2467	2812	group(new TextureNode());
2468	2813	} else
..	..	@@ -2482,17 +2827,30 @@
2482	2827	{
2483	2828	CastShadow(2);
2484	2829	} else
2485		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2831	{
2487		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2488	2834	for (int i=0; i<group.selection.size(); i++)
2489	2835	{
2490		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2491	2841	}
2492	2842
2493		- ClearSelection(false);
2494		-
2495		- 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	+ }
2496	2854	} else
2497	2855	if (source == genUVItem)
2498	2856	{
..	..	@@ -2504,7 +2862,7 @@
2504	2862	} else
2505	2863	if (source == genNormalsMESHItem)
2506	2864	{
2507		- GenNormals(true); // TODO
	2865	+ GenNormalsMESH();
2508	2866	} else
2509	2867	if (source == genNormalsORGANItem)
2510	2868	{
..	..	@@ -2569,6 +2927,22 @@
2569	2927	if (source == unmarkleavesItem)
2570	2928	{
2571	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);
2572	2946	} else
2573	2947	if (source == flipVItem)
2574	2948	{
..	..	@@ -2804,6 +3178,10 @@
2804	3178	if (source == twoButton)
2805	3179	{
2806	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2807	3185	// bug
2808	3186	//gridPanel.setDividerLocation(1.0);
2809	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3214,31 @@
2836	3214	bigThree.ClearUI();
2837	3215	bigThree.add(centralPanel);
2838	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	+
2839	3235	} else
2840	3236	if (source == threeButton)
2841	3237	{
2842	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2843	3242
2844	3243	// bigThree.remove(scenePanel);
2845	3244	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3271,15 @@
2872	3271	bigThree.add(centralPanel);
2873	3272	bigThree.add(XYZPanel);
2874	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2875	3276	} else
2876	3277	if (source == fourButton)
2877	3278	{
2878	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2879	3283
2880	3284	// bigThree.remove(scenePanel);
2881	3285	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3311,15 @@
2907	3311	bigThree.ClearUI();
2908	3312	bigThree.add(scenePanel);
2909	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2910	3316	} else
2911	3317	if (source == sixButton)
2912	3318	{
2913	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2914	3323
2915	3324	// bigThree.remove(scenePanel);
2916	3325	// bigThree.remove(centralPanel);
..	..	@@ -2943,10 +3352,15 @@
2943	3352	bigThree.add(scenePanel);
2944	3353	bigThree.add(centralPanel);
2945	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2946	3357	} else
2947	3358	if (source == sevenButton)
2948	3359	{
2949	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
2950	3364
2951	3365	// bigThree.remove(scenePanel);
2952	3366	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3394,8 @@
2980	3394	bigThree.add(centralPanel);
2981	3395	bigThree.add(XYZPanel);
2982	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
2983	3399	} else
2984	3400	if (source == rootButton)
2985	3401	{
..	..	@@ -2991,6 +3407,7 @@
2991	3407	EditObject(obj);
2992	3408	}
2993	3409
	3410	+ cameraView.requestFocusInWindow();
2994	3411	refreshContents(true);
2995	3412	} else
2996	3413	if (source == closeButton)
..	..	@@ -3000,22 +3417,37 @@
3000	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3418	{
3002	3419	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
3005	3428	buttonGroup.remove(ab);
3006	3429	radioPanel.remove(ab);
3007	3430
3008		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
3009	3433	// ab.GetObject().objectUI = null; // ?????????
3010	3434
3011	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3436	break;
3013	3437	}
3014	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
3015	3441	refreshContents(true);
3016	3442	} else
3017	3443	if (source == editItem \|\| source == editButton)
3018	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
3019	3451	EditSelection(false);
3020	3452	} else
3021	3453	if (source == uneditButton)
..	..	@@ -3025,10 +3457,11 @@
3025	3457	Object3D child = (Object3D)e.nextElement();
3026	3458	if(child.editWindow != null)
3027	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
3028	3461	child.CloseUI();
3029	3462	listUI.remove(child);
3030	3463
3031		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
3032	3465	}
3033	3466	objEditor.ctrlPanel.FlushUI();
3034	3467	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3474,7 @@
3041	3474	//copy.ClearUI();
3042	3475	for (Object3D obj : listUI)
3043	3476	{
	3477	+ obj.pinned = false;
3044	3478	obj.CloseUI();
3045	3479	}
3046	3480	listUI.clear();
..	..	@@ -3050,7 +3484,7 @@
3050	3484	{
3051	3485	assert(copy == group);
3052	3486
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3488
3055	3489	for (Object3D obj : listUI)
3056	3490	{
..	..	@@ -3099,6 +3533,9 @@
3099	3533	}
3100	3534
3101	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3102	3539	//Globals.theRenderer.object = group;
3103	3540	if(!useclient)
3104	3541	{
..	..	@@ -3115,7 +3552,9 @@
3115	3552	sideView.object = group;
3116	3553	}
3117	3554
3118		-// fix "+" issue group.editWindow = this;
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
3119	3558
3120	3559	/*
3121	3560	currentLayout = radio.layout;
..	..	@@ -3123,18 +3562,27 @@
3123	3562	currentLayout = sevenButton;
3124	3563	*/
3125	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);
3126	3572	keepparent = group.parent;
3127	3573	// PARENT = NULL or not???
3128	3574	//group.parent = null; // ROOT
3129	3575	//group.attributes = -1;
3130	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3131	3579	refreshContents(true);
3132	3580	} else if (event.getSource() == editCameraItem)
3133	3581	{
3134	3582	cameraView.ProtectCamera();
3135	3583	cameraView.repaint();
3136	3584	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3586	{
3139	3587	cameraView.RevertCamera();
3140	3588	cameraView.repaint();
..	..	@@ -3151,7 +3599,6 @@
3151	3599	}
3152	3600
3153	3601	boolean useclient = false;
3154		- cRadio radio;
3155	3602
3156	3603	void ToggleRoot()
3157	3604	{
..	..	@@ -3390,7 +3837,8 @@
3390	3837
3391	3838	int size = obj.MemorySize();
3392	3839
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	3840	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3841	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	3842	}
3395	3843	}
3396	3844	catch (Exception e)
..	..	@@ -3471,6 +3919,13 @@
3471	3919	void GenNormals(boolean crease)
3472	3920	{
3473	3921	group.GenNormalsS(crease);
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
	3926	+ void GenNormalsMESH()
	3927	+ {
	3928	+ group.GenNormalsMeshS();
3474	3929
3475	3930	refreshContents();
3476	3931	}
..	..	@@ -4098,6 +4553,18 @@
4098	4553	refreshContents();
4099	4554	}
4100	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	+
4101	4568	void SetTexRes(int tr)
4102	4569	{
4103	4570	group.selection.SetTexRes(tr);
..	..	@@ -4169,28 +4636,25 @@
4169	4636	// }
4170	4637	// }
4171	4638
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4639	void EditSelection(boolean newWindow)
4177	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4178	4647	// aConstraints.gridy = 0;
4179	4648	for (int i=0; i<group.selection.size(); i++)
4180	4649	{
4181	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4653
4185	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4655	if(elem != group \|\| !newWindow)
4187	4656	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4194	4658	}
4195	4659	}
4196	4660	}
..	..	@@ -4265,7 +4729,8 @@
4265	4729	//new Exception().printStackTrace();
4266	4730
4267	4731	freezemodel = true;
4268		-
	4732	+ ClearUnpinned();
	4733	+
4269	4734	/**/
4270	4735	//switch (event.id)
4271	4736	{
..	..	@@ -4273,7 +4738,6 @@
4273	4738	//case 702: // Event.LIST_DESELECT
4274	4739	group.deselectAll();
4275	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4741	if (tps != null)
4278	4742	{
4279	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4746,8 @@
4282	4746
4283	4747	//if (child.parent != null)
4284	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
4285	4750	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4751	}
4290	4752	}
4291	4753	// else
..	..	@@ -4295,20 +4757,28 @@
4295	4757	// System.err.println("info : " + group.GetPath());
4296	4758	// }
4297	4759
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4760	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4761	CameraPane.flash = true;
4302	4762
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4764	// a camera
4305	4765	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4767	+ {
	4768	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4769	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4770	+ }
4308	4771	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4773	}
4311	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4312	4782	refreshContents();
4313	4783	//return true;
4314	4784	}
..	..	@@ -4317,6 +4787,35 @@
4317	4787
4318	4788	freezemodel = false;
4319	4789	}
	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	+
	4799	+ void refreshContents(boolean cp)
	4800	+ {
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4803	+ {
	4804	+ objEditor.ClearInfo(); // .GetMaterial());
	4805	+
	4806	+ for (int i=0; i < group.selection.Size(); i++)
	4807	+ {
	4808	+ Object3D child = (Object3D) group.selection.get(i);
	4809	+
	4810	+ objEditor.AddInfo(child, this, true);
	4811	+ System.err.println("info : " + child.GetPath());
	4812	+ }
	4813	+
	4814	+ objEditor.SetText(); // jan 2014
	4815	+ }
	4816	+
	4817	+ super.refreshContents(cp);
	4818	+ }
4320	4819
4321	4820	void linkSomething(Object3D thing)
4322	4821	{
..	..	@@ -4388,6 +4887,7 @@
4388	4887	{
4389	4888	if (group.selection.isEmpty())
4390	4889	return;
	4890	+
4391	4891	Grafreed.clipboardIsTempGroup = false;
4392	4892	Composite tGroup = null;
4393	4893	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +4898,8 @@
4398	4898
4399	4899	if (cut)
4400	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4401	4903	//int indices[] = jList.getSelectedIndices();
4402	4904	//for (int i = indices.length - 1; i >= 0; i--)
4403	4905	//jList.remove(indices[i]);
..	..	@@ -4487,8 +4989,10 @@
4487	4989	}
4488	4990
4489	4991	}
	4992	+
4490	4993	if (Grafreed.clipboardIsTempGroup)
4491	4994	Grafreed.clipboard = tGroup;
	4995	+
4492	4996	if (cut)
4493	4997	{
4494	4998	ResetModel();
..	..	@@ -4498,6 +5002,10 @@
4498	5002
4499	5003	void paste(boolean expand)
4500	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4501	5009	// if (GrafreeD.clipboard == null)
4502	5010	// return;
4503	5011	boolean first = true;
..	..	@@ -4557,6 +5065,7 @@
4557	5065	Grafreed.clipboard.get(0).parent = keepparent;
4558	5066	}
4559	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4560	5069	ResetModel();
4561	5070	refreshContents();
4562	5071	}
..	..	@@ -4692,6 +5201,10 @@
4692	5201
4693	5202	void group(Object3D csg, boolean grab)
4694	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4695	5208	if (//false) // why??
4696	5209	!group.selection.isEmpty())
4697	5210	{
..	..	@@ -4805,10 +5318,15 @@
4805	5318	//node.add(csg);
4806	5319	//makeSomething(node);
4807	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4808	5322	}
4809	5323
4810	5324	void Ungroup(Object3D g)
4811	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4812	5330	if (g instanceof HiddenObject)
4813	5331	{
4814	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5343,7 @@
4825	5343	objEditor.makeSomething(g.get(i), false);
4826	5344	}
4827	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4828	5347	}
4829	5348
4830	5349	void ungroup()
..	..	@@ -5113,7 +5632,28 @@
5113	5632	cButton clearpanelButton;
5114	5633	cButton unselectButton;
5115	5634
	5635	+ cButton restoreCameraButton;
	5636	+
	5637	+ cButton saveButton;
5116	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;
5117	5657
5118	5658	cButton screenfitButton;
5119	5659	cButton screenfitpointButton;
..	..	@@ -5126,14 +5666,6 @@
5126	5666
5127	5667	cButton setsupportButton;
5128	5668
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	5669	//
5138	5670	//Composite
5139	5671	Object3D // to do !!
..	..	@@ -5143,9 +5675,11 @@
5143	5675	//JTree jTree;
5144	5676	private MenuItem lookAtItem;
5145	5677	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5147	5679	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
5149	5683	private MenuItem cloneItem;
5150	5684	private MenuItem cloneSupportItem;
5151	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5173,7 +5707,7 @@
5173	5707	private MenuItem pasteLinkItem;
5174	5708	private MenuItem pasteCloneItem;
5175	5709	private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5177	5711	private MenuItem clearAllItem;
5178	5712	private MenuItem genUVItem;
5179	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5208,6 +5742,10 @@
5208	5742	private MenuItem showleavesItem;
5209	5743	private MenuItem markleavesItem;
5210	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
5211	5749
5212	5750	private MenuItem flipVItem;
5213	5751	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5767,7 @@
5229	5767	private MenuItem frontItem;
5230	5768	private MenuItem cameraItem;
5231	5769	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5233	5771	private MenuItem physicsItem;
5234	5772	private MenuItem frameselectorItem;
5235	5773	private MenuItem scriptNodeItem;
..	..	@@ -5303,5 +5841,5 @@
5303	5841
5304	5842	Menu cameraMenu;
5305	5843	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	5844	+ MenuItem restoreCameraItem;
5307	5845	}