~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -80,10 +86,22 @@
80	86	SetupViews(objEditor);
81	87
82	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
83	97	}
84	98
85	99	void CloneSelection(boolean supports)
86	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
87	105	// Object3D keep = GrafreeD.clipboard;
88	106	//Object3D obj;
89	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +112,7 @@
94	112
95	113	makeSomething(clone, i==group.selection.size()-1);
96	114	}
	115	+ Globals.REPLACEONMAKE = keep;
97	116	}
98	117
99	118	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +208,8 @@
189	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	209	// pasteExpandItem.addActionListener(this);
191	210	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
194	213
195	214	if (Globals.ADVANCED)
196	215	{
..	..	@@ -204,23 +223,23 @@
204	223	//zBufferItem.addActionListener(this);
205	224	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	225	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
209	228
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	241
215		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216		- toggleTextureItem.addItemListener(this);
217		- toggleTextureItem.setState(CameraPane.textureon);
218		-
219		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220		- toggleSwitchItem.addItemListener(this);
221		- toggleSwitchItem.setState(CameraPane.SWITCH);
222		-
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	243	toggleHandleItem.addItemListener(this);
225	244	toggleHandleItem.setState(CameraPane.HANDLES);
226	245
..	..	@@ -275,7 +294,7 @@
275	294	{
276	295	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	296	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	298	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	299	oe.cameraMenu.add("-");
281	300	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -283,7 +302,7 @@
283	302	editLeafItem.addActionListener(this);
284	303	lookAtItem.addActionListener(this);
285	304	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	305	+ //switchViewItem.addActionListener(this);
287	306	}
288	307
289	308	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,14 +347,14 @@
328	347	}
329	348
330	349	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
333	352	backItem = menu.add(new MenuItem("Back"));
334	353	backItem.addActionListener(this);
335	354	frontItem = menu.add(new MenuItem("Front"));
336	355	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
339	358
340	359	if (Globals.ADVANCED)
341	360	{
..	..	@@ -345,10 +364,10 @@
345	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
346	365	ungroupItem.addActionListener(this);
347	366
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
352	371	if (Globals.ADVANCED)
353	372	{
354	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +384,11 @@
365	384	frameselectorItem.addActionListener(this);
366	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	386	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	387	}
371	388
372	389	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
375	392	billboardItem = menu.add(new MenuItem("Billboard"));
376	393	billboardItem.addActionListener(this);
377	394	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,13 +399,14 @@
382	399	shadowYItem.addActionListener(this);
383	400	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
385	405	if (Globals.ADVANCED)
386	406	{
387	407	menu.add("-");
388	408	linkerItem = menu.add(new MenuItem("Linker"));
389	409	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	410	templateItem = menu.add(new MenuItem("Template"));
393	411	templateItem.addActionListener(this);
394	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -417,7 +435,7 @@
417	435	genNormalsMESHItem.addActionListener(this);
418	436	if (Globals.ADVANCED)
419	437	{
420		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421	439	genNormalsMINEItem.addActionListener(this);
422	440	}
423	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -510,10 +528,15 @@
510	528	attachBumpItem.addActionListener(this);
511	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
513	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514	533	detachPigmentItem.addActionListener(this);
515	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
517	540	menu.add("-");
518	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519	542	sortbysizeItem.addActionListener(this);
..	..	@@ -540,6 +563,7 @@
540	563	buildToolsMenu(menu);
541	564	}
542	565
	566	+
543	567	void SetupUI2(ObjEditor oe)
544	568	{
545	569	// June 2019
..	..	@@ -582,53 +606,79 @@
582	606	oe.radioPanel.add(dummyButton);
583	607	oe.buttonGroup.add(dummyButton);
584	608	*/
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
	612	+
585	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	614
587	615	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	616	//minButton.setToolTipText("Minimize window");
589	617	//minButton.addActionListener(this);
590	618
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
594	625
595	626	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	627	fullButton.setToolTipText("Full-screen window");
597	628	fullButton.addActionListener(this);
598	629
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
	634	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	636	+ restoreCameraButton.addActionListener(this);
602	637
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604		- redoButton.setToolTipText("Redo changes");
605		- redoButton.addActionListener(this);
606		-
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- saveButton.setToolTipText("Save changes");
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
609	640	saveButton.addActionListener(this);
	641	+
	642	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	643	+ undoButton.setToolTipText("Previous version");
	644	+ undoButton.addActionListener(this);
	645	+ undoButton.setEnabled(false);
610	646
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
	660	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ redoButton.setToolTipText("Next version");
	662	+ redoButton.addActionListener(this);
	663	+ redoButton.setEnabled(false);
	664	+
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	666	liveCB.setToolTipText("Enable animation");
613	667	liveCB.addItemListener(this);
614	668
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	670	oneStepButton.setToolTipText("Animate one step forward");
617	671	oneStepButton.addActionListener(this);
618	672
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	674	fastCB.setToolTipText("Fast mode");
621	675	fastCB.addItemListener(this);
622	676
623		- oe.toolboxPanel.Return();
	677	+ //oe.toolboxPanel.Return();
624	678
625		- oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
626		- trackCB.setToolTipText("Enable tracking");
627		- trackCB.addItemListener(this);
628		-
629		- oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- screenfitButton.setToolTipText("Screen fit");
631		- screenfitButton.addActionListener(this);
	679	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	680	+// trackCB.setToolTipText("Enable tracking");
	681	+// trackCB.addItemListener(this);
632	682
633	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	684	// screenfitpointButton.addActionListener(this);
..	..	@@ -640,33 +690,30 @@
640	690	snapobjectButton.setToolTipText("Snap Object");
641	691	}
642	692
643		- oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- flashSelectionButton.setToolTipText("Highlight selection");
645		- flashSelectionButton.addActionListener(this);
646		-
647	693	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648		-
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
651		- twoButton.addActionListener(this);
652		- this.fullscreenLayout = twoButton;
653	694
654	695	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
655	696	fourButton.addActionListener(this);
656	697	fourButton.setToolTipText("Show left panel only");
	698	+
	699	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show right view only");
	701	+ twoButton.addActionListener(this);
	702	+ this.fullscreenLayout = twoButton;
	703	+
657	704	oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- sixButton.setToolTipText("2-column layout left");
	705	+ sixButton.setToolTipText("Show left and right");
659	706	sixButton.addActionListener(this);
660		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661		- threeButton.setToolTipText("2-column layout right");
662		- threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
	707	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+// threeButton.setToolTipText("2-column layout right");
	709	+// threeButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
666	713	//
667	714
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
670	717	rootButton.addActionListener(this);
671	718
672	719	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,8 +735,6 @@
688	735	sphereButton.setToolTipText("Create sphere");
689	736	sphereButton.addActionListener(this);
690	737
691		- oe.toolboxPanel.Return();
692		-
693	738	oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	739	coneButton.setToolTipText("Create cone");
695	740	coneButton.addActionListener(this);
..	..	@@ -713,6 +758,28 @@
713	758	particlesButton.setToolTipText("Create particle system");
714	759	particlesButton.addActionListener(this);
715	760
	761	+ oe.toolboxPanel.Return();
	762	+
	763	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ groupButton.setToolTipText("Create group");
	765	+ groupButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ compositeButton.setToolTipText("Create composite");
	769	+ compositeButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ switchButton.setToolTipText("Create item switcher");
	773	+ switchButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ loopButton.setToolTipText("Create loop");
	777	+ loopButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ textureButton.setToolTipText("Create texture");
	781	+ textureButton.addActionListener(this);
	782	+
716	783	oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	784	overlayButton.setToolTipText("Create overlay");
718	785	overlayButton.addActionListener(this);
..	..	@@ -721,17 +788,29 @@
721	788	lightButton.setToolTipText("Create light");
722	789	lightButton.addActionListener(this);
723	790
	791	+ for (int i=6; --i>=0;)
	792	+ {
	793	+ oe.toolboxPanel.Return();
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ oe.toolboxPanel.add(new cGridBag());
	797	+ oe.toolboxPanel.add(new cGridBag());
	798	+ oe.toolboxPanel.add(new cGridBag());
	799	+ oe.toolboxPanel.add(new cGridBag());
	800	+ oe.toolboxPanel.add(new cGridBag());
	801	+ }
	802	+
724	803	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
727	806	editButton.addActionListener(this);
728	807
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
731	810	uneditButton.addActionListener(this);
732	811
733	812	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	813	+ allParamsButton.setToolTipText("Show all controle");
735	814	allParamsButton.addActionListener(this);
736	815
737	816	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +821,13 @@
742	821	unselectButton.setToolTipText("Unselect");
743	822	unselectButton.addActionListener(this);
744	823
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
	827	+
745	828	editCommandsPanel.preferredHeight = 1;
746	829
	830	+ SetPinStates(false);
747	831	// oe.treePanel.add(commandsPanel);
748	832	// oe.treePanel.Return();
749	833
..	..	@@ -768,23 +852,11 @@
768	852	oe.treePanel.add(jSPPanel);
769	853	oe.treePanel.Return();
770	854
771		- cGridBag copyOptionsPanel = new cGridBag();
772		-
773		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
774		- colorCB.setToolTipText("Copy color when dropped");
775		- colorCB.addItemListener(this);
776		-
777		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
778		- materialCB.setToolTipText("Copy material when dropped");
779		- materialCB.addItemListener(this);
780		-
781		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
782		- textureCB.setToolTipText("Copy texture when dropped");
783		- textureCB.addItemListener(this);
784		-
785		- copyOptionsPanel.preferredHeight = 1;
786	855	oe.treePanel.add(copyOptionsPanel);
787	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
788	860
789	861	// mainPanel.setDividerLocation(0.5); //1.0);
790	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -807,29 +879,49 @@
807	879	dgr.addDragGestureListener(this);
808	880	}catch(Exception e) {}
809	881	*/
810		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
811	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	884	}
813	885
814	886	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	887	{
	888	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	889	+ colorCB.setToolTipText("Copy color when dropped");
	890	+ colorCB.addItemListener(this);
	891	+
	892	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	893	+ materialCB.setToolTipText("Copy material when dropped");
	894	+ materialCB.addItemListener(this);
	895	+
	896	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	897	+ textureCB.setToolTipText("Copy texture when dropped");
	898	+ textureCB.addItemListener(this);
	899	+
	900	+ panel.Return();
	901	+
816	902	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	903	boxCB.setToolTipText("Display bounding boxes");
818	904	boxCB.addItemListener(this);
819	905
820	906	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	908	zoomBoxCB.addItemListener(this);
823	909
824	910	if (true) // Globals.ADVANCED)
825	911	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
829	919
830	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	921	// localCB.addItemListener(this);
832	922
	923	+ panel.Return();
	924	+
833	925	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	926	crowdCB.setToolTipText("Used for crowds");
835	927	crowdCB.addItemListener(this);
..	..	@@ -846,6 +938,8 @@
846	938	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	939	// speakerMocapCB.addItemListener(this);
848	940
	941	+ panel.Return();
	942	+
849	943	if (false)
850	944	{
851	945	// handled in scripts
..	..	@@ -860,24 +954,39 @@
860	954	//constraints.gridy += 1;
861	955	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	956	smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
863	958	}
864	959
865	960	//constraints.gridx += 1;
866	961	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	962	// debugCB.addItemListener(this);
868	963
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
869	968	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	969	+ oeilCB.setToolTipText("Move camera when tracking");
871	970	oeilCB.addItemListener(this);
872	971
873	972	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	973	+ shadowCB.setToolTipText("When live compute shadows");
875	974	shadowCB.addItemListener(this);
876	975
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	976	+ panel.Return();
	977	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	978	+ toggleTextureCB.setToolTipText("Load textures");
	979	+ toggleTextureCB.addItemListener(this);
	980	+
	981	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
	983	+ toggleSwitchCB.addItemListener(this);
	984	+
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
880	988
	989	+ panel.Return();
881	990	if (Globals.ADVANCED)
882	991	{
883	992	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +997,15 @@
888	997	}
889	998
890	999	cGridBag fill = new cGridBag();
891		-
892	1000	fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
893	1005
894	1006	panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
895	1009
896	1010	}
897	1011
..	..	@@ -899,7 +1013,7 @@
899	1013	{
900	1014	cRadio radioButton = new cRadio(obj.name);
901	1015
902		- // Patch to avoid bug with transparency.
	1016	+ // June 2019. Patch to avoid bug with transparency.
903	1017	radioButton.hadMaterial = obj.material != null;
904	1018	if (!radioButton.hadMaterial)
905	1019	{
..	..	@@ -907,7 +1021,7 @@
907	1021	}
908	1022
909	1023	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
911	1025	radioButton.SetCamera(cameraView.renderCamera, false);
912	1026	radioButton.addActionListener(this);
913	1027	radioPanel.add(radioButton);
..	..	@@ -936,7 +1050,9 @@
936	1050	cCheckBox slowCB;
937	1051	cCheckBox boxCB;
938	1052	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1053	+ cCheckBox freezeCB;
	1054	+ //cToggleButton trackCB;
	1055	+ cCheckBox trackCB;
940	1056	cCheckBox smoothfocusCB;
941	1057	// JCheckBox speakerMocapCB;
942	1058	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1061,7 @@
945	1061
946	1062	cCheckBox oeilCB;
947	1063	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1064	+ cCheckBox autokeepCB;
949	1065	cCheckBox lookAtCB;
950	1066
951	1067	// static int COLOR = 1;
..	..	@@ -1053,9 +1169,13 @@
1053	1169	{
1054	1170	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1171	}
1056		- else if(e.getSource() == autosaveCB)
	1172	+ else if(e.getSource() == freezeCB)
1057	1173	{
1058		- Globals.SAVEONMAKE ^= true;
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
1059	1179	}
1060	1180	else if(e.getSource() == lookAtCB)
1061	1181	{
..	..	@@ -1137,8 +1257,6 @@
1137	1257	}
1138	1258	}
1139	1259
1140		- String string = (String) object;
1141		-
1142	1260	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1261	// if( object instanceof java.io.File[])
1144	1262	// {
..	..	@@ -1146,6 +1264,8 @@
1146	1264	// objEditor.DropFile((java.io.File[]) object, true);
1147	1265	// return;
1148	1266	// }
	1267	+
	1268	+ String string = object.toString();
