~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,360 @@
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.equals("") ? "No background" : 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", "", 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	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -74,16 +437,28 @@
74	437	this.copy = this.group = copy;
75	438	//selectees = this.group.selectees;
76	439
77		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
78	441	SetupUI2(objEditor);
79	442	objEditor.SetupUI(true);
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +469,19 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
100	476	{
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));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	482	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
109	485	}
110	486
111	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +495,7 @@
119	495	// obj.support = null;
120	496	if (!supports)
121	497	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	499	obj.parent = parent;
124	500	// obj.support = support;
125	501	// clone.support = support; // aout 2013
..	..	@@ -148,40 +524,37 @@
148	524
149	525	//JTextField nameField;
150	526
151		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
152	528	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	529	+ oe.jTree = new cTree();
	530	+
168	531	Menu menu;
169	532	oe.menuBar.add(menu = new Menu("Edit"));
170	533	//editItem = menu.add(new MenuItem("Edit"));
171	534	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	542	duplicateItem.addActionListener(this);
	543	+ cloneItem = menu.add(new MenuItem("Clone"));
	544	+ cloneItem.addActionListener(this);
	545	+ if (Globals.ADVANCED)
	546	+ {
	547	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	548	+ cloneSupportItem.addActionListener(this);
	549	+ }
	550	+ menu.add("-");
174	551	cutItem = menu.add(new MenuItem("Cut"));
175	552	cutItem.addActionListener(this);
176	553	copyItem = menu.add(new MenuItem("Copy"));
177	554	copyItem.addActionListener(this);
178	555	pasteItem = menu.add(new MenuItem("Paste"));
179	556	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	557	+
185	558	menu.add("-");
186	559	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	560	pasteIntoItem.addActionListener(this);
..	..	@@ -192,8 +565,8 @@
192	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
193	566	// pasteExpandItem.addActionListener(this);
194	567	menu.add("-");
195		- clearItem = menu.add(new MenuItem("Clear"));
196		- clearItem.addActionListener(this);
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
197	570
198	571	if (Globals.ADVANCED)
199	572	{
..	..	@@ -201,14 +574,95 @@
201	574	clearAllItem = menu.add(new MenuItem("Clear All"));
202	575	clearAllItem.addActionListener(this);
203	576	}
	577	+
	578	+ menuBar.add(cameraMenu = new Menu("View"));
	579	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	580	+ //zBufferItem.addActionListener(this);
	581	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	582	+ //normalLensItem.addActionListener(this);
	583	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	584	+ restoreCameraItem.addActionListener(this);
	585	+
	586	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	587	+// toggleFullScreenItem.addItemListener(this);
	588	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	589	+// cameraMenu.add("-");
	590	+//
	591	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	592	+// toggleTextureItem.addItemListener(this);
	593	+// toggleTextureItem.setState(CameraPane.textureon);
	594	+//
	595	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	596	+// toggleSwitchItem.addItemListener(this);
	597	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	598	+
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	600	+ toggleHandleItem.addItemListener(this);
	601	+ toggleHandleItem.setState(CameraPane.HANDLES);
	602	+
	603	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	604	+ togglePaintItem.addItemListener(this);
	605	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	606	+
	607	+ if (Globals.ADVANCED)
	608	+ {
	609	+ cameraMenu.add("-");
	610	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	611	+ toggleLiveItem.addItemListener(this);
	612	+ toggleLiveItem.setState(Globals.isLIVE());
204	613
	614	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	615	+ stepItem.addActionListener(this);
	616	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	617	+ // toggleDLItem.addItemListener(this);
	618	+ // toggleDLItem.setState(false);
	619	+
	620	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	621	+ toggleRenderItem.addItemListener(this);
	622	+ toggleRenderItem.setState(!CameraPane.frozen);
	623	+
	624	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	625	+ toggleDebugItem.addItemListener(this);
	626	+ toggleDebugItem.setState(Globals.DEBUG);
	627	+
	628	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	629	+ toggleFrustumItem.addItemListener(this);
	630	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	631	+
	632	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	633	+ toggleFootContactItem.addItemListener(this);
	634	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	635	+
	636	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	637	+ toggleTimelineItem.addItemListener(this);
	638	+ }
	639	+
	640	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	641	+// toggleRootItem.addItemListener(this);
	642	+// toggleRootItem.setState(false);
	643	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	644	+// animationItem.addItemListener(this);
	645	+// animationItem.setState(CameraPane.ANIMATION);
	646	+ cameraMenu.add("-");
	647	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	648	+ editCameraItem.addActionListener(this);
	649	+
	650	+ if (Globals.ADVANCED)
	651	+ {
	652	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	653	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	654	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	655	+ oe.cameraMenu.add("-");
	656	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	657	+ openWindowItem.addActionListener(this);
	658	+ lookAtItem.addActionListener(this);
	659	+ //lookFromItem.addActinoListener(this);
	660	+ //switchViewItem.addActionListener(this);
	661	+ }
	662	+
205	663	oe.menuBar.add(menu = new Menu("Setting"));
206	664	if (Globals.ADVANCED)
207	665	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	666	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	667	revertMeshItem.addActionListener(this);
214	668	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +702,29 @@
248	702	}
249	703
250	704	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	705	+// grabItem = menu.add(new MenuItem("Grab"));
	706	+// grabItem.addActionListener(this);
253	707	backItem = menu.add(new MenuItem("Back"));
254	708	backItem.addActionListener(this);
255	709	frontItem = menu.add(new MenuItem("Front"));
256	710	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ if (Globals.ADVANCED)
	715	+ {
259	716	hideItem = menu.add(new MenuItem("Hidden Group"));
260	717	hideItem.addActionListener(this);
	718	+ }
261	719	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	720	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	721	+
	722	+// menu.add("-");
	723	+//
	724	+// switchItem = menu.add(new MenuItem("Switch node"));
	725	+// switchItem.addActionListener(this);
	726	+ if (Globals.ADVANCED)
	727	+ {
266	728	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	729	switchGeoItem.addActionListener(this);
268	730	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +732,52 @@
270	732	morphItem = menu.add(new MenuItem("Morph Group"));
271	733	morphItem.addActionListener(this);
272	734
273		- if (Globals.ADVANCED)
274		- {
	735	+ menu.add("-");
275	736	physicsItem = menu.add(new MenuItem("Physics"));
276	737	physicsItem.addActionListener(this);
277	738	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	739	frameselectorItem.addActionListener(this);
279	740	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	741	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	742	}
284	743
285	744	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	745	+// textureItem = menu.add(new MenuItem("Texture"));
	746	+// textureItem.addActionListener(this);
288	747	billboardItem = menu.add(new MenuItem("Billboard"));
289	748	billboardItem.addActionListener(this);
290	749	csgItem = menu.add(new MenuItem("CSG"));
291	750	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	751	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	752	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	753	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	754	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	755	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	756	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	757	attributeItem = menu.add(new MenuItem("Attribute"));
303	758	attributeItem.addActionListener(this);
	759	+
	760	+ if (Globals.ADVANCED)
	761	+ {
	762	+ menu.add("-");
	763	+ linkerItem = menu.add(new MenuItem("Linker"));
	764	+ linkerItem.addActionListener(this);
304	765	templateItem = menu.add(new MenuItem("Template"));
305	766	templateItem.addActionListener(this);
306	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	768	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	769	}
	770	+ menu.add("-");
310	771	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	772	resetTransformItem.addActionListener(this);
312	773	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	774	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	775	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	776	+ resetCentroidXZItem.addActionListener(this);
	777	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	778	+ transformGeometryItem.addActionListener(this);
	779	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	780	+ transformChildrenItem.addActionListener(this);
316	781
317	782	oe.menuBar.add(menu = new Menu("Geometry"));
318	783	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -325,7 +790,7 @@
325	790	genNormalsMESHItem.addActionListener(this);
326	791	if (Globals.ADVANCED)
327	792	{
328		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
329	794	genNormalsMINEItem.addActionListener(this);
330	795	}
331	796	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -361,6 +826,10 @@
361	826	oe.menuBar.add(menu = new Menu("Attributes"));
362	827	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	828	clearMaterialsItem.addActionListener(this);
	829	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	830	+ resetAllItem.addActionListener(this);
	831	+ stepAllItem = menu.add(new MenuItem("Step All"));
	832	+ stepAllItem.addActionListener(this);
364	833	menu.add("-");
365	834	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	835	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +850,14 @@
381	850	markleavesItem.addActionListener(this);
382	851	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	852	unmarkleavesItem.addActionListener(this);
	853	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	854	+ rewindleavesItem.addActionListener(this);
	855	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	856	+ unrewindleavesItem.addActionListener(this);
	857	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	858	+ randomleavesItem.addActionListener(this);
	859	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	860	+ unrandomleavesItem.addActionListener(this);
384	861	menu.add("-");
385	862	flipVItem = menu.add(new MenuItem("Flip V"));
386	863	flipVItem.addActionListener(this);
..	..	@@ -406,55 +883,129 @@
406	883	attachBumpItem.addActionListener(this);
407	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
408	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
409	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
410	888	detachPigmentItem.addActionListener(this);
411	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
412	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
413	895	menu.add("-");
414	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
415	897	sortbysizeItem.addActionListener(this);
416	898	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	899	sortbynameItem.addActionListener(this);
	900	+ menu.add("-");
	901	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	902	+ shareGeometriesItem.addActionListener(this);
	903	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	904	+ mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
418	908	if (Globals.ADVANCED)
419	909	{
420		- menu.add("-");
	910	+ // Pretty much the same as duplicate and clone.
421	911	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	912	extractGeometriesItem.addActionListener(this);
423	913	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	914	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	915	}
430	916
431	917	oe.menuBar.add(menu = new Menu("Insert"));
432	918	buildCreateMenu(menu);
433	919
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	920	oe.menuBar.add(menu = new Menu("Tools"));
445	921	buildToolsMenu(menu);
446	922	}
447	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
448	992	void SetupUI2(ObjEditor oe)
449	993	{
	994	+ // June 2019
	995	+ if (oe == null)
	996	+ {
	997	+ //super.SetupUI2(this);
	998	+ //return;
	999	+ }
	1000	+
	1001	+ if (copy != group)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ }
	1005	+
