~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"));
..	..	@@ -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"));
..	..	@@ -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,145 @@
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);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591	689	twoButton.setToolTipText("Show center view only");
592	690	twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594	694	fourButton.addActionListener(this);
595	695	fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	697	sixButton.setToolTipText("2-column layout left");
598	698	sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	700	threeButton.setToolTipText("2-column layout right");
601	701	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603	703	sevenButton.setToolTipText("3-column layout");
604	704	sevenButton.addActionListener(this);
605	705	//
606	706
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	708	rootButton.setToolTipText("Edit selection in new tab");
609	709	rootButton.addActionListener(this);
610	710
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	712	closeButton.setToolTipText("Close tab");
613	713	closeButton.addActionListener(this);
614	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	715	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	716	+
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
618	748
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- editButton.setToolTipText("Edit selection");
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	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	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
621	798	editButton.addActionListener(this);
622	799
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
625	802	uneditButton.addActionListener(this);
626	803
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
629	806	allParamsButton.addActionListener(this);
630	807
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	809	clearPanelButton.setToolTipText("Clear edit panel");
633	810	clearPanelButton.addActionListener(this);
634	811
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	813	unselectButton.setToolTipText("Unselect");
637	814	unselectButton.addActionListener(this);
638	815
639		- commandsPanel.preferredHeight = 1;
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
640	819
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
643	825
644	826	// oe.aConstraints.gridx += 1;
645	827	// oe.aConstraints.weighty = 0;
..	..	@@ -656,29 +838,17 @@
656	838
657	839	JScrollPane jSP;
658	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	842	ResetModel();
661	843
662	844	oe.treePanel.add(jSPPanel);
663	845	oe.treePanel.Return();
664	846
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	847	oe.treePanel.add(copyOptionsPanel);
681	848	oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
682	852
683	853	// mainPanel.setDividerLocation(0.5); //1.0);
684	854	// mainPanel.setResizeWeight(0.5);
..	..	@@ -707,23 +877,43 @@
707	877
708	878	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	879	{
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
	883	+
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
710	894	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	895	boxCB.setToolTipText("Display bounding boxes");
712	896	boxCB.addItemListener(this);
713	897
714	898	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	900	zoomBoxCB.addItemListener(this);
717	901
718	902	if (true) // Globals.ADVANCED)
719	903	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- supportCB.addItemListener(this);
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
723	911
724	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	913	// localCB.addItemListener(this);
726	914
	915	+ panel.Return();
	916	+
727	917	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	918	crowdCB.setToolTipText("Used for crowds");
729	919	crowdCB.addItemListener(this);
..	..	@@ -740,6 +930,8 @@
740	930	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	931	// speakerMocapCB.addItemListener(this);
742	932
	933	+ panel.Return();
	934	+
743	935	if (false)
744	936	{
745	937	// handled in scripts
..	..	@@ -754,32 +946,72 @@
754	946	//constraints.gridy += 1;
755	947	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	948	smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
757	950	}
758	951
759	952	//constraints.gridx += 1;
760	953	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	954	// debugCB.addItemListener(this);
762	955
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
763	960	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
764	962	oeilCB.addItemListener(this);
765	963
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
766	984	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	985	lookAtCB.setToolTipText("Look-at target");
768	986	lookAtCB.addItemListener(this);
	987	+ }
