~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"));
..	..	@@ -540,6 +558,7 @@
540	558	buildToolsMenu(menu);
541	559	}
542	560
	561	+
543	562	void SetupUI2(ObjEditor oe)
544	563	{
545	564	// June 2019
..	..	@@ -582,53 +601,79 @@
582	601	oe.radioPanel.add(dummyButton);
583	602	oe.buttonGroup.add(dummyButton);
584	603	*/
	604	+ cGridBag copyOptionsPanel = new cGridBag();
	605	+
	606	+ copyOptionsPanel.preferredHeight = 1;
	607	+
585	608	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	609
587	610	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	611	//minButton.setToolTipText("Minimize window");
589	612	//minButton.addActionListener(this);
590	613
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	614	+ if (Globals.ADVANCED)
	615	+ {
	616	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ maxButton.setToolTipText("Maximize window");
	618	+ maxButton.addActionListener(this);
	619	+ }
594	620
595	621	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	622	fullButton.setToolTipText("Full-screen window");
597	623	fullButton.addActionListener(this);
598	624
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
	625	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ screenfitButton.setToolTipText("Screen fit");
	627	+ screenfitButton.addActionListener(this);
	628	+
	629	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	631	+ restoreCameraButton.addActionListener(this);
602	632
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");
	633	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ saveButton.setToolTipText("New version");
609	635	saveButton.addActionListener(this);
	636	+
	637	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ undoButton.setToolTipText("Previous version");
	639	+ undoButton.addActionListener(this);
	640	+ undoButton.setEnabled(false);
610	641
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	642	+ cGridBag updown = new cGridBag().setVertical(true);
	643	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ restoreButton.setToolTipText("Restore current");
	645	+ restoreButton.addActionListener(this);
	646	+ restoreButton.setEnabled(false);
	647	+
	648	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ replaceButton.setToolTipText("Replace current");
	650	+ replaceButton.addActionListener(this);
	651	+ replaceButton.setEnabled(false);
	652	+
	653	+ copyOptionsPanel.add(updown);
	654	+
	655	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ redoButton.setToolTipText("Next version");
	657	+ redoButton.addActionListener(this);
	658	+ redoButton.setEnabled(false);
	659	+
	660	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	661	liveCB.setToolTipText("Enable animation");
613	662	liveCB.addItemListener(this);
614	663
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	665	oneStepButton.setToolTipText("Animate one step forward");
617	666	oneStepButton.addActionListener(this);
618	667
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	668	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	669	fastCB.setToolTipText("Fast mode");
621	670	fastCB.addItemListener(this);
622	671
623		- oe.toolboxPanel.Return();
	672	+ //oe.toolboxPanel.Return();
624	673
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);
	674	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	675	+// trackCB.setToolTipText("Enable tracking");
	676	+// trackCB.addItemListener(this);
632	677
633	678	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	679	// screenfitpointButton.addActionListener(this);
..	..	@@ -640,33 +685,30 @@
640	685	snapobjectButton.setToolTipText("Snap Object");
641	686	}
642	687
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	688	//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	689
654	690	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
655	691	fourButton.addActionListener(this);
656	692	fourButton.setToolTipText("Show left panel only");
	693	+
	694	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ twoButton.setToolTipText("Show right view only");
	696	+ twoButton.addActionListener(this);
	697	+ this.fullscreenLayout = twoButton;
	698	+
657	699	oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- sixButton.setToolTipText("2-column layout left");
	700	+ sixButton.setToolTipText("Show left and right");
659	701	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);
	702	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+// threeButton.setToolTipText("2-column layout right");
	704	+// threeButton.addActionListener(this);
	705	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	706	+// sevenButton.setToolTipText("3-column layout");
	707	+// sevenButton.addActionListener(this);