450	1006	//new Exception().printStackTrace();
451	1007
452	1008	oe.radioPanel = new JPanel(new GridBagLayout());
453		- oe.aConstraints.weightx = 1;
454		- oe.aConstraints.weighty = 0;
455		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
456		- oe.aConstraints.gridwidth = 100;
457		- oe.aConstraints.gridheight = 1;
458	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
459	1010
460	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -475,97 +1026,262 @@
475	1026	oe.radioPanel.add(dummyButton);
476	1027	oe.buttonGroup.add(dummyButton);
477	1028	*/
	1029	+ cGridBag copyOptionsPanel = new cGridBag();
	1030	+
	1031	+ copyOptionsPanel.preferredHeight = 2;
	1032	+
478	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	1034
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
482		- liveCB.addItemListener(this);
	1035	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ //minButton.setToolTipText("Minimize window");
	1037	+ //minButton.addActionListener(this);
	1038	+
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
	1084	+
	1085	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ fullButton.setToolTipText("Full-screen window");
	1087	+ fullButton.addActionListener(this);
	1088	+
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ screenfitButton.setToolTipText("Screen fit");
	1091	+ screenfitButton.addActionListener(this);
483	1092
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1095	+ restoreCameraButton.addActionListener(this);
	1096	+
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
	1109	+
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
	1115	+
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
	1120	+
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	1129	oneStepButton.setToolTipText("Animate one step forward");
486	1130	oneStepButton.addActionListener(this);
487	1131
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	1137	fastCB.setToolTipText("Fast mode");
490	1138	fastCB.addItemListener(this);
491	1139
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- screenfitButton.addActionListener(this);
	1140	+ //oe.toolboxPanel.Return();
	1141	+
	1142	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1143	+// trackCB.setToolTipText("Enable tracking");
	1144	+// trackCB.addItemListener(this);
499	1145
500	1146	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	1147	// screenfitpointButton.addActionListener(this);
502	1148
503	1149	if (Globals.ADVANCED)
504	1150	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	1152	snapobjectButton.addActionListener(this);
507	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
508	1158	}
509	1159
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	1160	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	1161
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
517		- twoButton.setToolTipText("Show center view only");
518		- twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520		- fourButton.addActionListener(this);
521		- fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523		- sixButton.setToolTipText("2-column layout left");
524		- sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526		- threeButton.setToolTipText("2-column layout right");
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529		- sevenButton.setToolTipText("3-column layout");
530		- sevenButton.addActionListener(this);
531		- //
532	1162
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534		- rootButton.setToolTipText("Edit selection in new tab");
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
535	1165	rootButton.addActionListener(this);
536	1166
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	1168	closeButton.setToolTipText("Close tab");
539	1169	closeButton.addActionListener(this);
540	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	1171	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	1172	+
	1173	+ cGridBag row1 = new cGridBag();
544	1174
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	1175	+ // INSERT
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
	1178	+ gridButton.addActionListener(this);
	1179	+
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ boxButton.setToolTipText("Create box");
	1182	+ boxButton.addActionListener(this);
	1183	+
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ sphereButton.setToolTipText("Create sphere");
	1186	+ sphereButton.addActionListener(this);
	1187	+
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ coneButton.setToolTipText("Create cone");
	1190	+ coneButton.addActionListener(this);
	1191	+
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ torusButton.setToolTipText("Create torus");
	1194	+ torusButton.addActionListener(this);
	1195	+
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ superButton.setToolTipText("Create superellipsoid");
	1198	+ superButton.addActionListener(this);
	1199	+
	1200	+ if (Globals.ADVANCED)
	1201	+ {
	1202	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ kleinButton.setToolTipText("Create Klein bottle");
	1204	+ kleinButton.addActionListener(this);
	1205	+ }
	1206	+
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ particlesButton.setToolTipText("Create particle system");
	1209	+ particlesButton.addActionListener(this);
	1210	+
	1211	+ oe.toolboxPanel.add(row1);
	1212	+
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ groupButton.setToolTipText("Create group");
	1217	+ groupButton.addActionListener(this);
	1218	+
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ compositeButton.setToolTipText("Create composite");
	1221	+ compositeButton.addActionListener(this);
	1222	+
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
	1225	+ switchButton.addActionListener(this);
	1226	+
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ loopButton.setToolTipText("Create loop");
	1229	+ loopButton.addActionListener(this);
	1230	+
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ textureButton.setToolTipText("Create texture");
	1233	+ textureButton.addActionListener(this);
	1234	+
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ overlayButton.setToolTipText("Create overlay");
	1237	+ overlayButton.addActionListener(this);
	1238	+
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ lightButton.setToolTipText("Create light");
	1241	+ lightButton.addActionListener(this);
	1242	+
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
	1255	+ // EDIT panel
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
547	1258	editButton.addActionListener(this);
548	1259
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
551	1262	uneditButton.addActionListener(this);
552	1263
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	1264	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1265	+ allParamsButton.setToolTipText("Show all controls");
555	1266	allParamsButton.addActionListener(this);
556	1267
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
559	1270	clearPanelButton.addActionListener(this);
560	1271
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
562		- unselectButton.setToolTipText("Unselect");
563		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
564	1275
565		- commandsPanel.preferredHeight = 1;
	1276	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1277	+ flashSelectionButton.setToolTipText("Highlight selection");
	1278	+ flashSelectionButton.addActionListener(this);
566	1279
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	1280	+ editCommandsPanel.preferredHeight = 1;
	1281	+
	1282	+ SetPinStates(false);
	1283	+// oe.treePanel.add(commandsPanel);
	1284	+// oe.treePanel.Return();