769	988
770	989	}
771	990
772	991	cGridBag fill = new cGridBag();
773		-
774	992	fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
775	997
776	998	panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
777	1001
778	1002	}
779	1003
780	1004	void EditObject(Object3D obj)
781	1005	{
782	1006	cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
783	1015	radioButton.SetObject(obj);
784	1016	radioButton.layout = sevenButton;
785	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -791,6 +1023,8 @@
791	1023
792	1024	void SetupViews(ObjEditor oe)
793	1025	{
	1026	+ theFrame = this;
	1027	+
794	1028	oe.SetupViews();
795	1029
796	1030	System.out.println("SetupViews");
..	..	@@ -799,23 +1033,28 @@
799	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1034	}
801	1035
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;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
813	1049	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
819	1058
820	1059	// static int COLOR = 1;
821	1060	// static int MATERIAL = 2;
..	..	@@ -823,9 +1062,9 @@
823	1062
824	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1064
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
829	1068
830	1069	public void itemStateChanged(ItemEvent e)
831	1070	{
..	..	@@ -853,6 +1092,7 @@
853	1092	} else if(e.getSource() == liveCB)
854	1093	{
855	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
856	1096	}
857	1097	else if(e.getSource() == supportCB)
858	1098	{
..	..	@@ -917,6 +1157,18 @@
917	1157	{
918	1158	cameraView.ToggleOeil();
919	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
920	1172	else if(e.getSource() == lookAtCB)
921	1173	{
922	1174	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1185,8 @@
933	1185
934	1186	/**/
935	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1191	// We can't move the root node or an empty selection
939	1192	return;
..	..	@@ -996,8 +1249,6 @@
996	1249	}
997	1250	}
998	1251
999		- String string = (String) object;
1000		-
1001	1252	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1253	// if( object instanceof java.io.File[])
1003	1254	// {
..	..	@@ -1005,6 +1256,8 @@
1005	1256	// objEditor.DropFile((java.io.File[]) object, true);
1006	1257	// return;
1007	1258	// }
	1259	+
	1260	+ String string = object.toString();
1008	1261
1009	1262	// File path for Mac and Windows
1010	1263	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1303,33 @@
1050	1303
1051	1304	assert target == objEditor.jTree;
1052	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
1053	1307	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1309	} catch (Exception e) {
1056	1310	System.out.println("destinationPath : " + destinationPath);
1057	1311	return;
1058	1312	}
1059	1313
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
1061	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
1062	1325	loadClipboard(true);
1063	1326	objEditor.jTree.setSelectionPath(destinationPath);
1064	1327	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
1070	1333	}
1071	1334	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1434,30 @@
1171	1434	{
1172	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1436	//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);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1186	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1456	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
1190	1461	if (Globals.ADVANCED)
1191	1462	{
1192	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1483,15 @@
1212	1483	}
1213	1484	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1485	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);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1219	1490	menu.add("-");
1220	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1492	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1224	1495	doubleItem = menu.add(new MenuItem("Fork"));
1225	1496	doubleItem.addActionListener(this);
1226	1497	if (Globals.ADVANCED)
..	..	@@ -1236,6 +1507,9 @@
1236	1507	animationItem.addItemListener(this);
1237	1508	animationItem.setState(Globals.ANIMATION);
1238	1509
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
	1512	+
1239	1513	menu.add("-");
1240	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	1515	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +1522,8 @@
1248	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	1523	reduce34MorphItem.addActionListener(this);
1250	1524	menu.add("-");
	1525	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1526	+ memoryItem.addActionListener(this);