666	708	//
667	709
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	710	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ rootButton.setToolTipText("Open selection in new tab");
670	712	rootButton.addActionListener(this);
671	713
672	714	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,8 +730,6 @@
688	730	sphereButton.setToolTipText("Create sphere");
689	731	sphereButton.addActionListener(this);
690	732
691		- oe.toolboxPanel.Return();
692		-
693	733	oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	734	coneButton.setToolTipText("Create cone");
695	735	coneButton.addActionListener(this);
..	..	@@ -713,6 +753,28 @@
713	753	particlesButton.setToolTipText("Create particle system");
714	754	particlesButton.addActionListener(this);
715	755
	756	+ oe.toolboxPanel.Return();
	757	+
	758	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	759	+ groupButton.setToolTipText("Create group");
	760	+ groupButton.addActionListener(this);
	761	+
	762	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	763	+ compositeButton.setToolTipText("Create composite");
	764	+ compositeButton.addActionListener(this);
	765	+
	766	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	767	+ switchButton.setToolTipText("Create item switcher");
	768	+ switchButton.addActionListener(this);
	769	+
	770	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ loopButton.setToolTipText("Create loop");
	772	+ loopButton.addActionListener(this);
	773	+
	774	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ textureButton.setToolTipText("Create texture");
	776	+ textureButton.addActionListener(this);
	777	+
716	778	oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	779	overlayButton.setToolTipText("Create overlay");
718	780	overlayButton.addActionListener(this);
..	..	@@ -721,17 +783,29 @@
721	783	lightButton.setToolTipText("Create light");
722	784	lightButton.addActionListener(this);
723	785
	786	+ for (int i=6; --i>=0;)
	787	+ {
	788	+ oe.toolboxPanel.Return();
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ }
	797	+
724	798	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	799	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	800	+ editButton.setToolTipText("Pin selection controls");
727	801	editButton.addActionListener(this);
728	802
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	803	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ uneditButton.setToolTipText("Remove selection controls");
731	805	uneditButton.addActionListener(this);
732	806
733	807	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	808	+ allParamsButton.setToolTipText("Show all controle");
735	809	allParamsButton.addActionListener(this);
736	810
737	811	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +816,13 @@
742	816	unselectButton.setToolTipText("Unselect");
743	817	unselectButton.addActionListener(this);
744	818
	819	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	820	+ flashSelectionButton.setToolTipText("Highlight selection");
	821	+ flashSelectionButton.addActionListener(this);
	822	+
745	823	editCommandsPanel.preferredHeight = 1;
746	824
	825	+ SetPinStates(false);
747	826	// oe.treePanel.add(commandsPanel);
748	827	// oe.treePanel.Return();
749	828
..	..	@@ -768,23 +847,11 @@
768	847	oe.treePanel.add(jSPPanel);
769	848	oe.treePanel.Return();
770	849
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	850	oe.treePanel.add(copyOptionsPanel);
787	851	oe.treePanel.Return();
	852	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	853	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	854	+ sliderPane.preferredHeight = 1;
788	855
789	856	// mainPanel.setDividerLocation(0.5); //1.0);
790	857	// mainPanel.setResizeWeight(0.5);
..	..	@@ -807,29 +874,49 @@
807	874	dgr.addDragGestureListener(this);
808	875	}catch(Exception e) {}
809	876	*/
810		- radio.layout = sevenButton;
	877	+ radio.layout = sixButton; // sevenButton;