569	1285
570	1286	// oe.aConstraints.gridx += 1;
571	1287	// oe.aConstraints.weighty = 0;
..	..	@@ -582,32 +1298,20 @@
582	1298
583	1299	JScrollPane jSP;
584	1300	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1301	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	1302	ResetModel();
587	1303
588	1304	oe.treePanel.add(jSPPanel);
589	1305	oe.treePanel.Return();
590	1306
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	1307	oe.treePanel.add(copyOptionsPanel);
607	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
608	1312
609		-// mainPanel.setDividerLocation(0.5); //1.0);
610		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
611	1315
612	1316	//jList.addListSelectionListener(this);
613	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -615,7 +1319,7 @@
615	1319	//jTree.setEditable(true);
616	1320	oe.jTree.setDragEnabled(true);
617	1321	//jTree.setPreferredSize(new Dimension(10,10));
618		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
619	1323
620	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
621	1325
..	..	@@ -627,29 +1331,49 @@
627	1331	dgr.addDragGestureListener(this);
628	1332	}catch(Exception e) {}
629	1333	*/
630		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
631	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
632	1336	}
633	1337
634	1338	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	1339	{
	1340	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1341	+ colorCB.setToolTipText("Copy color when dropped");
	1342	+ colorCB.addItemListener(this);
	1343	+
	1344	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1345	+ materialCB.setToolTipText("Copy material when dropped");
	1346	+ materialCB.addItemListener(this);
	1347	+
	1348	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1349	+ textureCB.setToolTipText("Copy texture when dropped");
	1350	+ textureCB.addItemListener(this);
	1351	+
	1352	+ panel.Return();
	1353	+
636	1354	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	1355	boxCB.setToolTipText("Display bounding boxes");
638	1356	boxCB.addItemListener(this);
639	1357
640	1358	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	1360	zoomBoxCB.addItemListener(this);
643	1361
644		- if (Globals.ADVANCED)
	1362	+ if (true) // Globals.ADVANCED)
645	1363	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
649	1371
650	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	1373	// localCB.addItemListener(this);
652	1374
	1375	+ panel.Return();
	1376	+
653	1377	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	1378	crowdCB.setToolTipText("Used for crowds");
655	1379	crowdCB.addItemListener(this);
..	..	@@ -658,14 +1382,19 @@
658	1382	smoothCB.setToolTipText("Snapping delay");
659	1383	smoothCB.addItemListener(this);
660	1384
661		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
662		- slowCB.setToolTipText("Smooth interpolation");
663		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
664	1391
665	1392	// constraints.gridy += 1;
666	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	1394	// speakerMocapCB.addItemListener(this);
668	1395
	1396	+ panel.Return();
	1397	+
669	1398	if (false)
670	1399	{
671	1400	// handled in scripts
..	..	@@ -680,42 +1409,93 @@
680	1409	//constraints.gridy += 1;
681	1410	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	1411	smoothfocusCB.addItemListener(this);
	1412	+ panel.Return();
683	1413	}
684	1414
685	1415	//constraints.gridx += 1;
686	1416	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	1417	// debugCB.addItemListener(this);
688	1418
	1419	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1420	+ trackCB.setToolTipText("Enable tracking target");
	1421	+ trackCB.addItemListener(this);
	1422	+
689	1423	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1424	+ oeilCB.setToolTipText("Move camera when tracking");
690	1425	oeilCB.addItemListener(this);
691	1426
	1427	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1428	+ shadowCB.setToolTipText("When live compute shadows");
	1429	+ shadowCB.addItemListener(this);
	1430	+
	1431	+ panel.Return();
	1432	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1433	+ toggleTextureCB.setToolTipText("Load textures");
	1434	+ toggleTextureCB.addItemListener(this);
	1435	+
	1436	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1438	+ toggleSwitchCB.addItemListener(this);
	1439	+
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ if (Globals.ADVANCED)
	1446	+ {
692	1447	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	1448	lookAtCB.setToolTipText("Look-at target");
694	1449	lookAtCB.addItemListener(this);
	1450	+ }
695	1451
696	1452	}
697	1453
698	1454	cGridBag fill = new cGridBag();
699		-
700	1455	fill.preferredHeight = 200;
	1456	+ cGridBag fill2 = new cGridBag();
	1457	+ fill2.preferredHeight = 200;
	1458	+ cGridBag fill3 = new cGridBag();
	1459	+ fill3.preferredHeight = 200;
701	1460
702	1461	panel.add(fill);
	1462	+ panel.add(fill2);
	1463	+ panel.add(fill3);
703	1464
704	1465	}
705	1466
706	1467	void EditObject(Object3D obj)
707	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
708	1477	cRadio radioButton = new cRadio(obj.name);
	1478	+
	1479	+ // June 2019. Patch to avoid bug with transparency.
	1480	+ radioButton.hadMaterial = obj.material != null;
	1481	+ if (!radioButton.hadMaterial)
	1482	+ {
	1483	+ obj.material = new cMaterial();
	1484	+ }
	1485	+
709	1486	radioButton.SetObject(obj);
710		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
711	1488	radioButton.SetCamera(cameraView.renderCamera, false);
712	1489	radioButton.addActionListener(this);
713	1490	radioPanel.add(radioButton);
714	1491	buttonGroup.add(radioButton);
715	1492	radioButton.doClick();
716	1493	}
	1494	+
717	1495	void SetupViews(ObjEditor oe)
718	1496	{
	1497	+ theFrame = this;
	1498	+
719	1499	oe.SetupViews();
720	1500
721	1501	System.out.println("SetupViews");
..	..	@@ -724,23 +1504,30 @@
724	1504	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1505	}
726	1506
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	1507	+ cToggleButton liveCB;
	1508	+ cCheckBox supportCB;
	1509	+ cCheckBox localCB;
	1510	+ cCheckBox crowdCB;
	1511	+ cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
	1514	+ cToggleButton fastCB;
	1515	+ cCheckBox slowCB;
	1516	+ cCheckBox boxCB;
	1517	+ cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
	1519	+ //cToggleButton trackCB;
	1520	+ cCheckBox trackCB;
	1521	+ cCheckBox smoothfocusCB;
738	1522	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1523	+ cCheckBox speakerCameraCB;
	1524	+ cCheckBox speakerFocusCB;
	1525	+ cCheckBox debugCB;
	1526	+
	1527	+ cCheckBox oeilCB;
	1528	+ cCheckBox shadowCB;
	1529	+ cCheckBox autokeepCB;
	1530	+ cCheckBox lookAtCB;
744	1531
745	1532	// static int COLOR = 1;
746	1533	// static int MATERIAL = 2;
..	..	@@ -748,9 +1535,9 @@
748	1535
749	1536	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1537
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1538	+ cCheckBox colorCB;
	1539	+ cCheckBox materialCB;
	1540	+ cCheckBox textureCB;