1251	1527	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	1528	computeAOItem.addActionListener(this);
1253	1529
..	..	@@ -1256,11 +1532,9 @@
1256	1532	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	1533	mirrorItem.addActionListener(this);
1258	1534	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1536	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1538	dumpItem.addActionListener(this);
1265	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1540	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1675,24 @@
1401	1675	shadow.material = new cMaterial(obj.material);
1402	1676	shadow.material.diffuse = 0.0001f;
1403	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1404	1679
1405	1680	makeSomething(shadow);
1406	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1407	1696
1408	1697	/**
1409	1698	* applyExample
..	..	@@ -1648,7 +1937,7 @@
1648	1937	{
1649	1938	ScreenFit();
1650	1939	} else
1651		- if (source == switchItem)
	1940	+ if (source == switchViewItem)
1652	1941	{
1653	1942	cVector v1 = new cVector();
1654	1943	cVector v2 = new cVector();
..	..	@@ -1657,11 +1946,11 @@
1657	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	1947	objEditor.cameraView.repaint();
1659	1948	} else
1660		- if (source == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1661	1950	{
1662	1951	makeSomething(new Box());
1663	1952	} else
1664		- if (source == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1665	1954	{
1666	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2029,27 @@
1740	2029
1741	2030	makeSomething(obj);
1742	2031	} else
1743		- if (source == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1744	2033	{
1745	2034	makeSomething(new Grid());
1746	2035	} else
1747		- if (source == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2037	{
1749	2038	makeSomething(new Sphere());
1750	2039	} else
1751		- if (source == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1752	2041	{
1753	2042	makeSomething(new Cone());
1754	2043	} else
1755		- if (source == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1756	2045	{
1757	2046	makeSomething(new Torus());
1758	2047	} else
1759		- if (source == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1760	2049	{
1761	2050	makeSomething(new Superellipsoid());
1762	2051	} else
1763		- if (source == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1764	2053	{
1765	2054	makeSomething(new Klein());
1766	2055	} else
..	..	@@ -1780,7 +2069,7 @@
1780	2069	{
1781	2070	makeSomething(new BezierSurface());
1782	2071	} else
1783		- if (source == overlayItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1784	2073	{
1785	2074	/*
1786	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,7 +2117,7 @@
1828	2117	s.setup();
1829	2118	makeSomething(s);
1830	2119	} else
1831		- if (source == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1832	2121	{
1833	2122	makeSomething(new Light());
1834	2123	} else
..	..	@@ -1878,30 +2167,30 @@
1878	2167
1879	2168	group(g);
1880	2169	} else
1881		- if (source == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1882	2171	{
1883	2172	Composite csg = new GroupLeaf();
1884	2173	csg.count = 5;
1885	2174	group(csg);
1886		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1887	2176	csg.addChild(child);
1888	2177	child.addChild(csg);
1889	2178	} else
1890	2179	if (source == doubleItem)
1891	2180	{
1892		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1893	2182	csg.count = 5;
1894	2183	group(csg);
1895		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1896	2185	csg.addChild(child);
1897	2186	child.addChild(csg);
1898		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1899	2188	csg.addChild(child);
1900	2189	child.addChild(csg);
1901	2190	} else
1902	2191	if (source == tripleItem)
1903	2192	{
1904		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1905	2194	csg.count = 4;
1906	2195	group(csg);
1907	2196	Composite child = new cGroup();
..	..	@@ -1951,6 +2240,46 @@
1951	2240	{
1952	2241	DumpObject();
1953	2242	} else
	2243	+ if (source == minButton)
	2244	+ {
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
1954	2283	if (source == oneStepButton)
1955	2284	{
1956	2285	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2287,14 @@
1958	2287	} else
1959	2288	if (source == screenfitButton)
1960	2289	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2290	ScreenFit();
1963	2291	} else
1964	2292	if (source == screenfitpointButton)
1965	2293	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2294	ScreenFitPoint();
1968	2295	} else
1969	2296	if (source == snapobjectButton)
1970	2297	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2298	SnapObject();
1973	2299	} else
1974	2300	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2330,14 @@
2004	2330	if (source == cutItem \|\| source == clearButton)
2005	2331	{
2006	2332	loadClipboard(true);
	2333	+ } else
	2334	+ if (source == undoItem)
	2335	+ {
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
2007	2341	} else
2008	2342	if (source == duplicateItem)
2009	2343	{
..	..	@@ -2336,9 +2670,9 @@
2336	2670	{
2337	2671	ClearSelection(true);
2338	2672	} else
2339		- if (source == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2340	2674	{
2341		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2342	2676	} else
2343	2677	if (source == hideItem)
2344	2678	{
..	..	@@ -2356,11 +2690,11 @@
2356	2690	{
2357	2691	makeSomething(new Camera());
2358	2692	} else
2359		- if (source == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2360	2694	{
2361	2695	group(new Composite());
2362	2696	} else
2363		- if (source == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2364	2698	{
2365	2699	RandomNode random = new RandomNode();
2366	2700	group(random);
..	..	@@ -2462,7 +2796,7 @@
2462	2796	{
2463	2797	group(new cLinker());
2464	2798	} else
2465		- if (source == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2466	2800	{
2467	2801	group(new TextureNode());
2468	2802	} else
..	..	@@ -2482,17 +2816,30 @@
2482	2816	{
2483	2817	CastShadow(2);
2484	2818	} else
2485		- if (source == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2820	{
2487		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2488	2823	for (int i=0; i<group.selection.size(); i++)
2489	2824	{
2490		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2491	2830	}
2492	2831
2493		- ClearSelection(false);
2494		-
2495		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2496	2843	} else
2497	2844	if (source == genUVItem)
2498	2845	{
..	..	@@ -2504,7 +2851,7 @@
2504	2851	} else
2505	2852	if (source == genNormalsMESHItem)
2506	2853	{
2507		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2508	2855	} else
2509	2856	if (source == genNormalsORGANItem)
2510	2857	{
..	..	@@ -2569,6 +2916,22 @@
2569	2916	if (source == unmarkleavesItem)
2570	2917	{
2571	2918	MarkLeaves(false);
	2919	+ } else
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
2572	2935	} else
2573	2936	if (source == flipVItem)
2574	2937	{
..	..	@@ -2804,6 +3167,10 @@
2804	3167	if (source == twoButton)
2805	3168	{
2806	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2807	3174	// bug
2808	3175	//gridPanel.setDividerLocation(1.0);
2809	3176	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3203,31 @@
2836	3203	bigThree.ClearUI();
2837	3204	bigThree.add(centralPanel);
2838	3205	bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2839	3224	} else
2840	3225	if (source == threeButton)
2841	3226	{
2842	3227	radio.layout = threeButton;
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
2843	3231
2844	3232	// bigThree.remove(scenePanel);
2845	3233	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3260,15 @@
2872	3260	bigThree.add(centralPanel);
2873	3261	bigThree.add(XYZPanel);
2874	3262	bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2875	3265	} else
2876	3266	if (source == fourButton)
2877	3267	{
2878	3268	radio.layout = fourButton;
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
2879	3272
2880	3273	// bigThree.remove(scenePanel);
2881	3274	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3300,15 @@
2907	3300	bigThree.ClearUI();
2908	3301	bigThree.add(scenePanel);
2909	3302	bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2910	3305	} else
2911	3306	if (source == sixButton)
2912	3307	{
2913	3308	radio.layout = sixButton;
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
2914	3312
2915	3313	// bigThree.remove(scenePanel);
2916	3314	// bigThree.remove(centralPanel);
..	..	@@ -2943,10 +3341,15 @@
2943	3341	bigThree.add(scenePanel);
2944	3342	bigThree.add(centralPanel);
2945	3343	bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2946	3346	} else
2947	3347	if (source == sevenButton)
2948	3348	{
2949	3349	radio.layout = sevenButton;
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
2950	3353
2951	3354	// bigThree.remove(scenePanel);
2952	3355	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3383,8 @@
2980	3383	bigThree.add(centralPanel);
2981	3384	bigThree.add(XYZPanel);
2982	3385	bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2983	3388	} else
2984	3389	if (source == rootButton)
2985	3390	{
..	..	@@ -2991,6 +3396,7 @@
2991	3396	EditObject(obj);
2992	3397	}
2993	3398
	3399	+ cameraView.requestFocusInWindow();
2994	3400	refreshContents(true);
2995	3401	} else
2996	3402	if (source == closeButton)
..	..	@@ -3000,22 +3406,37 @@
3000	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3407	{
3002	3408	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
3005	3417	buttonGroup.remove(ab);
3006	3418	radioPanel.remove(ab);
3007	3419
3008		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
3009	3422	// ab.GetObject().objectUI = null; // ?????????
3010	3423
3011	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3425	break;
3013	3426	}
3014	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
3015	3430	refreshContents(true);
3016	3431	} else
3017	3432	if (source == editItem \|\| source == editButton)
3018	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
3019	3440	EditSelection(false);
3020	3441	} else
3021	3442	if (source == uneditButton)
..	..	@@ -3025,10 +3446,11 @@
3025	3446	Object3D child = (Object3D)e.nextElement();
3026	3447	if(child.editWindow != null)
3027	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
3028	3450	child.CloseUI();
3029	3451	listUI.remove(child);
3030	3452
3031		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
3032	3454	}
3033	3455	objEditor.ctrlPanel.FlushUI();
3034	3456	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3463,7 @@
3041	3463	//copy.ClearUI();
3042	3464	for (Object3D obj : listUI)
3043	3465	{
	3466	+ obj.pinned = false;
3044	3467	obj.CloseUI();
3045	3468	}
3046	3469	listUI.clear();
..	..	@@ -3050,7 +3473,7 @@
3050	3473	{
3051	3474	assert(copy == group);
3052	3475
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3477
3055	3478	for (Object3D obj : listUI)
3056	3479	{
..	..	@@ -3099,6 +3522,9 @@
3099	3522	}
3100	3523
3101	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
3102	3528	//Globals.theRenderer.object = group;
3103	3529	if(!useclient)
3104	3530	{
..	..	@@ -3115,7 +3541,9 @@
3115	3541	sideView.object = group;
3116	3542	}
3117	3543
3118		-// fix "+" issue group.editWindow = this;
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
3119	3547
3120	3548	/*
3121	3549	currentLayout = radio.layout;
..	..	@@ -3123,18 +3551,27 @@
3123	3551	currentLayout = sevenButton;
3124	3552	*/
3125	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
3126	3561	keepparent = group.parent;
3127	3562	// PARENT = NULL or not???
3128	3563	//group.parent = null; // ROOT
3129	3564	//group.attributes = -1;
3130	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
3131	3568	refreshContents(true);
3132	3569	} else if (event.getSource() == editCameraItem)
3133	3570	{
3134	3571	cameraView.ProtectCamera();
3135	3572	cameraView.repaint();
3136	3573	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3575	{
3139	3576	cameraView.RevertCamera();
3140	3577	cameraView.repaint();
..	..	@@ -3151,7 +3588,6 @@
3151	3588	}
3152	3589
3153	3590	boolean useclient = false;
3154		- cRadio radio;
3155	3591
3156	3592	void ToggleRoot()
3157	3593	{
..	..	@@ -3390,7 +3826,8 @@
3390	3826
3391	3827	int size = obj.MemorySize();
3392	3828
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	3831	}
3395	3832	}
3396	3833	catch (Exception e)
..	..	@@ -3471,6 +3908,13 @@
3471	3908	void GenNormals(boolean crease)
3472	3909	{
3473	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3474	3918
3475	3919	refreshContents();
3476	3920	}
..	..	@@ -4098,6 +4542,18 @@
4098	4542	refreshContents();
4099	4543	}
4100	4544
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
	4554	+ refreshContents();
	4555	+ }
	4556	+