811	878	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	879	}
813	880
814	881	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	882	{
	883	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	884	+ colorCB.setToolTipText("Copy color when dropped");
	885	+ colorCB.addItemListener(this);
	886	+
	887	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	888	+ materialCB.setToolTipText("Copy material when dropped");
	889	+ materialCB.addItemListener(this);
	890	+
	891	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	892	+ textureCB.setToolTipText("Copy texture when dropped");
	893	+ textureCB.addItemListener(this);
	894	+
	895	+ panel.Return();
	896	+
816	897	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	898	boxCB.setToolTipText("Display bounding boxes");
818	899	boxCB.addItemListener(this);
819	900
820	901	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	902	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	903	zoomBoxCB.addItemListener(this);
823	904
824	905	if (true) // Globals.ADVANCED)
825	906	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	907	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	908	+// supportCB.setToolTipText("Enable rigging");
	909	+// supportCB.addItemListener(this);
	910	+
	911	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	912	+ freezeCB.setToolTipText("Fast moving camera");
	913	+ freezeCB.addItemListener(this);
829	914
830	915	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	916	// localCB.addItemListener(this);
832	917
	918	+ panel.Return();
	919	+
833	920	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	921	crowdCB.setToolTipText("Used for crowds");
835	922	crowdCB.addItemListener(this);
..	..	@@ -846,6 +933,8 @@
846	933	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	934	// speakerMocapCB.addItemListener(this);
848	935
	936	+ panel.Return();
	937	+
849	938	if (false)
850	939	{
851	940	// handled in scripts
..	..	@@ -860,24 +949,39 @@
860	949	//constraints.gridy += 1;
861	950	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	951	smoothfocusCB.addItemListener(this);
	952	+ panel.Return();
863	953	}
864	954
865	955	//constraints.gridx += 1;
866	956	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	957	// debugCB.addItemListener(this);
868	958
	959	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	960	+ trackCB.setToolTipText("Enable tracking target");
	961	+ trackCB.addItemListener(this);
	962	+
869	963	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	964	+ oeilCB.setToolTipText("Move camera when tracking");
871	965	oeilCB.addItemListener(this);
872	966
873	967	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	968	+ shadowCB.setToolTipText("When live compute shadows");
875	969	shadowCB.addItemListener(this);
876	970
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	971	+ panel.Return();
	972	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	973	+ toggleTextureCB.setToolTipText("Load textures");
	974	+ toggleTextureCB.addItemListener(this);
	975	+
	976	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	977	+ toggleSwitchCB.setToolTipText("Choose a single item");
	978	+ toggleSwitchCB.addItemListener(this);
	979	+
	980	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	981	+ autokeepCB.setToolTipText("On structure change");
	982	+ autokeepCB.addItemListener(this);
880	983
	984	+ panel.Return();
881	985	if (Globals.ADVANCED)
882	986	{
883	987	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +992,15 @@
888	992	}
889	993
890	994	cGridBag fill = new cGridBag();
891		-
892	995	fill.preferredHeight = 200;
	996	+ cGridBag fill2 = new cGridBag();
	997	+ fill2.preferredHeight = 200;
	998	+ cGridBag fill3 = new cGridBag();
	999	+ fill3.preferredHeight = 200;
893	1000
894	1001	panel.add(fill);
	1002	+ panel.add(fill2);
	1003	+ panel.add(fill3);
895	1004
896	1005	}
897	1006
..	..	@@ -899,7 +1008,7 @@
899	1008	{
900	1009	cRadio radioButton = new cRadio(obj.name);
901	1010
902		- // Patch to avoid bug with transparency.
	1011	+ // June 2019. Patch to avoid bug with transparency.
903	1012	radioButton.hadMaterial = obj.material != null;
904	1013	if (!radioButton.hadMaterial)
905	1014	{
..	..	@@ -907,7 +1016,7 @@
907	1016	}
908	1017
909	1018	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1019	+ radioButton.layout = sixButton; // sevenButton;
911	1020	radioButton.SetCamera(cameraView.renderCamera, false);
912	1021	radioButton.addActionListener(this);
913	1022	radioPanel.add(radioButton);
..	..	@@ -936,7 +1045,9 @@
936	1045	cCheckBox slowCB;
937	1046	cCheckBox boxCB;
938	1047	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1048	+ cCheckBox freezeCB;
	1049	+ //cToggleButton trackCB;
	1050	+ cCheckBox trackCB;
940	1051	cCheckBox smoothfocusCB;
941	1052	// JCheckBox speakerMocapCB;
942	1053	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1056,7 @@
945	1056
946	1057	cCheckBox oeilCB;
947	1058	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1059	+ cCheckBox autokeepCB;
949	1060	cCheckBox lookAtCB;
950	1061
951	1062	// static int COLOR = 1;
..	..	@@ -1053,9 +1164,13 @@
1053	1164	{
1054	1165	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1166	}
1056		- else if(e.getSource() == autosaveCB)
	1167	+ else if(e.getSource() == freezeCB)
1057	1168	{
1058		- Globals.SAVEONMAKE ^= true;
	1169	+ Globals.FREEZEONMOVE ^= true;
	1170	+ }
	1171	+ else if(e.getSource() == autokeepCB)
	1172	+ {
	1173	+ Globals.REPLACEONMAKE ^= true;
1059	1174	}
1060	1175	else if(e.getSource() == lookAtCB)
1061	1176	{
..	..	@@ -1137,8 +1252,6 @@
1137	1252	}
1138	1253	}
1139	1254
1140		- String string = (String) object;
1141		-
1142	1255	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1256	// if( object instanceof java.io.File[])
1144	1257	// {
..	..	@@ -1146,6 +1259,8 @@
1146	1259	// objEditor.DropFile((java.io.File[]) object, true);
1147	1260	// return;
1148	1261	// }
	1262	+
	1263	+ String string = object.toString();
