~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -80,10 +382,22 @@
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versions == null)
	387	+ {
	388	+ copy.versions = new byte[100][];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +408,7 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +504,8 @@
189	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	505	// pasteExpandItem.addActionListener(this);
191	506	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
194	509
195	510	if (Globals.ADVANCED)
196	511	{
..	..	@@ -220,7 +535,7 @@
220	535	// toggleSwitchItem.addItemListener(this);
221	536	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	537
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	539	toggleHandleItem.addItemListener(this);
225	540	toggleHandleItem.setState(CameraPane.HANDLES);
226	541
..	..	@@ -380,13 +695,14 @@
380	695	shadowYItem.addActionListener(this);
381	696	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
383	701	if (Globals.ADVANCED)
384	702	{
385	703	menu.add("-");
386	704	linkerItem = menu.add(new MenuItem("Linker"));
387	705	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	706	templateItem = menu.add(new MenuItem("Template"));
391	707	templateItem.addActionListener(this);
392	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +731,7 @@
415	731	genNormalsMESHItem.addActionListener(this);
416	732	if (Globals.ADVANCED)
417	733	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	735	genNormalsMINEItem.addActionListener(this);
420	736	}
421	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +824,15 @@
508	824	attachBumpItem.addActionListener(this);
509	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
511	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	829	detachPigmentItem.addActionListener(this);
513	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
515	836	menu.add("-");
516	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	838	sortbysizeItem.addActionListener(this);
..	..	@@ -538,6 +859,7 @@
538	859	buildToolsMenu(menu);
539	860	}
540	861
	862	+
541	863	void SetupUI2(ObjEditor oe)
542	864	{
543	865	// June 2019
..	..	@@ -590,50 +912,66 @@
590	912	//minButton.setToolTipText("Minimize window");
591	913	//minButton.addActionListener(this);
592	914
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
596	921
597	922	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	923	fullButton.setToolTipText("Full-screen window");
599	924	fullButton.addActionListener(this);
600	925
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
601	930	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	931	restoreCameraButton.setToolTipText("Restore viewpoint");
603	932	restoreCameraButton.addActionListener(this);
604	933
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("Duplicate current version");
	936	+ saveButton.addActionListener(this);
	937	+
605	938	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
	939	+ undoButton.setToolTipText("Previous version");
607	940	undoButton.addActionListener(this);
608	941	undoButton.setEnabled(false);
609	942
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current version (undo latest change)");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current version (save latest change)");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
610	956	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
	957	+ redoButton.setToolTipText("Next version");
612	958	redoButton.addActionListener(this);
613	959	redoButton.setEnabled(false);
614	960
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
618		-
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620	962	liveCB.setToolTipText("Enable animation");
621	963	liveCB.addItemListener(this);
622	964
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	966	oneStepButton.setToolTipText("Animate one step forward");
625	967	oneStepButton.addActionListener(this);
626	968
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	970	fastCB.setToolTipText("Fast mode");
629	971	fastCB.addItemListener(this);
630	972
631	973	//oe.toolboxPanel.Return();
632	974
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	975	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	976	// trackCB.setToolTipText("Enable tracking");
639	977	// trackCB.addItemListener(this);
..	..	@@ -646,31 +984,32 @@
646	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	985	snapobjectButton.addActionListener(this);
648	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
649	991	}
650	992
651	993	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	994
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
655	997	twoButton.addActionListener(this);
656	998	this.fullscreenLayout = twoButton;
657	999
658		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659		- fourButton.addActionListener(this);
660		- fourButton.setToolTipText("Show left panel only");
661		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
663		- sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
666	1002	threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
670	1009	//
671	1010
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
674	1013	rootButton.addActionListener(this);
675	1014
676	1015	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -679,28 +1018,30 @@
679	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1019	//clearButton.addActionListener(this);
681	1020
	1021	+ cGridBag row1 = new cGridBag();
	1022	+
682	1023	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1025	gridButton.setToolTipText("Create grid");
685	1026	gridButton.addActionListener(this);
686	1027
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1029	boxButton.setToolTipText("Create box");
689	1030	boxButton.addActionListener(this);
690	1031
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1033	sphereButton.setToolTipText("Create sphere");
693	1034	sphereButton.addActionListener(this);
694	1035
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1037	coneButton.setToolTipText("Create cone");
697	1038	coneButton.addActionListener(this);
698	1039
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1041	torusButton.setToolTipText("Create torus");
701	1042	torusButton.addActionListener(this);
702	1043
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1045	superButton.setToolTipText("Create superellipsoid");
705	1046	superButton.addActionListener(this);
706	1047
..	..	@@ -711,51 +1052,57 @@
711	1052	kleinButton.addActionListener(this);
712	1053	}
713	1054
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1056	particlesButton.setToolTipText("Create particle system");
716	1057	particlesButton.addActionListener(this);
717	1058
718		- oe.toolboxPanel.Return();
	1059	+ oe.toolboxPanel.add(row1);
