~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,341 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "rgb", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
26	362	//ObjEditor objEditor;
27	363	public void closeUI2()
28	364	{
..	..	@@ -60,6 +396,12 @@
60	396	this.copy = this.group = group;
61	397	//selectees = this.group.selectees;
62	398
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+ }
	404	+
63	405	if(ui)
64	406	SetupUI(objEditor);
65	407	}
..	..	@@ -74,16 +416,28 @@
74	416	this.copy = this.group = copy;
75	417	//selectees = this.group.selectees;
76	418
77		- SetupMenu2(objEditor);
	419	+ SetupMenu2(this); //objEditor);
78	420	SetupUI2(objEditor);
79	421	objEditor.SetupUI(true);
80	422	SetupViews(objEditor);
81	423
82	424	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	425	+
	426	+ if (copy.versionlist == null)
	427	+ {
	428	+ copy.versionlist = new Object3D[100];
	429	+ copy.versionindex = -1;
	430	+
	431	+ Save(true);
	432	+ }
83	433	}
84	434
85	435	void CloneSelection(boolean supports)
86	436	{
	437	+ if (Globals.REPLACEONMAKE)
	438	+ Save();
	439	+ boolean keep = Globals.REPLACEONMAKE;
	440	+ Globals.REPLACEONMAKE = false;
87	441	// Object3D keep = GrafreeD.clipboard;
88	442	//Object3D obj;
89	443	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +448,19 @@
94	448
95	449	makeSomething(clone, i==group.selection.size()-1);
96	450	}
	451	+ Globals.REPLACEONMAKE = keep;
97	452	}
98	453
99	454	void CloneClipboard(boolean supports)
100	455	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	456	+ assert(Grafreed.clipboard.parent == null);
	457	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	458	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	459	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	460	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	461	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	462	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	463	+ Grafreed.clipboard.get(0).parent = keepparent;
109	464	}
110	465
111	466	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +474,7 @@
119	474	// obj.support = null;
120	475	if (!supports)
121	476	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	477	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	478	obj.parent = parent;
124	479	// obj.support = support;
125	480	// clone.support = support; // aout 2013
..	..	@@ -148,30 +503,29 @@
148	503
149	504	//JTextField nameField;
150	505
151		- void SetupMenu2(ObjEditor oe)
	506	+ void SetupMenu2(GroupEditor oe)
152	507	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	508	+ oe.jTree = new cTree();
	509	+
164	510	Menu menu;
165	511	oe.menuBar.add(menu = new Menu("Edit"));
166	512	//editItem = menu.add(new MenuItem("Edit"));
167	513	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	514	+
	515	+// undoItem = menu.add(new MenuItem("Undo"));
	516	+// undoItem.addActionListener(this);
	517	+// redoItem = menu.add(new MenuItem("Redo"));
	518	+// redoItem.addActionListener(this);
	519	+// menu.add("-");
	520	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	521	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	522	cloneItem = menu.add(new MenuItem("Clone"));
172	523	cloneItem.addActionListener(this);
	524	+ if (Globals.ADVANCED)
	525	+ {
173	526	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	527	cloneSupportItem.addActionListener(this);
	528	+ }
175	529	menu.add("-");
176	530	cutItem = menu.add(new MenuItem("Cut"));
177	531	cutItem.addActionListener(this);
..	..	@@ -179,27 +533,123 @@
179	533	copyItem.addActionListener(this);
180	534	pasteItem = menu.add(new MenuItem("Paste"));
181	535	pasteItem.addActionListener(this);
	536	+
	537	+ menu.add("-");
	538	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	539	+ pasteIntoItem.addActionListener(this);
182	540	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	541	pasteLinkItem.addActionListener(this);
184	542	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	543	pasteCloneItem.addActionListener(this);
186	544	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	545	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	546	+ menu.add("-");
	547	+ deleteItem = menu.add(new MenuItem("Delete"));
	548	+ deleteItem.addActionListener(this);
	549	+
	550	+ if (Globals.ADVANCED)
	551	+ {
	552	+ // Deletes the cameras...
190	553	clearAllItem = menu.add(new MenuItem("Clear All"));
191	554	clearAllItem.addActionListener(this);
	555	+ }
	556	+
	557	+ menuBar.add(cameraMenu = new Menu("View"));
	558	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	559	+ //zBufferItem.addActionListener(this);
	560	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	561	+ //normalLensItem.addActionListener(this);
	562	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	563	+ restoreCameraItem.addActionListener(this);
	564	+
	565	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	566	+// toggleFullScreenItem.addItemListener(this);
	567	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	568	+// cameraMenu.add("-");
	569	+//
	570	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	571	+// toggleTextureItem.addItemListener(this);
	572	+// toggleTextureItem.setState(CameraPane.textureon);
	573	+//
	574	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	575	+// toggleSwitchItem.addItemListener(this);
	576	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	577	+
	578	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	579	+ toggleHandleItem.addItemListener(this);
	580	+ toggleHandleItem.setState(CameraPane.HANDLES);
	581	+
	582	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	583	+ togglePaintItem.addItemListener(this);
	584	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	585	+
	586	+ if (Globals.ADVANCED)
	587	+ {
	588	+ cameraMenu.add("-");
	589	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	590	+ toggleLiveItem.addItemListener(this);
	591	+ toggleLiveItem.setState(Globals.isLIVE());
192	592
	593	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	594	+ stepItem.addActionListener(this);
	595	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	596	+ // toggleDLItem.addItemListener(this);
	597	+ // toggleDLItem.setState(false);
	598	+
	599	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	600	+ toggleRenderItem.addItemListener(this);
	601	+ toggleRenderItem.setState(!CameraPane.frozen);
	602	+
	603	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	604	+ toggleDebugItem.addItemListener(this);
	605	+ toggleDebugItem.setState(Globals.DEBUG);
	606	+
	607	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	608	+ toggleFrustumItem.addItemListener(this);
	609	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	610	+
	611	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	612	+ toggleFootContactItem.addItemListener(this);
	613	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	614	+
	615	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	616	+ toggleTimelineItem.addItemListener(this);
	617	+ }
	618	+
	619	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	620	+// toggleRootItem.addItemListener(this);
	621	+// toggleRootItem.setState(false);
	622	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	623	+// animationItem.addItemListener(this);
	624	+// animationItem.setState(CameraPane.ANIMATION);
	625	+ cameraMenu.add("-");
	626	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	627	+ editCameraItem.addActionListener(this);
	628	+
	629	+ if (Globals.ADVANCED)
	630	+ {
	631	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	632	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	633	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	634	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	635	+ oe.cameraMenu.add("-");
	636	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	637	+ openWindowItem.addActionListener(this);
	638	+ editLeafItem.addActionListener(this);
	639	+ lookAtItem.addActionListener(this);
	640	+ //lookFromItem.addActinoListener(this);
	641	+ //switchViewItem.addActionListener(this);
	642	+ }
	643	+
193	644	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	645	+ if (Globals.ADVANCED)
	646	+ {
198	647	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	648	revertMeshItem.addActionListener(this);
200	649	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	650	resetreferencesItem.addActionListener(this);
202	651	menu.add("-");
	652	+ }
203	653	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	654	overwriteGeoItem.addActionListener(this);
205	655	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +661,104 @@
211	661	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	662	overwriteUVItem.addActionListener(this);
213	663	menu.add("-");
	664	+ if (Globals.ADVANCED)
	665	+ {
214	666	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	667	generateMeshItem.addActionListener(this);
216	668	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	669	poseMeshItem.addActionListener(this);
218	670	menu.add("-");
	671	+ }
219	672	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	673	resetsupportItem.addActionListener(this);
221	674	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	675	linkverticesItem.addActionListener(this);
223	676	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	677	relinkverticesItem.addActionListener(this);
	678	+
	679	+ if (Globals.ADVANCED)
	680	+ {
225	681	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	682	setMasterItem.addActionListener(this);
	683	+ }
227	684
228	685	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	686	+// grabItem = menu.add(new MenuItem("Grab"));
	687	+// grabItem.addActionListener(this);
231	688	backItem = menu.add(new MenuItem("Back"));
232	689	backItem.addActionListener(this);
233	690	frontItem = menu.add(new MenuItem("Front"));
234	691	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	692	+// compositeItem = menu.add(new MenuItem("Composite"));
	693	+// compositeItem.addActionListener(this);
	694	+
	695	+ if (Globals.ADVANCED)
	696	+ {
	697	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	698	hideItem.addActionListener(this);
	699	+ }
239	700	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	701	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Switch node"));
243		- randomItem.addActionListener(this);
	702	+
	703	+// menu.add("-");
	704	+//
	705	+// switchItem = menu.add(new MenuItem("Switch node"));
	706	+// switchItem.addActionListener(this);
	707	+ if (Globals.ADVANCED)
	708	+ {
244	709	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
245	710	switchGeoItem.addActionListener(this);
246	711	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	712	switchTransfoItem.addActionListener(this);
	713	+ morphItem = menu.add(new MenuItem("Morph Group"));
	714	+ morphItem.addActionListener(this);
	715	+
	716	+ menu.add("-");
248	717	physicsItem = menu.add(new MenuItem("Physics"));
249	718	physicsItem.addActionListener(this);
250	719	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	720	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	721	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	722	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	723	+ }
258	724
259	725	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	726	+// textureItem = menu.add(new MenuItem("Texture"));
	727	+// textureItem.addActionListener(this);
262	728	billboardItem = menu.add(new MenuItem("Billboard"));
263	729	billboardItem.addActionListener(this);
264	730	csgItem = menu.add(new MenuItem("CSG"));
265	731	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	732	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	733	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	734	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	735	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	736	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	737	shadowZItem.addActionListener(this);
	738	+ attributeItem = menu.add(new MenuItem("Attribute"));
	739	+ attributeItem.addActionListener(this);
	740	+
	741	+ if (Globals.ADVANCED)
	742	+ {
	743	+ menu.add("-");
272	744	linkerItem = menu.add(new MenuItem("Linker"));
273	745	linkerItem.addActionListener(this);
274	746	templateItem = menu.add(new MenuItem("Template"));
275	747	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	748	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	749	pointflowItem.addActionListener(this);
	750	+ }
280	751	menu.add("-");
281	752	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	753	resetTransformItem.addActionListener(this);
283	754	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	755	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	756	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	757	+ resetCentroidXZItem.addActionListener(this);
	758	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	759	+ transformGeometryItem.addActionListener(this);
	760	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	761	+ transformChildrenItem.addActionListener(this);
287	762
288	763	oe.menuBar.add(menu = new Menu("Geometry"));
289	764	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +769,11 @@
294	769	genNormalsCADItem.addActionListener(this);
295	770	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	771	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	772	+ if (Globals.ADVANCED)
	773	+ {
	774	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	775	genNormalsMINEItem.addActionListener(this);
	776	+ }
299	777	stripifyItem = menu.add(new MenuItem("Stripify"));
300	778	stripifyItem.addActionListener(this);
301	779	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +795,34 @@
317	795	reduce34MeshItem.addActionListener(this);
318	796	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	797	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	798	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	799	clipMeshItem.addActionListener(this);
	800	+
	801	+ if (Globals.ADVANCED)
	802	+ {
	803	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	804	+ smoothMeshItem.addActionListener(this);
	805	+ }
324	806
325	807	oe.menuBar.add(menu = new Menu("Attributes"));
326	808	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	809	clearMaterialsItem.addActionListener(this);
	810	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	811	+ resetAllItem.addActionListener(this);
	812	+ stepAllItem = menu.add(new MenuItem("Step All"));
	813	+ stepAllItem.addActionListener(this);