754	1541
755	1542	public void itemStateChanged(ItemEvent e)
756	1543	{
..	..	@@ -778,6 +1565,7 @@
778	1565	} else if(e.getSource() == liveCB)
779	1566	{
780	1567	cameraView.ToggleLive();
	1568	+ refreshContents(false);
781	1569	}
782	1570	else if(e.getSource() == supportCB)
783	1571	{
..	..	@@ -793,6 +1581,12 @@
793	1581	{
794	1582	cameraView.ToggleInertia();
795	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
796	1590	}
797	1591	else if(e.getSource() == localCB)
798	1592	{
..	..	@@ -842,6 +1636,18 @@
842	1636	{
843	1637	cameraView.ToggleOeil();
844	1638	}
	1639	+ else if(e.getSource() == shadowCB)
	1640	+ {
	1641	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1642	+ }
	1643	+ else if(e.getSource() == freezeCB)
	1644	+ {
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
	1650	+ }
845	1651	else if(e.getSource() == lookAtCB)
846	1652	{
847	1653	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1664,8 @@
858	1664
859	1665	/**/
860	1666	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1667	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1668	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1669	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1670	// We can't move the root node or an empty selection
864	1671	return;
..	..	@@ -921,8 +1728,6 @@
921	1728	}
922	1729	}
923	1730
924		- String string = (String) object;
925		-
926	1731	System.out.println("Transfer = " + object + "; drop : " + target);
927	1732	// if( object instanceof java.io.File[])
928	1733	// {
..	..	@@ -930,7 +1735,11 @@
930	1735	// objEditor.DropFile((java.io.File[]) object, true);
931	1736	// return;
932	1737	// }
933		- if (string.charAt(0) == '/')
	1738	+
	1739	+ String string = object.toString();
	1740	+
	1741	+ // File path for Mac and Windows
	1742	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1743	{
935	1744	// file(s)
936	1745	String[] names = string.split("\n");
..	..	@@ -957,7 +1766,7 @@
957	1766
958	1767	flashIt = false;
959	1768	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1769	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1770	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1771
963	1772	if (group.selection.size() == 1)
..	..	@@ -973,23 +1782,33 @@
973	1782
974	1783	assert target == objEditor.jTree;
975	1784	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1785	+ Object3D destinationLeaf;
976	1786	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1787	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1788	} catch (Exception e) {
979	1789	System.out.println("destinationPath : " + destinationPath);
980	1790	return;
981	1791	}
982	1792
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1793	+ for (int i=group.selection.size(); --i>=0;)
984	1794	{
	1795	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1796	+
	1797	+ // Cannot move into itself
	1798	+ if (child == destinationLeaf)
	1799	+ return;
	1800	+ }
	1801	+
	1802	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1803	+// {
985	1804	loadClipboard(true);
986	1805	objEditor.jTree.setSelectionPath(destinationPath);
987	1806	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1807	+// } else {
	1808	+// loadClipboard(false);
	1809	+// objEditor.jTree.setSelectionPath(destinationPath);
	1810	+// pasteInto(false, false); // true); // ???
	1811	+// }
993	1812	}
994	1813	public void dropActionChanged(DropTargetDragEvent dtde)
995	1814	// Called if the user has modified the current drop gesture
..	..	@@ -1045,7 +1864,12 @@
1045	1864	TreePath path;
1046	1865
1047	1866	public TransferableTreePath(TreePath tp) {
1048		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1049	1873	}
1050	1874
1051	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1094,22 +1918,30 @@
1094	1918	{
1095	1919	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1920	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- superItem.addActionListener(this);
	1921	+// gridItem = menu.add(new MenuItem("Grid"));
	1922	+// gridItem.addActionListener(this);
	1923	+// rectoidItem = menu.add(new MenuItem("Box"));
	1924	+// rectoidItem.addActionListener(this);
	1925	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1926	+// ellipsoidItem.addActionListener(this);
	1927	+// coneItem = menu.add(new MenuItem("Cone"));
	1928	+// coneItem.addActionListener(this);
	1929	+// torusItem = menu.add(new MenuItem("Torus"));
	1930	+// torusItem.addActionListener(this);
	1931	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1932	+// superItem.addActionListener(this);
	1933	+
	1934	+ cameraItem = menu.add(new MenuItem("Camera"));
	1935	+ cameraItem.addActionListener(this);
	1936	+
	1937	+ if (!Globals.ADVANCED)
	1938	+ {
1109	1939	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1940	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1941	+ }
	1942	+
	1943	+// particleItem = menu.add(new MenuItem("Particle system"));
	1944	+// particleItem.addActionListener(this);
1113	1945	if (Globals.ADVANCED)
1114	1946	{
1115	1947	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1967,15 @@
1135	1967	}
1136	1968	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1969	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- lightItem.addActionListener(this);
	1970	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1971	+// overlayItem.addActionListener(this);
	1972	+// lightItem = menu.add(new MenuItem("Light"));
	1973	+// lightItem.addActionListener(this);
1142	1974	menu.add("-");
1143	1975	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1976	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1977	+// loopItem = menu.add(new MenuItem("Loop"));
	1978	+// loopItem.addActionListener(this);
1147	1979	doubleItem = menu.add(new MenuItem("Fork"));
1148	1980	doubleItem.addActionListener(this);
1149	1981	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1991,23 @@
1159	1991	animationItem.addItemListener(this);
1160	1992	animationItem.setState(Globals.ANIMATION);
1161	1993
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
	1996	+
1162	1997	menu.add("-");
1163	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	1999	parseverticesItem.addActionListener(this);
1165	2000	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	2001	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	2002	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	2003	alignItem.addActionListener(this);
1169	2004	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	2005	reduceMorphItem.addActionListener(this);
1171	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	2007	reduce34MorphItem.addActionListener(this);
1173		-
	2008	+ menu.add("-");
	2009	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2010	+ memoryItem.addActionListener(this);
1174	2011	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	2012	computeAOItem.addActionListener(this);
1176	2013
..	..	@@ -1179,11 +2016,9 @@
1179	2016	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	2017	mirrorItem.addActionListener(this);
1181	2018	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	2020	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	2021	+ menu.add(dumpItem = new MenuItem("Print"));
1187	2022	dumpItem.addActionListener(this);
1188	2023	// menu.add(pathItem = new MenuItem("From-to path"));
1189	2024	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +2159,34 @@
1324	2159	shadow.material = new cMaterial(obj.material);
1325	2160	shadow.material.diffuse = 0.0001f;
1326	2161	shadow.material.specular = 0.0001f;
	2162	+ //shadow.projectedVertices[1].x = 300;
1327	2163
1328	2164	makeSomething(shadow);
1329	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1330	2190
1331	2191	/**
1332	2192	* applyExample
..	..	@@ -1530,9 +2390,9 @@
1530	2390
1531	2391	void Overwrite(int mask)
1532	2392	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2393	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	2394	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	2395	+ Object3D content = Grafreed.clipboard.get(0);
1536	2396
1537	2397	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	2398	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +2431,7 @@
1571	2431	{
1572	2432	ScreenFit();
1573	2433	} else
1574		- if (source == switchItem)
	2434	+ if (source == switchViewItem)
1575	2435	{
1576	2436	cVector v1 = new cVector();
1577	2437	cVector v2 = new cVector();
..	..	@@ -1580,11 +2440,11 @@
1580	2440	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	2441	objEditor.cameraView.repaint();
1582	2442	} else
1583		- if (source == rectoidItem)
	2443	+ if (source == rectoidItem \|\| source == boxButton)
1584	2444	{
1585	2445	makeSomething(new Box());
1586	2446	} else
1587		- if (source == particleItem)
	2447	+ if (source == particleItem \|\| source == particlesButton)
1588	2448	{
1589	2449	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	2450	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2523,27 @@
1663	2523
1664	2524	makeSomething(obj);
1665	2525	} else
1666		- if (source == gridItem)
	2526	+ if (source == gridItem \|\| source == gridButton)
1667	2527	{
1668	2528	makeSomething(new Grid());
1669	2529	} else
1670		- if (source == ellipsoidItem)
	2530	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2531	{
1672	2532	makeSomething(new Sphere());
1673	2533	} else
1674		- if (source == coneItem)
	2534	+ if (source == coneItem \|\| source == coneButton)
1675	2535	{
1676	2536	makeSomething(new Cone());
1677	2537	} else
1678		- if (source == torusItem)
	2538	+ if (source == torusItem \|\| source == torusButton)
1679	2539	{
1680	2540	makeSomething(new Torus());
1681	2541	} else
1682		- if (source == superItem)
	2542	+ if (source == superItem \|\| source == superButton)
1683	2543	{
1684	2544	makeSomething(new Superellipsoid());
1685	2545	} else
1686		- if (source == kleinItem)
	2546	+ if (source == kleinItem \|\| source == kleinButton)
1687	2547	{
1688	2548	makeSomething(new Klein());
1689	2549	} else
..	..	@@ -1703,7 +2563,7 @@
1703	2563	{
1704	2564	makeSomething(new BezierSurface());
1705	2565	} else
1706		- if (source == overlayItem)
	2566	+ if (source == overlayItem \|\| source == overlayButton)
1707	2567	{
1708	2568	/*
1709	2569	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,10 +2611,27 @@
1751	2611	s.setup();
1752	2612	makeSomething(s);
1753	2613	} else
1754		- if (source == lightItem)
	2614	+ if (source == lightItem \|\| source == lightButton)
1755	2615	{
1756	2616	makeSomething(new Light());
1757	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
1758	2635	if (source == csgItem)
1759	2636	{
1760	2637	group(new CSG());
..	..	@@ -1801,30 +2678,30 @@
1801	2678
1802	2679	group(g);
1803	2680	} else
1804		- if (source == loopItem)
	2681	+ if (source == loopItem \|\| source == loopButton)
1805	2682	{
1806	2683	Composite csg = new GroupLeaf();
1807	2684	csg.count = 5;
1808	2685	group(csg);
1809		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
1810	2687	csg.addChild(child);
1811	2688	child.addChild(csg);
1812	2689	} else
1813	2690	if (source == doubleItem)
1814	2691	{
1815		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
1816	2693	csg.count = 5;
1817	2694	group(csg);
1818		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
1819	2696	csg.addChild(child);
1820	2697	child.addChild(csg);
1821		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
1822	2699	csg.addChild(child);
1823	2700	child.addChild(csg);
1824	2701	} else
1825	2702	if (source == tripleItem)
1826	2703	{
1827		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
1828	2705	csg.count = 4;
1829	2706	group(csg);
1830	2707	Composite child = new cGroup();
..	..	@@ -1837,27 +2714,10 @@
1837	2714	csg.addChild(child);
1838	2715	child.addChild(csg);
1839	2716	} else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856		- } else
1857	2717	if (source == computeAOItem)
1858	2718	{
1859	2719	Globals.drawMode = CameraPane.OCCLUSION;
1860		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
1861	2721	} else
1862	2722	if (source == recompileItem)
1863	2723	{
..	..	@@ -1872,7 +2732,7 @@
1872	2732	if (source == invariantsItem)
1873	2733	{
1874	2734	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
1876	2736	} else
1877	2737	if (source == memoryItem)
1878	2738	{
..	..	@@ -1891,6 +2751,65 @@
1891	2751	{
1892	2752	DumpObject();
1893	2753	} else
	2754	+ if (source == minButton)
	2755	+ {
	2756	+ Minimize();
	2757	+ } else
	2758	+ if (source == maxButton)
	2759	+ {
	2760	+ Maximize();
	2761	+ } else
	2762	+ if (source == fullButton)
	2763	+ {
	2764	+ ToggleFullScreen();
	2765	+ } else
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
	2777	+ } else
	2778	+ if (source == previousVersionButton)
	2779	+ {
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
	2812	+ } else
1894	2813	if (source == oneStepButton)
1895	2814	{
1896	2815	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2817,14 @@
1898	2817	} else
1899	2818	if (source == screenfitButton)
1900	2819	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2820	ScreenFit();
1903	2821	} else
1904	2822	if (source == screenfitpointButton)
1905	2823	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2824	ScreenFitPoint();
1908	2825	} else
1909	2826	if (source == snapobjectButton)
1910	2827	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2828	SnapObject();
1913	2829	} else
1914	2830	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2861,20 @@
1945	2861	{
1946	2862	loadClipboard(true);
1947	2863	} else
	2864	+ if (source == undoItem)
	2865	+ {
	2866	+ PreviousVersion();
	2867	+ } else
	2868	+ if (source == redoItem)
	2869	+ {
	2870	+ NextVersion();
	2871	+ } else
1948	2872	if (source == duplicateItem)
1949	2873	{
1950		- Object3D keep = GrafreeD.clipboard;
	2874	+ Object3D keep = Grafreed.clipboard;
1951	2875	loadClipboard(false);
1952	2876	paste(false);
1953		- GrafreeD.clipboard = keep;
	2877	+ Grafreed.clipboard = keep;
1954	2878	} else
1955	2879	if (source == cloneItem)
1956	2880	{
..	..	@@ -2170,9 +3094,9 @@
2170	3094	// group.selection.get(0).setMasterThis(content); // should be identity
2171	3095	// refreshContents();
2172	3096	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3097	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	3098	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	3099	+ Object3D content = Grafreed.clipboard.get(0);
2176	3100
2177	3101	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	3102	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +3146,9 @@
2222	3146	} else
2223	3147	if (source == setMasterItem)
2224	3148	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3149	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	3150	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	3151	+ Object3D content = Grafreed.clipboard.get(0);
2228	3152
2229	3153	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	3154	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +3161,9 @@
2237	3161	{
2238	3162	if (group.selection.size() == 1)
2239	3163	{
2240		- if (GrafreeD.clipboard.size() == 1)
	3164	+ if (Grafreed.clipboard.size() == 1)
2241	3165	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	3166	+ Object3D content = Grafreed.clipboard.get(0);
2243	3167
2244	3168	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	3169	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +3180,7 @@
2256	3180	{
2257	3181	RevertMeshes();
2258	3182	} else
2259		- if (source == resetMeshItem)
	3183	+ if (source == resetAllItem)
2260	3184	{
2261	3185	ResetAll();
2262	3186	} else
..	..	@@ -2264,7 +3188,7 @@
2264	3188	{
2265	3189	StepAll();
2266	3190	} else
2267		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2268	3192	{
2269	3193	//int indices[] = jList.getSelectedIndices();
2270	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2276,9 +3200,9 @@
2276	3200	{
2277	3201	ClearSelection(true);
2278	3202	} else
2279		- if (source == grabItem)
	3203	+ if (source == grabItem \|\| source == groupButton)
2280	3204	{
2281		- group(new cGroup(), true);
	3205	+ group(new cGroup(), false); // true);
2282	3206	} else
2283	3207	if (source == hideItem)
2284	3208	{
..	..	@@ -2296,11 +3220,11 @@
2296	3220	{
2297	3221	makeSomething(new Camera());
2298	3222	} else
2299		- if (source == compositeItem)
	3223	+ if (source == compositeItem \|\| source == compositeButton)
2300	3224	{
2301	3225	group(new Composite());
2302	3226	} else
2303		- if (source == randomItem)
	3227	+ if (source == switchItem \|\| source == switchButton)
2304	3228	{
2305	3229	RandomNode random = new RandomNode();
2306	3230	group(random);
..	..	@@ -2402,7 +3326,7 @@
2402	3326	{
2403	3327	group(new cLinker());
2404	3328	} else
2405		- if (source == textureItem)
	3329	+ if (source == textureItem \|\| source == textureButton)
2406	3330	{
2407	3331	group(new TextureNode());
2408	3332	} else
..	..	@@ -2422,17 +3346,30 @@
2422	3346	{
2423	3347	CastShadow(2);
2424	3348	} else
2425		- if (source == ungroupItem)
	3349	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	3350	{
2427		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2428	3353	for (int i=0; i<group.selection.size(); i++)
2429	3354	{
2430		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2431	3360	}
2432	3361
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2436	3373	} else
2437	3374	if (source == genUVItem)
2438	3375	{
..	..	@@ -2444,7 +3381,7 @@
2444	3381	} else
2445	3382	if (source == genNormalsMESHItem)
2446	3383	{
2447		- GenNormals(true); // TODO
	3384	+ GenNormalsMESH();
2448	3385	} else
2449	3386	if (source == genNormalsORGANItem)
2450	3387	{
..	..	@@ -2509,6 +3446,22 @@
2509	3446	if (source == unmarkleavesItem)
2510	3447	{
2511	3448	MarkLeaves(false);
	3449	+ } else
	3450	+ if (source == rewindleavesItem)
	3451	+ {
	3452	+ RewindLeaves(true);
	3453	+ } else
	3454	+ if (source == unrewindleavesItem)
	3455	+ {
	3456	+ RewindLeaves(false);
	3457	+ } else
	3458	+ if (source == randomleavesItem)
	3459	+ {
	3460	+ RandomLeaves(true);
	3461	+ } else
	3462	+ if (source == unrandomleavesItem)
	3463	+ {
	3464	+ RandomLeaves(false);
2512	3465	} else
2513	3466	if (source == flipVItem)
2514	3467	{
..	..	@@ -2594,9 +3547,13 @@
2594	3547	{
2595	3548	SmoothMesh();
2596	3549	} else
2597		- if (source == transformgeometryItem)
	3550	+ if (source == transformGeometryItem)
2598	3551	{
2599	3552	TransformGeometry();
	3553	+ } else
	3554	+ if (source == transformChildrenItem)
	3555	+ {
	3556	+ TransformChildren();
2600	3557	} else
2601	3558	if (source == resetTransformItem)
2602	3559	{
..	..	@@ -2604,7 +3561,11 @@
2604	3561	} else
2605	3562	if (source == resetCentroidItem)
2606	3563	{
2607		- ResetCentroid();
	3564	+ ResetCentroid(true);
	3565	+ } else
	3566	+ if (source == resetCentroidXZItem)
	3567	+ {
	3568	+ ResetCentroid(false);
2608	3569	} else
2609	3570	if (source == resetParentItem)
2610	3571	{
..	..	@@ -2709,7 +3670,7 @@
2709	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2710	3671	{
2711	3672	obj = (Object3D)e.nextElement();
2712		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
2713	3674	}
2714	3675
2715	3676	refreshContents();
..	..	@@ -2725,6 +3686,31 @@
2725	3686
2726	3687	refreshContents();
2727	3688	} else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
	3712	+ refreshContents();
	3713	+ } else
2728	3714	if (source == flashSelectionButton)
2729	3715	{
2730	3716	CameraPane.flash = true;
..	..	@@ -2736,42 +3722,36 @@
2736	3722	if (source == twoButton)
2737	3723	{
2738	3724	radio.layout = twoButton;
2739		- // bug
2740		- //gridPanel.setDividerLocation(1.0);
2741		- //bigPanel.setDividerLocation(0.0);
2742		-// bigThree.remove(scenePanel);
2743		-// bigThree.remove(centralPanel);
2744		-// bigThree.remove(XYZPanel);
2745		-// aWindowConstraints.gridx = 0;
2746		-// aWindowConstraints.gridy = 0;
2747		-// aWindowConstraints.gridwidth = 1;
2748		-// // aConstraints.gridheight = 3;
2749		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2750		-// aWindowConstraints.weightx = 0;
2751		-// aWindowConstraints.weighty = 1;
2752		-// //bigThree.add(jtp, aWindowConstraints);
2753		-// aWindowConstraints.weightx = 1;
2754		-// aWindowConstraints.gridwidth = 3;
2755		-// // aConstraints.gridheight = 3;
2756		-// aWindowConstraints.gridx = 1;
2757		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2758		-// bigThree.add(centralPanel, aWindowConstraints);
2759		-// aWindowConstraints.weightx = 0;
2760		-// aWindowConstraints.gridx = 4;
2761		-// aWindowConstraints.gridwidth = 1;
2762		-// // aConstraints.gridheight = 3;
2763		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2764		-// //bigThree.add(XYZPanel, aWindowConstraints);
2765		-// scenePanel.setVisible(false);
2766		-// centralPanel.setVisible(true);
2767		-// XYZPanel.setVisible(false);
2768		- bigThree.ClearUI();
2769		- bigThree.add(centralPanel);
2770		- bigThree.FlushUI();
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
	3728	+
	3729	+ Show3DView();
	3730	+
	3731	+ cameraView.requestFocusInWindow();
	3732	+
	3733	+// refreshContents(true);
	3734	+//
	3735	+// try
	3736	+// {
	3737	+// java.awt.Robot bot = new java.awt.Robot();
	3738	+// int mask = InputEvent.BUTTON1_MASK;
	3739	+// bot.mouseMove(100, 100);
	3740	+// bot.mousePress(mask);
	3741	+// bot.mouseRelease(mask);
	3742	+// }
	3743	+// catch (Exception e)
	3744	+// {
	3745	+//
	3746	+// }
	3747	+
2771	3748	} else
2772	3749	if (source == threeButton)
2773	3750	{
2774	3751	radio.layout = threeButton;
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
2775	3755
2776	3756	// bigThree.remove(scenePanel);
2777	3757	// bigThree.remove(centralPanel);
..	..	@@ -2801,13 +3781,18 @@
2801	3781	// centralPanel.setVisible(true);
2802	3782	// XYZPanel.setVisible(true);
2803	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
2804	3785	bigThree.add(centralPanel);
2805		- bigThree.add(XYZPanel);
2806	3786	bigThree.FlushUI();
	3787	+
	3788	+ cameraView.requestFocusInWindow();
2807	3789	} else
2808	3790	if (source == fourButton)
2809	3791	{
2810	3792	radio.layout = fourButton;
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
2811	3796
2812	3797	// bigThree.remove(scenePanel);
2813	3798	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3824,15 @@
2839	3824	bigThree.ClearUI();
2840	3825	bigThree.add(scenePanel);
2841	3826	bigThree.FlushUI();
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2842	3829	} else
2843	3830	if (source == sixButton)
2844	3831	{
2845	3832	radio.layout = sixButton;
	3833	+
	3834	+ if (CameraPane.FULLSCREEN)
	3835	+ fullscreenLayout = radio.layout;
2846	3836
2847	3837	// bigThree.remove(scenePanel);
2848	3838	// bigThree.remove(centralPanel);
..	..	@@ -2872,13 +3862,18 @@
2872	3862	// centralPanel.setVisible(true);
2873	3863	// XYZPanel.setVisible(false);
2874	3864	bigThree.ClearUI();
2875		- bigThree.add(scenePanel);
2876	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
2877	3867	bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2878	3870	} else
2879	3871	if (source == sevenButton)
2880	3872	{
2881	3873	radio.layout = sevenButton;
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
2882	3877
2883	3878	// bigThree.remove(scenePanel);
2884	3879	// bigThree.remove(centralPanel);
..	..	@@ -2912,9 +3907,12 @@
2912	3907	bigThree.add(centralPanel);
2913	3908	bigThree.add(XYZPanel);
2914	3909	bigThree.FlushUI();
	3910	+
	3911	+ cameraView.requestFocusInWindow();
2915	3912	} else
2916	3913	if (source == rootButton)
2917	3914	{
	3915	+ Replace();
2918	3916	Object3D obj;
2919	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2920	3918	{
..	..	@@ -2923,6 +3921,7 @@
2923	3921	EditObject(obj);
2924	3922	}
2925	3923
	3924	+ cameraView.requestFocusInWindow();
2926	3925	refreshContents(true);
2927	3926	} else
2928	3927	if (source == closeButton)
..	..	@@ -2932,22 +3931,37 @@
2932	3931	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3932	{
2934	3933	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3934	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3935	{
	3936	+ // Patch to avoid bug with transparency.
	3937	+ if (!ab.hadMaterial)
	3938	+ {
	3939	+ ab.object.material = null;
	3940	+ }
	3941	+
2937	3942	buttonGroup.remove(ab);
2938	3943	radioPanel.remove(ab);
2939	3944
2940		- ab.GetObject().editWindow = null;
	3945	+ //ab.GetObject().editWindow = null;
	3946	+ ab.GetObject().manipWindow = null;
2941	3947	// ab.GetObject().objectUI = null; // ?????????
2942	3948
2943	3949	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3950	break;
2945	3951	}
2946	3952	}
	3953	+
	3954	+ cameraView.requestFocusInWindow();
2947	3955	refreshContents(true);
2948	3956	} else
2949	3957	if (source == editItem \|\| source == editButton)
2950	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
2951	3965	EditSelection(false);
2952	3966	} else
2953	3967	if (source == uneditButton)
..	..	@@ -2956,11 +3970,12 @@
2956	3970	{
2957	3971	Object3D child = (Object3D)e.nextElement();
2958	3972	if(child.editWindow != null)
2959		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
2960	3974	child.CloseUI();
2961	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2962	3977
2963		- child.editWindow = null; // ???????????
	3978	+ //child.editWindow = null; // ???????????
2964	3979	}
2965	3980	objEditor.ctrlPanel.FlushUI();
2966	3981	//objEditor.jTree.clearSelection();
..	..	@@ -2973,16 +3988,18 @@
2973	3988	//copy.ClearUI();
2974	3989	for (Object3D obj : listUI)
2975	3990	{
	3991	+ obj.pinned = false;
2976	3992	obj.CloseUI();
2977	3993	}
2978	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
2979	3996	refreshContents(true);
2980	3997	} else
2981	3998	if (source == allParamsButton)
2982	3999	{
2983	4000	assert(copy == group);
2984	4001
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	4003
2987	4004	for (Object3D obj : listUI)
2988	4005	{
..	..	@@ -3031,6 +4048,7 @@
3031	4048	}
3032	4049
3033	4050	copy = group;
	4051	+
3034	4052	//Globals.theRenderer.object = group;
3035	4053	if(!useclient)
3036	4054	{
..	..	@@ -3046,20 +4064,61 @@
3046	4064	frontView.object = group;
3047	4065	sideView.object = group;
3048	4066	}
3049		- group.editWindow = this;
	4067	+
	4068	+// fix "+" issue
	4069	+ //group.editWindow = this;
	4070	+ group.manipWindow = this;
	4071	+
3050	4072	/*
3051	4073	currentLayout = radio.layout;
3052	4074	if (currentLayout == null)
3053	4075	currentLayout = sevenButton;
3054	4076	*/
3055	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
3056	4098	keepparent = group.parent;
3057	4099	// PARENT = NULL or not???
3058	4100	//group.parent = null; // ROOT
3059	4101	//group.attributes = -1;
3060	4102	ResetModel();
	4103	+
	4104	+ cameraView.requestFocusInWindow();
3061	4105	refreshContents(true);
3062		- }
	4106	+ } else if (event.getSource() == editCameraItem)
	4107	+ {
	4108	+ cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
	4110	+ cameraView.repaint();
	4111	+ return;
	4112	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4113	+ {
	4114	+ cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
	4116	+ cameraView.repaint();
	4117	+ return;
	4118	+ // } else if (event.getSource() == textureButton)
	4119	+ // {
	4120	+ // return; // true;
	4121	+ }
3063	4122	else
3064	4123	{
3065	4124	//return super.action(event, arg);
..	..	@@ -3068,7 +4127,6 @@
3068	4127	}
3069	4128
3070	4129	boolean useclient = false;
3071		- cRadio radio;
3072	4130
3073	4131	void ToggleRoot()
3074	4132	{
..	..	@@ -3120,6 +4178,28 @@
3120	4178	refreshContents();
3121	4179	}
3122	4180
	4181	+ void TransformChildren()
	4182	+ {
	4183	+ Object3D obj;
	4184	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4185	+ {
	4186	+ obj = (Object3D)e.nextElement();
	4187	+ obj.KeepTextureMatrices();
	4188	+ obj.TransformChildren();
	4189	+ obj.RestoreTextureMatrices();
	4190	+
	4191	+// if (obj.parent == null)
	4192	+// {
	4193	+// System.out.println("NULL PARENT!");
	4194	+// new Exception().printStackTrace();
	4195	+// }
	4196	+// else
	4197	+// TouchTransform(obj);
	4198	+// //obj.parent.Touch();
	4199	+ }
	4200	+
	4201	+ refreshContents();
	4202	+ }
3123	4203
3124	4204	void ResetTransform()
3125	4205	{
..	..	@@ -3232,7 +4312,7 @@
3232	4312	refreshContents();
3233	4313	}
3234	4314
3235		- void ResetCentroid()
	4315	+ void ResetCentroid(boolean full)
3236	4316	{
3237	4317	Object3D obj;
3238	4318	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +4327,16 @@
3247	4327	LA.matIdentity(Object3D.mat);
3248	4328	obj.getBounds(minima, maxima, false);
3249	4329	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4330	+ if (full)
	4331	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	4332	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	4333	obj.TransformMesh(Object3D.mat);
	4334	+
3253	4335	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4336	+ if (full)
	4337	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	4338	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4339	+
3256	4340	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	4341	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	4342	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +4365,8 @@
3281	4365
3282	4366	int size = obj.MemorySize();
3283	4367
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	4368	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4369	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	4370	}
3286	4371	}
3287	4372	catch (Exception e)
..	..	@@ -3318,9 +4403,9 @@
3318	4403	obj = (Object3D)e.nextElement();
3319	4404
3320	4405	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	4406	+ Grafreed.AnalyzeObject(obj);
3322	4407	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	4408	+ Grafreed.AnalyzeObject(obj.bRep);
3324	4409
3325	4410	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	4411	}
..	..	@@ -3362,6 +4447,13 @@
3362	4447	void GenNormals(boolean crease)
3363	4448	{
3364	4449	group.GenNormalsS(crease);
	4450	+
	4451	+ refreshContents();
	4452	+ }
	4453	+
	4454	+ void GenNormalsMESH()
	4455	+ {
	4456	+ group.GenNormalsMeshS();
3365	4457
3366	4458	refreshContents();
3367	4459	}
..	..	@@ -3534,8 +4626,8 @@
3534	4626
3535	4627	void ParseVertices()
3536	4628	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4629	+ boolean epsequal = Grafreed.epsequal;
	4630	+ Grafreed.epsequal = true;