1149	1264
1150	1265	// File path for Mac and Windows
1151	1266	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1306,23 @@
1191	1306
1192	1307	assert target == objEditor.jTree;
1193	1308	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1309	+ Object3D destinationLeaf;
1194	1310	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1311	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1312	} catch (Exception e) {
1197	1313	System.out.println("destinationPath : " + destinationPath);
1198	1314	return;
1199	1315	}
1200	1316
	1317	+ for (int i=group.selection.size(); --i>=0;)
	1318	+ {
	1319	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1320	+
	1321	+ // Cannot move into itself
	1322	+ if (child == destinationLeaf)
	1323	+ return;
	1324	+ }
	1325	+
1201	1326	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1327	// {
1203	1328	loadClipboard(true);
..	..	@@ -1312,22 +1437,30 @@
1312	1437	{
1313	1438	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1439	//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);
	1440	+// gridItem = menu.add(new MenuItem("Grid"));
	1441	+// gridItem.addActionListener(this);
	1442	+// rectoidItem = menu.add(new MenuItem("Box"));
	1443	+// rectoidItem.addActionListener(this);
	1444	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1445	+// ellipsoidItem.addActionListener(this);
	1446	+// coneItem = menu.add(new MenuItem("Cone"));
	1447	+// coneItem.addActionListener(this);
	1448	+// torusItem = menu.add(new MenuItem("Torus"));
	1449	+// torusItem.addActionListener(this);
	1450	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1451	+// superItem.addActionListener(this);
	1452	+
	1453	+ cameraItem = menu.add(new MenuItem("Camera"));
	1454	+ cameraItem.addActionListener(this);
	1455	+
	1456	+ if (!Globals.ADVANCED)
	1457	+ {
1327	1458	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1459	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1460	+ }
	1461	+
	1462	+// particleItem = menu.add(new MenuItem("Particle system"));
	1463	+// particleItem.addActionListener(this);
1331	1464	if (Globals.ADVANCED)
1332	1465	{
1333	1466	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1486,15 @@
1353	1486	}
1354	1487	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1488	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);
	1489	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1490	+// overlayItem.addActionListener(this);
	1491	+// lightItem = menu.add(new MenuItem("Light"));
	1492	+// lightItem.addActionListener(this);
1360	1493	menu.add("-");
1361	1494	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1495	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1496	+// loopItem = menu.add(new MenuItem("Loop"));
	1497	+// loopItem.addActionListener(this);
1365	1498	doubleItem = menu.add(new MenuItem("Fork"));
1366	1499	doubleItem.addActionListener(this);
1367	1500	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1510,9 @@
1377	1510	animationItem.addItemListener(this);
1378	1511	animationItem.setState(Globals.ANIMATION);
1379	1512
	1513	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1514	+ archiveItem.addActionListener(this);
	1515	+
1380	1516	menu.add("-");
1381	1517	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1518	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1525,8 @@
1389	1525	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1526	reduce34MorphItem.addActionListener(this);
1391	1527	menu.add("-");
	1528	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1529	+ memoryItem.addActionListener(this);