328	814	menu.add("-");
329	815	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	816	liveleavesItem.addActionListener(this);
331	817	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	818	unliveleavesItem.addActionListener(this);
	819	+ if (Globals.ADVANCED)
	820	+ {
333	821	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	822	supportleavesItem.addActionListener(this);
335	823	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	824	unsupportleavesItem.addActionListener(this);
	825	+ }
337	826	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	827	hideleavesItem.addActionListener(this);
339	828	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +831,14 @@
342	831	markleavesItem.addActionListener(this);
343	832	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	833	unmarkleavesItem.addActionListener(this);
	834	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	835	+ rewindleavesItem.addActionListener(this);
	836	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	837	+ unrewindleavesItem.addActionListener(this);
	838	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	839	+ randomleavesItem.addActionListener(this);
	840	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	841	+ unrandomleavesItem.addActionListener(this);
345	842	menu.add("-");
346	843	flipVItem = menu.add(new MenuItem("Flip V"));
347	844	flipVItem.addActionListener(this);
..	..	@@ -367,45 +864,123 @@
367	864	attachBumpItem.addActionListener(this);
368	865	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	866	pigmentBumpItem.addActionListener(this);
	867	+ //embedTexturesItem
370	868	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	869	detachPigmentItem.addActionListener(this);
372	870	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	871	detachBumpItem.addActionListener(this);
	872	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	873	+ embedTexturesItem.addActionListener(this);
	874	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	875	+ deEmbedTexturesItem.addActionListener(this);
374	876	menu.add("-");
375	877	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	878	sortbysizeItem.addActionListener(this);
377	879	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	880	sortbynameItem.addActionListener(this);
379	881	menu.add("-");
	882	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	883	+ shareGeometriesItem.addActionListener(this);
	884	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	885	+ mergeGeometriesItem.addActionListener(this);
	886	+ if (Globals.ADVANCED)
	887	+ {
	888	+ // Pretty much the same as duplicate and clone.
380	889	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	890	extractGeometriesItem.addActionListener(this);
382	891	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	892	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	893	+ }
388	894
389	895	oe.menuBar.add(menu = new Menu("Insert"));
390	896	buildCreateMenu(menu);
391	897
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	898	oe.menuBar.add(menu = new Menu("Tools"));
404	899	buildToolsMenu(menu);
405	900	}
406	901
	902	+ JTabbedPane resourcecontainer;
	903	+ cGridBag currenttab;
	904	+ boolean added; // patch for jar
	905	+
	906	+ int tabcount = 0;
	907	+ int colcount = 0;
	908	+ int rowcount = 0;
	909	+ int texturecount = 0;
	910	+
	911	+ int columns = 5;
	912	+ int rows = 7;
	913	+
	914	+ public void ResourceCallBack(String[] path)
	915	+ {
	916	+// for (int i = 0; i < path.length; i++)
	917	+// System.out.print(path[i] + "/");
	918	+// System.out.println();
	919	+
	920	+ if (//rowcount == 0 \|\|
	921	+ path.length == 1)
	922	+ {
	923	+ currenttab = new cGridBag();
	924	+ added = false;
	925	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	926	+ currenttab.setName(tabname);
	927	+ rowcount = 1;
	928	+ colcount = 0;
	929	+ texturecount = 0;
	930	+ }
	931	+
	932	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	933	+ {
	934	+ if (!added)
	935	+ {
	936	+ added = true;
	937	+ resourcecontainer.add(currenttab);
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	940	+ }
	941	+
	942	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	943	+
	944	+ if (++colcount >= columns)
	945	+ {
	946	+ colcount = 0;
	947	+ currenttab.Return();
	948	+
	949	+ if (rowcount++ >= rows)
	950	+ {
	951	+ rowcount = 0;
	952	+ }
	953	+ }
	954	+ }
	955	+ else
	956	+ {
	957	+// if (!path[path.length-1].equals("icons"))
	958	+// resourcecontainer.Return();
	959	+ }
	960	+ }
	961	+
	962	+ void CreateTexturePanel(cGridBag container)
	963	+ {
	964	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	965	+ container.add(resourcecontainer);
	966	+
	967	+ Grafreed.ParseResources("textures", this);
	968	+ }
	969	+
407	970	void SetupUI2(ObjEditor oe)
408	971	{
	972	+ // June 2019
	973	+ if (oe == null)
	974	+ {
	975	+ //super.SetupUI2(this);
	976	+ //return;
	977	+ }
	978	+
	979	+ if (copy != group)
	980	+ {
	981	+ //super.SetupUI2(this);
	982	+ }
	983	+
409	984	//new Exception().printStackTrace();
410	985
411	986	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,93 +1009,238 @@
434	1009	oe.radioPanel.add(dummyButton);
435	1010	oe.buttonGroup.add(dummyButton);
436	1011	*/
	1012	+ cGridBag copyOptionsPanel = new cGridBag();
	1013	+
	1014	+ copyOptionsPanel.preferredHeight = 2;
	1015	+
437	1016	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	1017
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	1018	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ //minButton.setToolTipText("Minimize window");
	1020	+ //minButton.addActionListener(this);
	1021	+
	1022	+ if (Globals.ADVANCED)
	1023	+ {
	1024	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ maxButton.setToolTipText("Maximize window");
	1026	+ maxButton.addActionListener(this);
	1027	+ }
	1028	+
	1029	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ fullButton.setToolTipText("Full-screen window");
	1031	+ fullButton.addActionListener(this);
	1032	+
	1033	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ screenfitButton.setToolTipText("Screen fit");
	1035	+ screenfitButton.addActionListener(this);
	1036	+
	1037	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1039	+ restoreCameraButton.addActionListener(this);
	1040	+
	1041	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ saveVersionButton.setToolTipText("Duplicate current version");
	1043	+ saveVersionButton.addActionListener(this);
	1044	+
	1045	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ deleteVersionButton.setToolTipText("Delete current version");
	1047	+ deleteVersionButton.addActionListener(this);
	1048	+
	1049	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ previousVersionButton.setToolTipText("Previous version");
	1051	+ previousVersionButton.addActionListener(this);
	1052	+ previousVersionButton.setEnabled(false);
	1053	+
	1054	+ cGridBag updown = new cGridBag().setVertical(true);
	1055	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ restoreButton.setToolTipText("Undo (restore current version)");
	1057	+ restoreButton.addActionListener(this);
	1058	+ //restoreButton.setEnabled(false);
	1059	+
	1060	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ replaceButton.setToolTipText("Save (replace current version)");
	1062	+ replaceButton.addActionListener(this);
	1063	+ //replaceButton.setEnabled(false);
	1064	+
	1065	+ copyOptionsPanel.add(updown);
	1066	+
	1067	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ nextVersionButton.setToolTipText("Next version");
	1069	+ nextVersionButton.addActionListener(this);
	1070	+ nextVersionButton.setEnabled(false);
	1071	+
	1072	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1073	+ liveCB.setToolTipText("Enable animation");
441	1074	liveCB.addItemListener(this);
442	1075
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1076	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ oneStepButton.setToolTipText("Animate one step forward");
	1078	+ oneStepButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	1081	fastCB.setToolTipText("Fast mode");
445	1082	fastCB.addItemListener(this);
446	1083
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
452		- screenfitButton.setToolTipText("Screen fit");
453		- screenfitButton.addActionListener(this);
	1084	+ //oe.toolboxPanel.Return();
	1085	+
	1086	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1087	+// trackCB.setToolTipText("Enable tracking");
	1088	+// trackCB.addItemListener(this);
454	1089
455	1090	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	1091	// screenfitpointButton.addActionListener(this);
457	1092
458	1093	if (Globals.ADVANCED)
459	1094	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	1096	snapobjectButton.addActionListener(this);
462	1097	snapobjectButton.setToolTipText("Snap Object");
	1098	+
	1099	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ fourButton.addActionListener(this);
	1101	+ fourButton.setToolTipText("Show control panel only");
463	1102	}
464	1103
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
467		- flashSelectionButton.addActionListener(this);
	1104	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
468	1105
469		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470		-
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472		- twoButton.setToolTipText("Show center view only");
	1106	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ twoButton.setToolTipText("Show 3D view only");
473	1108	twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
475		- fourButton.addActionListener(this);
476		- fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
478		- sixButton.setToolTipText("2-column layout left");
479		- sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
481		- threeButton.setToolTipText("2-column layout right");
	1109	+ this.fullscreenLayout = twoButton;
	1110	+
	1111	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ threeButton.setToolTipText("Show controls and 3D view");
482	1113	threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
484		- sevenButton.setToolTipText("3-column layout");
485		- sevenButton.addActionListener(this);
	1114	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ sixButton.setToolTipText("Show 3D view and controls");
	1116	+ sixButton.addActionListener(this);
	1117	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+// sevenButton.setToolTipText("3-column layout");
	1119	+// sevenButton.addActionListener(this);
486	1120	//
487	1121
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489		- rootButton.setToolTipText("Edit selection in new tab");
	1122	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ rootButton.setToolTipText("Open selection in new tab");
490	1124	rootButton.addActionListener(this);
491	1125
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	1127	closeButton.setToolTipText("Close tab");
494	1128	closeButton.addActionListener(this);
495	1129	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	1130	//clearButton.addActionListener(this);
497		-
498		- cGridBag commandsPanel = new cGridBag();
	1131	+
	1132	+ cGridBag row1 = new cGridBag();
499	1133
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501		- editButton.setToolTipText("Edit selection");
	1134	+ // INSERT
	1135	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ gridButton.setToolTipText("Create grid");
	1137	+ gridButton.addActionListener(this);
	1138	+
	1139	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ boxButton.setToolTipText("Create box");
	1141	+ boxButton.addActionListener(this);
	1142	+
	1143	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ sphereButton.setToolTipText("Create sphere");
	1145	+ sphereButton.addActionListener(this);
	1146	+
	1147	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1148	+ coneButton.setToolTipText("Create cone");
	1149	+ coneButton.addActionListener(this);
	1150	+
	1151	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ torusButton.setToolTipText("Create torus");
	1153	+ torusButton.addActionListener(this);
	1154	+
	1155	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ superButton.setToolTipText("Create superellipsoid");
	1157	+ superButton.addActionListener(this);
	1158	+
	1159	+ if (Globals.ADVANCED)
	1160	+ {
	1161	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ kleinButton.setToolTipText("Create Klein bottle");
	1163	+ kleinButton.addActionListener(this);
	1164	+ }
	1165	+
	1166	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ particlesButton.setToolTipText("Create particle system");
	1168	+ particlesButton.addActionListener(this);
	1169	+
	1170	+ oe.toolboxPanel.add(row1);
	1171	+
	1172	+ cGridBag row2 = new cGridBag();
	1173	+
	1174	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ groupButton.setToolTipText("Create group");
	1176	+ groupButton.addActionListener(this);
	1177	+
	1178	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ compositeButton.setToolTipText("Create composite");
	1180	+ compositeButton.addActionListener(this);
	1181	+
	1182	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ switchButton.setToolTipText("Create item switcher");
	1184	+ switchButton.addActionListener(this);
	1185	+
	1186	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ loopButton.setToolTipText("Create loop");
	1188	+ loopButton.addActionListener(this);
	1189	+
	1190	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ textureButton.setToolTipText("Create texture");
	1192	+ textureButton.addActionListener(this);
	1193	+
	1194	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ overlayButton.setToolTipText("Create overlay");
	1196	+ overlayButton.addActionListener(this);
	1197	+
	1198	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ lightButton.setToolTipText("Create light");
	1200	+ lightButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row2);
	1203	+
	1204	+ cGridBag textures = new cGridBag();
	1205	+
	1206	+ CreateTexturePanel(textures);
	1207	+
	1208	+ oe.toolboxPanel.add(textures);
	1209	+
	1210	+ textures.preferredHeight = 100;
	1211	+
	1212	+ CreateSkyboxPanel(oe.skyboxPanel);
	1213	+
	1214	+ // EDIT panel
	1215	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ editButton.setToolTipText("Pin selection controls");