3539	4631
3540	4632	for (int i=0; i<group.selection.size(); i++)
3541	4633	{
..	..	@@ -3560,7 +4652,7 @@
3560	4652	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4653	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4654
3563		- g.add(GrafreeD.clipboard);
	4655	+ g.add(Grafreed.clipboard);
3564	4656
3565	4657	buffer.add(g);
3566	4658	}
..	..	@@ -3575,7 +4667,7 @@
3575	4667	makeSomething(buffer, i==group.selection.size()-1);
3576	4668	}
3577	4669
3578		- GrafreeD.epsequal = epsequal;
	4670	+ Grafreed.epsequal = epsequal;
3579	4671
3580	4672	refreshContents();
3581	4673	}
..	..	@@ -3593,7 +4685,16 @@
3593	4685	String pigment = Object3D.GetPigment(tex);
3594	4686	//String bump = Object3D.GetBump(tex);
3595	4687
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4688	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4689	+
	4690	+ try
	4691	+ {
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4693	+ }
	4694	+ catch (Exception e)
	4695	+ {
	4696	+ System.err.println("FAIL: " + node);
	4697	+ }
3597	4698
3598	4699	double s = v.s;
3599	4700
..	..	@@ -3725,7 +4826,7 @@
3725	4826	return;
3726	4827
3727	4828	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4829	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4830
3730	4831	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4832
..	..	@@ -3919,9 +5020,9 @@
3919	5020
3920	5021	void ClipMesh()
3921	5022	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5023	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	5024	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	5025	+ Object3D content = Grafreed.clipboard.get(0);
3925	5026
3926	5027	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	5028	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +5031,7 @@
3930	5031	// {
3931	5032	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	5033	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	5034	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	5035	}
3935	5036	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	5037	System.out.println("DONE.");
..	..	@@ -3977,6 +5078,18 @@
3977	5078	void MarkLeaves(boolean hide)
3978	5079	{
3979	5080	group.selection.MarkLeaves(hide);
	5081	+ refreshContents();
	5082	+ }
	5083	+
	5084	+ void RewindLeaves(boolean hide)
	5085	+ {
	5086	+ group.selection.RewindLeaves(hide);
	5087	+ refreshContents();
	5088	+ }
	5089	+
	5090	+ void RandomLeaves(boolean hide)
	5091	+ {
	5092	+ group.selection.RandomLeaves(hide);
3980	5093	refreshContents();
3981	5094	}
3982	5095
..	..	@@ -4051,28 +5164,25 @@
4051	5164	// }
4052	5165	// }
4053	5166
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	5167	void EditSelection(boolean newWindow)
4059	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4060	5175	// aConstraints.gridy = 0;
4061	5176	for (int i=0; i<group.selection.size(); i++)
4062	5177	{
4063	5178	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	5179	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5180	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	5181
4067	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	5183	+ if(elem != group \|\| !newWindow)
4069	5184	{
4070		- // if (!(elem instanceof Composite))
4071		- // newWindow = false;
4072		- listUI.add(elem);
4073		- elem.openEditWindow(this, newWindow); //, false);
4074		- System.out.println("edit : " + elem);
4075		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
4076	5186	}
4077	5187	}
4078	5188	}
..	..	@@ -4135,9 +5245,7 @@
4135	5245
4136	5246	freezemodel = false;
4137	5247	}
4138		-
4139		- boolean flashIt = true;
4140		-
	5248	+