719	1060
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1064	groupButton.setToolTipText("Create group");
722	1065	groupButton.addActionListener(this);
723	1066
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1068	compositeButton.setToolTipText("Create composite");
726	1069	compositeButton.addActionListener(this);
727	1070
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
730	1073	switchButton.addActionListener(this);
731	1074
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1076	loopButton.setToolTipText("Create loop");
734	1077	loopButton.addActionListener(this);
735	1078
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1080	textureButton.setToolTipText("Create texture");
738	1081	textureButton.addActionListener(this);
739	1082
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1084	overlayButton.setToolTipText("Create overlay");
742	1085	overlayButton.addActionListener(this);
743	1086
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745	1088	lightButton.setToolTipText("Create light");
746	1089	lightButton.addActionListener(this);
747	1090
748		- for (int i=6; --i>=0;)
749		- {
750		- oe.toolboxPanel.Return();
751		- oe.toolboxPanel.add(new cGridBag());
752		- oe.toolboxPanel.add(new cGridBag());
753		- oe.toolboxPanel.add(new cGridBag());
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- }
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
759	1106
760	1107	// EDIT panel
761	1108	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -811,9 +1158,12 @@
811	1158
812	1159	oe.treePanel.add(copyOptionsPanel);
813	1160	oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
814	1164
815		-// mainPanel.setDividerLocation(0.5); //1.0);
816		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
817	1167
818	1168	//jList.addListSelectionListener(this);
819	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -821,7 +1171,7 @@
821	1171	//jTree.setEditable(true);
822	1172	oe.jTree.setDragEnabled(true);
823	1173	//jTree.setPreferredSize(new Dimension(10,10));
824		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
825	1175
826	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
827	1177
..	..	@@ -833,7 +1183,7 @@
833	1183	dgr.addDragGestureListener(this);
834	1184	}catch(Exception e) {}
835	1185	*/
836		- radio.layout = sevenButton;
	1186	+ radio.layout = threeButton; // sixButton;
837	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838	1188	}
839	1189
..	..	@@ -863,9 +1213,13 @@
863	1213
864	1214	if (true) // Globals.ADVANCED)
865	1215	{
866		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867		- supportCB.setToolTipText("Enable rigging");
868		- supportCB.addItemListener(this);
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
869	1223
870	1224	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871	1225	// localCB.addItemListener(this);
..	..	@@ -880,9 +1234,12 @@
880	1234	smoothCB.setToolTipText("Snapping delay");
881	1235	smoothCB.addItemListener(this);
882	1236
883		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
884		- slowCB.setToolTipText("Smooth interpolation");
885		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
886	1243
887	1244	// constraints.gridy += 1;
888	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -929,12 +1286,12 @@
929	1286	toggleTextureCB.addItemListener(this);
930	1287
931	1288	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932		- toggleSwitchCB.setToolTipText("Use switch");
	1289	+ toggleSwitchCB.setToolTipText("Choose a single item");
933	1290	toggleSwitchCB.addItemListener(this);
934	1291
935		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
936		- autosaveCB.setToolTipText("On structure change");
937		- autosaveCB.addItemListener(this);
	1292	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1293	+ autokeepCB.setToolTipText("On structure change");
	1294	+ autokeepCB.addItemListener(this);
938	1295
939	1296	panel.Return();
940	1297	if (Globals.ADVANCED)
..	..	@@ -963,7 +1320,7 @@
963	1320	{
964	1321	cRadio radioButton = new cRadio(obj.name);
965	1322
966		- // Patch to avoid bug with transparency.
	1323	+ // June 2019. Patch to avoid bug with transparency.
967	1324	radioButton.hadMaterial = obj.material != null;
968	1325	if (!radioButton.hadMaterial)
969	1326	{
..	..	@@ -971,7 +1328,7 @@
971	1328	}
972	1329
973	1330	radioButton.SetObject(obj);
974		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = threeButton; // sixButton;
975	1332	radioButton.SetCamera(cameraView.renderCamera, false);
976	1333	radioButton.addActionListener(this);
977	1334	radioPanel.add(radioButton);
..	..	@@ -996,10 +1353,13 @@
996	1353	cCheckBox localCB;
997	1354	cCheckBox crowdCB;
998	1355	cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
999	1358	cToggleButton fastCB;
1000	1359	cCheckBox slowCB;
1001	1360	cCheckBox boxCB;
1002	1361	cCheckBox zoomBoxCB;
	1362	+ cCheckBox freezeCB;
1003	1363	//cToggleButton trackCB;
1004	1364	cCheckBox trackCB;
1005	1365	cCheckBox smoothfocusCB;
..	..	@@ -1010,7 +1370,7 @@
1010	1370
1011	1371	cCheckBox oeilCB;
1012	1372	cCheckBox shadowCB;
1013		- cCheckBox autosaveCB;
	1373	+ cCheckBox autokeepCB;
1014	1374	cCheckBox lookAtCB;
1015	1375
1016	1376	// static int COLOR = 1;
..	..	@@ -1066,6 +1426,12 @@
1066	1426	cameraView.ToggleInertia();
1067	1427	cameraView.repaint();
1068	1428	}
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
	1434	+ }