502	1217	editButton.addActionListener(this);
503	1218
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505		- uneditButton.setToolTipText("Unedit selection");
	1219	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
506	1221	uneditButton.addActionListener(this);
507	1222
508		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
509		- allParamsButton.setToolTipText("Edit all params");
	1223	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1224	+ allParamsButton.setToolTipText("Show all controls");
510	1225	allParamsButton.addActionListener(this);
511	1226
512		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- clearPanelButton.setToolTipText("Clear edit panel");
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
514	1229	clearPanelButton.addActionListener(this);
515	1230
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- unselectButton.setToolTipText("Unselect");
518		- unselectButton.addActionListener(this);
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
519	1234
520		- commandsPanel.preferredHeight = 1;
	1235	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ flashSelectionButton.setToolTipText("Highlight selection");
	1237	+ flashSelectionButton.addActionListener(this);
521	1238
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	1239	+ editCommandsPanel.preferredHeight = 1;
	1240	+
	1241	+ SetPinStates(false);
	1242	+// oe.treePanel.add(commandsPanel);
	1243	+// oe.treePanel.Return();
524	1244
525	1245	// oe.aConstraints.gridx += 1;
526	1246	// oe.aConstraints.weighty = 0;
..	..	@@ -537,32 +1257,20 @@
537	1257
538	1258	JScrollPane jSP;
539	1259	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
540		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1260	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
541	1261	ResetModel();
542	1262
543	1263	oe.treePanel.add(jSPPanel);
544	1264	oe.treePanel.Return();
545	1265
546		- cGridBag copyOptionsPanel = new cGridBag();
547		-
548		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549		- colorCB.setToolTipText("Copy color when dropped");
550		- colorCB.addItemListener(this);
551		-
552		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553		- materialCB.setToolTipText("Copy material when dropped");
554		- materialCB.addItemListener(this);
555		-
556		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557		- textureCB.setToolTipText("Copy texture when dropped");
558		- textureCB.addItemListener(this);
559		-
560		- copyOptionsPanel.preferredHeight = 1;
561	1266	oe.treePanel.add(copyOptionsPanel);
562	1267	oe.treePanel.Return();
	1268	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1269	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1270	+ sliderPane.preferredHeight = 1;
563	1271
564		-// mainPanel.setDividerLocation(0.5); //1.0);
565		-// mainPanel.setResizeWeight(0.5);
	1272	+// mainPanel.setDividerLocation(0.1); //1.0);
	1273	+ mainPanel.setResizeWeight(0.4);
566	1274
567	1275	//jList.addListSelectionListener(this);
568	1276	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -570,7 +1278,7 @@
570	1278	//jTree.setEditable(true);
571	1279	oe.jTree.setDragEnabled(true);
572	1280	//jTree.setPreferredSize(new Dimension(10,10));
573		- jSP.setPreferredSize(new Dimension(100,200));
	1281	+ //jSP.setPreferredSize(new Dimension(100,200));
574	1282
575	1283	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
576	1284
..	..	@@ -582,19 +1290,49 @@
582	1290	dgr.addDragGestureListener(this);
583	1291	}catch(Exception e) {}
584	1292	*/
585		- radio.layout = sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
586	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
587	1295	}
588	1296
589	1297	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	1298	{
591		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
593		- supportCB.addItemListener(this);
	1299	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1300	+ colorCB.setToolTipText("Copy color when dropped");
	1301	+ colorCB.addItemListener(this);
	1302	+
	1303	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1304	+ materialCB.setToolTipText("Copy material when dropped");
	1305	+ materialCB.addItemListener(this);
	1306	+
	1307	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1308	+ textureCB.setToolTipText("Copy texture when dropped");
	1309	+ textureCB.addItemListener(this);
	1310	+
	1311	+ panel.Return();
	1312	+
	1313	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1314	+ boxCB.setToolTipText("Display bounding boxes");
	1315	+ boxCB.addItemListener(this);
	1316	+
	1317	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1318	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1319	+ zoomBoxCB.addItemListener(this);
	1320	+
	1321	+ if (true) // Globals.ADVANCED)
	1322	+ {
	1323	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1324	+// supportCB.setToolTipText("Enable rigging");
	1325	+// supportCB.addItemListener(this);
	1326	+
	1327	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1328	+ freezeCB.setToolTipText("Fast moving camera");
	1329	+ freezeCB.addItemListener(this);
594	1330
595	1331	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
596	1332	// localCB.addItemListener(this);
597	1333
	1334	+ panel.Return();
	1335	+
598	1336	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
599	1337	crowdCB.setToolTipText("Used for crowds");
600	1338	crowdCB.addItemListener(this);
..	..	@@ -603,22 +1341,19 @@
603	1341	smoothCB.setToolTipText("Snapping delay");
604	1342	smoothCB.addItemListener(this);
605	1343
606		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
607		- slowCB.setToolTipText("Smooth interpolation");
608		- slowCB.addItemListener(this);
	1344	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1345	+// slowCB.setToolTipText("Smooth interpolation");
	1346	+// slowCB.addItemListener(this);
	1347	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1348	+ minshaderCB.setToolTipText("Minimal fast shader");
	1349	+ minshaderCB.addItemListener(this);
609	1350
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	1351	// constraints.gridy += 1;
619	1352	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	1353	// speakerMocapCB.addItemListener(this);
621	1354
	1355	+ panel.Return();
	1356	+
622	1357	if (false)
623	1358	{
624	1359	// handled in scripts
..	..	@@ -633,40 +1368,85 @@
633	1368	//constraints.gridy += 1;
634	1369	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
635	1370	smoothfocusCB.addItemListener(this);
	1371	+ panel.Return();
636	1372	}
637	1373
638	1374	//constraints.gridx += 1;
639	1375	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
640	1376	// debugCB.addItemListener(this);
641	1377
	1378	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1379	+ trackCB.setToolTipText("Enable tracking target");
	1380	+ trackCB.addItemListener(this);
	1381	+
642	1382	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1383	+ oeilCB.setToolTipText("Move camera when tracking");
643	1384	oeilCB.addItemListener(this);
644	1385
	1386	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1387	+ shadowCB.setToolTipText("When live compute shadows");
	1388	+ shadowCB.addItemListener(this);
	1389	+
	1390	+ panel.Return();
	1391	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1392	+ toggleTextureCB.setToolTipText("Load textures");
	1393	+ toggleTextureCB.addItemListener(this);
	1394	+
	1395	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1396	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1397	+ toggleSwitchCB.addItemListener(this);
	1398	+
	1399	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1400	+ autokeepCB.setToolTipText("On structure change");
	1401	+ autokeepCB.addItemListener(this);
	1402	+
	1403	+ panel.Return();
	1404	+ if (Globals.ADVANCED)
	1405	+ {
645	1406	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	1407	lookAtCB.setToolTipText("Look-at target");
647	1408	lookAtCB.addItemListener(this);
	1409	+ }
	1410	+
	1411	+ }
648	1412
649	1413	cGridBag fill = new cGridBag();
650		-
651	1414	fill.preferredHeight = 200;
	1415	+ cGridBag fill2 = new cGridBag();
	1416	+ fill2.preferredHeight = 200;
	1417	+ cGridBag fill3 = new cGridBag();
	1418	+ fill3.preferredHeight = 200;
652	1419
653	1420	panel.add(fill);
	1421	+ panel.add(fill2);
	1422	+ panel.add(fill3);
654	1423
655	1424	}
656	1425
657	1426	void EditObject(Object3D obj)
658	1427	{
659	1428	cRadio radioButton = new cRadio(obj.name);
	1429	+
	1430	+ // June 2019. Patch to avoid bug with transparency.
	1431	+ radioButton.hadMaterial = obj.material != null;
	1432	+ if (!radioButton.hadMaterial)
	1433	+ {
	1434	+ obj.material = new cMaterial();
	1435	+ }
	1436	+
660	1437	radioButton.SetObject(obj);
661		- radioButton.layout = sevenButton;
	1438	+ radioButton.layout = threeButton; // sixButton;
662	1439	radioButton.SetCamera(cameraView.renderCamera, false);
663	1440	radioButton.addActionListener(this);
664	1441	radioPanel.add(radioButton);
665	1442	buttonGroup.add(radioButton);
666	1443	radioButton.doClick();
667	1444	}
	1445	+
668	1446	void SetupViews(ObjEditor oe)
669	1447	{
	1448	+ theFrame = this;
	1449	+
670	1450	oe.SetupViews();
671	1451
672	1452	System.out.println("SetupViews");
..	..	@@ -675,23 +1455,30 @@
675	1455	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	1456	}
677	1457
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- JCheckBox smoothfocusCB;
	1458	+ cToggleButton liveCB;
	1459	+ cCheckBox supportCB;
	1460	+ cCheckBox localCB;
	1461	+ cCheckBox crowdCB;
	1462	+ cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
	1465	+ cToggleButton fastCB;
	1466	+ cCheckBox slowCB;
	1467	+ cCheckBox boxCB;
	1468	+ cCheckBox zoomBoxCB;
	1469	+ cCheckBox freezeCB;
	1470	+ //cToggleButton trackCB;
	1471	+ cCheckBox trackCB;
	1472	+ cCheckBox smoothfocusCB;
689	1473	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	1474	+ cCheckBox speakerCameraCB;
	1475	+ cCheckBox speakerFocusCB;
	1476	+ cCheckBox debugCB;
	1477	+
	1478	+ cCheckBox oeilCB;
	1479	+ cCheckBox shadowCB;
	1480	+ cCheckBox autokeepCB;
	1481	+ cCheckBox lookAtCB;
695	1482
696	1483	// static int COLOR = 1;
697	1484	// static int MATERIAL = 2;
..	..	@@ -699,9 +1486,9 @@
699	1486
700	1487	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	1488
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	1489	+ cCheckBox colorCB;
	1490	+ cCheckBox materialCB;
	1491	+ cCheckBox textureCB;