4141	5249	public void valueChanged(TreeSelectionEvent e)
4142	5250	//public boolean handleEvent(Event event)
4143	5251	{
..	..	@@ -4147,7 +5255,8 @@
4147	5255	//new Exception().printStackTrace();
4148	5256
4149	5257	freezemodel = true;
4150		-
	5258	+ ClearUnpinned();
	5259	+
4151	5260	/**/
4152	5261	//switch (event.id)
4153	5262	{
..	..	@@ -4155,7 +5264,6 @@
4155	5264	//case 702: // Event.LIST_DESELECT
4156	5265	group.deselectAll();
4157	5266	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	5267	if (tps != null)
4160	5268	{
4161	5269	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +5272,8 @@
4164	5272
4165	5273	//if (child.parent != null)
4166	5274	//child.parent.addSelectee(child);
	5275	+ objEditor.SetMaterial(child);
4167	5276	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	5277	}
4172	5278	}
4173	5279	// else
..	..	@@ -4177,20 +5283,28 @@
4177	5283	// System.err.println("info : " + group.GetPath());
4178	5284	// }
4179	5285
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5286	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	5287	CameraPane.flash = true;
4184	5288
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5289	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	5290	// a camera
4187	5291	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5293	+ {
	5294	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5295	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5296	+ }
4190	5297	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	5298	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	5299	}
4193	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
4194	5308	refreshContents();
4195	5309	//return true;
4196	5310	}
..	..	@@ -4199,6 +5313,50 @@
4199	5313
4200	5314	freezemodel = false;
4201	5315	}
	5316	+
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
	5338	+ }
	5339	+
	5340	+ void refreshContents(boolean cp)
	5341	+ {
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5343	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5344	+ {
	5345	+ objEditor.ClearInfo(); // .GetMaterial());
	5346	+
	5347	+ for (int i=0; i < group.selection.Size(); i++)
	5348	+ {
	5349	+ Object3D child = (Object3D) group.selection.get(i);
	5350	+
	5351	+ objEditor.AddInfo(child, this, true);
	5352	+// System.err.println("info : " + child.GetPath());
	5353	+ }
	5354	+
	5355	+ objEditor.SetText(); // jan 2014
	5356	+ }
	5357	+
	5358	+ super.refreshContents(cp);
	5359	+ }