4101	4557	void SetTexRes(int tr)
4102	4558	{
4103	4559	group.selection.SetTexRes(tr);
..	..	@@ -4169,10 +4625,6 @@
4169	4625	// }
4170	4626	// }
4171	4627
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4628	void EditSelection(boolean newWindow)
4177	4629	{
4178	4630	// aConstraints.gridy = 0;
..	..	@@ -4180,7 +4632,7 @@
4180	4632	{
4181	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4636
4185	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4638	if(elem != group \|\| !newWindow)
..	..	@@ -4265,7 +4717,8 @@
4265	4717	//new Exception().printStackTrace();
4266	4718
4267	4719	freezemodel = true;
4268		-
	4720	+ ClearUnpinned();
	4721	+
4269	4722	/**/
4270	4723	//switch (event.id)
4271	4724	{
..	..	@@ -4273,7 +4726,6 @@
4273	4726	//case 702: // Event.LIST_DESELECT
4274	4727	group.deselectAll();
4275	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4729	if (tps != null)
4278	4730	{
4279	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4734,8 @@
4282	4734
4283	4735	//if (child.parent != null)
4284	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4285	4738	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4739	}
4290	4740	}
4291	4741	// else
..	..	@@ -4295,20 +4745,28 @@
4295	4745	// System.err.println("info : " + group.GetPath());
4296	4746	// }
4297	4747
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4749	CameraPane.flash = true;
4302	4750
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4752	// a camera
4305	4753	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
4308	4759	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4760	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4761	}
4311	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4312	4770	refreshContents();
4313	4771	//return true;
4314	4772	}
..	..	@@ -4317,6 +4775,35 @@
4317	4775
4318	4776	freezemodel = false;
4319	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4320	4807
4321	4808	void linkSomething(Object3D thing)
4322	4809	{
..	..	@@ -4388,6 +4875,7 @@
4388	4875	{
4389	4876	if (group.selection.isEmpty())
4390	4877	return;
	4878	+
4391	4879	Grafreed.clipboardIsTempGroup = false;
4392	4880	Composite tGroup = null;
4393	4881	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +4886,8 @@
4398	4886
4399	4887	if (cut)
4400	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4401	4891	//int indices[] = jList.getSelectedIndices();
4402	4892	//for (int i = indices.length - 1; i >= 0; i--)
4403	4893	//jList.remove(indices[i]);
..	..	@@ -4487,8 +4977,10 @@
4487	4977	}
4488	4978
4489	4979	}
	4980	+
4490	4981	if (Grafreed.clipboardIsTempGroup)
4491	4982	Grafreed.clipboard = tGroup;
	4983	+
4492	4984	if (cut)
4493	4985	{
4494	4986	ResetModel();
..	..	@@ -4498,6 +4990,10 @@
4498	4990
4499	4991	void paste(boolean expand)
4500	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4501	4997	// if (GrafreeD.clipboard == null)
4502	4998	// return;
4503	4999	boolean first = true;
..	..	@@ -4557,6 +5053,7 @@
4557	5053	Grafreed.clipboard.get(0).parent = keepparent;
4558	5054	}
4559	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4560	5057	ResetModel();
4561	5058	refreshContents();
4562	5059	}
..	..	@@ -4692,6 +5189,10 @@
4692	5189
4693	5190	void group(Object3D csg, boolean grab)
4694	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4695	5196	if (//false) // why??
4696	5197	!group.selection.isEmpty())
4697	5198	{
..	..	@@ -4805,10 +5306,15 @@
4805	5306	//node.add(csg);
4806	5307	//makeSomething(node);
4807	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4808	5310	}
4809	5311
4810	5312	void Ungroup(Object3D g)
4811	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4812	5318	if (g instanceof HiddenObject)
4813	5319	{
4814	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5331,7 @@
4825	5331	objEditor.makeSomething(g.get(i), false);
4826	5332	}
4827	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4828	5335	}
4829	5336
4830	5337	void ungroup()
..	..	@@ -5113,7 +5620,28 @@
5113	5620	cButton clearpanelButton;
5114	5621	cButton unselectButton;
5115	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
5116	5626	cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
5117	5645
5118	5646	cButton screenfitButton;
5119	5647	cButton screenfitpointButton;
..	..	@@ -5126,14 +5654,6 @@
5126	5654
5127	5655	cButton setsupportButton;
5128	5656
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	5657	//
5138	5658	//Composite
5139	5659	Object3D // to do !!
..	..	@@ -5143,9 +5663,11 @@
5143	5663	//JTree jTree;
5144	5664	private MenuItem lookAtItem;
5145	5665	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
5147	5667	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
5149	5671	private MenuItem cloneItem;
5150	5672	private MenuItem cloneSupportItem;
5151	5673	private MenuItem overwriteGeoItem;
..	..	@@ -5208,6 +5730,10 @@
5208	5730	private MenuItem showleavesItem;
5209	5731	private MenuItem markleavesItem;
5210	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
5211	5737
5212	5738	private MenuItem flipVItem;
5213	5739	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5755,7 @@
5229	5755	private MenuItem frontItem;
5230	5756	private MenuItem cameraItem;
5231	5757	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5233	5759	private MenuItem physicsItem;
5234	5760	private MenuItem frameselectorItem;
5235	5761	private MenuItem scriptNodeItem;
..	..	@@ -5303,5 +5829,5 @@
5303	5829
5304	5830	Menu cameraMenu;
5305	5831	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	5832	+ MenuItem restoreCameraItem;
5307	5833	}