705	1492
706	1493	public void itemStateChanged(ItemEvent e)
707	1494	{
..	..	@@ -729,6 +1516,7 @@
729	1516	} else if(e.getSource() == liveCB)
730	1517	{
731	1518	cameraView.ToggleLive();
	1519	+ refreshContents(false);
732	1520	}
733	1521	else if(e.getSource() == supportCB)
734	1522	{
..	..	@@ -744,6 +1532,12 @@
744	1532	{
745	1533	cameraView.ToggleInertia();
746	1534	cameraView.repaint();
	1535	+ }
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
747	1541	}
748	1542	else if(e.getSource() == localCB)
749	1543	{
..	..	@@ -793,6 +1587,18 @@
793	1587	{
794	1588	cameraView.ToggleOeil();
795	1589	}
	1590	+ else if(e.getSource() == shadowCB)
	1591	+ {
	1592	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1593	+ }
	1594	+ else if(e.getSource() == freezeCB)
	1595	+ {
	1596	+ Globals.FREEZEONMOVE ^= true;
	1597	+ }
	1598	+ else if(e.getSource() == autokeepCB)
	1599	+ {
	1600	+ Globals.REPLACEONMAKE ^= true;
	1601	+ }
796	1602	else if(e.getSource() == lookAtCB)
797	1603	{
798	1604	cameraView.ToggleLookAt();
..	..	@@ -809,7 +1615,8 @@
809	1615
810	1616	/**/
811	1617	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
812		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1618	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1619	+ TreePath path = objEditor.jTree.getSelectionPath();
813	1620	if ((path == null) \|\| (path.getPathCount() <= 1)) {
814	1621	// We can't move the root node or an empty selection
815	1622	return;
..	..	@@ -872,8 +1679,6 @@
872	1679	}
873	1680	}
874	1681
875		- String string = (String) object;
876		-
877	1682	System.out.println("Transfer = " + object + "; drop : " + target);
878	1683	// if( object instanceof java.io.File[])
879	1684	// {
..	..	@@ -881,7 +1686,11 @@
881	1686	// objEditor.DropFile((java.io.File[]) object, true);
882	1687	// return;
883	1688	// }
884		- if (string.charAt(0) == '/')
	1689	+
	1690	+ String string = object.toString();
	1691	+
	1692	+ // File path for Mac and Windows
	1693	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1694	{
886	1695	// file(s)
887	1696	String[] names = string.split("\n");
..	..	@@ -908,7 +1717,7 @@
908	1717
909	1718	flashIt = false;
910	1719	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1720	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1721	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1722
914	1723	if (group.selection.size() == 1)
..	..	@@ -924,23 +1733,33 @@
924	1733
925	1734	assert target == objEditor.jTree;
926	1735	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1736	+ Object3D destinationLeaf;
927	1737	try {
928		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1738	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
929	1739	} catch (Exception e) {
930	1740	System.out.println("destinationPath : " + destinationPath);
931	1741	return;
932	1742	}
933	1743
934		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1744	+ for (int i=group.selection.size(); --i>=0;)
935	1745	{
	1746	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1747	+
	1748	+ // Cannot move into itself
	1749	+ if (child == destinationLeaf)
	1750	+ return;
	1751	+ }
	1752	+
	1753	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1754	+// {
936	1755	loadClipboard(true);
937	1756	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
939		- } else {
940		- loadClipboard(false);
941		- objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
943		- }
	1757	+ pasteInto(false, false);
	1758	+// } else {
	1759	+// loadClipboard(false);
	1760	+// objEditor.jTree.setSelectionPath(destinationPath);
	1761	+// pasteInto(false, false); // true); // ???
	1762	+// }
944	1763	}
945	1764	public void dropActionChanged(DropTargetDragEvent dtde)
946	1765	// Called if the user has modified the current drop gesture
..	..	@@ -1045,54 +1864,71 @@
1045	1864	{
1046	1865	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1047	1866	//heightFieldItem.addActionListener(this);
1048		- gridItem = menu.add(new MenuItem("Grid"));
1049		- gridItem.addActionListener(this);
1050		- rectoidItem = menu.add(new MenuItem("Box"));
1051		- rectoidItem.addActionListener(this);
1052		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1053		- ellipsoidItem.addActionListener(this);
1054		- coneItem = menu.add(new MenuItem("Cone"));
1055		- coneItem.addActionListener(this);
1056		- torusItem = menu.add(new MenuItem("Torus"));
1057		- torusItem.addActionListener(this);
1058		- superItem = menu.add(new MenuItem("Superellipsoid"));
1059		- superItem.addActionListener(this);
	1867	+// gridItem = menu.add(new MenuItem("Grid"));
	1868	+// gridItem.addActionListener(this);
	1869	+// rectoidItem = menu.add(new MenuItem("Box"));
	1870	+// rectoidItem.addActionListener(this);
	1871	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1872	+// ellipsoidItem.addActionListener(this);
	1873	+// coneItem = menu.add(new MenuItem("Cone"));
	1874	+// coneItem.addActionListener(this);
	1875	+// torusItem = menu.add(new MenuItem("Torus"));
	1876	+// torusItem.addActionListener(this);
	1877	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1878	+// superItem.addActionListener(this);
	1879	+
	1880	+ cameraItem = menu.add(new MenuItem("Camera"));
	1881	+ cameraItem.addActionListener(this);
	1882	+
	1883	+ if (!Globals.ADVANCED)
	1884	+ {
1060	1885	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1061	1886	kleinItem.addActionListener(this);
1062		- particleItem = menu.add(new MenuItem("Particle system"));
1063		- particleItem.addActionListener(this);
	1887	+ }
	1888	+
	1889	+// particleItem = menu.add(new MenuItem("Particle system"));
	1890	+// particleItem.addActionListener(this);
	1891	+ if (Globals.ADVANCED)
	1892	+ {
1064	1893	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1894	ragdollItem.addActionListener(this);
1066	1895	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1896	ragdoll2Item.addActionListener(this);
	1897	+ }
1068	1898	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1899	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1900	meshItem.addActionListener(this);
1071	1901	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1902	// meshGroupItem.addActionListener(this);
	1903	+ if (Globals.ADVANCED)
	1904	+ {
1073	1905	springItem = menu.add(new MenuItem("Spring"));
1074	1906	springItem.addActionListener(this);
1075	1907	flagItem = menu.add(new MenuItem("Flag"));
1076	1908	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1909	blobItem = menu.add(new MenuItem("Blob"));
1082	1910	blobItem.addActionListener(this);
1083	1911	latheItem = menu.add(new MenuItem("Lathe"));
1084	1912	latheItem.addActionListener(this);
1085		- lightItem = menu.add(new MenuItem("Light"));
1086		- lightItem.addActionListener(this);
	1913	+ }
	1914	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1915	+ bezierItem.addActionListener(this);
	1916	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1917	+// overlayItem.addActionListener(this);
	1918	+// lightItem = menu.add(new MenuItem("Light"));
	1919	+// lightItem.addActionListener(this);
1087	1920	menu.add("-");
1088	1921	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1089	1922	//superLoopItem.addActionListener(this);
1090		- loopItem = menu.add(new MenuItem("Loop"));
1091		- loopItem.addActionListener(this);
	1923	+// loopItem = menu.add(new MenuItem("Loop"));
	1924	+// loopItem.addActionListener(this);
1092	1925	doubleItem = menu.add(new MenuItem("Fork"));
1093	1926	doubleItem.addActionListener(this);
	1927	+ if (Globals.ADVANCED)
	1928	+ {
1094	1929	tripleItem = menu.add(new MenuItem("Trident"));
1095	1930	tripleItem.addActionListener(this);
	1931	+ }
1096	1932	}
1097	1933
1098	1934	void buildToolsMenu(Menu menu)
..	..	@@ -1101,29 +1937,34 @@
1101	1937	animationItem.addItemListener(this);
1102	1938	animationItem.setState(Globals.ANIMATION);
1103	1939
	1940	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1941	+ archiveItem.addActionListener(this);
	1942	+
1104	1943	menu.add("-");
1105	1944	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1106	1945	parseverticesItem.addActionListener(this);
1107	1946	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1947	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1948	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1949	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1950	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1951	reduceMorphItem.addActionListener(this);
1115	1952	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1953	reduce34MorphItem.addActionListener(this);
1117		-
1118		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1119		- computeAOItem.addActionListener(this);
1120	1954	menu.add("-");
1121		-
1122	1955	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1956	memoryItem.addActionListener(this);
	1957	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1958	+ computeAOItem.addActionListener(this);
	1959	+
	1960	+ if (Globals.ADVANCED)
	1961	+ {
	1962	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1963	+ mirrorItem.addActionListener(this);
	1964	+ menu.add("-");
1124	1965	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	1966	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	1967	+ menu.add(dumpItem = new MenuItem("Print"));
1127	1968	dumpItem.addActionListener(this);
1128	1969	// menu.add(pathItem = new MenuItem("From-to path"));
1129	1970	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +1982,7 @@
1141	1982	menu.add("-");
1142	1983	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1984	editScriptItem.addActionListener(this);
	1985	+ }
1144	1986	}
1145	1987
1146	1988	void ScreenFit()
..	..	@@ -1263,9 +2105,34 @@
1263	2105	shadow.material = new cMaterial(obj.material);
1264	2106	shadow.material.diffuse = 0.0001f;
1265	2107	shadow.material.specular = 0.0001f;
	2108	+ //shadow.projectedVertices[1].x = 300;
1266	2109
1267	2110	makeSomething(shadow);
1268	2111	}
	2112	+
	2113	+ private void ClearUnpinned()
	2114	+ {
	2115	+ //for (Object3D obj : listUI)
	2116	+ for (int i=listUI.size(); --i>=0;)
	2117	+ {
	2118	+ Object3D obj = listUI.elementAt(i);
	2119	+ if (!obj.pinned)
	2120	+ {
	2121	+ obj.CloseUI();
	2122	+ listUI.remove(i);
	2123	+ }
	2124	+ }
	2125	+ }
	2126	+
	2127	+ private void EditElement(Object3D elem, boolean newWindow)
	2128	+ {
	2129	+ // if (!(elem instanceof Composite))
	2130	+ // newWindow = false;
	2131	+ listUI.add(elem);
	2132	+ elem.openEditWindow(this, newWindow); //, false);
	2133	+ System.out.println("edit : " + elem);
	2134	+ elem.editWindow.refreshContents(true); // ? new
	2135	+ }