1149	1269
1150	1270	// File path for Mac and Windows
1151	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1311,23 @@
1191	1311
1192	1312	assert target == objEditor.jTree;
1193	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
1194	1315	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1317	} catch (Exception e) {
1197	1318	System.out.println("destinationPath : " + destinationPath);
1198	1319	return;
1199	1320	}
1200	1321
	1322	+ for (int i=group.selection.size(); --i>=0;)
	1323	+ {
	1324	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1325	+
	1326	+ // Cannot move into itself
	1327	+ if (child == destinationLeaf)
	1328	+ return;
	1329	+ }
	1330	+
1201	1331	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1332	// {
1203	1333	loadClipboard(true);
..	..	@@ -1312,22 +1442,30 @@
1312	1442	{
1313	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1444	//heightFieldItem.addActionListener(this);
1315		- gridItem = menu.add(new MenuItem("Grid"));
1316		- gridItem.addActionListener(this);
1317		- rectoidItem = menu.add(new MenuItem("Box"));
1318		- rectoidItem.addActionListener(this);
1319		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1320		- ellipsoidItem.addActionListener(this);
1321		- coneItem = menu.add(new MenuItem("Cone"));
1322		- coneItem.addActionListener(this);
1323		- torusItem = menu.add(new MenuItem("Torus"));
1324		- torusItem.addActionListener(this);
1325		- superItem = menu.add(new MenuItem("Superellipsoid"));
1326		- superItem.addActionListener(this);
	1445	+// gridItem = menu.add(new MenuItem("Grid"));
	1446	+// gridItem.addActionListener(this);
	1447	+// rectoidItem = menu.add(new MenuItem("Box"));
	1448	+// rectoidItem.addActionListener(this);
	1449	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1450	+// ellipsoidItem.addActionListener(this);
	1451	+// coneItem = menu.add(new MenuItem("Cone"));
	1452	+// coneItem.addActionListener(this);
	1453	+// torusItem = menu.add(new MenuItem("Torus"));
	1454	+// torusItem.addActionListener(this);
	1455	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1456	+// superItem.addActionListener(this);
	1457	+
	1458	+ cameraItem = menu.add(new MenuItem("Camera"));
	1459	+ cameraItem.addActionListener(this);
	1460	+
	1461	+ if (!Globals.ADVANCED)
	1462	+ {
1327	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1464	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
1331	1469	if (Globals.ADVANCED)
1332	1470	{
1333	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1491,15 @@
1353	1491	}
1354	1492	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1493	bezierItem.addActionListener(this);
1356		- overlayItem = menu.add(new MenuItem("Overlay"));
1357		- overlayItem.addActionListener(this);
1358		- lightItem = menu.add(new MenuItem("Light"));
1359		- lightItem.addActionListener(this);
	1494	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1495	+// overlayItem.addActionListener(this);
	1496	+// lightItem = menu.add(new MenuItem("Light"));
	1497	+// lightItem.addActionListener(this);
1360	1498	menu.add("-");
1361	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1500	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1365	1503	doubleItem = menu.add(new MenuItem("Fork"));
1366	1504	doubleItem.addActionListener(this);
1367	1505	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1515,9 @@
1377	1515	animationItem.addItemListener(this);
1378	1516	animationItem.setState(Globals.ANIMATION);
1379	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1380	1521	menu.add("-");
1381	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1523	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1530,8 @@
1389	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1531	reduce34MorphItem.addActionListener(this);
1391	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1392	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1536	computeAOItem.addActionListener(this);
1394	1537
..	..	@@ -1397,8 +1540,6 @@
1397	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1541	mirrorItem.addActionListener(this);
1399	1542	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1544	analyzeItem.addActionListener(this);
1404	1545	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +1687,30 @@
1546	1687
1547	1688	makeSomething(shadow);
1548	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1549	1714
1550	1715	/**
1551	1716	* applyExample
..	..	@@ -1790,7 +1955,7 @@
1790	1955	{
1791	1956	ScreenFit();
1792	1957	} else
1793		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1794	1959	{
1795	1960	cVector v1 = new cVector();
1796	1961	cVector v2 = new cVector();
..	..	@@ -2020,30 +2185,30 @@
2020	2185
2021	2186	group(g);
2022	2187	} else
2023		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
2024	2189	{
2025	2190	Composite csg = new GroupLeaf();
2026	2191	csg.count = 5;
2027	2192	group(csg);
2028		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
2029	2194	csg.addChild(child);
2030	2195	child.addChild(csg);
2031	2196	} else
2032	2197	if (source == doubleItem)
2033	2198	{
2034		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
2035	2200	csg.count = 5;
2036	2201	group(csg);
2037		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
2038	2203	csg.addChild(child);
2039	2204	child.addChild(csg);
2040		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
2041	2206	csg.addChild(child);
2042	2207	child.addChild(csg);
2043	2208	} else
2044	2209	if (source == tripleItem)
2045	2210	{
2046		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
2047	2212	csg.count = 4;
2048	2213	group(csg);
2049	2214	Composite child = new cGroup();
..	..	@@ -2107,15 +2272,31 @@
2107	2272	} else
2108	2273	if (source == undoButton)
2109	2274	{
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2110	2278	Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
2111	2289	} else
2112	2290	if (source == redoButton)
2113	2291	{
	2292	+ // Go to next version
2114	2293	Redo();
2115	2294	} else
2116	2295	if (source == saveButton)
2117	2296	{
2118		- Save();
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
2119	2300	} else
2120	2301	if (source == oneStepButton)
2121	2302	{
..	..	@@ -2124,17 +2305,14 @@
2124	2305	} else
2125	2306	if (source == screenfitButton)
2126	2307	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2308	ScreenFit();
2129	2309	} else
2130	2310	if (source == screenfitpointButton)
2131	2311	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2312	ScreenFitPoint();
2134	2313	} else
2135	2314	if (source == snapobjectButton)
2136	2315	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2316	SnapObject();
2139	2317	} else
2140	2318	// if (event.getSource() == recompileButton)
..	..	@@ -2498,7 +2676,7 @@
2498	2676	{
2499	2677	StepAll();
2500	2678	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	2680	{
2503	2681	//int indices[] = jList.getSelectedIndices();
2504	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +2688,9 @@
2510	2688	{
2511	2689	ClearSelection(true);
2512	2690	} else
2513		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2514	2692	{
2515		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2516	2694	} else
2517	2695	if (source == hideItem)
2518	2696	{
..	..	@@ -2530,11 +2708,11 @@
2530	2708	{
2531	2709	makeSomething(new Camera());
2532	2710	} else
2533		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2534	2712	{
2535	2713	group(new Composite());
2536	2714	} else
2537		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2538	2716	{
2539	2717	RandomNode random = new RandomNode();
2540	2718	group(random);
..	..	@@ -2636,7 +2814,7 @@
2636	2814	{
2637	2815	group(new cLinker());
2638	2816	} else
2639		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2640	2818	{
2641	2819	group(new TextureNode());
2642	2820	} else
..	..	@@ -2658,15 +2836,28 @@
2658	2836	} else
2659	2837	if (source == ungroupItem \|\| source == ungroupButton)
2660	2838	{
2661		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2662	2841	for (int i=0; i<group.selection.size(); i++)
2663	2842	{
2664		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2665	2848	}
2666	2849
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2670	2861	} else
2671	2862	if (source == genUVItem)
2672	2863	{
..	..	@@ -2967,7 +3158,7 @@
2967	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3159	{
2969	3160	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2971	3162	}
2972	3163
2973	3164	refreshContents();
..	..	@@ -2981,6 +3172,31 @@
2981	3172	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3173	}
2983	3174
	3175	+ refreshContents();
	3176	+ } else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
2984	3200	refreshContents();
2985	3201	} else
2986	3202	if (source == flashSelectionButton)
..	..	@@ -3258,6 +3474,12 @@
3258	3474	} else
3259	3475	if (source == editItem \|\| source == editButton)
3260	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
3261	3483	EditSelection(false);
3262	3484	} else
3263	3485	if (source == uneditButton)
..	..	@@ -3267,6 +3489,7 @@
3267	3489	Object3D child = (Object3D)e.nextElement();
3268	3490	if(child.editWindow != null)
3269	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
3270	3493	child.CloseUI();
3271	3494	listUI.remove(child);
3272	3495
..	..	@@ -3283,6 +3506,7 @@
3283	3506	//copy.ClearUI();
3284	3507	for (Object3D obj : listUI)
3285	3508	{
	3509	+ obj.pinned = false;
3286	3510	obj.CloseUI();
3287	3511	}
3288	3512	listUI.clear();
..	..	@@ -3292,7 +3516,7 @@
3292	3516	{
3293	3517	assert(copy == group);
3294	3518
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3520
3297	3521	for (Object3D obj : listUI)
3298	3522	{
..	..	@@ -3341,6 +3565,9 @@
3341	3565	}
3342	3566
3343	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3344	3571	//Globals.theRenderer.object = group;
3345	3572	if(!useclient)
3346	3573	{
..	..	@@ -3367,6 +3594,13 @@
3367	3594	currentLayout = sevenButton;
3368	3595	*/
3369	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
3370	3604	keepparent = group.parent;
3371	3605	// PARENT = NULL or not???
3372	3606	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3614,7 @@
3380	3614	cameraView.ProtectCamera();
3381	3615	cameraView.repaint();
3382	3616	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3617	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3618	{
3385	3619	cameraView.RevertCamera();
3386	3620	cameraView.repaint();
..	..	@@ -3959,7 +4193,7 @@
3959	4193
3960	4194	try
3961	4195	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4197	}
3964	4198	catch (Exception e)
3965	4199	{
..	..	@@ -4434,12 +4668,14 @@
4434	4668	// }
4435	4669	// }
4436	4670
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4671	void EditSelection(boolean newWindow)
4442	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4443	4679	// aConstraints.gridy = 0;
4444	4680	for (int i=0; i<group.selection.size(); i++)
4445	4681	{
..	..	@@ -4450,12 +4686,7 @@
4450	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	4687	if(elem != group \|\| !newWindow)
4452	4688	{
4453		- // if (!(elem instanceof Composite))
4454		- // newWindow = false;
4455		- listUI.add(elem);
4456		- elem.openEditWindow(this, newWindow); //, false);
4457		- System.out.println("edit : " + elem);
4458		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4459	4690	}
4460	4691	}
4461	4692	}
..	..	@@ -4530,7 +4761,8 @@
4530	4761	//new Exception().printStackTrace();
4531	4762
4532	4763	freezemodel = true;
4533		-
	4764	+ ClearUnpinned();
	4765	+
4534	4766	/**/
4535	4767	//switch (event.id)
4536	4768	{
..	..	@@ -4563,7 +4795,7 @@
4563	4795	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	4796	// a camera
4565	4797	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4798	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	4799	{
4568	4800	CameraPane.camerachangeframe = 0; // don't refuse it
4569	4801	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +4804,13 @@
4572	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	4805	}
4574	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4575	4814	refreshContents();
4576	4815	//return true;
4577	4816	}
..	..	@@ -4581,9 +4820,18 @@
4581	4820	freezemodel = false;
4582	4821	}
4583	4822
	4823	+ void SetPinStates(boolean enabled)
	4824	+ {
	4825	+ editButton.setEnabled(enabled);
	4826	+ uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
	4829	+ }
	4830	+
4584	4831	void refreshContents(boolean cp)
4585	4832	{
4586		- if (!Globals.MOUSEDRAGGED)
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	4835	{
4588	4836	objEditor.ClearInfo(); // .GetMaterial());
4589	4837
..	..	@@ -4682,8 +4930,8 @@
4682	4930
4683	4931	if (cut)
4684	4932	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4687	4935	//int indices[] = jList.getSelectedIndices();
4688	4936	//for (int i = indices.length - 1; i >= 0; i--)
4689	4937	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5034,10 @@
4786	5034
4787	5035	void paste(boolean expand)
4788	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4789	5041	// if (GrafreeD.clipboard == null)
4790	5042	// return;
4791	5043	boolean first = true;
..	..	@@ -4845,6 +5097,7 @@
4845	5097	Grafreed.clipboard.get(0).parent = keepparent;
4846	5098	}
4847	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4848	5101	ResetModel();
4849	5102	refreshContents();
4850	5103	}
..	..	@@ -4980,6 +5233,10 @@
4980	5233
4981	5234	void group(Object3D csg, boolean grab)
4982	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4983	5240	if (//false) // why??
4984	5241	!group.selection.isEmpty())
4985	5242	{
..	..	@@ -5093,10 +5350,15 @@
5093	5350	//node.add(csg);
5094	5351	//makeSomething(node);
5095	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
5096	5354	}
5097	5355
5098	5356	void Ungroup(Object3D g)
5099	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
5100	5362	if (g instanceof HiddenObject)
5101	5363	{
5102	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5375,7 @@
5113	5375	objEditor.makeSomething(g.get(i), false);
5114	5376	}
5115	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
5116	5379	}
5117	5380
5118	5381	void ungroup()
..	..	@@ -5401,17 +5664,17 @@
5401	5664	cButton clearpanelButton;
5402	5665	cButton unselectButton;
5403	5666
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5667	+ cButton restoreCameraButton;
	5668	+