1069	1435	else if(e.getSource() == localCB)
1070	1436	{
1071	1437	cameraView.ToggleLocal();
..	..	@@ -1118,9 +1484,13 @@
1118	1484	{
1119	1485	Globals.COMPUTESHADOWWHENLIVE ^= true;
1120	1486	}
1121		- else if(e.getSource() == autosaveCB)
	1487	+ else if(e.getSource() == freezeCB)
1122	1488	{
1123		- Globals.SAVEONMAKE ^= true;
	1489	+ Globals.FREEZEONMOVE ^= true;
	1490	+ }
	1491	+ else if(e.getSource() == autokeepCB)
	1492	+ {
	1493	+ Globals.REPLACEONMAKE ^= true;
1124	1494	}
1125	1495	else if(e.getSource() == lookAtCB)
1126	1496	{
..	..	@@ -1202,8 +1572,6 @@
1202	1572	}
1203	1573	}
1204	1574
1205		- String string = (String) object;
1206		-
1207	1575	System.out.println("Transfer = " + object + "; drop : " + target);
1208	1576	// if( object instanceof java.io.File[])
1209	1577	// {
..	..	@@ -1211,6 +1579,8 @@
1211	1579	// objEditor.DropFile((java.io.File[]) object, true);
1212	1580	// return;
1213	1581	// }
	1582	+
	1583	+ String string = object.toString();
1214	1584
1215	1585	// File path for Mac and Windows
1216	1586	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1460,6 +1830,9 @@
1460	1830	animationItem.addItemListener(this);
1461	1831	animationItem.setState(Globals.ANIMATION);
1462	1832
	1833	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1834	+ archiveItem.addActionListener(this);
	1835	+
1463	1836	menu.add("-");
1464	1837	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1465	1838	parseverticesItem.addActionListener(this);
..	..	@@ -1472,6 +1845,8 @@
1472	1845	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1473	1846	reduce34MorphItem.addActionListener(this);
1474	1847	menu.add("-");
	1848	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1849	+ memoryItem.addActionListener(this);