1269	2136
1270	2137	/**
1271	2138	* applyExample
..	..	@@ -1469,9 +2336,9 @@
1469	2336
1470	2337	void Overwrite(int mask)
1471	2338	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2339	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	2340	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
1475	2342
1476	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	2344	content = ((cGroup)content).get(0);
..	..	@@ -1510,7 +2377,7 @@
1510	2377	{
1511	2378	ScreenFit();
1512	2379	} else
1513		- if (source == switchItem)
	2380	+ if (source == switchViewItem)
1514	2381	{
1515	2382	cVector v1 = new cVector();
1516	2383	cVector v2 = new cVector();
..	..	@@ -1519,11 +2386,11 @@
1519	2386	objEditor.cameraView.renderCamera.setAim(v2, v1);
1520	2387	objEditor.cameraView.repaint();
1521	2388	} else
1522		- if (source == rectoidItem)
	2389	+ if (source == rectoidItem \|\| source == boxButton)
1523	2390	{
1524	2391	makeSomething(new Box());
1525	2392	} else
1526		- if (source == particleItem)
	2393	+ if (source == particleItem \|\| source == particlesButton)
1527	2394	{
1528	2395	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1529	2396	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1602,27 +2469,27 @@
1602	2469
1603	2470	makeSomething(obj);
1604	2471	} else
1605		- if (source == gridItem)
	2472	+ if (source == gridItem \|\| source == gridButton)
1606	2473	{
1607	2474	makeSomething(new Grid());
1608	2475	} else
1609		- if (source == ellipsoidItem)
	2476	+ if (source == ellipsoidItem \|\| source == sphereButton)
1610	2477	{
1611	2478	makeSomething(new Sphere());
1612	2479	} else
1613		- if (source == coneItem)
	2480	+ if (source == coneItem \|\| source == coneButton)
1614	2481	{
1615	2482	makeSomething(new Cone());
1616	2483	} else
1617		- if (source == torusItem)
	2484	+ if (source == torusItem \|\| source == torusButton)
1618	2485	{
1619	2486	makeSomething(new Torus());
1620	2487	} else
1621		- if (source == superItem)
	2488	+ if (source == superItem \|\| source == superButton)
1622	2489	{
1623	2490	makeSomething(new Superellipsoid());
1624	2491	} else
1625		- if (source == kleinItem)
	2492	+ if (source == kleinItem \|\| source == kleinButton)
1626	2493	{
1627	2494	makeSomething(new Klein());
1628	2495	} else
..	..	@@ -1642,7 +2509,7 @@
1642	2509	{
1643	2510	makeSomething(new BezierSurface());
1644	2511	} else
1645		- if (source == checkerItem)
	2512	+ if (source == overlayItem \|\| source == overlayButton)
1646	2513	{
1647	2514	/*
1648	2515	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1690,10 +2557,27 @@
1690	2557	s.setup();
1691	2558	makeSomething(s);
1692	2559	} else
1693		- if (source == lightItem)
	2560	+ if (source == lightItem \|\| source == lightButton)
1694	2561	{
1695	2562	makeSomething(new Light());
1696	2563	} else
	2564	+// if (source == skybox1Button \|\|
	2565	+// source == skybox2Button \|\|
	2566	+// source == skybox3Button \|\|
	2567	+// source == skybox4Button \|\|
	2568	+// source == skybox5Button \|\|
	2569	+// source == skybox6Button \|\|
	2570	+// source == skybox7Button \|\|
	2571	+// source == skybox11Button \|\|
	2572	+// source == skybox12Button \|\|
	2573	+// source == skybox13Button \|\|
	2574	+// source == skybox14Button \|\|
	2575	+// source == skybox15Button \|\|
	2576	+// source == skybox16Button \|\|
	2577	+// source == skybox17Button)
	2578	+// {
	2579	+// ChangeSkybox(source);
	2580	+// } else
1697	2581	if (source == csgItem)
1698	2582	{
1699	2583	group(new CSG());
..	..	@@ -1740,30 +2624,30 @@
1740	2624
1741	2625	group(g);
1742	2626	} else
1743		- if (source == loopItem)
	2627	+ if (source == loopItem \|\| source == loopButton)
1744	2628	{
1745	2629	Composite csg = new GroupLeaf();
1746	2630	csg.count = 5;
1747	2631	group(csg);
1748		- Composite child = new cGroup();
	2632	+ Composite child = new cGroup("Branch");
1749	2633	csg.addChild(child);
1750	2634	child.addChild(csg);
1751	2635	} else
1752	2636	if (source == doubleItem)
1753	2637	{
1754		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Fork");
1755	2639	csg.count = 5;
1756	2640	group(csg);
1757		- Composite child = new cGroup();
	2641	+ Composite child = new cGroup("Branch A");
1758	2642	csg.addChild(child);
1759	2643	child.addChild(csg);
1760		- child = new cGroup();
	2644	+ child = new cGroup("Branch B");
1761	2645	csg.addChild(child);
1762	2646	child.addChild(csg);
1763	2647	} else
1764	2648	if (source == tripleItem)
1765	2649	{
1766		- Composite csg = new GroupLeaf();
	2650	+ Composite csg = new GroupLeaf("Trident");
1767	2651	csg.count = 4;
1768	2652	group(csg);
1769	2653	Composite child = new cGroup();
..	..	@@ -1776,27 +2660,10 @@
1776	2660	csg.addChild(child);
1777	2661	child.addChild(csg);
1778	2662	} else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795		- } else
1796	2663	if (source == computeAOItem)
1797	2664	{
1798	2665	Globals.drawMode = CameraPane.OCCLUSION;
1799		- Globals.theRenderer.repaint();
	2666	+ cameraView.repaint();
1800	2667	} else
1801	2668	if (source == recompileItem)
1802	2669	{
..	..	@@ -1811,7 +2678,7 @@
1811	2678	if (source == invariantsItem)
1812	2679	{
1813	2680	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
1815	2682	} else
1816	2683	if (source == memoryItem)
1817	2684	{
..	..	@@ -1830,19 +2697,68 @@
1830	2697	{
1831	2698	DumpObject();
1832	2699	} else
	2700	+ if (source == minButton)
	2701	+ {
	2702	+ Minimize();
	2703	+ } else
	2704	+ if (source == maxButton)
	2705	+ {
	2706	+ Maximize();
	2707	+ } else
	2708	+ if (source == fullButton)
	2709	+ {
	2710	+ ToggleFullScreen();
	2711	+ } else
	2712	+ if (source == previousVersionButton)
	2713	+ {
	2714	+ // Go to previous version
	2715	+ //if (!Undo())
	2716	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2717	+ PreviousVersion();
	2718	+ } else
	2719	+ if (source == restoreButton)
	2720	+ {
	2721	+ // Restore current version
	2722	+ Restore();
	2723	+ //restoreButton.setEnabled(false);
	2724	+ } else
	2725	+ if (source == replaceButton)
	2726	+ {
	2727	+ // Overwrite current version
	2728	+ Replace();
	2729	+ //replaceButton.setEnabled(false);
	2730	+ } else
	2731	+ if (source == nextVersionButton)
	2732	+ {
	2733	+ // Go to next version
	2734	+ NextVersion();
	2735	+ } else
	2736	+ if (source == saveVersionButton)
	2737	+ {
	2738	+ // Save a new version
	2739	+ if (!Save(true))
	2740	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2741	+ } else
	2742	+ if (source == deleteVersionButton)
	2743	+ {
	2744	+ // Delete a new version
	2745	+ DeleteVersion();
	2746	+ } else
	2747	+ if (source == oneStepButton)
	2748	+ {
	2749	+ Globals.ONESTEP = true;
	2750	+ cameraView.repaint();
	2751	+ } else
1833	2752	if (source == screenfitButton)
1834	2753	{
1835		- //Reload(lastConverter, lastFilename, true);
1836	2754	ScreenFit();
1837	2755	} else
1838	2756	if (source == screenfitpointButton)
1839	2757	{
1840		- //Reload(lastConverter, lastFilename, true);
1841	2758	ScreenFitPoint();
1842	2759	} else
1843	2760	if (source == snapobjectButton)
1844	2761	{
1845		- //Reload(lastConverter, lastFilename, true);
1846	2762	SnapObject();
1847	2763	} else
1848	2764	// if (event.getSource() == recompileButton)
..	..	@@ -1879,12 +2795,20 @@
1879	2795	{
1880	2796	loadClipboard(true);
1881	2797	} else
	2798	+ if (source == undoItem)
	2799	+ {
	2800	+ PreviousVersion();
	2801	+ } else
	2802	+ if (source == redoItem)
	2803	+ {
	2804	+ NextVersion();
	2805	+ } else
1882	2806	if (source == duplicateItem)
1883	2807	{
1884		- Object3D keep = GrafreeD.clipboard;
	2808	+ Object3D keep = Grafreed.clipboard;
1885	2809	loadClipboard(false);
1886	2810	paste(false);
1887		- GrafreeD.clipboard = keep;
	2811	+ Grafreed.clipboard = keep;
1888	2812	} else
1889	2813	if (source == cloneItem)
1890	2814	{
..	..	@@ -1902,13 +2826,17 @@
1902	2826	{
1903	2827	paste(false);
1904	2828	} else
	2829	+ if (source == pasteIntoItem)
	2830	+ {
	2831	+ pasteInto(true, false);
	2832	+ } else
1905	2833	if (source == pasteLinkItem)
1906	2834	{
1907		- pasteInto(false);
	2835	+ pasteInto(false, false);
1908	2836	} else
1909	2837	if (source == pasteCloneItem)
1910	2838	{
1911		- pasteInto(true);
	2839	+ pasteInto(true, true);
1912	2840	} else
1913	2841	if (source == pasteExpandItem)
1914	2842	{
..	..	@@ -2100,9 +3028,9 @@
2100	3028	// group.selection.get(0).setMasterThis(content); // should be identity
2101	3029	// refreshContents();
2102	3030	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3031	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	3032	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	3033	+ Object3D content = Grafreed.clipboard.get(0);
2106	3034
2107	3035	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	3036	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +3038,11 @@
2110	3038	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	3039	for (int i=0; i<group.selection.size(); i++)
2112	3040	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	3041	+ boolean random = CameraPane.SWITCH;
	3042	+ CameraPane.SWITCH = false; // parse all random nodes
2115	3043	group.selection.get(i).linkVerticesThis(content);
2116	3044	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	3045	+ CameraPane.SWITCH = random;
2118	3046	}
2119	3047	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	3048	refreshContents();
..	..	@@ -2124,20 +3052,20 @@
2124	3052	{
2125	3053	for (int i=0; i<group.selection.size(); i++)
2126	3054	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	3055	+ boolean random = CameraPane.SWITCH;
	3056	+ CameraPane.SWITCH = false; // parse all random nodes
2129	3057	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	3058	+ CameraPane.SWITCH = random;
2131	3059	}
2132	3060
2133	3061	refreshContents();
2134	3062	} else
2135	3063	if (source == relinkverticesItem)
2136	3064	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	3065	+ boolean random = CameraPane.SWITCH;
	3066	+ CameraPane.SWITCH = false; // parse all random nodes
2139	3067	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	3068	+ CameraPane.SWITCH = random;
2141	3069
2142	3070	refreshContents();
2143	3071	} else
..	..	@@ -2152,9 +3080,9 @@
2152	3080	} else
2153	3081	if (source == setMasterItem)
2154	3082	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3083	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	3084	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	3085	+ Object3D content = Grafreed.clipboard.get(0);
2158	3086
2159	3087	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	3088	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +3095,9 @@
2167	3095	{
2168	3096	if (group.selection.size() == 1)
2169	3097	{
2170		- if (GrafreeD.clipboard.size() == 1)
	3098	+ if (Grafreed.clipboard.size() == 1)
2171	3099	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	3100	+ Object3D content = Grafreed.clipboard.get(0);
2173	3101
2174	3102	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	3103	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +3114,7 @@
2186	3114	{
2187	3115	RevertMeshes();
2188	3116	} else
2189		- if (source == resetMeshItem)
	3117	+ if (source == resetAllItem)
2190	3118	{
2191	3119	ResetAll();
2192	3120	} else
..	..	@@ -2194,7 +3122,7 @@
2194	3122	{
2195	3123	StepAll();
2196	3124	} else
2197		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3125	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2198	3126	{
2199	3127	//int indices[] = jList.getSelectedIndices();
2200	3128	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2206,9 +3134,9 @@
2206	3134	{
2207	3135	ClearSelection(true);
2208	3136	} else
2209		- if (source == grabItem)
	3137	+ if (source == grabItem \|\| source == groupButton)
2210	3138	{
2211		- group(new cGroup(), true);
	3139	+ group(new cGroup(), false); // true);
2212	3140	} else
2213	3141	if (source == hideItem)
2214	3142	{
..	..	@@ -2226,11 +3154,11 @@
2226	3154	{
2227	3155	makeSomething(new Camera());
2228	3156	} else
2229		- if (source == compositeItem)
	3157	+ if (source == compositeItem \|\| source == compositeButton)
2230	3158	{
2231	3159	group(new Composite());
2232	3160	} else
2233		- if (source == randomItem)
	3161	+ if (source == switchItem \|\| source == switchButton)
2234	3162	{
2235	3163	RandomNode random = new RandomNode();
2236	3164	group(random);
..	..	@@ -2332,7 +3260,7 @@
2332	3260	{
2333	3261	group(new cLinker());
2334	3262	} else
2335		- if (source == textureItem)
	3263	+ if (source == textureItem \|\| source == textureButton)
2336	3264	{
2337	3265	group(new TextureNode());
2338	3266	} else
..	..	@@ -2352,17 +3280,30 @@
2352	3280	{
2353	3281	CastShadow(2);
2354	3282	} else
2355		- if (source == ungroupItem)
	3283	+ if (source == ungroupItem \|\| source == ungroupButton)
2356	3284	{
2357		- //ungroup();
	3285	+ boolean hasRoot = false;
	3286	+
2358	3287	for (int i=0; i<group.selection.size(); i++)
2359	3288	{
2360		- Ungroup(group.selection.get(i));
	3289	+ if (group.selection.get(i) == group)
	3290	+ {
	3291	+ hasRoot = true;
	3292	+ break;
	3293	+ }
2361	3294	}
2362	3295
2363		- ClearSelection(false);
2364		-
2365		- refreshContents();
	3296	+ if (!hasRoot)
	3297	+ {
	3298	+ for (int i=0; i<group.selection.size(); i++)
	3299	+ {
	3300	+ Ungroup(group.selection.get(i));
	3301	+ }
	3302	+
	3303	+ ClearSelection(false);
	3304	+
	3305	+ refreshContents();
	3306	+ }
2366	3307	} else
2367	3308	if (source == genUVItem)
2368	3309	{
..	..	@@ -2374,7 +3315,7 @@
2374	3315	} else
2375	3316	if (source == genNormalsMESHItem)
2376	3317	{
2377		- GenNormals(true); // TODO
	3318	+ GenNormalsMESH();
2378	3319	} else
2379	3320	if (source == genNormalsORGANItem)
2380	3321	{
..	..	@@ -2439,6 +3380,22 @@
2439	3380	if (source == unmarkleavesItem)
2440	3381	{
2441	3382	MarkLeaves(false);
	3383	+ } else
	3384	+ if (source == rewindleavesItem)
	3385	+ {
	3386	+ RewindLeaves(true);
	3387	+ } else
	3388	+ if (source == unrewindleavesItem)
	3389	+ {
	3390	+ RewindLeaves(false);
	3391	+ } else
	3392	+ if (source == randomleavesItem)
	3393	+ {
	3394	+ RandomLeaves(true);
	3395	+ } else
	3396	+ if (source == unrandomleavesItem)
	3397	+ {
	3398	+ RandomLeaves(false);
2442	3399	} else
2443	3400	if (source == flipVItem)
2444	3401	{
..	..	@@ -2524,9 +3481,13 @@
2524	3481	{
2525	3482	SmoothMesh();
2526	3483	} else
2527		- if (source == transformgeometryItem)
	3484	+ if (source == transformGeometryItem)
2528	3485	{
2529	3486	TransformGeometry();
	3487	+ } else
	3488	+ if (source == transformChildrenItem)
	3489	+ {
	3490	+ TransformChildren();
2530	3491	} else
2531	3492	if (source == resetTransformItem)
2532	3493	{
..	..	@@ -2534,7 +3495,11 @@
2534	3495	} else
2535	3496	if (source == resetCentroidItem)
2536	3497	{
2537		- ResetCentroid();
	3498	+ ResetCentroid(true);
	3499	+ } else
	3500	+ if (source == resetCentroidXZItem)
	3501	+ {
	3502	+ ResetCentroid(false);
2538	3503	} else
2539	3504	if (source == resetParentItem)
2540	3505	{
..	..	@@ -2639,7 +3604,7 @@
2639	3604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2640	3605	{
2641	3606	obj = (Object3D)e.nextElement();
2642		- obj.SetBumpTexture(null);
	3607	+ obj.ResetBumpTexture();
2643	3608	}
2644	3609
2645	3610	refreshContents();
..	..	@@ -2655,6 +3620,31 @@
2655	3620
2656	3621	refreshContents();
2657	3622	} else
	3623	+ if (source == embedTexturesItem)
	3624	+ {
	3625	+ Object3D obj;
	3626	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3627	+ {
	3628	+ obj = (Object3D)e.nextElement();
	3629	+ obj.EmbedTextures(true);
	3630	+ }
	3631	+
	3632	+ refreshContents();
	3633	+ } else
	3634	+ if (source == deEmbedTexturesItem)
	3635	+ {
	3636	+ Object3D obj;
	3637	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3638	+ {
	3639	+ obj = (Object3D)e.nextElement();
	3640	+ obj.EmbedTextures(false);
	3641	+ }
	3642	+
	3643	+ CameraPane.texturepigment.clear();
	3644	+ CameraPane.texturebump.clear();
	3645	+
	3646	+ refreshContents();
	3647	+ } else
2658	3648	if (source == flashSelectionButton)
2659	3649	{
2660	3650	CameraPane.flash = true;
..	..	@@ -2666,6 +3656,10 @@
2666	3656	if (source == twoButton)
2667	3657	{
2668	3658	radio.layout = twoButton;
	3659	+
	3660	+ if (CameraPane.FULLSCREEN)
	3661	+ fullscreenLayout = radio.layout;
	3662	+
2669	3663	// bug
2670	3664	//gridPanel.setDividerLocation(1.0);
2671	3665	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2698,10 +3692,31 @@
2698	3692	bigThree.ClearUI();
2699	3693	bigThree.add(centralPanel);
2700	3694	bigThree.FlushUI();
	3695	+
	3696	+ cameraView.requestFocusInWindow();
	3697	+
	3698	+// refreshContents(true);
	3699	+//
	3700	+// try
	3701	+// {
	3702	+// java.awt.Robot bot = new java.awt.Robot();
	3703	+// int mask = InputEvent.BUTTON1_MASK;
	3704	+// bot.mouseMove(100, 100);
	3705	+// bot.mousePress(mask);
	3706	+// bot.mouseRelease(mask);
	3707	+// }
	3708	+// catch (Exception e)
	3709	+// {
	3710	+//
	3711	+// }
	3712	+
2701	3713	} else
2702	3714	if (source == threeButton)
2703	3715	{
2704	3716	radio.layout = threeButton;
	3717	+
	3718	+ if (CameraPane.FULLSCREEN)
	3719	+ fullscreenLayout = radio.layout;
2705	3720
2706	3721	// bigThree.remove(scenePanel);
2707	3722	// bigThree.remove(centralPanel);
..	..	@@ -2731,13 +3746,18 @@
2731	3746	// centralPanel.setVisible(true);
2732	3747	// XYZPanel.setVisible(true);
2733	3748	bigThree.ClearUI();
	3749	+ bigThree.add(scenePanel);
2734	3750	bigThree.add(centralPanel);
2735		- bigThree.add(XYZPanel);
2736	3751	bigThree.FlushUI();
	3752	+
	3753	+ cameraView.requestFocusInWindow();
2737	3754	} else
2738	3755	if (source == fourButton)
2739	3756	{
2740	3757	radio.layout = fourButton;
	3758	+
	3759	+ if (CameraPane.FULLSCREEN)
	3760	+ fullscreenLayout = radio.layout;
2741	3761
2742	3762	// bigThree.remove(scenePanel);
2743	3763	// bigThree.remove(centralPanel);
..	..	@@ -2769,10 +3789,15 @@
2769	3789	bigThree.ClearUI();
2770	3790	bigThree.add(scenePanel);
2771	3791	bigThree.FlushUI();
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2772	3794	} else
2773	3795	if (source == sixButton)
2774	3796	{
2775	3797	radio.layout = sixButton;
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
2776	3801
2777	3802	// bigThree.remove(scenePanel);
2778	3803	// bigThree.remove(centralPanel);
..	..	@@ -2802,13 +3827,18 @@
2802	3827	// centralPanel.setVisible(true);
2803	3828	// XYZPanel.setVisible(false);
2804	3829	bigThree.ClearUI();
2805		- bigThree.add(scenePanel);
2806	3830	bigThree.add(centralPanel);
	3831	+ bigThree.add(scenePanel);
2807	3832	bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2808	3835	} else
2809	3836	if (source == sevenButton)
2810	3837	{
2811	3838	radio.layout = sevenButton;
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
2812	3842
2813	3843	// bigThree.remove(scenePanel);
2814	3844	// bigThree.remove(centralPanel);
..	..	@@ -2842,6 +3872,8 @@
2842	3872	bigThree.add(centralPanel);
2843	3873	bigThree.add(XYZPanel);
2844	3874	bigThree.FlushUI();
	3875	+
	3876	+ cameraView.requestFocusInWindow();
2845	3877	} else
2846	3878	if (source == rootButton)
2847	3879	{
..	..	@@ -2853,6 +3885,7 @@
2853	3885	EditObject(obj);
2854	3886	}
2855	3887
	3888	+ cameraView.requestFocusInWindow();
2856	3889	refreshContents(true);
2857	3890	} else
2858	3891	if (source == closeButton)
..	..	@@ -2862,22 +3895,37 @@
2862	3895	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	3896	{
2864	3897	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3898	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	3899	{
	3900	+ // Patch to avoid bug with transparency.
	3901	+ if (!ab.hadMaterial)
	3902	+ {
	3903	+ ab.object.material = null;
	3904	+ }
	3905	+
2867	3906	buttonGroup.remove(ab);
2868	3907	radioPanel.remove(ab);
2869	3908
2870		- ab.GetObject().editWindow = null;
	3909	+ //ab.GetObject().editWindow = null;
	3910	+ ab.GetObject().manipWindow = null;
2871	3911	// ab.GetObject().objectUI = null; // ?????????
2872	3912
2873	3913	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	3914	break;
2875	3915	}
2876	3916	}
	3917	+
	3918	+ cameraView.requestFocusInWindow();
2877	3919	refreshContents(true);
2878	3920	} else
2879	3921	if (source == editItem \|\| source == editButton)
2880	3922	{
	3923	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3924	+ {
	3925	+ Object3D child = (Object3D)e.nextElement();
	3926	+ child.pinned = true;
	3927	+ }
	3928	+
2881	3929	EditSelection(false);
2882	3930	} else
2883	3931	if (source == uneditButton)
..	..	@@ -2886,11 +3934,12 @@
2886	3934	{
2887	3935	Object3D child = (Object3D)e.nextElement();
2888	3936	if(child.editWindow != null)
2889		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3937	+ child.pinned = false;
2890	3938	child.CloseUI();
2891	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2892	3941
2893		- child.editWindow = null; // ???????????
	3942	+ //child.editWindow = null; // ???????????
2894	3943	}
2895	3944	objEditor.ctrlPanel.FlushUI();
2896	3945	//objEditor.jTree.clearSelection();
..	..	@@ -2903,16 +3952,18 @@
2903	3952	//copy.ClearUI();
2904	3953	for (Object3D obj : listUI)
2905	3954	{
	3955	+ obj.pinned = false;
2906	3956	obj.CloseUI();
2907	3957	}
2908	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
2909	3960	refreshContents(true);
2910	3961	} else
2911	3962	if (source == allParamsButton)
2912	3963	{
2913	3964	assert(copy == group);
2914	3965
2915		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3966	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	3967
2917	3968	for (Object3D obj : listUI)
2918	3969	{
..	..	@@ -2961,6 +4012,9 @@
2961	4012	}
2962	4013
2963	4014	copy = group;
	4015	+
	4016	+ SetUndoStates();
	4017	+
2964	4018	//Globals.theRenderer.object = group;
2965	4019	if(!useclient)
2966	4020	{
..	..	@@ -2976,20 +4030,49 @@
2976	4030	frontView.object = group;
2977	4031	sideView.object = group;
2978	4032	}
2979		- group.editWindow = this;
	4033	+
	4034	+// fix "+" issue
	4035	+ //group.editWindow = this;
	4036	+ group.manipWindow = this;
	4037	+
2980	4038	/*
2981	4039	currentLayout = radio.layout;
2982	4040	if (currentLayout == null)
2983	4041	currentLayout = sevenButton;
2984	4042	*/
2985	4043	radio.layout.doClick();
	4044	+
	4045	+ ClearUnpinned();
	4046	+
	4047	+ //Grafreed.Assert(group != null);
	4048	+ //Grafreed.Assert(group.selection != null);
	4049	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4050	+ if (group.selection == null \|\| group.selection.size() == 1)
	4051	+ EditSelection(false);