4202	5360
4203	5361	void linkSomething(Object3D thing)
4204	5362	{
..	..	@@ -4270,16 +5428,19 @@
4270	5428	{
4271	5429	if (group.selection.isEmpty())
4272	5430	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	5431	+
	5432	+ Grafreed.clipboardIsTempGroup = false;
4274	5433	Composite tGroup = null;
4275	5434	if (group.selection.size() > 0) // 1)
4276	5435	{
4277	5436	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	5437	+ Grafreed.clipboardIsTempGroup = true;
4279	5438	}
4280	5439
4281	5440	if (cut)
4282	5441	{
	5442	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5443	+// Save();
4283	5444	//int indices[] = jList.getSelectedIndices();
4284	5445	//for (int i = indices.length - 1; i >= 0; i--)
4285	5446	//jList.remove(indices[i]);
..	..	@@ -4315,16 +5476,16 @@
4315	5476	//System.out.println("cut " + child);
4316	5477	//System.out.println("parent = " + child.parent);
4317	5478	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	5479	+ if (Grafreed.clipboardIsTempGroup)
4319	5480	tGroup.add/Child/(tmp);
4320	5481	else
4321		- GrafreeD.clipboard = tmp;
	5482	+ Grafreed.clipboard = tmp;
4322	5483	}
4323	5484	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	5485	+ if (Grafreed.clipboardIsTempGroup)
4325	5486	tGroup.add/Child/(child);
4326	5487	else
4327		- GrafreeD.clipboard = child;
	5488	+ Grafreed.clipboard = child;
4328	5489	}
4329	5490
4330	5491	//ResetModel();
..	..	@@ -4356,21 +5517,23 @@
4356	5517	//System.out.println("cut " + elem);
4357	5518	//System.out.println("parent = " + elem.parent);
4358	5519	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	5520	+ if (Grafreed.clipboardIsTempGroup)
4360	5521	tGroup.add/Child/(tmp);
4361	5522	else
4362		- GrafreeD.clipboard = tmp;
	5523	+ Grafreed.clipboard = tmp;
4363	5524	}
4364	5525	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	5526	+ if (Grafreed.clipboardIsTempGroup)
4366	5527	tGroup.add/Child/(child);
4367	5528	else
4368		- GrafreeD.clipboard = child;
	5529	+ Grafreed.clipboard = child;
4369	5530	}
4370	5531
4371	5532	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	5533	+
	5534	+ if (Grafreed.clipboardIsTempGroup)
	5535	+ Grafreed.clipboard = tGroup;
	5536	+