5409	5669	cButton saveButton;
5410	5670	cButton oneStepButton;
5411	5671
5412	5672	cButton groupButton;
5413	5673	cButton ungroupButton;
5414	5674	cButton compositeButton;
	5675	+ cButton switchButton;
	5676	+ cButton loopButton;
	5677	+ cButton textureButton;
5415	5678
5416	5679	cButton gridButton;
5417	5680	cButton boxButton;
..	..	@@ -5444,7 +5707,7 @@
5444	5707	//JTree jTree;
5445	5708	private MenuItem lookAtItem;
5446	5709	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
5448	5711	private MenuItem cutItem;
5449	5712	private MenuItem undoItem;
5450	5713	private MenuItem redoItem;
..	..	@@ -5476,7 +5739,7 @@
5476	5739	private MenuItem pasteLinkItem;
5477	5740	private MenuItem pasteCloneItem;
5478	5741	private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5480	5743	private MenuItem clearAllItem;
5481	5744	private MenuItem genUVItem;
5482	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +5799,7 @@
5536	5799	private MenuItem frontItem;
5537	5800	private MenuItem cameraItem;
5538	5801	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5540	5803	private MenuItem physicsItem;
5541	5804	private MenuItem frameselectorItem;
5542	5805	private MenuItem scriptNodeItem;
..	..	@@ -5560,6 +5823,8 @@
5560	5823	private MenuItem attachBumpItem;
5561	5824	private MenuItem detachBumpItem;
5562	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5563	5828
5564	5829	private MenuItem particleItem;
5565	5830	private MenuItem ragdollItem;
..	..	@@ -5610,5 +5875,5 @@
5610	5875
5611	5876	Menu cameraMenu;
5612	5877	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	5878	+ MenuItem restoreCameraItem;
5614	5879	}