1392	1530	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1531	computeAOItem.addActionListener(this);
1394	1532
..	..	@@ -1397,8 +1535,6 @@
1397	1535	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1536	mirrorItem.addActionListener(this);
1399	1537	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1538	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1539	analyzeItem.addActionListener(this);
1404	1540	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +1682,30 @@
1546	1682
1547	1683	makeSomething(shadow);
1548	1684	}
	1685	+
	1686	+ private void ClearUnpinned()
	1687	+ {
	1688	+ //for (Object3D obj : listUI)
	1689	+ for (int i=listUI.size(); --i>=0;)
	1690	+ {
	1691	+ Object3D obj = listUI.elementAt(i);
	1692	+ if (!obj.pinned)
	1693	+ {
	1694	+ obj.CloseUI();
	1695	+ listUI.remove(i);
	1696	+ }
	1697	+ }
	1698	+ }
	1699	+
	1700	+ private void EditElement(Object3D elem, boolean newWindow)
	1701	+ {
	1702	+ // if (!(elem instanceof Composite))
	1703	+ // newWindow = false;
	1704	+ listUI.add(elem);
	1705	+ elem.openEditWindow(this, newWindow); //, false);
	1706	+ System.out.println("edit : " + elem);
	1707	+ elem.editWindow.refreshContents(true); // ? new
	1708	+ }