2986	4052	keepparent = group.parent;
2987	4053	// PARENT = NULL or not???
2988	4054	//group.parent = null; // ROOT
2989	4055	//group.attributes = -1;
2990	4056	ResetModel();
	4057	+
	4058	+ cameraView.requestFocusInWindow();
2991	4059	refreshContents(true);
2992		- }
	4060	+ } else if (event.getSource() == editCameraItem)
	4061	+ {
	4062	+ cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
	4064	+ cameraView.repaint();
	4065	+ return;
	4066	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4067	+ {
	4068	+ cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
	4070	+ cameraView.repaint();
	4071	+ return;
	4072	+ // } else if (event.getSource() == textureButton)
	4073	+ // {
	4074	+ // return; // true;
	4075	+ }
2993	4076	else
2994	4077	{
2995	4078	//return super.action(event, arg);
..	..	@@ -2998,7 +4081,6 @@
2998	4081	}
2999	4082
3000	4083	boolean useclient = false;
3001		- cRadio radio;
3002	4084
3003	4085	void ToggleRoot()
3004	4086	{
..	..	@@ -3050,6 +4132,28 @@
3050	4132	refreshContents();
3051	4133	}
3052	4134
	4135	+ void TransformChildren()
	4136	+ {
	4137	+ Object3D obj;
	4138	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4139	+ {
	4140	+ obj = (Object3D)e.nextElement();
	4141	+ obj.KeepTextureMatrices();
	4142	+ obj.TransformChildren();
	4143	+ obj.RestoreTextureMatrices();
	4144	+
	4145	+// if (obj.parent == null)
	4146	+// {
	4147	+// System.out.println("NULL PARENT!");
	4148	+// new Exception().printStackTrace();
	4149	+// }
	4150	+// else
	4151	+// TouchTransform(obj);
	4152	+// //obj.parent.Touch();
	4153	+ }
	4154	+
	4155	+ refreshContents();
	4156	+ }
3053	4157
3054	4158	void ResetTransform()
3055	4159	{
..	..	@@ -3162,7 +4266,7 @@
3162	4266	refreshContents();
3163	4267	}
3164	4268
3165		- void ResetCentroid()
	4269	+ void ResetCentroid(boolean full)
3166	4270	{
3167	4271	Object3D obj;
3168	4272	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +4281,16 @@
3177	4281	LA.matIdentity(Object3D.mat);
3178	4282	obj.getBounds(minima, maxima, false);
3179	4283	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4284	+ if (full)
	4285	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	4286	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	4287	obj.TransformMesh(Object3D.mat);
	4288	+
3183	4289	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4290	+ if (full)
	4291	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	4292	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4293	+
3186	4294	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	4295	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	4296	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +4319,8 @@
3211	4319
3212	4320	int size = obj.MemorySize();
3213	4321
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	4322	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4323	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	4324	}
3216	4325	}
3217	4326	catch (Exception e)
..	..	@@ -3248,9 +4357,9 @@
3248	4357	obj = (Object3D)e.nextElement();
3249	4358
3250	4359	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	4360	+ Grafreed.AnalyzeObject(obj);
3252	4361	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	4362	+ Grafreed.AnalyzeObject(obj.bRep);
3254	4363
3255	4364	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	4365	}
..	..	@@ -3292,6 +4401,13 @@
3292	4401	void GenNormals(boolean crease)
3293	4402	{
3294	4403	group.GenNormalsS(crease);
	4404	+
	4405	+ refreshContents();
	4406	+ }
	4407	+
	4408	+ void GenNormalsMESH()
	4409	+ {
	4410	+ group.GenNormalsMeshS();
3295	4411
3296	4412	refreshContents();
3297	4413	}
..	..	@@ -3464,8 +4580,8 @@
3464	4580
3465	4581	void ParseVertices()
3466	4582	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	4583	+ boolean epsequal = Grafreed.epsequal;
	4584	+ Grafreed.epsequal = true;