1475	1850	menu.add(computeAOItem = new MenuItem("Compute AO"));
1476	1851	computeAOItem.addActionListener(this);
1477	1852
..	..	@@ -1480,8 +1855,6 @@
1480	1855	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1481	1856	mirrorItem.addActionListener(this);
1482	1857	menu.add("-");
1483		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1484		- memoryItem.addActionListener(this);
1485	1858	menu.add(analyzeItem = new MenuItem("Analyze"));
1486	1859	analyzeItem.addActionListener(this);
1487	1860	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1642,6 +2015,16 @@
1642	2015	listUI.remove(i);
1643	2016	}
1644	2017	}
	2018	+ }
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
1645	2028	}
1646	2029
1647	2030	/**
..	..	@@ -2071,6 +2454,23 @@
2071	2454	{
2072	2455	makeSomething(new Light());
2073	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
2074	2474	if (source == csgItem)
2075	2475	{
2076	2476	group(new CSG());
..	..	@@ -2122,25 +2522,25 @@
2122	2522	Composite csg = new GroupLeaf();
2123	2523	csg.count = 5;
2124	2524	group(csg);
2125		- Composite child = new cGroup();
	2525	+ Composite child = new cGroup("Branch");
2126	2526	csg.addChild(child);
2127	2527	child.addChild(csg);
2128	2528	} else
2129	2529	if (source == doubleItem)
2130	2530	{
2131		- Composite csg = new GroupLeaf();
	2531	+ Composite csg = new GroupLeaf("Fork");
2132	2532	csg.count = 5;
2133	2533	group(csg);
2134		- Composite child = new cGroup();
	2534	+ Composite child = new cGroup("Branch A");
2135	2535	csg.addChild(child);
2136	2536	child.addChild(csg);
2137		- child = new cGroup();
	2537	+ child = new cGroup("Branch B");
2138	2538	csg.addChild(child);
2139	2539	child.addChild(csg);
2140	2540	} else
2141	2541	if (source == tripleItem)
2142	2542	{
2143		- Composite csg = new GroupLeaf();
	2543	+ Composite csg = new GroupLeaf("Trident");
2144	2544	csg.count = 4;
2145	2545	group(csg);
2146	2546	Composite child = new cGroup();
..	..	@@ -2156,7 +2556,7 @@
2156	2556	if (source == computeAOItem)
2157	2557	{
2158	2558	Globals.drawMode = CameraPane.OCCLUSION;
2159		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
2160	2560	} else
2161	2561	if (source == recompileItem)
2162	2562	{
..	..	@@ -2204,15 +2604,31 @@
2204	2604	} else
2205	2605	if (source == undoButton)
2206	2606	{
	2607	+ // Go to previous version
	2608	+ //if (!Undo())
	2609	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2207	2610	Undo();
	2611	+ } else
	2612	+ if (source == restoreButton)
	2613	+ {
	2614	+ // Restore current version
	2615	+ Restore();
	2616	+ } else
	2617	+ if (source == replaceButton)
	2618	+ {
	2619	+ // Overwrite current version
	2620	+ Replace();
2208	2621	} else
2209	2622	if (source == redoButton)
2210	2623	{
	2624	+ // Go to next version
2211	2625	Redo();
2212	2626	} else
2213	2627	if (source == saveButton)
2214	2628	{
2215		- Save();
	2629	+ // Save a new version
	2630	+ if (!Save(true))
	2631	+ java.awt.Toolkit.getDefaultToolkit().beep();
2216	2632	} else
2217	2633	if (source == oneStepButton)
2218	2634	{
..	..	@@ -2221,17 +2637,14 @@
2221	2637	} else
2222	2638	if (source == screenfitButton)
2223	2639	{
2224		- //Reload(lastConverter, lastFilename, true);
2225	2640	ScreenFit();
2226	2641	} else
2227	2642	if (source == screenfitpointButton)
2228	2643	{
2229		- //Reload(lastConverter, lastFilename, true);
2230	2644	ScreenFitPoint();
2231	2645	} else
2232	2646	if (source == snapobjectButton)
2233	2647	{
2234		- //Reload(lastConverter, lastFilename, true);
2235	2648	SnapObject();
2236	2649	} else
2237	2650	// if (event.getSource() == recompileButton)
..	..	@@ -2595,7 +3008,7 @@
2595	3008	{
2596	3009	StepAll();
2597	3010	} else
2598		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2599	3012	{
2600	3013	//int indices[] = jList.getSelectedIndices();
2601	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2755,15 +3168,28 @@
2755	3168	} else
2756	3169	if (source == ungroupItem \|\| source == ungroupButton)
2757	3170	{
2758		- //ungroup();
	3171	+ boolean hasRoot = false;
	3172	+
2759	3173	for (int i=0; i<group.selection.size(); i++)
2760	3174	{
2761		- Ungroup(group.selection.get(i));
	3175	+ if (group.selection.get(i) == group)
	3176	+ {
	3177	+ hasRoot = true;
	3178	+ break;
	3179	+ }
2762	3180	}
2763	3181
2764		- ClearSelection(false);
2765		-
2766		- refreshContents();
	3182	+ if (!hasRoot)
	3183	+ {
	3184	+ for (int i=0; i<group.selection.size(); i++)
	3185	+ {
	3186	+ Ungroup(group.selection.get(i));
	3187	+ }
	3188	+
	3189	+ ClearSelection(false);
	3190	+
	3191	+ refreshContents();
	3192	+ }
2767	3193	} else
2768	3194	if (source == genUVItem)
2769	3195	{
..	..	@@ -3064,7 +3490,7 @@
3064	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3065	3491	{
3066	3492	obj = (Object3D)e.nextElement();
3067		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
3068	3494	}
3069	3495
3070	3496	refreshContents();
..	..	@@ -3078,6 +3504,31 @@
3078	3504	obj.SetBumpTexture(obj.GetPigmentTexture());
3079	3505	}
3080	3506
	3507	+ refreshContents();
	3508	+ } else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
3081	3532	refreshContents();
3082	3533	} else
3083	3534	if (source == flashSelectionButton)
..	..	@@ -3181,8 +3632,8 @@
3181	3632	// centralPanel.setVisible(true);
3182	3633	// XYZPanel.setVisible(true);
3183	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
3184	3636	bigThree.add(centralPanel);
3185		- bigThree.add(XYZPanel);
3186	3637	bigThree.FlushUI();
3187	3638
3188	3639	cameraView.requestFocusInWindow();
..	..	@@ -3262,8 +3713,8 @@
3262	3713	// centralPanel.setVisible(true);
3263	3714	// XYZPanel.setVisible(false);
3264	3715	bigThree.ClearUI();
3265		- bigThree.add(scenePanel);
3266	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
3267	3718	bigThree.FlushUI();
3268	3719
3269	3720	cameraView.requestFocusInWindow();
..	..	@@ -3446,6 +3897,9 @@
3446	3897	}
3447	3898
3448	3899	copy = group;
	3900	+
	3901	+ SetUndoStates();
	3902	+
3449	3903	//Globals.theRenderer.object = group;
3450	3904	if(!useclient)
3451	3905	{
..	..	@@ -3474,8 +3928,10 @@
3474	3928	radio.layout.doClick();
3475	3929
3476	3930	ClearUnpinned();
3477		- SetPinStates(group.selection.size() > 0);
3478		- if (group.selection.size() == 1)
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
3479	3935	EditSelection(false);
3480	3936	keepparent = group.parent;
3481	3937	// PARENT = NULL or not???
..	..	@@ -3488,11 +3944,13 @@
3488	3944	} else if (event.getSource() == editCameraItem)
3489	3945	{
3490	3946	cameraView.ProtectCamera();
	3947	+ cameraView.requestFocusInWindow();
3491	3948	cameraView.repaint();
3492	3949	return;
3493	3950	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3494	3951	{
3495	3952	cameraView.RevertCamera();
	3953	+ cameraView.requestFocusInWindow();
3496	3954	cameraView.repaint();
3497	3955	return;
3498	3956	// } else if (event.getSource() == textureButton)
..	..	@@ -4069,7 +4527,7 @@
4069	4527
4070	4528	try
4071	4529	{
4072		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4530	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4073	4531	}
4074	4532	catch (Exception e)
4075	4533	{
..	..	@@ -4546,6 +5004,12 @@
4546	5004
4547	5005	void EditSelection(boolean newWindow)
4548	5006	{
	5007	+ if (group.selection == null)
	5008	+ {
	5009	+ EditElement(group, newWindow); // ? new
	5010	+ return;
	5011	+ }
	5012	+
4549	5013	// aConstraints.gridy = 0;
4550	5014	for (int i=0; i<group.selection.size(); i++)
4551	5015	{
..	..	@@ -4556,12 +5020,7 @@
4556	5020	Object3D elem = (Object3D)group.selection.elementAt(i);
4557	5021	if(elem != group \|\| !newWindow)
4558	5022	{
4559		- // if (!(elem instanceof Composite))
4560		- // newWindow = false;
4561		- listUI.add(elem);
4562		- elem.openEditWindow(this, newWindow); //, false);
4563		- System.out.println("edit : " + elem);
4564		- elem.editWindow.refreshContents(true); // ? new
	5023	+ EditElement(elem, newWindow); // ? new
4565	5024	}
4566	5025	}
4567	5026	}
..	..	@@ -4705,8 +5164,8 @@
4705	5164
4706	5165	void refreshContents(boolean cp)
4707	5166	{
4708		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5167	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5168	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4710	5169	{
4711	5170	objEditor.ClearInfo(); // .GetMaterial());
4712	5171
..	..	@@ -4805,8 +5264,8 @@
4805	5264
4806	5265	if (cut)
4807	5266	{
4808		- if (Globals.SAVEONMAKE)
4809		- Save();
	5267	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5268	+// Save();
4810	5269	//int indices[] = jList.getSelectedIndices();
4811	5270	//for (int i = indices.length - 1; i >= 0; i--)
4812	5271	//jList.remove(indices[i]);
..	..	@@ -4909,6 +5368,10 @@
4909	5368
4910	5369	void paste(boolean expand)
4911	5370	{
	5371	+ if (Globals.REPLACEONMAKE)
	5372	+ Save();
	5373	+ boolean keep = Globals.REPLACEONMAKE;
	5374	+ Globals.REPLACEONMAKE = false;
4912	5375	// if (GrafreeD.clipboard == null)
4913	5376	// return;
4914	5377	boolean first = true;
..	..	@@ -4968,6 +5431,7 @@
4968	5431	Grafreed.clipboard.get(0).parent = keepparent;
4969	5432	}
4970	5433
	5434	+ Globals.REPLACEONMAKE = keep;
4971	5435	ResetModel();
4972	5436	refreshContents();
4973	5437	}
..	..	@@ -5103,6 +5567,10 @@
5103	5567
5104	5568	void group(Object3D csg, boolean grab)
5105	5569	{
	5570	+ if (Globals.REPLACEONMAKE)
	5571	+ Save();
	5572	+ boolean keep = Globals.REPLACEONMAKE;
	5573	+ Globals.REPLACEONMAKE = false;
5106	5574	if (//false) // why??
5107	5575	!group.selection.isEmpty())
5108	5576	{
..	..	@@ -5216,10 +5684,15 @@
5216	5684	//node.add(csg);
5217	5685	//makeSomething(node);
5218	5686	makeSomething(csg);
	5687	+ Globals.REPLACEONMAKE = keep;
5219	5688	}
5220	5689
5221	5690	void Ungroup(Object3D g)
5222	5691	{
	5692	+ if (Globals.REPLACEONMAKE)
	5693	+ Save();
	5694	+ boolean keep = Globals.REPLACEONMAKE;
	5695	+ Globals.REPLACEONMAKE = false;
5223	5696	if (g instanceof HiddenObject)
5224	5697	{
5225	5698	HiddenObject h = (HiddenObject) g;
..	..	@@ -5236,6 +5709,7 @@
5236	5709	objEditor.makeSomething(g.get(i), false);
5237	5710	}
5238	5711	}
	5712	+ Globals.REPLACEONMAKE = keep;
5239	5713	}
5240	5714
5241	5715	void ungroup()
..	..	@@ -5526,9 +6000,6 @@
5526	6000
5527	6001	cButton restoreCameraButton;
5528	6002
5529		- cButton minButton;
5530		- cButton maxButton;
5531		- cButton fullButton;
5532	6003	cButton saveButton;
5533	6004	cButton oneStepButton;
5534	6005
..	..	@@ -5538,6 +6009,22 @@
5538	6009	cButton switchButton;
5539	6010	cButton loopButton;
5540	6011	cButton textureButton;
	6012	+
	6013	+ cButton skybox1Button;
	6014	+ cButton skybox2Button;
	6015	+ cButton skybox3Button;
	6016	+ cButton skybox4Button;
	6017	+ cButton skybox5Button;
	6018	+ cButton skybox6Button;
	6019	+ cButton skybox7Button;
	6020	+
	6021	+ cButton skybox11Button;
	6022	+ cButton skybox12Button;
	6023	+ cButton skybox13Button;
	6024	+ cButton skybox14Button;
	6025	+ cButton skybox15Button;
	6026	+ cButton skybox16Button;
	6027	+ cButton skybox17Button;
5541	6028
5542	6029	cButton gridButton;
5543	6030	cButton boxButton;
..	..	@@ -5602,7 +6089,7 @@
5602	6089	private MenuItem pasteLinkItem;
5603	6090	private MenuItem pasteCloneItem;
5604	6091	private MenuItem pasteExpandItem;
5605		- private MenuItem clearItem;
	6092	+ private MenuItem deleteItem;
5606	6093	private MenuItem clearAllItem;
5607	6094	private MenuItem genUVItem;
5608	6095	private MenuItem genNormalsMESHItem;
..	..	@@ -5686,6 +6173,8 @@
5686	6173	private MenuItem attachBumpItem;
5687	6174	private MenuItem detachBumpItem;
5688	6175	private MenuItem pigmentBumpItem;
	6176	+ private MenuItem embedTexturesItem;
	6177	+ private MenuItem deEmbedTexturesItem;
5689	6178
5690	6179	private MenuItem particleItem;
5691	6180	private MenuItem ragdollItem;