1549	1709
1550	1710	/**
1551	1711	* applyExample
..	..	@@ -1790,7 +1950,7 @@
1790	1950	{
1791	1951	ScreenFit();
1792	1952	} else
1793		- if (source == switchItem)
	1953	+ if (source == switchViewItem)
1794	1954	{
1795	1955	cVector v1 = new cVector();
1796	1956	cVector v2 = new cVector();
..	..	@@ -2020,30 +2180,30 @@
2020	2180
2021	2181	group(g);
2022	2182	} else
2023		- if (source == loopItem)
	2183	+ if (source == loopItem \|\| source == loopButton)
2024	2184	{
2025	2185	Composite csg = new GroupLeaf();
2026	2186	csg.count = 5;
2027	2187	group(csg);
2028		- Composite child = new cGroup();
	2188	+ Composite child = new cGroup("Branch");
2029	2189	csg.addChild(child);
2030	2190	child.addChild(csg);
2031	2191	} else
2032	2192	if (source == doubleItem)
2033	2193	{
2034		- Composite csg = new GroupLeaf();
	2194	+ Composite csg = new GroupLeaf("Fork");
2035	2195	csg.count = 5;
2036	2196	group(csg);
2037		- Composite child = new cGroup();
	2197	+ Composite child = new cGroup("Branch A");
2038	2198	csg.addChild(child);
2039	2199	child.addChild(csg);
2040		- child = new cGroup();
	2200	+ child = new cGroup("Branch B");
2041	2201	csg.addChild(child);
2042	2202	child.addChild(csg);
2043	2203	} else
2044	2204	if (source == tripleItem)
2045	2205	{
2046		- Composite csg = new GroupLeaf();
	2206	+ Composite csg = new GroupLeaf("Trident");
2047	2207	csg.count = 4;
2048	2208	group(csg);
2049	2209	Composite child = new cGroup();
..	..	@@ -2107,15 +2267,31 @@
2107	2267	} else
2108	2268	if (source == undoButton)
2109	2269	{
	2270	+ // Go to previous version
	2271	+ //if (!Undo())
	2272	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2110	2273	Undo();
	2274	+ } else
	2275	+ if (source == restoreButton)
	2276	+ {
	2277	+ // Restore current version
	2278	+ Restore();
	2279	+ } else
	2280	+ if (source == replaceButton)
	2281	+ {
	2282	+ // Overwrite current version
	2283	+ Replace();
2111	2284	} else
2112	2285	if (source == redoButton)
2113	2286	{
	2287	+ // Go to next version
2114	2288	Redo();
2115	2289	} else
2116	2290	if (source == saveButton)
2117	2291	{
2118		- Save();
	2292	+ // Save a new version
	2293	+ if (!Save(true))
	2294	+ java.awt.Toolkit.getDefaultToolkit().beep();
2119	2295	} else
2120	2296	if (source == oneStepButton)
2121	2297	{
..	..	@@ -2124,17 +2300,14 @@
2124	2300	} else
2125	2301	if (source == screenfitButton)
2126	2302	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2303	ScreenFit();
2129	2304	} else
2130	2305	if (source == screenfitpointButton)
2131	2306	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2307	ScreenFitPoint();
2134	2308	} else
2135	2309	if (source == snapobjectButton)
2136	2310	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2311	SnapObject();
2139	2312	} else
2140	2313	// if (event.getSource() == recompileButton)
..	..	@@ -2498,7 +2671,7 @@
2498	2671	{
2499	2672	StepAll();
2500	2673	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2674	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	2675	{
2503	2676	//int indices[] = jList.getSelectedIndices();
2504	2677	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +2683,9 @@
2510	2683	{
2511	2684	ClearSelection(true);
2512	2685	} else
2513		- if (source == grabItem)
	2686	+ if (source == grabItem \|\| source == groupButton)
2514	2687	{
2515		- group(new cGroup(), true);
	2688	+ group(new cGroup(), false); // true);
2516	2689	} else
2517	2690	if (source == hideItem)
2518	2691	{
..	..	@@ -2530,11 +2703,11 @@
2530	2703	{
2531	2704	makeSomething(new Camera());
2532	2705	} else
2533		- if (source == compositeItem)
	2706	+ if (source == compositeItem \|\| source == compositeButton)
2534	2707	{
2535	2708	group(new Composite());
2536	2709	} else
2537		- if (source == randomItem)
	2710	+ if (source == switchItem \|\| source == switchButton)
2538	2711	{
2539	2712	RandomNode random = new RandomNode();
2540	2713	group(random);
..	..	@@ -2636,7 +2809,7 @@
2636	2809	{
2637	2810	group(new cLinker());
2638	2811	} else
2639		- if (source == textureItem)
	2812	+ if (source == textureItem \|\| source == textureButton)
2640	2813	{
2641	2814	group(new TextureNode());
2642	2815	} else
..	..	@@ -2658,15 +2831,28 @@
2658	2831	} else
2659	2832	if (source == ungroupItem \|\| source == ungroupButton)
2660	2833	{
2661		- //ungroup();
	2834	+ boolean hasRoot = false;
	2835	+
2662	2836	for (int i=0; i<group.selection.size(); i++)
2663	2837	{
2664		- Ungroup(group.selection.get(i));
	2838	+ if (group.selection.get(i) == group)
	2839	+ {
	2840	+ hasRoot = true;
	2841	+ break;
	2842	+ }
2665	2843	}
2666	2844
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	2845	+ if (!hasRoot)
	2846	+ {
	2847	+ for (int i=0; i<group.selection.size(); i++)
	2848	+ {
	2849	+ Ungroup(group.selection.get(i));
	2850	+ }
	2851	+
	2852	+ ClearSelection(false);
	2853	+
	2854	+ refreshContents();
	2855	+ }
2670	2856	} else
2671	2857	if (source == genUVItem)
2672	2858	{
..	..	@@ -2967,7 +3153,7 @@
2967	3153	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3154	{
2969	3155	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3156	+ obj.ResetBumpTexture();
2971	3157	}
2972	3158
2973	3159	refreshContents();
..	..	@@ -3258,6 +3444,12 @@
3258	3444	} else
3259	3445	if (source == editItem \|\| source == editButton)
3260	3446	{
	3447	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3448	+ {
	3449	+ Object3D child = (Object3D)e.nextElement();
	3450	+ child.pinned = true;
	3451	+ }
	3452	+
3261	3453	EditSelection(false);
3262	3454	} else
3263	3455	if (source == uneditButton)
..	..	@@ -3267,6 +3459,7 @@
3267	3459	Object3D child = (Object3D)e.nextElement();
3268	3460	if(child.editWindow != null)
3269	3461	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3462	+ child.pinned = false;
3270	3463	child.CloseUI();
3271	3464	listUI.remove(child);
3272	3465
..	..	@@ -3283,6 +3476,7 @@
3283	3476	//copy.ClearUI();
3284	3477	for (Object3D obj : listUI)
3285	3478	{
	3479	+ obj.pinned = false;
3286	3480	obj.CloseUI();
3287	3481	}
3288	3482	listUI.clear();
..	..	@@ -3292,7 +3486,7 @@
3292	3486	{
3293	3487	assert(copy == group);
3294	3488
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3489	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3490
3297	3491	for (Object3D obj : listUI)
3298	3492	{
..	..	@@ -3341,6 +3535,9 @@
3341	3535	}
3342	3536
3343	3537	copy = group;
	3538	+
	3539	+ SetUndoStates();
	3540	+
3344	3541	//Globals.theRenderer.object = group;
3345	3542	if(!useclient)
3346	3543	{
..	..	@@ -3367,6 +3564,13 @@
3367	3564	currentLayout = sevenButton;
3368	3565	*/
3369	3566	radio.layout.doClick();
	3567	+
	3568	+ ClearUnpinned();
	3569	+ //Grafreed.Assert(group != null);
	3570	+ //Grafreed.Assert(group.selection != null);
	3571	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3572	+ if (group.selection == null \|\| group.selection.size() == 1)
	3573	+ EditSelection(false);