3469	4585
3470	4586	for (int i=0; i<group.selection.size(); i++)
3471	4587	{
..	..	@@ -3490,7 +4606,7 @@
3490	4606	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	4607	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	4608
3493		- g.add(GrafreeD.clipboard);
	4609	+ g.add(Grafreed.clipboard);
3494	4610
3495	4611	buffer.add(g);
3496	4612	}
..	..	@@ -3505,7 +4621,7 @@
3505	4621	makeSomething(buffer, i==group.selection.size()-1);
3506	4622	}
3507	4623
3508		- GrafreeD.epsequal = epsequal;
	4624	+ Grafreed.epsequal = epsequal;
3509	4625
3510	4626	refreshContents();
3511	4627	}
..	..	@@ -3523,7 +4639,16 @@
3523	4639	String pigment = Object3D.GetPigment(tex);
3524	4640	//String bump = Object3D.GetBump(tex);
3525	4641
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4642	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4643	+
	4644	+ try
	4645	+ {
	4646	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4647	+ }
	4648	+ catch (Exception e)
	4649	+ {
	4650	+ System.err.println("FAIL: " + node);
	4651	+ }
3527	4652
3528	4653	double s = v.s;
3529	4654
..	..	@@ -3611,11 +4736,11 @@
3611	4736
3612	4737	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	4738
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	4739	+ boolean random = CameraPane.SWITCH;
	4740	+ CameraPane.SWITCH = false; // parse all random nodes
3616	4741	lowres.linkVerticesThis(null);
3617	4742	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	4743	+ CameraPane.SWITCH = random;
3619	4744
3620	4745	System.err.flush();
3621	4746
..	..	@@ -3655,7 +4780,7 @@
3655	4780	return;
3656	4781
3657	4782	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4783	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4784
3660	4785	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4786
..	..	@@ -3849,9 +4974,9 @@
3849	4974
3850	4975	void ClipMesh()
3851	4976	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4977	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4978	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4979	+ Object3D content = Grafreed.clipboard.get(0);
3855	4980
3856	4981	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4982	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4985,7 @@
3860	4985	// {
3861	4986	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4987	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4988	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4989	}
3865	4990	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4991	System.out.println("DONE.");
..	..	@@ -3907,6 +5032,18 @@
3907	5032	void MarkLeaves(boolean hide)
3908	5033	{
3909	5034	group.selection.MarkLeaves(hide);
	5035	+ refreshContents();
	5036	+ }
	5037	+
	5038	+ void RewindLeaves(boolean hide)
	5039	+ {
	5040	+ group.selection.RewindLeaves(hide);
	5041	+ refreshContents();
	5042	+ }
	5043	+
	5044	+ void RandomLeaves(boolean hide)
	5045	+ {
	5046	+ group.selection.RandomLeaves(hide);
3910	5047	refreshContents();
3911	5048	}
3912	5049
..	..	@@ -3981,28 +5118,25 @@
3981	5118	// }
3982	5119	// }
3983	5120
3984		- static boolean allparams = true;
3985		-
3986		- static Vector<Object3D> listUI = new Vector<Object3D>();
3987		-
3988	5121	void EditSelection(boolean newWindow)
3989	5122	{
	5123	+ if (group.selection == null)
	5124	+ {
	5125	+ EditElement(group, newWindow); // ? new
	5126	+ return;
	5127	+ }
	5128	+
3990	5129	// aConstraints.gridy = 0;
3991	5130	for (int i=0; i<group.selection.size(); i++)
3992	5131	{
3993	5132	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3994	5133	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3995		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5134	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	5135
3997	5136	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	5137	+ if(elem != group \|\| !newWindow)
3999	5138	{
4000		- // if (!(elem instanceof Composite))
4001		- // newWindow = false;
4002		- listUI.add(elem);
4003		- elem.openEditWindow(this, newWindow); //, false);
4004		- System.out.println("edit : " + elem);
4005		- elem.editWindow.refreshContents(true); // ? new
	5139	+ EditElement(elem, newWindow); // ? new
4006	5140	}
4007	5141	}
4008	5142	}
..	..	@@ -4065,9 +5199,7 @@
4065	5199
4066	5200	freezemodel = false;
4067	5201	}
4068		-
4069		- boolean flashIt = true;
4070		-
	5202	+
4071	5203	public void valueChanged(TreeSelectionEvent e)
4072	5204	//public boolean handleEvent(Event event)
4073	5205	{
..	..	@@ -4077,7 +5209,8 @@
4077	5209	//new Exception().printStackTrace();
4078	5210
4079	5211	freezemodel = true;
4080		-
	5212	+ ClearUnpinned();
	5213	+
4081	5214	/**/
4082	5215	//switch (event.id)
4083	5216	{
..	..	@@ -4085,7 +5218,6 @@
4085	5218	//case 702: // Event.LIST_DESELECT
4086	5219	group.deselectAll();
4087	5220	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	5221	if (tps != null)
4090	5222	{
4091	5223	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +5226,8 @@
4094	5226
4095	5227	//if (child.parent != null)
4096	5228	//child.parent.addSelectee(child);
	5229	+ objEditor.SetMaterial(child);
4097	5230	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	5231	}
4102	5232	}
4103	5233	// else
..	..	@@ -4107,20 +5237,28 @@
4107	5237	// System.err.println("info : " + group.GetPath());
4108	5238	// }
4109	5239
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5240	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	5241	CameraPane.flash = true;
4114	5242
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5243	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	5244	// a camera
4117	5245	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5246	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5247	+ {
	5248	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5249	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5250	+ }
4120	5251	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	5252	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	5253	}
4123	5254
	5255	+ if (tps != null && tps.length == 1)
	5256	+ {
	5257	+ EditSelection(false);
	5258	+ }
	5259	+
	5260	+ SetPinStates(tps != null && tps.length > 0);
	5261	+
4124	5262	refreshContents();
4125	5263	//return true;
4126	5264	}
..	..	@@ -4129,6 +5267,37 @@
4129	5267
4130	5268	freezemodel = false;
4131	5269	}
	5270	+
	5271	+ void SetPinStates(boolean enabled)
	5272	+ {
	5273	+ editButton.setEnabled(enabled);
	5274	+ uneditButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
	5276	+ flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5279	+ }
	5280	+
	5281	+ void refreshContents(boolean cp)
	5282	+ {
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5284	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5285	+ {
	5286	+ objEditor.ClearInfo(); // .GetMaterial());
	5287	+
	5288	+ for (int i=0; i < group.selection.Size(); i++)
	5289	+ {
	5290	+ Object3D child = (Object3D) group.selection.get(i);
	5291	+
	5292	+ objEditor.AddInfo(child, this, true);
	5293	+ System.err.println("info : " + child.GetPath());
	5294	+ }
	5295	+
	5296	+ objEditor.SetText(); // jan 2014
	5297	+ }
	5298	+
	5299	+ super.refreshContents(cp);
	5300	+ }
4132	5301
4133	5302	void linkSomething(Object3D thing)
4134	5303	{
..	..	@@ -4200,16 +5369,19 @@
4200	5369	{
4201	5370	if (group.selection.isEmpty())
4202	5371	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	5372	+
	5373	+ Grafreed.clipboardIsTempGroup = false;
4204	5374	Composite tGroup = null;
4205	5375	if (group.selection.size() > 0) // 1)
4206	5376	{
4207	5377	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	5378	+ Grafreed.clipboardIsTempGroup = true;
4209	5379	}
4210	5380
4211	5381	if (cut)
4212	5382	{
	5383	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5384	+// Save();
4213	5385	//int indices[] = jList.getSelectedIndices();
4214	5386	//for (int i = indices.length - 1; i >= 0; i--)
4215	5387	//jList.remove(indices[i]);
..	..	@@ -4245,16 +5417,16 @@
4245	5417	//System.out.println("cut " + child);
4246	5418	//System.out.println("parent = " + child.parent);
4247	5419	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	5420	+ if (Grafreed.clipboardIsTempGroup)
4249	5421	tGroup.add/Child/(tmp);
4250	5422	else
4251		- GrafreeD.clipboard = tmp;
	5423	+ Grafreed.clipboard = tmp;
4252	5424	}
4253	5425	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	5426	+ if (Grafreed.clipboardIsTempGroup)
4255	5427	tGroup.add/Child/(child);
4256	5428	else
4257		- GrafreeD.clipboard = child;
	5429	+ Grafreed.clipboard = child;
4258	5430	}
4259	5431
4260	5432	//ResetModel();
..	..	@@ -4286,21 +5458,23 @@
4286	5458	//System.out.println("cut " + elem);
4287	5459	//System.out.println("parent = " + elem.parent);
4288	5460	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	5461	+ if (Grafreed.clipboardIsTempGroup)
4290	5462	tGroup.add/Child/(tmp);
4291	5463	else
4292		- GrafreeD.clipboard = tmp;
	5464	+ Grafreed.clipboard = tmp;
4293	5465	}
4294	5466	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	5467	+ if (Grafreed.clipboardIsTempGroup)
4296	5468	tGroup.add/Child/(child);
4297	5469	else
4298		- GrafreeD.clipboard = child;
	5470	+ Grafreed.clipboard = child;