4374	5537	if (cut)
4375	5538	{
4376	5539	ResetModel();
..	..	@@ -4380,11 +5543,15 @@
4380	5543
4381	5544	void paste(boolean expand)
4382	5545	{
	5546	+ if (Globals.REPLACEONMAKE)
	5547	+ Save();
	5548	+ boolean keep = Globals.REPLACEONMAKE;
	5549	+ Globals.REPLACEONMAKE = false;
4383	5550	// if (GrafreeD.clipboard == null)
4384	5551	// return;
4385	5552	boolean first = true;
4386	5553
4387		- if (GrafreeD.clipboardIsTempGroup)
	5554	+ if (Grafreed.clipboardIsTempGroup)
4388	5555	{
4389	5556	Composite temp;
4390	5557
..	..	@@ -4395,7 +5562,7 @@
4395	5562	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	5563	*/
4397	5564	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5565	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	5566	{
4400	5567	Object3D child = (Object3D)e.nextElement();
4401	5568
..	..	@@ -4429,16 +5596,17 @@
4429	5596	//Object3D cb = Applet3D.clipboard;
4430	5597	//temp.addChild(cb);
4431	5598	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5599	+ assert(Grafreed.clipboard.parent == null);
	5600	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5601	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5602	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5603	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	5604	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5605	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5606	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5607	}
4441	5608
	5609	+ Globals.REPLACEONMAKE = keep;
4442	5610	ResetModel();
4443	5611	refreshContents();
4444	5612	}
..	..	@@ -4485,9 +5653,9 @@
4485	5653	{
4486	5654	boolean first = true;
4487	5655
4488		- if (GrafreeD.clipboardIsTempGroup)
	5656	+ if (Grafreed.clipboardIsTempGroup)
4489	5657	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5658	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5659	Object3D copy;
4492	5660	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5661	{
..	..	@@ -4497,7 +5665,7 @@
4497	5665	}
4498	5666	} else
4499	5667	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5668	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5669	}
4502	5670	}
4503	5671	}
..	..	@@ -4574,6 +5742,10 @@
4574	5742
4575	5743	void group(Object3D csg, boolean grab)
4576	5744	{
	5745	+ if (Globals.REPLACEONMAKE)
	5746	+ Save();
	5747	+ boolean keep = Globals.REPLACEONMAKE;
	5748	+ Globals.REPLACEONMAKE = false;
4577	5749	if (//false) // why??
4578	5750	!group.selection.isEmpty())
4579	5751	{
..	..	@@ -4687,10 +5859,15 @@
4687	5859	//node.add(csg);
4688	5860	//makeSomething(node);
4689	5861	makeSomething(csg);
	5862	+ Globals.REPLACEONMAKE = keep;
4690	5863	}
4691	5864
4692	5865	void Ungroup(Object3D g)
4693	5866	{
	5867	+ if (Globals.REPLACEONMAKE)
	5868	+ Save();
	5869	+ boolean keep = Globals.REPLACEONMAKE;
	5870	+ Globals.REPLACEONMAKE = false;
4694	5871	if (g instanceof HiddenObject)
4695	5872	{
4696	5873	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5884,7 @@
4707	5884	objEditor.makeSomething(g.get(i), false);
4708	5885	}
4709	5886	}
	5887	+ Globals.REPLACEONMAKE = keep;
4710	5888	}
4711	5889
4712	5890	void ungroup()
..	..	@@ -4902,21 +6080,6 @@
4902	6080	}
4903	6081	*/
4904	6082
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	6083	/*
4921	6084	public void Callback(Object obj)
4922	6085	{
..	..	@@ -4940,26 +6103,9 @@
4940	6103	}
4941	6104	*/
4942	6105
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	6106	String GetFile(String dialogName)
4961	6107	{
4962		- if (GrafreeD.standAlone)
	6108	+ if (Grafreed.standAlone)
4963	6109	{
4964	6110	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	6111	browser.show();
..	..	@@ -5027,7 +6173,43 @@
5027	6173	cButton clearpanelButton;
5028	6174	cButton unselectButton;
5029	6175
	6176	+ cButton restoreCameraButton;
	6177	+
5030	6178	cButton oneStepButton;
	6179	+
	6180	+ cButton groupButton;
	6181	+ cButton ungroupButton;
	6182	+ cButton compositeButton;
	6183	+ cButton switchButton;
	6184	+ cButton loopButton;
	6185	+ cButton textureButton;
	6186	+
	6187	+ cButton skybox1Button;
	6188	+ cButton skybox2Button;
	6189	+ cButton skybox3Button;
	6190	+ cButton skybox4Button;
	6191	+ cButton skybox5Button;
	6192	+ cButton skybox6Button;
	6193	+ cButton skybox7Button;
	6194	+
	6195	+ cButton skybox11Button;
	6196	+ cButton skybox12Button;
	6197	+ cButton skybox13Button;
	6198	+ cButton skybox14Button;
	6199	+ cButton skybox15Button;
	6200	+ cButton skybox16Button;
	6201	+ cButton skybox17Button;
	6202	+
	6203	+ cButton gridButton;
	6204	+ cButton boxButton;
	6205	+ cButton sphereButton;
	6206	+ cButton coneButton;
	6207	+ cButton torusButton;
	6208	+ cButton superButton;
	6209	+ cButton kleinButton;
	6210	+ cButton particlesButton;
	6211	+ cButton overlayButton;
	6212	+ cButton lightButton;
5031	6213
5032	6214	cButton screenfitButton;
5033	6215	cButton screenfitpointButton;
..	..	@@ -5040,14 +6222,6 @@
5040	6222
5041	6223	cButton setsupportButton;
5042	6224
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	6225	//
5052	6226	//Composite
5053	6227	Object3D // to do !!
..	..	@@ -5057,9 +6231,11 @@
5057	6231	//JTree jTree;
5058	6232	private MenuItem lookAtItem;
5059	6233	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	6234	+ private MenuItem switchViewItem;
5061	6235	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	6236	+ private MenuItem undoItem;
	6237	+ private MenuItem redoItem;
	6238	+ private JMenuItem duplicateItem;
5063	6239	private MenuItem cloneItem;
5064	6240	private MenuItem cloneSupportItem;
5065	6241	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +6248,7 @@
5072	6248	private MenuItem linkverticesItem;
5073	6249	private MenuItem relinkverticesItem;
5074	6250	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	6251	+ private MenuItem resetAllItem;
5076	6252	private MenuItem stepAllItem;
5077	6253	private MenuItem revertMeshItem;
5078	6254	private MenuItem poseMeshItem;
..	..	@@ -5087,7 +6263,7 @@
5087	6263	private MenuItem pasteLinkItem;
5088	6264	private MenuItem pasteCloneItem;
5089	6265	private MenuItem pasteExpandItem;
5090		- private MenuItem clearItem;
	6266	+ private MenuItem deleteItem;
5091	6267	private MenuItem clearAllItem;
5092	6268	private MenuItem genUVItem;
5093	6269	private MenuItem genNormalsMESHItem;
..	..	@@ -5122,6 +6298,10 @@
5122	6298	private MenuItem showleavesItem;
5123	6299	private MenuItem markleavesItem;
5124	6300	private MenuItem unmarkleavesItem;
	6301	+ private MenuItem rewindleavesItem;
	6302	+ private MenuItem unrewindleavesItem;
	6303	+ private MenuItem randomleavesItem;
	6304	+ private MenuItem unrandomleavesItem;
5125	6305
5126	6306	private MenuItem flipVItem;
5127	6307	private MenuItem unflipVItem;
..	..	@@ -5133,15 +6313,17 @@
5133	6313	private MenuItem panoTexturesItem;
5134	6314
5135	6315	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	6316	+ private MenuItem resetCentroidXZItem;
5137	6317	private MenuItem resetTransformItem;
	6318	+ private MenuItem transformGeometryItem;
	6319	+ private MenuItem transformChildrenItem;
5138	6320	private MenuItem hideItem;
5139	6321	private MenuItem grabItem;
5140	6322	private MenuItem backItem;
5141	6323	private MenuItem frontItem;
5142	6324	private MenuItem cameraItem;
5143	6325	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	6326	+ private MenuItem switchItem;
5145	6327	private MenuItem physicsItem;
5146	6328	private MenuItem frameselectorItem;
5147	6329	private MenuItem scriptNodeItem;
..	..	@@ -5165,6 +6347,8 @@
5165	6347	private MenuItem attachBumpItem;
5166	6348	private MenuItem detachBumpItem;
5167	6349	private MenuItem pigmentBumpItem;
	6350	+ private MenuItem embedTexturesItem;
	6351	+ private MenuItem deEmbedTexturesItem;
5168	6352
5169	6353	private MenuItem particleItem;
5170	6354	private MenuItem ragdollItem;
..	..	@@ -5203,11 +6387,6 @@
5203	6387	private MenuItem doubleItem;
5204	6388	private MenuItem tripleItem;
5205	6389
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	6390	private MenuItem computeAOItem;
5212	6391	private MenuItem recompileItem;
5213	6392	private MenuItem editScriptItem;
..	..	@@ -5217,4 +6396,8 @@
5217	6396	private MenuItem analyzeItem;
5218	6397	private MenuItem dumpItem;
5219	6398	//boolean freezemodel = false;
	6399	+
	6400	+ Menu cameraMenu;
	6401	+ MenuItem editCameraItem;
	6402	+ MenuItem restoreCameraItem;
5220	6403	}