3370	3574	keepparent = group.parent;
3371	3575	// PARENT = NULL or not???
3372	3576	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3584,7 @@
3380	3584	cameraView.ProtectCamera();
3381	3585	cameraView.repaint();
3382	3586	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3587	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3588	{
3385	3589	cameraView.RevertCamera();
3386	3590	cameraView.repaint();
..	..	@@ -3959,7 +4163,7 @@
3959	4163
3960	4164	try
3961	4165	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4166	+ texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
3963	4167	}
3964	4168	catch (Exception e)
3965	4169	{
..	..	@@ -4434,12 +4638,14 @@
4434	4638	// }
4435	4639	// }
4436	4640
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4641	void EditSelection(boolean newWindow)
4442	4642	{
	4643	+ if (group.selection == null)
	4644	+ {
	4645	+ EditElement(group, newWindow); // ? new
	4646	+ return;
	4647	+ }
	4648	+
4443	4649	// aConstraints.gridy = 0;
4444	4650	for (int i=0; i<group.selection.size(); i++)
4445	4651	{
..	..	@@ -4450,12 +4656,7 @@
4450	4656	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	4657	if(elem != group \|\| !newWindow)
4452	4658	{
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
	4659	+ EditElement(elem, newWindow); // ? new
4459	4660	}
4460	4661	}
4461	4662	}
..	..	@@ -4530,7 +4731,8 @@
4530	4731	//new Exception().printStackTrace();
4531	4732
4532	4733	freezemodel = true;
4533		-
	4734	+ ClearUnpinned();
	4735	+
4534	4736	/**/
4535	4737	//switch (event.id)
4536	4738	{
..	..	@@ -4563,7 +4765,7 @@
4563	4765	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	4766	// a camera
4565	4767	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4768	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	4769	{
4568	4770	CameraPane.camerachangeframe = 0; // don't refuse it
4569	4771	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +4774,13 @@
4572	4774	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	4775	}
4574	4776
	4777	+ if (tps != null && tps.length == 1)
	4778	+ {
	4779	+ EditSelection(false);
	4780	+ }
	4781	+
	4782	+ SetPinStates(tps != null && tps.length > 0);
	4783	+
4575	4784	refreshContents();
4576	4785	//return true;
4577	4786	}
..	..	@@ -4581,9 +4790,18 @@
4581	4790	freezemodel = false;
4582	4791	}
4583	4792
	4793	+ void SetPinStates(boolean enabled)
	4794	+ {
	4795	+ editButton.setEnabled(enabled);
	4796	+ uneditButton.setEnabled(enabled);
	4797	+ unselectButton.setEnabled(enabled);
	4798	+ flashSelectionButton.setEnabled(enabled);
	4799	+ }
	4800	+