4299	5471	}
4300	5472
4301	5473	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	5474	+
	5475	+ if (Grafreed.clipboardIsTempGroup)
	5476	+ Grafreed.clipboard = tGroup;
	5477	+
4304	5478	if (cut)
4305	5479	{
4306	5480	ResetModel();
..	..	@@ -4310,11 +5484,15 @@
4310	5484
4311	5485	void paste(boolean expand)
4312	5486	{
	5487	+ if (Globals.REPLACEONMAKE)
	5488	+ Save();
	5489	+ boolean keep = Globals.REPLACEONMAKE;
	5490	+ Globals.REPLACEONMAKE = false;
4313	5491	// if (GrafreeD.clipboard == null)
4314	5492	// return;
4315	5493	boolean first = true;
4316	5494
4317		- if (GrafreeD.clipboardIsTempGroup)
	5495	+ if (Grafreed.clipboardIsTempGroup)
4318	5496	{
4319	5497	Composite temp;
4320	5498
..	..	@@ -4325,7 +5503,7 @@
4325	5503	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	5504	*/
4327	5505	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5506	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	5507	{
4330	5508	Object3D child = (Object3D)e.nextElement();
4331	5509
..	..	@@ -4359,21 +5537,22 @@
4359	5537	//Object3D cb = Applet3D.clipboard;
4360	5538	//temp.addChild(cb);
4361	5539	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5540	+ assert(Grafreed.clipboard.parent == null);
	5541	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5542	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5543	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5544	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	5545	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	5546	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5547	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	5548	}
4371	5549
	5550	+ Globals.REPLACEONMAKE = keep;
4372	5551	ResetModel();
4373	5552	refreshContents();
4374	5553	}
4375	5554
4376		- void pasteInto(boolean copyit)
	5555	+ void pasteInto(boolean copyit, boolean clone)
4377	5556	{
4378	5557	// if (GrafreeD.clipboard == null)
4379	5558	// return;
..	..	@@ -4402,15 +5581,22 @@
4402	5581	if (copyit)
4403	5582	{
4404	5583	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	5584	+ if (clone)
	5585	+ {
	5586	+ CloneClipboard(false); // sept 2014
	5587	+ }
	5588	+ else
	5589	+ {
	5590	+ paste(false);
	5591	+ }
4406	5592	}
4407	5593	else
4408	5594	{
4409	5595	boolean first = true;
4410	5596
4411		- if (GrafreeD.clipboardIsTempGroup)
	5597	+ if (Grafreed.clipboardIsTempGroup)
4412	5598	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	5599	+ Composite temp = (Composite)Grafreed.clipboard;
4414	5600	Object3D copy;
4415	5601	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	5602	{
..	..	@@ -4420,7 +5606,7 @@
4420	5606	}
4421	5607	} else
4422	5608	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	5609	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	5610	}
4425	5611	}
4426	5612	}
..	..	@@ -4497,6 +5683,10 @@
4497	5683
4498	5684	void group(Object3D csg, boolean grab)
4499	5685	{
	5686	+ if (Globals.REPLACEONMAKE)
	5687	+ Save();
	5688	+ boolean keep = Globals.REPLACEONMAKE;
	5689	+ Globals.REPLACEONMAKE = false;
4500	5690	if (//false) // why??
4501	5691	!group.selection.isEmpty())
4502	5692	{
..	..	@@ -4610,10 +5800,15 @@
4610	5800	//node.add(csg);
4611	5801	//makeSomething(node);
4612	5802	makeSomething(csg);
	5803	+ Globals.REPLACEONMAKE = keep;
4613	5804	}
4614	5805
4615	5806	void Ungroup(Object3D g)
4616	5807	{
	5808	+ if (Globals.REPLACEONMAKE)
	5809	+ Save();
	5810	+ boolean keep = Globals.REPLACEONMAKE;
	5811	+ Globals.REPLACEONMAKE = false;
4617	5812	if (g instanceof HiddenObject)
4618	5813	{
4619	5814	HiddenObject h = (HiddenObject) g;
..	..	@@ -4630,6 +5825,7 @@
4630	5825	objEditor.makeSomething(g.get(i), false);
4631	5826	}
4632	5827	}
	5828	+ Globals.REPLACEONMAKE = keep;
4633	5829	}
4634	5830
4635	5831	void ungroup()
..	..	@@ -4825,21 +6021,6 @@
4825	6021	}
4826	6022	*/
4827	6023
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	6024	/*
4844	6025	public void Callback(Object obj)
4845	6026	{
..	..	@@ -4863,26 +6044,9 @@
4863	6044	}
4864	6045	*/
4865	6046
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	6047	String GetFile(String dialogName)
4884	6048	{
4885		- if (GrafreeD.standAlone)
	6049	+ if (Grafreed.standAlone)
4886	6050	{
4887	6051	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	6052	browser.show();
..	..	@@ -4950,6 +6114,44 @@
4950	6114	cButton clearpanelButton;
4951	6115	cButton unselectButton;
4952	6116
	6117	+ cButton restoreCameraButton;
	6118	+
	6119	+ cButton oneStepButton;
	6120	+
	6121	+ cButton groupButton;
	6122	+ cButton ungroupButton;
	6123	+ cButton compositeButton;
	6124	+ cButton switchButton;
	6125	+ cButton loopButton;
	6126	+ cButton textureButton;
	6127	+
	6128	+ cButton skybox1Button;
	6129	+ cButton skybox2Button;
	6130	+ cButton skybox3Button;
	6131	+ cButton skybox4Button;
	6132	+ cButton skybox5Button;
	6133	+ cButton skybox6Button;
	6134	+ cButton skybox7Button;
	6135	+
	6136	+ cButton skybox11Button;
	6137	+ cButton skybox12Button;
	6138	+ cButton skybox13Button;
	6139	+ cButton skybox14Button;
	6140	+ cButton skybox15Button;
	6141	+ cButton skybox16Button;
	6142	+ cButton skybox17Button;
	6143	+
	6144	+ cButton gridButton;
	6145	+ cButton boxButton;
	6146	+ cButton sphereButton;
	6147	+ cButton coneButton;
	6148	+ cButton torusButton;
	6149	+ cButton superButton;
	6150	+ cButton kleinButton;
	6151	+ cButton particlesButton;
	6152	+ cButton overlayButton;
	6153	+ cButton lightButton;
	6154	+
4953	6155	cButton screenfitButton;
4954	6156	cButton screenfitpointButton;
4955	6157	cButton snapobjectButton;
..	..	@@ -4961,14 +6163,6 @@
4961	6163
4962	6164	cButton setsupportButton;
4963	6165
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971		-
4972	6166	//
4973	6167	//Composite
4974	6168	Object3D // to do !!
..	..	@@ -4978,9 +6172,11 @@
4978	6172	//JTree jTree;
4979	6173	private MenuItem lookAtItem;
4980	6174	private MenuItem lookFromItem;
4981		- private MenuItem switchItem;
	6175	+ private MenuItem switchViewItem;
4982	6176	private MenuItem cutItem;
4983		- private MenuItem duplicateItem;
	6177	+ private MenuItem undoItem;
	6178	+ private MenuItem redoItem;
	6179	+ private JMenuItem duplicateItem;
4984	6180	private MenuItem cloneItem;
4985	6181	private MenuItem cloneSupportItem;
4986	6182	private MenuItem overwriteGeoItem;
..	..	@@ -4993,7 +6189,7 @@
4993	6189	private MenuItem linkverticesItem;
4994	6190	private MenuItem relinkverticesItem;
4995	6191	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	6192	+ private MenuItem resetAllItem;
4997	6193	private MenuItem stepAllItem;
4998	6194	private MenuItem revertMeshItem;
4999	6195	private MenuItem poseMeshItem;
..	..	@@ -5004,10 +6200,11 @@
5004	6200	private MenuItem mergeGeometriesItem;
5005	6201	private MenuItem copyItem;
5006	6202	private MenuItem pasteItem;
	6203	+ private MenuItem pasteIntoItem;
5007	6204	private MenuItem pasteLinkItem;
5008	6205	private MenuItem pasteCloneItem;
5009	6206	private MenuItem pasteExpandItem;
5010		- private MenuItem clearItem;
	6207	+ private MenuItem deleteItem;
5011	6208	private MenuItem clearAllItem;
5012	6209	private MenuItem genUVItem;
5013	6210	private MenuItem genNormalsMESHItem;
..	..	@@ -5042,6 +6239,10 @@
5042	6239	private MenuItem showleavesItem;
5043	6240	private MenuItem markleavesItem;
5044	6241	private MenuItem unmarkleavesItem;
	6242	+ private MenuItem rewindleavesItem;
	6243	+ private MenuItem unrewindleavesItem;
	6244	+ private MenuItem randomleavesItem;
	6245	+ private MenuItem unrandomleavesItem;
5045	6246
5046	6247	private MenuItem flipVItem;
5047	6248	private MenuItem unflipVItem;
..	..	@@ -5053,15 +6254,17 @@
5053	6254	private MenuItem panoTexturesItem;
5054	6255
5055	6256	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	6257	+ private MenuItem resetCentroidXZItem;
5057	6258	private MenuItem resetTransformItem;
	6259	+ private MenuItem transformGeometryItem;
	6260	+ private MenuItem transformChildrenItem;
5058	6261	private MenuItem hideItem;
5059	6262	private MenuItem grabItem;
5060	6263	private MenuItem backItem;
5061	6264	private MenuItem frontItem;
5062	6265	private MenuItem cameraItem;
5063	6266	private MenuItem compositeItem;
5064		- private MenuItem randomItem;
	6267	+ private MenuItem switchItem;
5065	6268	private MenuItem physicsItem;
5066	6269	private MenuItem frameselectorItem;
5067	6270	private MenuItem scriptNodeItem;
..	..	@@ -5085,6 +6288,8 @@
5085	6288	private MenuItem attachBumpItem;
5086	6289	private MenuItem detachBumpItem;
5087	6290	private MenuItem pigmentBumpItem;
	6291	+ private MenuItem embedTexturesItem;
	6292	+ private MenuItem deEmbedTexturesItem;
5088	6293
5089	6294	private MenuItem particleItem;
5090	6295	private MenuItem ragdollItem;
..	..	@@ -5101,7 +6306,7 @@
5101	6306	private MenuItem blobItem;
5102	6307	private MenuItem latheItem;
5103	6308	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	6309	+ private MenuItem overlayItem;
5105	6310	private MenuItem meshItem;
5106	6311	// private MenuItem meshGroupItem;
5107	6312	private MenuItem springItem;
..	..	@@ -5123,11 +6328,6 @@
5123	6328	private MenuItem doubleItem;
5124	6329	private MenuItem tripleItem;
5125	6330
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	6331	private MenuItem computeAOItem;
5132	6332	private MenuItem recompileItem;
5133	6333	private MenuItem editScriptItem;
..	..	@@ -5137,4 +6337,8 @@
5137	6337	private MenuItem analyzeItem;
5138	6338	private MenuItem dumpItem;
5139	6339	//boolean freezemodel = false;
	6340	+
	6341	+ Menu cameraMenu;
	6342	+ MenuItem editCameraItem;
	6343	+ MenuItem restoreCameraItem;
5140	6344	}