4584	4801	void refreshContents(boolean cp)
4585	4802	{
4586		- if (!Globals.MOUSEDRAGGED)
	4803	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4804	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	4805	{
4588	4806	objEditor.ClearInfo(); // .GetMaterial());
4589	4807
..	..	@@ -4682,8 +4900,8 @@
4682	4900
4683	4901	if (cut)
4684	4902	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	4903	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4904	+// Save();
4687	4905	//int indices[] = jList.getSelectedIndices();
4688	4906	//for (int i = indices.length - 1; i >= 0; i--)
4689	4907	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5004,10 @@
4786	5004
4787	5005	void paste(boolean expand)
4788	5006	{
	5007	+ if (Globals.REPLACEONMAKE)
	5008	+ Save();
	5009	+ boolean keep = Globals.REPLACEONMAKE;
	5010	+ Globals.REPLACEONMAKE = false;
4789	5011	// if (GrafreeD.clipboard == null)
4790	5012	// return;
4791	5013	boolean first = true;
..	..	@@ -4845,6 +5067,7 @@
4845	5067	Grafreed.clipboard.get(0).parent = keepparent;
4846	5068	}
4847	5069
	5070	+ Globals.REPLACEONMAKE = keep;
4848	5071	ResetModel();
4849	5072	refreshContents();
4850	5073	}
..	..	@@ -4980,6 +5203,10 @@
4980	5203
4981	5204	void group(Object3D csg, boolean grab)
4982	5205	{
	5206	+ if (Globals.REPLACEONMAKE)
	5207	+ Save();
	5208	+ boolean keep = Globals.REPLACEONMAKE;
	5209	+ Globals.REPLACEONMAKE = false;
4983	5210	if (//false) // why??
4984	5211	!group.selection.isEmpty())
4985	5212	{
..	..	@@ -5093,10 +5320,15 @@
5093	5320	//node.add(csg);
5094	5321	//makeSomething(node);
5095	5322	makeSomething(csg);
	5323	+ Globals.REPLACEONMAKE = keep;
5096	5324	}
5097	5325
5098	5326	void Ungroup(Object3D g)
5099	5327	{
	5328	+ if (Globals.REPLACEONMAKE)
	5329	+ Save();
	5330	+ boolean keep = Globals.REPLACEONMAKE;
	5331	+ Globals.REPLACEONMAKE = false;
5100	5332	if (g instanceof HiddenObject)
5101	5333	{
5102	5334	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5345,7 @@
5113	5345	objEditor.makeSomething(g.get(i), false);
5114	5346	}
5115	5347	}
	5348	+ Globals.REPLACEONMAKE = keep;
5116	5349	}
5117	5350
5118	5351	void ungroup()
..	..	@@ -5401,17 +5634,17 @@
5401	5634	cButton clearpanelButton;
5402	5635	cButton unselectButton;
5403	5636
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5637	+ cButton restoreCameraButton;
	5638	+
5409	5639	cButton saveButton;
5410	5640	cButton oneStepButton;
5411	5641
5412	5642	cButton groupButton;
5413	5643	cButton ungroupButton;
5414	5644	cButton compositeButton;
	5645	+ cButton switchButton;
	5646	+ cButton loopButton;
	5647	+ cButton textureButton;
5415	5648
5416	5649	cButton gridButton;
5417	5650	cButton boxButton;
..	..	@@ -5444,7 +5677,7 @@
5444	5677	//JTree jTree;
5445	5678	private MenuItem lookAtItem;
5446	5679	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5680	+ private MenuItem switchViewItem;
5448	5681	private MenuItem cutItem;
5449	5682	private MenuItem undoItem;
5450	5683	private MenuItem redoItem;
..	..	@@ -5476,7 +5709,7 @@
5476	5709	private MenuItem pasteLinkItem;
5477	5710	private MenuItem pasteCloneItem;
5478	5711	private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	5712	+ private MenuItem deleteItem;
5480	5713	private MenuItem clearAllItem;
5481	5714	private MenuItem genUVItem;
5482	5715	private MenuItem genNormalsMESHItem;
..	..	@@ -5536,7 +5769,7 @@
5536	5769	private MenuItem frontItem;
5537	5770	private MenuItem cameraItem;
5538	5771	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	5772	+ private MenuItem switchItem;
5540	5773	private MenuItem physicsItem;
5541	5774	private MenuItem frameselectorItem;
5542	5775	private MenuItem scriptNodeItem;
..	..	@@ -5610,5 +5843,5 @@
5610	5843
5611	5844	Menu cameraMenu;
5612	5845	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	5846	+ MenuItem restoreCameraItem;
5614	5847	}