~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,350 @@
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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
	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	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -74,16 +429,28 @@
74	429	this.copy = this.group = copy;
75	430	//selectees = this.group.selectees;
76	431
77		- SetupMenu2(objEditor);
	432	+ SetupMenu2(this); //objEditor);
78	433	SetupUI2(objEditor);
79	434	objEditor.SetupUI(true);
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +461,19 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
100	468	{
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));
	469	+ assert(Grafreed.clipboard.parent == null);
	470	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	471	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	472	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	473	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	474	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	475	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	476	+ Grafreed.clipboard.get(0).parent = keepparent;
109	477	}
110	478
111	479	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +487,7 @@
119	487	// obj.support = null;
120	488	if (!supports)
121	489	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	490	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	491	obj.parent = parent;
124	492	// obj.support = support;
125	493	// clone.support = support; // aout 2013
..	..	@@ -148,57 +516,51 @@
148	516
149	517	//JTextField nameField;
150	518
151		- void SetupMenu2(ObjEditor oe)
	519	+ void SetupMenu2(GroupEditor oe)
152	520	{
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		-
	521	+ oe.jTree = new cTree();
	522	+
168	523	Menu menu;
169	524	oe.menuBar.add(menu = new Menu("Edit"));
170	525	//editItem = menu.add(new MenuItem("Edit"));
171	526	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	527	+
	528	+// undoItem = menu.add(new MenuItem("Undo"));
	529	+// undoItem.addActionListener(this);
	530	+// redoItem = menu.add(new MenuItem("Redo"));
	531	+// redoItem.addActionListener(this);
	532	+// menu.add("-");
	533	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	534	duplicateItem.addActionListener(this);
174		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175	537	cloneItem.addActionListener(this);
176		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
177	539	{
178	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179	541	cloneSupportItem.addActionListener(this);
180	542	}
	543	+ oe.jTree.popup.addSeparator();
181	544	menu.add("-");
182		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183	546	cutItem.addActionListener(this);
184		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185	548	copyItem.addActionListener(this);
186	549	pasteItem = menu.add(new MenuItem("Paste"));
187	550	pasteItem.addActionListener(this);
188		- menu.add("-");
189	551
190		- menu.add("-");
191		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
192	555	pasteIntoItem.addActionListener(this);
193		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194	557	pasteLinkItem.addActionListener(this);
195		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196	559	pasteCloneItem.addActionListener(this);
197		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
198	561	// pasteExpandItem.addActionListener(this);
199		- menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
202	564
203	565	if (Globals.ADVANCED)
204	566	{
..	..	@@ -206,14 +568,95 @@
206	568	clearAllItem = menu.add(new MenuItem("Clear All"));
207	569	clearAllItem.addActionListener(this);
208	570	}
	571	+
	572	+ menuBar.add(cameraMenu = new Menu("View"));
	573	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	574	+ //zBufferItem.addActionListener(this);
	575	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	576	+ //normalLensItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
	579	+
	580	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	581	+// toggleFullScreenItem.addItemListener(this);
	582	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	583	+// cameraMenu.add("-");
	584	+//
	585	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	586	+// toggleTextureItem.addItemListener(this);
	587	+// toggleTextureItem.setState(CameraPane.textureon);
	588	+//
	589	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	590	+// toggleSwitchItem.addItemListener(this);
	591	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	592	+
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	594	+ toggleHandleItem.addItemListener(this);
	595	+ toggleHandleItem.setState(CameraPane.HANDLES);
	596	+
	597	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	598	+ togglePaintItem.addItemListener(this);
	599	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	600	+
	601	+ if (Globals.ADVANCED)
	602	+ {
	603	+ cameraMenu.add("-");
	604	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	605	+ toggleLiveItem.addItemListener(this);
	606	+ toggleLiveItem.setState(Globals.isLIVE());
209	607
	608	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	609	+ stepItem.addActionListener(this);
	610	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	611	+ // toggleDLItem.addItemListener(this);
	612	+ // toggleDLItem.setState(false);
	613	+
	614	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	615	+ toggleRenderItem.addItemListener(this);
	616	+ toggleRenderItem.setState(!CameraPane.frozen);
	617	+
	618	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	619	+ toggleDebugItem.addItemListener(this);
	620	+ toggleDebugItem.setState(Globals.DEBUG);
	621	+
	622	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	623	+ toggleFrustumItem.addItemListener(this);
	624	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	625	+
	626	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	627	+ toggleFootContactItem.addItemListener(this);
	628	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	629	+
	630	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	631	+ toggleTimelineItem.addItemListener(this);
	632	+ }
	633	+
	634	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	635	+// toggleRootItem.addItemListener(this);
	636	+// toggleRootItem.setState(false);
	637	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	638	+// animationItem.addItemListener(this);
	639	+// animationItem.setState(CameraPane.ANIMATION);
	640	+ cameraMenu.add("-");
	641	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	642	+ editCameraItem.addActionListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	647	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	649	+ oe.cameraMenu.add("-");
	650	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	651	+ openWindowItem.addActionListener(this);
	652	+ lookAtItem.addActionListener(this);
	653	+ //lookFromItem.addActinoListener(this);
	654	+ //switchViewItem.addActionListener(this);
	655	+ }
	656	+
210	657	oe.menuBar.add(menu = new Menu("Setting"));
211	658	if (Globals.ADVANCED)
212	659	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	660	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	661	revertMeshItem.addActionListener(this);
219	662	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -252,22 +695,37 @@
252	695	setMasterItem.addActionListener(this);
253	696	}
254	697
255		- oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
258	700	backItem = menu.add(new MenuItem("Back"));
259	701	backItem.addActionListener(this);
260	702	frontItem = menu.add(new MenuItem("Front"));
261	703	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	704	+// compositeItem = menu.add(new MenuItem("Composite"));
	705	+// compositeItem.addActionListener(this);
	706	+
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
264	712	hideItem = menu.add(new MenuItem("Hidden Group"));
265	713	hideItem.addActionListener(this);
266		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
267	716	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
	722	+
	723	+// menu.add("-");
	724	+//
	725	+// switchItem = menu.add(new MenuItem("Switch node"));
	726	+// switchItem.addActionListener(this);
	727	+ if (Globals.ADVANCED)
	728	+ {
271	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	730	switchGeoItem.addActionListener(this);
273	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +733,6 @@
275	733	morphItem = menu.add(new MenuItem("Morph Group"));
276	734	morphItem.addActionListener(this);
277	735
278		- if (Globals.ADVANCED)
279		- {
280	736	menu.add("-");
281	737	physicsItem = menu.add(new MenuItem("Physics"));
282	738	physicsItem.addActionListener(this);
..	..	@@ -284,42 +740,52 @@
284	740	frameselectorItem.addActionListener(this);
285	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	742	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	743	}
290	744
291	745	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
294	748	billboardItem = menu.add(new MenuItem("Billboard"));
295	749	billboardItem.addActionListener(this);
296	750	csgItem = menu.add(new MenuItem("CSG"));
297	751	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	753	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	755	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
304	761	if (Globals.ADVANCED)
305	762	{
306	763	menu.add("-");
307	764	linkerItem = menu.add(new MenuItem("Linker"));
308	765	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	766	templateItem = menu.add(new MenuItem("Template"));
312	767	templateItem.addActionListener(this);
313	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
314	769	pointflowItem.addActionListener(this);
315	770	}
316	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
317	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
318	780	resetTransformItem.addActionListener(this);
319	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	782	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	784	+ resetCentroidXZItem.addActionListener(this);
	785	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	786	+ transformGeometryItem.addActionListener(this);
	787	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	788	+ transformChildrenItem.addActionListener(this);
323	789
324	790	oe.menuBar.add(menu = new Menu("Geometry"));
325	791	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +798,7 @@
332	798	genNormalsMESHItem.addActionListener(this);
333	799	if (Globals.ADVANCED)
334	800	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	802	genNormalsMINEItem.addActionListener(this);
337	803	}
338	804	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -366,8 +832,14 @@
366	832	}
367	833
368	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
369	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	838	clearMaterialsItem.addActionListener(this);
	839	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	840	+ resetAllItem.addActionListener(this);
	841	+ stepAllItem = menu.add(new MenuItem("Step All"));
	842	+ stepAllItem.addActionListener(this);
371	843	menu.add("-");
372	844	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	845	liveleavesItem.addActionListener(this);
..	..	@@ -384,10 +856,18 @@
384	856	hideleavesItem.addActionListener(this);
385	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
386	858	showleavesItem.addActionListener(this);
387		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
388	860	markleavesItem.addActionListener(this);
389		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
390	862	unmarkleavesItem.addActionListener(this);
	863	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	864	+ rewindleavesItem.addActionListener(this);
	865	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	866	+ unrewindleavesItem.addActionListener(this);
	867	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	868	+ randomleavesItem.addActionListener(this);
	869	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	870	+ unrandomleavesItem.addActionListener(this);
391	871	menu.add("-");
392	872	flipVItem = menu.add(new MenuItem("Flip V"));
393	873	flipVItem.addActionListener(this);
..	..	@@ -413,55 +893,135 @@
413	893	attachBumpItem.addActionListener(this);
414	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
416	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	898	detachPigmentItem.addActionListener(this);
418	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	900	detachBumpItem.addActionListener(this);
	901	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	902	+ embedTexturesItem.addActionListener(this);
	903	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	904	+ deEmbedTexturesItem.addActionListener(this);
420	905	menu.add("-");
421	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	907	sortbysizeItem.addActionListener(this);
423	908	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	909	sortbynameItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	912	+ shareGeometriesItem.addActionListener(this);
	913	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	914	+ mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
425	918	if (Globals.ADVANCED)
426	919	{
427		- menu.add("-");
	920	+ // Pretty much the same as duplicate and clone.
428	921	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	922	extractGeometriesItem.addActionListener(this);
430	923	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	924	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	925	}
437	926
438	927	oe.menuBar.add(menu = new Menu("Insert"));
439	928	buildCreateMenu(menu);
440	929
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	930	oe.menuBar.add(menu = new Menu("Tools"));
452	931	buildToolsMenu(menu);
453	932	}
454	933
	934	+ JTabbedPane resourcecontainer;
	935	+ cGridBag currenttab;
	936	+ //boolean added; // patch for jar
	937	+
	938	+ int totalcount = 0;
	939	+
	940	+ int tabcount = 0;
	941	+ int colcount = 0;
	942	+ int rowcount = 0;
	943	+ int texturecount = 0;
	944	+
	945	+ int columns = 5;
	946	+ int rows = 7;
	947	+
	948	+ public void ResourceCallBack(String[] path)
	949	+ {
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	956	+ {
	957	+ currenttab = new cGridBag();
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	959	+ currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	963	+ rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
	966	+ }
	967	+
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	969	+ {
	970	+ //if (!added)
	971	+ {
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	975	+ }
	976	+
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
	980	+ if (++colcount >= columns)
	981	+ {
	982	+ colcount = 0;
	983	+ currenttab.Return();
	984	+
	985	+ if (rowcount++ >= rows)
	986	+ {
	987	+ rowcount = 0;
	988	+ }
	989	+ }
	990	+ }
	991	+ else
	992	+ {
	993	+// if (!path[path.length-1].equals("icons"))
	994	+// resourcecontainer.Return();
	995	+ }
	996	+ }
	997	+
	998	+ void CreateTexturePanel(cGridBag container)
	999	+ {
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1001	+ container.add(resourcecontainer);
	1002	+
	1003	+ Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
	1006	+ }
	1007	+
455	1008	void SetupUI2(ObjEditor oe)
456	1009	{
	1010	+ // June 2019
	1011	+ if (oe == null)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ //return;
	1015	+ }
	1016	+
	1017	+ if (copy != group)
	1018	+ {
	1019	+ //super.SetupUI2(this);
	1020	+ }
	1021	+
457	1022	//new Exception().printStackTrace();
458	1023
459	1024	oe.radioPanel = new JPanel(new GridBagLayout());
460		- oe.aConstraints.weightx = 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
463		- oe.aConstraints.gridwidth = 100;
464		- oe.aConstraints.gridheight = 1;
465	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
466	1026
467	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -482,97 +1042,268 @@
482	1042	oe.radioPanel.add(dummyButton);
483	1043	oe.buttonGroup.add(dummyButton);
484	1044	*/
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
	1048	+
485	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	1050
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
489		- liveCB.addItemListener(this);
	1051	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //minButton.setToolTipText("Minimize window");
	1053	+ //minButton.addActionListener(this);
	1054	+
	1055	+ if (Globals.ADVANCED)
	1056	+ {
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
	1060	+ }
	1061	+
	1062	+ cButton gcButton;
	1063	+
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
	1073	+
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
	1081	+
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ screenfitButton.setToolTipText("Screen fit");
	1107	+ screenfitButton.addActionListener(this);
490	1108
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1111	+ restoreCameraButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
	1116	+
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ deleteVersionButton.setToolTipText("Delete current version");
	1119	+ deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
	1121	+
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ previousVersionButton.setToolTipText("Previous version");
	1124	+ previousVersionButton.addActionListener(this);
	1125	+ previousVersionButton.setEnabled(false);
	1126	+
	1127	+ cGridBag updown = new cGridBag().setVertical(true);
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
	1130	+ restoreButton.addActionListener(this);
	1131	+ restoreButton.setEnabled(false);
	1132	+
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
	1135	+ replaceButton.addActionListener(this);
	1136	+ replaceButton.setEnabled(false);
	1137	+
	1138	+ versionManagerPanel.add(updown);
	1139	+
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ nextVersionButton.setToolTipText("Next version");
	1142	+ nextVersionButton.addActionListener(this);
	1143	+ nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
492	1146	oneStepButton.setToolTipText("Animate one step forward");
493	1147	oneStepButton.addActionListener(this);
494	1148
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1149	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1150	+ liveCB.setToolTipText("Enable animation");
	1151	+ liveCB.addItemListener(this);
	1152	+
	1153	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	1154	fastCB.setToolTipText("Fast mode");
497	1155	fastCB.addItemListener(this);
498	1156
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	1157	+ //oe.toolboxPanel.Return();
	1158	+
	1159	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1160	+// trackCB.setToolTipText("Enable tracking");
	1161	+// trackCB.addItemListener(this);
506	1162
507	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	1164	// screenfitpointButton.addActionListener(this);
509	1165
510	1166	if (Globals.ADVANCED)
511	1167	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
513	1169	snapobjectButton.addActionListener(this);
514	1170	snapobjectButton.setToolTipText("Snap Object");
	1171	+
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ fourButton.addActionListener(this);
	1174	+ fourButton.setToolTipText("Show control panel only");
515	1175	}
516	1176
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	1178
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
524		- twoButton.setToolTipText("Show center view only");
525		- twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- fourButton.addActionListener(this);
528		- fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- sixButton.setToolTipText("2-column layout left");
531		- sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- threeButton.setToolTipText("2-column layout right");
534		- threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- sevenButton.setToolTipText("3-column layout");
537		- sevenButton.addActionListener(this);
538		- //
539	1179
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541		- rootButton.setToolTipText("Edit selection in new tab");
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ rootButton.setToolTipText("Open selection in new tab");
542	1182	rootButton.addActionListener(this);
543	1183
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
545	1185	closeButton.setToolTipText("Close tab");
546	1186	closeButton.addActionListener(this);
547	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	1188	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	1189	+
	1190	+ cGridBag row1 = new cGridBag();
551	1191
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	1192	+ // INSERT
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
	1195	+ gridButton.addActionListener(this);
	1196	+
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ boxButton.setToolTipText("Create box");
	1199	+ boxButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
	1218	+ {
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ kleinButton.setToolTipText("Create Klein bottle");
	1221	+ kleinButton.addActionListener(this);
	1222	+ }
	1223	+
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ particlesButton.setToolTipText("Create particle system");
	1226	+ particlesButton.addActionListener(this);
	1227	+
	1228	+ oe.toolboxPanel.add(row1);
	1229	+
	1230	+ cGridBag row2 = new cGridBag();
	1231	+
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ groupButton.setToolTipText("Create group");
	1234	+ groupButton.addActionListener(this);
	1235	+
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ compositeButton.setToolTipText("Create composite");
	1238	+ compositeButton.addActionListener(this);
	1239	+
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ switchButton.setToolTipText("Create item switcher");
	1242	+ switchButton.addActionListener(this);
	1243	+
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ loopButton.setToolTipText("Create loop");
	1246	+ loopButton.addActionListener(this);
	1247	+
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ textureButton.setToolTipText("Create texture");
	1250	+ textureButton.addActionListener(this);
	1251	+
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ overlayButton.setToolTipText("Create overlay");
	1254	+ overlayButton.addActionListener(this);
	1255	+
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ lightButton.setToolTipText("Create light");
	1258	+ lightButton.addActionListener(this);
	1259	+
	1260	+ oe.toolboxPanel.add(row2);
	1261	+
	1262	+ cGridBag textures = new cGridBag();
	1263	+
	1264	+ CreateTexturePanel(textures);
	1265	+
	1266	+ int tabCount = resourcecontainer.getTabCount();
	1267	+
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
	1271	+ oe.toolboxPanel.add(textures);
	1272	+
	1273	+ textures.preferredHeight = 100;
	1274	+
	1275	+ CreateSkyboxPanel(oe.skyboxPanel);
	1276	+
	1277	+ // EDIT panel
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editButton.setToolTipText("Pin selection controls");
554	1280	editButton.addActionListener(this);
555	1281
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
558	1284	uneditButton.addActionListener(this);
559	1285
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	1286	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1287	+ allParamsButton.setToolTipText("Show all controls");
562	1288	allParamsButton.addActionListener(this);
563	1289
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
565		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
566	1292	clearPanelButton.addActionListener(this);
567	1293
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
569		- unselectButton.setToolTipText("Unselect");
570		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
571	1297
572		- commandsPanel.preferredHeight = 1;
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ flashSelectionButton.setToolTipText("Highlight selection");
	1300	+ flashSelectionButton.addActionListener(this);
573	1301
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	1302	+ editCommandsPanel.preferredHeight = 1;
	1303	+
	1304	+ SetPinStates(false);
	1305	+// oe.treePanel.add(commandsPanel);
	1306	+// oe.treePanel.Return();
576	1307
577	1308	// oe.aConstraints.gridx += 1;
578	1309	// oe.aConstraints.weighty = 0;
..	..	@@ -587,34 +1318,24 @@
587	1318
588	1319	cGridBag jSPPanel = new cGridBag();
589	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
590	1323	JScrollPane jSP;
591	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	1326	ResetModel();
594	1327
595	1328	oe.treePanel.add(jSPPanel);
596	1329	oe.treePanel.Return();
597	1330
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
614	1332	oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
615	1336
616		-// mainPanel.setDividerLocation(0.5); //1.0);
617		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
618	1339
619	1340	//jList.addListSelectionListener(this);
620	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -622,7 +1343,7 @@
622	1343	//jTree.setEditable(true);
623	1344	oe.jTree.setDragEnabled(true);
624	1345	//jTree.setPreferredSize(new Dimension(10,10));
625		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
626	1347
627	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
628	1349
..	..	@@ -634,29 +1355,49 @@
634	1355	dgr.addDragGestureListener(this);
635	1356	}catch(Exception e) {}
636	1357	*/
637		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
638	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
639	1360	}
640	1361
641	1362	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	1363	{
	1364	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1365	+ colorCB.setToolTipText("Copy color when dropped");
	1366	+ colorCB.addItemListener(this);
	1367	+
	1368	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1369	+ materialCB.setToolTipText("Copy material when dropped");
	1370	+ materialCB.addItemListener(this);
	1371	+
	1372	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1373	+ textureCB.setToolTipText("Copy texture when dropped");
	1374	+ textureCB.addItemListener(this);
	1375	+
	1376	+ panel.Return();
	1377	+
643	1378	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	1379	boxCB.setToolTipText("Display bounding boxes");
645	1380	boxCB.addItemListener(this);
646	1381
647	1382	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	1384	zoomBoxCB.addItemListener(this);
650	1385
651		- if (Globals.ADVANCED)
	1386	+ if (true) // Globals.ADVANCED)
652	1387	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	1388	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1389	+// supportCB.setToolTipText("Enable rigging");
	1390	+// supportCB.addItemListener(this);
	1391	+
	1392	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1393	+ freezeCB.setToolTipText("Fast moving camera");
	1394	+ freezeCB.addItemListener(this);
656	1395
657	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	1397	// localCB.addItemListener(this);
659	1398
	1399	+ panel.Return();
	1400	+
660	1401	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	1402	crowdCB.setToolTipText("Used for crowds");
662	1403	crowdCB.addItemListener(this);
..	..	@@ -665,14 +1406,19 @@
665	1406	smoothCB.setToolTipText("Snapping delay");
666	1407	smoothCB.addItemListener(this);
667	1408
668		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
669		- slowCB.setToolTipText("Smooth interpolation");
670		- slowCB.addItemListener(this);
	1409	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1410	+// slowCB.setToolTipText("Smooth interpolation");
	1411	+// slowCB.addItemListener(this);
	1412	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1413	+ minshaderCB.setToolTipText("Minimal fast shader");
	1414	+ minshaderCB.addItemListener(this);
671	1415
672	1416	// constraints.gridy += 1;
673	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	1418	// speakerMocapCB.addItemListener(this);
675	1419
	1420	+ panel.Return();
	1421	+
676	1422	if (false)
677	1423	{
678	1424	// handled in scripts
..	..	@@ -687,67 +1433,126 @@
687	1433	//constraints.gridy += 1;
688	1434	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
690	1437	}
691	1438
692	1439	//constraints.gridx += 1;
693	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	1441	// debugCB.addItemListener(this);
695	1442
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
696	1447	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
697	1449	oeilCB.addItemListener(this);
698	1450
	1451	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1452	+ shadowCB.setToolTipText("When live compute shadows");
	1453	+ shadowCB.addItemListener(this);
	1454	+
	1455	+ panel.Return();
	1456	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1457	+ toggleTextureCB.setToolTipText("Load textures");
	1458	+ toggleTextureCB.addItemListener(this);
	1459	+
	1460	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1461	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1462	+ toggleSwitchCB.addItemListener(this);
	1463	+
	1464	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1465	+ autokeepCB.setToolTipText("On structure change");
	1466	+ autokeepCB.addItemListener(this);
	1467	+
	1468	+ panel.Return();
	1469	+ if (Globals.ADVANCED)
	1470	+ {
699	1471	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	1472	lookAtCB.setToolTipText("Look-at target");
701	1473	lookAtCB.addItemListener(this);
	1474	+ }
702	1475
703	1476	}
704	1477
705	1478	cGridBag fill = new cGridBag();
706		-
707	1479	fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
708	1484
709	1485	panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
710	1488
711	1489	}
712	1490
713	1491	void EditObject(Object3D obj)
714	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
715	1501	cRadio radioButton = new cRadio(obj.name);
	1502	+
	1503	+ // June 2019. Patch to avoid bug with transparency.
	1504	+ radioButton.hadMaterial = obj.material != null;
	1505	+ if (!radioButton.hadMaterial)
	1506	+ {
	1507	+ obj.material = new cMaterial();
	1508	+ }
	1509	+
716	1510	radioButton.SetObject(obj);
717		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
718	1512	radioButton.SetCamera(cameraView.renderCamera, false);
719	1513	radioButton.addActionListener(this);
720	1514	radioPanel.add(radioButton);
721	1515	buttonGroup.add(radioButton);
722	1516	radioButton.doClick();
723	1517	}
	1518	+
724	1519	void SetupViews(ObjEditor oe)
725	1520	{
	1521	+ theFrame = this;
	1522	+
726	1523	oe.SetupViews();
727	1524
	1525	+ if (Globals.DEBUG)
728	1526	System.out.println("SetupViews");
729	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
730	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
731	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1530	}
733	1531
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- JCheckBox smoothfocusCB;
	1532	+ cToggleButton liveCB;
	1533	+ cCheckBox supportCB;
	1534	+ cCheckBox localCB;
	1535	+ cCheckBox crowdCB;
	1536	+ cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
	1539	+ cToggleButton fastCB;
	1540	+ cCheckBox slowCB;
	1541	+ cCheckBox boxCB;
	1542	+ cCheckBox zoomBoxCB;
	1543	+ cCheckBox freezeCB;
	1544	+ //cToggleButton trackCB;
	1545	+ cCheckBox trackCB;
	1546	+ cCheckBox smoothfocusCB;
745	1547	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
751	1556
752	1557	// static int COLOR = 1;
753	1558	// static int MATERIAL = 2;
..	..	@@ -755,9 +1560,9 @@
755	1560
756	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1562
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
761	1566
762	1567	public void itemStateChanged(ItemEvent e)
763	1568	{
..	..	@@ -785,6 +1590,7 @@
785	1590	} else if(e.getSource() == liveCB)
786	1591	{
787	1592	cameraView.ToggleLive();
	1593	+ refreshContents(false);
788	1594	}
789	1595	else if(e.getSource() == supportCB)
790	1596	{
..	..	@@ -800,6 +1606,12 @@
800	1606	{
801	1607	cameraView.ToggleInertia();
802	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
803	1615	}
804	1616	else if(e.getSource() == localCB)
805	1617	{
..	..	@@ -849,6 +1661,18 @@
849	1661	{
850	1662	cameraView.ToggleOeil();
851	1663	}
	1664	+ else if(e.getSource() == shadowCB)
	1665	+ {
	1666	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == freezeCB)
	1669	+ {
	1670	+ Globals.FREEZEONMOVE ^= true;
	1671	+ }
	1672	+ else if(e.getSource() == autokeepCB)
	1673	+ {
	1674	+ Globals.REPLACEONMAKE ^= true;
	1675	+ }
852	1676	else if(e.getSource() == lookAtCB)
853	1677	{
854	1678	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1689,8 @@
865	1689
866	1690	/**/
867	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1695	// We can't move the root node or an empty selection
871	1696	return;
..	..	@@ -928,8 +1753,6 @@
928	1753	}
929	1754	}
930	1755
931		- String string = (String) object;
932		-
933	1756	System.out.println("Transfer = " + object + "; drop : " + target);
934	1757	// if( object instanceof java.io.File[])
935	1758	// {
..	..	@@ -937,7 +1760,11 @@
937	1760	// objEditor.DropFile((java.io.File[]) object, true);
938	1761	// return;
939	1762	// }
940		- if (string.charAt(0) == '/')
	1763	+
	1764	+ String string = object.toString();
	1765	+
	1766	+ // File path for Mac and Windows
	1767	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1768	{
942	1769	// file(s)
943	1770	String[] names = string.split("\n");
..	..	@@ -964,7 +1791,7 @@
964	1791
965	1792	flashIt = false;
966	1793	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1794	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1795	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1796
970	1797	if (group.selection.size() == 1)
..	..	@@ -980,23 +1807,33 @@
980	1807
981	1808	assert target == objEditor.jTree;
982	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
983	1811	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1813	} catch (Exception e) {
986	1814	System.out.println("destinationPath : " + destinationPath);
987	1815	return;
988	1816	}
989	1817
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
991	1819	{
	1820	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1821	+
	1822	+ // Cannot move into itself
	1823	+ if (child == destinationLeaf)
	1824	+ return;
	1825	+ }
	1826	+
	1827	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+// {
992	1829	loadClipboard(true);
993	1830	objEditor.jTree.setSelectionPath(destinationPath);
994	1831	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
1000	1837	}
1001	1838	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1839	// Called if the user has modified the current drop gesture
..	..	@@ -1052,7 +1889,12 @@
1052	1889	TreePath path;
1053	1890
1054	1891	public TransferableTreePath(TreePath tp) {
1055		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1056	1898	}
1057	1899
1058	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1101,22 +1943,30 @@
1101	1943	{
1102	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1945	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- superItem.addActionListener(this);
	1946	+// gridItem = menu.add(new MenuItem("Grid"));
	1947	+// gridItem.addActionListener(this);
	1948	+// rectoidItem = menu.add(new MenuItem("Box"));
	1949	+// rectoidItem.addActionListener(this);
	1950	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1951	+// ellipsoidItem.addActionListener(this);
	1952	+// coneItem = menu.add(new MenuItem("Cone"));
	1953	+// coneItem.addActionListener(this);
	1954	+// torusItem = menu.add(new MenuItem("Torus"));
	1955	+// torusItem.addActionListener(this);
	1956	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1957	+// superItem.addActionListener(this);
	1958	+
	1959	+ cameraItem = menu.add(new MenuItem("Camera"));
	1960	+ cameraItem.addActionListener(this);
	1961	+
	1962	+ if (!Globals.ADVANCED)
	1963	+ {
1116	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1965	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
1120	1970	if (Globals.ADVANCED)
1121	1971	{
1122	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1992,15 @@
1142	1992	}
1143	1993	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1994	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1995	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1996	+// overlayItem.addActionListener(this);
	1997	+// lightItem = menu.add(new MenuItem("Light"));
	1998	+// lightItem.addActionListener(this);
1149	1999	menu.add("-");
1150	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	2001	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1154	2004	doubleItem = menu.add(new MenuItem("Fork"));
1155	2005	doubleItem.addActionListener(this);
1156	2006	if (Globals.ADVANCED)
..	..	@@ -1166,6 +2016,9 @@
1166	2016	animationItem.addItemListener(this);
1167	2017	animationItem.setState(Globals.ANIMATION);
1168	2018
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
	2021	+
1169	2022	menu.add("-");
1170	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	2024	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +2031,8 @@
1178	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	2032	reduce34MorphItem.addActionListener(this);
1180	2033	menu.add("-");
	2034	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2035	+ memoryItem.addActionListener(this);
1181	2036	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	2037	computeAOItem.addActionListener(this);
1183	2038
..	..	@@ -1186,11 +2041,9 @@
1186	2041	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	2042	mirrorItem.addActionListener(this);
1188	2043	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	2045	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	2046	+ menu.add(dumpItem = new MenuItem("Print"));
1194	2047	dumpItem.addActionListener(this);
1195	2048	// menu.add(pathItem = new MenuItem("From-to path"));
1196	2049	// pathItem.addActionListener(this);
..	..	@@ -1273,24 +2126,24 @@
1273	2126	switch(axis)
1274	2127	{
1275	2128	case 0 :
1276		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1277		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1278		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1279		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1280	2133	norm = cVector.X;
1281	2134	break;
1282	2135	case 1 :
1283		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1284		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1285		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1286		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1287	2140	norm = cVector.Y;
1288	2141	break;
1289	2142	case 2 :
1290		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1291		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1292		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1293		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1294	2147	norm = cVector.Z;
1295	2148	break;
1296	2149	}
..	..	@@ -1331,9 +2184,38 @@
1331	2184	shadow.material = new cMaterial(obj.material);
1332	2185	shadow.material.diffuse = 0.0001f;
1333	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1334	2192
1335	2193	makeSomething(shadow);
1336	2194	}
	2195	+
	2196	+ private void ClearUnpinned()
	2197	+ {
	2198	+ //for (Object3D obj : listUI)
	2199	+ for (int i=listUI.size(); --i>=0;)
	2200	+ {
	2201	+ Object3D obj = listUI.elementAt(i);
	2202	+ if (!obj.pinned)
	2203	+ {
	2204	+ obj.CloseUI();
	2205	+ listUI.remove(i);
	2206	+ }
	2207	+ }
	2208	+ }
	2209	+
	2210	+ private void EditElement(Object3D elem, boolean newWindow)
	2211	+ {
	2212	+ // if (!(elem instanceof Composite))
	2213	+ // newWindow = false;
	2214	+ listUI.add(elem);
	2215	+ elem.openEditWindow(this, newWindow); //, false);
	2216	+ System.out.println("edit : " + elem);
	2217	+ elem.editWindow.refreshContents(true); // ? new
	2218	+ }
1337	2219
1338	2220	/**
1339	2221	* applyExample
..	..	@@ -1537,9 +2419,9 @@
1537	2419
1538	2420	void Overwrite(int mask)
1539	2421	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2422	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	2423	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	2424	+ Object3D content = Grafreed.clipboard.get(0);
1543	2425
1544	2426	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	2427	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +2460,7 @@
1578	2460	{
1579	2461	ScreenFit();
1580	2462	} else
1581		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1582	2464	{
1583	2465	cVector v1 = new cVector();
1584	2466	cVector v2 = new cVector();
..	..	@@ -1587,11 +2469,11 @@
1587	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	2470	objEditor.cameraView.repaint();
1589	2471	} else
1590		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1591	2473	{
1592	2474	makeSomething(new Box());
1593	2475	} else
1594		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1595	2477	{
1596	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2552,27 @@
1670	2552
1671	2553	makeSomething(obj);
1672	2554	} else
1673		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1674	2556	{
1675	2557	makeSomething(new Grid());
1676	2558	} else
1677		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2560	{
1679	2561	makeSomething(new Sphere());
1680	2562	} else
1681		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1682	2564	{
1683	2565	makeSomething(new Cone());
1684	2566	} else
1685		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1686	2568	{
1687	2569	makeSomething(new Torus());
1688	2570	} else
1689		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1690	2572	{
1691	2573	makeSomething(new Superellipsoid());
1692	2574	} else
1693		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1694	2576	{
1695	2577	makeSomething(new Klein());
1696	2578	} else
..	..	@@ -1710,7 +2592,7 @@
1710	2592	{
1711	2593	makeSomething(new BezierSurface());
1712	2594	} else
1713		- if (source == overlayItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1714	2596	{
1715	2597	/*
1716	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,10 +2640,27 @@
1758	2640	s.setup();
1759	2641	makeSomething(s);
1760	2642	} else
1761		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1762	2644	{
1763	2645	makeSomething(new Light());
1764	2646	} else
	2647	+// if (source == skybox1Button \|\|
	2648	+// source == skybox2Button \|\|
	2649	+// source == skybox3Button \|\|
	2650	+// source == skybox4Button \|\|
	2651	+// source == skybox5Button \|\|
	2652	+// source == skybox6Button \|\|
	2653	+// source == skybox7Button \|\|
	2654	+// source == skybox11Button \|\|
	2655	+// source == skybox12Button \|\|
	2656	+// source == skybox13Button \|\|
	2657	+// source == skybox14Button \|\|
	2658	+// source == skybox15Button \|\|
	2659	+// source == skybox16Button \|\|
	2660	+// source == skybox17Button)
	2661	+// {
	2662	+// ChangeSkybox(source);
	2663	+// } else
1765	2664	if (source == csgItem)
1766	2665	{
1767	2666	group(new CSG());
..	..	@@ -1808,30 +2707,38 @@
1808	2707
1809	2708	group(g);
1810	2709	} else
1811		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1812	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1813	2714	Composite csg = new GroupLeaf();
1814		- csg.count = 5;
1815	2715	group(csg);
1816		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1817	2718	csg.addChild(child);
1818	2719	child.addChild(csg);
	2720	+ }
1819	2721	} else
1820	2722	if (source == doubleItem)
1821	2723	{
1822		- Composite csg = new GroupLeaf();
1823		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1824	2727	group(csg);
1825		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1826	2730	csg.addChild(child);
1827	2731	child.addChild(csg);
1828		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1829	2733	csg.addChild(child);
1830	2734	child.addChild(csg);
	2735	+ }
1831	2736	} else
1832	2737	if (source == tripleItem)
1833	2738	{
1834		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1835	2742	csg.count = 4;
1836	2743	group(csg);
1837	2744	Composite child = new cGroup();
..	..	@@ -1843,28 +2750,12 @@
1843	2750	child = new cGroup();
1844	2751	csg.addChild(child);
1845	2752	child.addChild(csg);
1846		- } else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2753	+ }
1863	2754	} else
1864	2755	if (source == computeAOItem)
1865	2756	{
1866	2757	Globals.drawMode = CameraPane.OCCLUSION;
1867		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1868	2759	} else
1869	2760	if (source == recompileItem)
1870	2761	{
..	..	@@ -1879,7 +2770,7 @@
1879	2770	if (source == invariantsItem)
1880	2771	{
1881	2772	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1883	2774	} else
1884	2775	if (source == memoryItem)
1885	2776	{
..	..	@@ -1898,6 +2789,65 @@
1898	2789	{
1899	2790	DumpObject();
1900	2791	} else
	2792	+ if (source == minButton)
	2793	+ {
	2794	+ Minimize();
	2795	+ } else
	2796	+ if (source == maxButton)
	2797	+ {
	2798	+ Maximize();
	2799	+ } else
	2800	+ if (source == fullScreenButton)
	2801	+ {
	2802	+ ToggleFullScreen();
	2803	+ } else
	2804	+ if (source == collapseButton)
	2805	+ {
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
	2816	+ if (source == previousVersionButton)
	2817	+ {
	2818	+ // Go to previous version
	2819	+ //if (!Undo())
	2820	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ PreviousVersion();
	2822	+ } else
	2823	+ if (source == restoreButton)
	2824	+ {
	2825	+ // Restore current version
	2826	+ Restore();
	2827	+ //restoreButton.setEnabled(false);
	2828	+ } else
	2829	+ if (source == replaceButton)
	2830	+ {
	2831	+ // Overwrite current version
	2832	+ Replace();
	2833	+ //replaceButton.setEnabled(false);
	2834	+ } else
	2835	+ if (source == nextVersionButton)
	2836	+ {
	2837	+ // Go to next version
	2838	+ NextVersion();
	2839	+ } else
	2840	+ if (source == saveVersionButton)
	2841	+ {
	2842	+ // Save a new version
	2843	+ if (!Save(true))
	2844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
	2850	+ } else
1901	2851	if (source == oneStepButton)
1902	2852	{
1903	2853	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2855,14 @@
1905	2855	} else
1906	2856	if (source == screenfitButton)
1907	2857	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2858	ScreenFit();
1910	2859	} else
1911	2860	if (source == screenfitpointButton)
1912	2861	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2862	ScreenFitPoint();
1915	2863	} else
1916	2864	if (source == snapobjectButton)
1917	2865	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2866	SnapObject();
1920	2867	} else
1921	2868	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2899,20 @@
1952	2899	{
1953	2900	loadClipboard(true);
1954	2901	} else
	2902	+ if (source == undoItem)
	2903	+ {
	2904	+ PreviousVersion();
	2905	+ } else
	2906	+ if (source == redoItem)
	2907	+ {
	2908	+ NextVersion();
	2909	+ } else
1955	2910	if (source == duplicateItem)
1956	2911	{
1957		- Object3D keep = GrafreeD.clipboard;
	2912	+ Object3D keep = Grafreed.clipboard;
1958	2913	loadClipboard(false);
1959	2914	paste(false);
1960		- GrafreeD.clipboard = keep;
	2915	+ Grafreed.clipboard = keep;
1961	2916	} else
1962	2917	if (source == cloneItem)
1963	2918	{
..	..	@@ -2177,9 +3132,9 @@
2177	3132	// group.selection.get(0).setMasterThis(content); // should be identity
2178	3133	// refreshContents();
2179	3134	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3135	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	3136	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	3137	+ Object3D content = Grafreed.clipboard.get(0);
2183	3138
2184	3139	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	3140	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +3184,9 @@
2229	3184	} else
2230	3185	if (source == setMasterItem)
2231	3186	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3187	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	3188	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	3189	+ Object3D content = Grafreed.clipboard.get(0);
2235	3190
2236	3191	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	3192	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +3199,9 @@
2244	3199	{
2245	3200	if (group.selection.size() == 1)
2246	3201	{
2247		- if (GrafreeD.clipboard.size() == 1)
	3202	+ if (Grafreed.clipboard.size() == 1)
2248	3203	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	3204	+ Object3D content = Grafreed.clipboard.get(0);
2250	3205
2251	3206	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	3207	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +3218,7 @@
2263	3218	{
2264	3219	RevertMeshes();
2265	3220	} else
2266		- if (source == resetMeshItem)
	3221	+ if (source == resetAllItem)
2267	3222	{
2268	3223	ResetAll();
2269	3224	} else
..	..	@@ -2271,7 +3226,7 @@
2271	3226	{
2272	3227	StepAll();
2273	3228	} else
2274		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2275	3230	{
2276	3231	//int indices[] = jList.getSelectedIndices();
2277	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2283,9 +3238,9 @@
2283	3238	{
2284	3239	ClearSelection(true);
2285	3240	} else
2286		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2287	3242	{
2288		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2289	3244	} else
2290	3245	if (source == hideItem)
2291	3246	{
..	..	@@ -2303,11 +3258,11 @@
2303	3258	{
2304	3259	makeSomething(new Camera());
2305	3260	} else
2306		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2307	3262	{
2308	3263	group(new Composite());
2309	3264	} else
2310		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2311	3266	{
2312	3267	RandomNode random = new RandomNode();
2313	3268	group(random);
..	..	@@ -2409,7 +3364,7 @@
2409	3364	{
2410	3365	group(new cLinker());
2411	3366	} else
2412		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2413	3368	{
2414	3369	group(new TextureNode());
2415	3370	} else
..	..	@@ -2429,17 +3384,42 @@
2429	3384	{
2430	3385	CastShadow(2);
2431	3386	} else
2432		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	3388	{
2434		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2435	3391	for (int i=0; i<group.selection.size(); i++)
2436	3392	{
2437		- Ungroup(group.selection.get(i));
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
	3396	+ {
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
	3406	+ break;
	3407	+ }
2438	3408	}
2439	3409
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	3410	+ if (canUngroup)
	3411	+ {
	3412	+ for (int i=0; i<group.selection.size(); i++)
	3413	+ {
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
	3417	+ }
	3418	+
	3419	+ ClearSelection(false);
	3420	+
	3421	+ refreshContents();
	3422	+ }
2443	3423	} else
2444	3424	if (source == genUVItem)
2445	3425	{
..	..	@@ -2451,7 +3431,7 @@
2451	3431	} else
2452	3432	if (source == genNormalsMESHItem)
2453	3433	{
2454		- GenNormals(true); // TODO
	3434	+ GenNormalsMESH();
2455	3435	} else
2456	3436	if (source == genNormalsORGANItem)
2457	3437	{
..	..	@@ -2485,6 +3465,10 @@
2485	3465	{
2486	3466	ClearMaterials();
2487	3467	} else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
2488	3472	if (source == liveleavesItem)
2489	3473	{
2490	3474	LiveLeaves(true);
..	..	@@ -2516,6 +3500,22 @@
2516	3500	if (source == unmarkleavesItem)
2517	3501	{
2518	3502	MarkLeaves(false);
	3503	+ } else
	3504	+ if (source == rewindleavesItem)
	3505	+ {
	3506	+ RewindLeaves(true);
	3507	+ } else
	3508	+ if (source == unrewindleavesItem)
	3509	+ {
	3510	+ RewindLeaves(false);
	3511	+ } else
	3512	+ if (source == randomleavesItem)
	3513	+ {
	3514	+ RandomLeaves(true);
	3515	+ } else
	3516	+ if (source == unrandomleavesItem)
	3517	+ {
	3518	+ RandomLeaves(false);
2519	3519	} else
2520	3520	if (source == flipVItem)
2521	3521	{
..	..	@@ -2601,9 +3601,25 @@
2601	3601	{
2602	3602	SmoothMesh();
2603	3603	} else
2604		- if (source == transformgeometryItem)
	3604	+ if (source == transformGeometryItem)
2605	3605	{
2606	3606	TransformGeometry();
	3607	+ } else
	3608	+ if (source == transformChildrenItem)
	3609	+ {
	3610	+ TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
2607	3623	} else
2608	3624	if (source == resetTransformItem)
2609	3625	{
..	..	@@ -2611,7 +3627,11 @@
2611	3627	} else
2612	3628	if (source == resetCentroidItem)
2613	3629	{
2614		- ResetCentroid();
	3630	+ ResetCentroid(true);
	3631	+ } else
	3632	+ if (source == resetCentroidXZItem)
	3633	+ {
	3634	+ ResetCentroid(false);
2615	3635	} else
2616	3636	if (source == resetParentItem)
2617	3637	{
..	..	@@ -2716,7 +3736,7 @@
2716	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2717	3737	{
2718	3738	obj = (Object3D)e.nextElement();
2719		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2720	3740	}
2721	3741
2722	3742	refreshContents();
..	..	@@ -2732,6 +3752,31 @@
2732	3752
2733	3753	refreshContents();
2734	3754	} else
	3755	+ if (source == embedTexturesItem)
	3756	+ {
	3757	+ Object3D obj;
	3758	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3759	+ {
	3760	+ obj = (Object3D)e.nextElement();
	3761	+ obj.EmbedTextures(true);
	3762	+ }
	3763	+
	3764	+ refreshContents();
	3765	+ } else
	3766	+ if (source == deEmbedTexturesItem)
	3767	+ {
	3768	+ Object3D obj;
	3769	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3770	+ {
	3771	+ obj = (Object3D)e.nextElement();
	3772	+ obj.EmbedTextures(false);
	3773	+ }
	3774	+
	3775	+ CameraPane.texturepigment.clear();
	3776	+ CameraPane.texturebump.clear();
	3777	+
	3778	+ refreshContents();
	3779	+ } else
2735	3780	if (source == flashSelectionButton)
2736	3781	{
2737	3782	CameraPane.flash = true;
..	..	@@ -2743,42 +3788,36 @@
2743	3788	if (source == twoButton)
2744	3789	{
2745	3790	radio.layout = twoButton;
2746		- // bug
2747		- //gridPanel.setDividerLocation(1.0);
2748		- //bigPanel.setDividerLocation(0.0);
2749		-// bigThree.remove(scenePanel);
2750		-// bigThree.remove(centralPanel);
2751		-// bigThree.remove(XYZPanel);
2752		-// aWindowConstraints.gridx = 0;
2753		-// aWindowConstraints.gridy = 0;
2754		-// aWindowConstraints.gridwidth = 1;
2755		-// // aConstraints.gridheight = 3;
2756		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2757		-// aWindowConstraints.weightx = 0;
2758		-// aWindowConstraints.weighty = 1;
2759		-// //bigThree.add(jtp, aWindowConstraints);
2760		-// aWindowConstraints.weightx = 1;
2761		-// aWindowConstraints.gridwidth = 3;
2762		-// // aConstraints.gridheight = 3;
2763		-// aWindowConstraints.gridx = 1;
2764		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2765		-// bigThree.add(centralPanel, aWindowConstraints);
2766		-// aWindowConstraints.weightx = 0;
2767		-// aWindowConstraints.gridx = 4;
2768		-// aWindowConstraints.gridwidth = 1;
2769		-// // aConstraints.gridheight = 3;
2770		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2771		-// //bigThree.add(XYZPanel, aWindowConstraints);
2772		-// scenePanel.setVisible(false);
2773		-// centralPanel.setVisible(true);
2774		-// XYZPanel.setVisible(false);
2775		- bigThree.ClearUI();
2776		- bigThree.add(centralPanel);
2777		- bigThree.FlushUI();
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
	3794	+
	3795	+ Show3DView();
	3796	+
	3797	+ cameraView.requestFocusInWindow();
	3798	+
	3799	+// refreshContents(true);
	3800	+//
	3801	+// try
	3802	+// {
	3803	+// java.awt.Robot bot = new java.awt.Robot();
	3804	+// int mask = InputEvent.BUTTON1_MASK;
	3805	+// bot.mouseMove(100, 100);
	3806	+// bot.mousePress(mask);
	3807	+// bot.mouseRelease(mask);
	3808	+// }
	3809	+// catch (Exception e)
	3810	+// {
	3811	+//
	3812	+// }
	3813	+
2778	3814	} else
2779	3815	if (source == threeButton)
2780	3816	{
2781	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2782	3821
2783	3822	// bigThree.remove(scenePanel);
2784	3823	// bigThree.remove(centralPanel);
..	..	@@ -2808,13 +3847,18 @@
2808	3847	// centralPanel.setVisible(true);
2809	3848	// XYZPanel.setVisible(true);
2810	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2811	3851	bigThree.add(centralPanel);
2812		- bigThree.add(XYZPanel);
2813	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2814	3855	} else
2815	3856	if (source == fourButton)
2816	3857	{
2817	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2818	3862
2819	3863	// bigThree.remove(scenePanel);
2820	3864	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3890,15 @@
2846	3890	bigThree.ClearUI();
2847	3891	bigThree.add(scenePanel);
2848	3892	bigThree.FlushUI();
	3893	+
	3894	+ cameraView.requestFocusInWindow();
2849	3895	} else
2850	3896	if (source == sixButton)
2851	3897	{
2852	3898	radio.layout = sixButton;
	3899	+
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
2853	3902
2854	3903	// bigThree.remove(scenePanel);
2855	3904	// bigThree.remove(centralPanel);
..	..	@@ -2879,13 +3928,18 @@
2879	3928	// centralPanel.setVisible(true);
2880	3929	// XYZPanel.setVisible(false);
2881	3930	bigThree.ClearUI();
2882		- bigThree.add(scenePanel);
2883	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
2884	3933	bigThree.FlushUI();
	3934	+
	3935	+ cameraView.requestFocusInWindow();
2885	3936	} else
2886	3937	if (source == sevenButton)
2887	3938	{
2888	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
2889	3943
2890	3944	// bigThree.remove(scenePanel);
2891	3945	// bigThree.remove(centralPanel);
..	..	@@ -2919,9 +3973,12 @@
2919	3973	bigThree.add(centralPanel);
2920	3974	bigThree.add(XYZPanel);
2921	3975	bigThree.FlushUI();
	3976	+
	3977	+ cameraView.requestFocusInWindow();
2922	3978	} else
2923	3979	if (source == rootButton)
2924	3980	{
	3981	+ Replace();
2925	3982	Object3D obj;
2926	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2927	3984	{
..	..	@@ -2930,31 +3987,50 @@
2930	3987	EditObject(obj);
2931	3988	}
2932	3989
	3990	+ cameraView.requestFocusInWindow();
2933	3991	refreshContents(true);
2934	3992	} else
2935	3993	if (source == closeButton)
2936	3994	{
2937	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
2938	3999	cRadio ab;
2939	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	4001	{
2941	4002	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
2944	4011	buttonGroup.remove(ab);
2945	4012	radioPanel.remove(ab);
2946	4013
2947		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
2948	4016	// ab.GetObject().objectUI = null; // ?????????
2949	4017
2950	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	4019	break;
2952	4020	}
2953	4021	}
	4022	+
	4023	+ cameraView.requestFocusInWindow();
2954	4024	refreshContents(true);
2955	4025	} else
2956	4026	if (source == editItem \|\| source == editButton)
2957	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
2958	4034	EditSelection(false);
2959	4035	} else
2960	4036	if (source == uneditButton)
..	..	@@ -2963,11 +4039,12 @@
2963	4039	{
2964	4040	Object3D child = (Object3D)e.nextElement();
2965	4041	if(child.editWindow != null)
2966		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
2967	4043	child.CloseUI();
2968	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2969	4046
2970		- child.editWindow = null; // ???????????
	4047	+ //child.editWindow = null; // ???????????
2971	4048	}
2972	4049	objEditor.ctrlPanel.FlushUI();
2973	4050	//objEditor.jTree.clearSelection();
..	..	@@ -2980,16 +4057,18 @@
2980	4057	//copy.ClearUI();
2981	4058	for (Object3D obj : listUI)
2982	4059	{
	4060	+ obj.pinned = false;
2983	4061	obj.CloseUI();
2984	4062	}
2985	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
2986	4065	refreshContents(true);
2987	4066	} else
2988	4067	if (source == allParamsButton)
2989	4068	{
2990	4069	assert(copy == group);
2991	4070
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	4072
2994	4073	for (Object3D obj : listUI)
2995	4074	{
..	..	@@ -3015,6 +4094,9 @@
3015	4094	} else
3016	4095	if(source instanceof cRadio)
3017	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3018	4100	group.parent = keepparent;
3019	4101	group.attributes = 0;
3020	4102	//group.editWindow = null;
..	..	@@ -3038,6 +4120,7 @@
3038	4120	}
3039	4121
3040	4122	copy = group;
	4123	+
3041	4124	//Globals.theRenderer.object = group;
3042	4125	if(!useclient)
3043	4126	{
..	..	@@ -3053,20 +4136,75 @@
3053	4136	frontView.object = group;
3054	4137	sideView.object = group;
3055	4138	}
3056		- group.editWindow = this;
	4139	+
	4140	+// fix "+" issue
	4141	+ //group.editWindow = this;
	4142	+ group.manipWindow = this;
	4143	+
3057	4144	/*
3058	4145	currentLayout = radio.layout;
3059	4146	if (currentLayout == null)
3060	4147	currentLayout = sevenButton;
3061	4148	*/
3062	4149	radio.layout.doClick();
	4150	+
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
	4177	+ ClearUnpinned();
	4178	+
	4179	+ //Grafreed.Assert(group != null);
	4180	+ //Grafreed.Assert(group.selection != null);
	4181	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4182	+ if (group.selection == null \|\| group.selection.size() == 1)
	4183	+ EditSelection(false);
3063	4184	keepparent = group.parent;
3064	4185	// PARENT = NULL or not???
3065	4186	//group.parent = null; // ROOT
3066	4187	//group.attributes = -1;
3067	4188	ResetModel();
	4189	+
	4190	+ cameraView.requestFocusInWindow();
3068	4191	refreshContents(true);
3069		- }
	4192	+ } else if (event.getSource() == editCameraItem)
	4193	+ {
	4194	+ cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
	4196	+ cameraView.repaint();
	4197	+ return;
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4199	+ {
	4200	+ cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
	4202	+ cameraView.repaint();
	4203	+ return;
	4204	+ // } else if (event.getSource() == textureButton)
	4205	+ // {
	4206	+ // return; // true;
	4207	+ }
3070	4208	else
3071	4209	{
3072	4210	//return super.action(event, arg);
..	..	@@ -3075,7 +4213,6 @@
3075	4213	}
3076	4214
3077	4215	boolean useclient = false;
3078		- cRadio radio;
3079	4216
3080	4217	void ToggleRoot()
3081	4218	{
..	..	@@ -3127,6 +4264,40 @@
3127	4264	refreshContents();
3128	4265	}
3129	4266
	4267	+ void TransformChildren()
	4268	+ {
	4269	+ Object3D obj;
	4270	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4271	+ {
	4272	+ obj = (Object3D)e.nextElement();
	4273	+ obj.KeepTextureMatrices();
	4274	+ obj.TransformChildren();
	4275	+ obj.RestoreTextureMatrices();
	4276	+
	4277	+// if (obj.parent == null)
	4278	+// {
	4279	+// System.out.println("NULL PARENT!");
	4280	+// new Exception().printStackTrace();
	4281	+// }
	4282	+// else
	4283	+// TouchTransform(obj);
	4284	+// //obj.parent.Touch();
	4285	+ }
	4286	+
	4287	+ refreshContents();
	4288	+ }
	4289	+
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
3130	4301
3131	4302	void ResetTransform()
3132	4303	{
..	..	@@ -3143,42 +4314,8 @@
3143	4314	if (obj.toParent == null)
3144	4315	continue;
3145	4316
3146		- if (mask == -1)
3147		- {
3148		- if (obj instanceof Camera) // jan 2014
3149		- {
3150		- LA.matIdentity(obj.toParent);
3151		- LA.matIdentity(obj.fromParent);
3152		- }
3153		- else
3154		- {
3155		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3156		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3157		- }
3158		- TouchTransform(obj);
3159		- continue;
3160		- }
3161		- if ((mask&2) != 0) // Scale
3162		- {
3163		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3164		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3165		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3166		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3167		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3168		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3169		- }
3170		- if ((mask&4) != 0) // Rotation
3171		- {
3172		- // ?
3173		- }
3174		- if ((mask&1) != 0) // Translation
3175		- {
3176		- if (obj.toParent != null)
3177		- {
3178		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3179		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3180		- }
3181		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3182	4319	if (obj.parent == null)
3183	4320	{
3184	4321	System.out.println("NULL PARENT!");
..	..	@@ -3239,7 +4376,7 @@
3239	4376	refreshContents();
3240	4377	}
3241	4378
3242		- void ResetCentroid()
	4379	+ void ResetCentroid(boolean full)
3243	4380	{
3244	4381	Object3D obj;
3245	4382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +4391,16 @@
3254	4391	LA.matIdentity(Object3D.mat);
3255	4392	obj.getBounds(minima, maxima, false);
3256	4393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4394	+ if (full)
	4395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	4396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	4397	obj.TransformMesh(Object3D.mat);
	4398	+
3260	4399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4400	+ if (full)
	4401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	4402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4403	+
3263	4404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	4405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	4406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +4429,8 @@
3288	4429
3289	4430	int size = obj.MemorySize();
3290	4431
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	4432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	4434	}
3293	4435	}
3294	4436	catch (Exception e)
..	..	@@ -3325,9 +4467,9 @@
3325	4467	obj = (Object3D)e.nextElement();
3326	4468
3327	4469	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	4470	+ Grafreed.AnalyzeObject(obj);
3329	4471	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	4472	+ Grafreed.AnalyzeObject(obj.bRep);
3331	4473
3332	4474	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	4475	}
..	..	@@ -3369,6 +4511,13 @@
3369	4511	void GenNormals(boolean crease)
3370	4512	{
3371	4513	group.GenNormalsS(crease);
	4514	+
	4515	+ refreshContents();
	4516	+ }
	4517	+
	4518	+ void GenNormalsMESH()
	4519	+ {
	4520	+ group.GenNormalsMeshS();
3372	4521
3373	4522	refreshContents();
3374	4523	}
..	..	@@ -3541,8 +4690,8 @@
3541	4690
3542	4691	void ParseVertices()
3543	4692	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4693	+ boolean epsequal = Grafreed.epsequal;
	4694	+ Grafreed.epsequal = true;
3546	4695
3547	4696	for (int i=0; i<group.selection.size(); i++)
3548	4697	{
..	..	@@ -3567,7 +4716,7 @@
3567	4716	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4717	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4718
3570		- g.add(GrafreeD.clipboard);
	4719	+ g.add(Grafreed.clipboard);
3571	4720
3572	4721	buffer.add(g);
3573	4722	}
..	..	@@ -3582,7 +4731,7 @@
3582	4731	makeSomething(buffer, i==group.selection.size()-1);
3583	4732	}
3584	4733
3585		- GrafreeD.epsequal = epsequal;
	4734	+ Grafreed.epsequal = epsequal;
3586	4735
3587	4736	refreshContents();
3588	4737	}
..	..	@@ -3600,7 +4749,16 @@
3600	4749	String pigment = Object3D.GetPigment(tex);
3601	4750	//String bump = Object3D.GetBump(tex);
3602	4751
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4752	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4753	+
	4754	+ try
	4755	+ {
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4757	+ }
	4758	+ catch (Exception e)
	4759	+ {
	4760	+ System.err.println("FAIL: " + node);
	4761	+ }
3604	4762
3605	4763	double s = v.s;
3606	4764
..	..	@@ -3665,6 +4823,12 @@
3665	4823	for (int i=0; i<group.selection.size(); i++)
3666	4824	{
3667	4825	Object3D obj = group.selection.get(i);
	4826	+
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
3668	4832
3669	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3670	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -3732,7 +4896,7 @@
3732	4896	return;
3733	4897
3734	4898	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4899	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4900
3737	4901	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4902
..	..	@@ -3926,9 +5090,9 @@
3926	5090
3927	5091	void ClipMesh()
3928	5092	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5093	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	5094	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	5095	+ Object3D content = Grafreed.clipboard.get(0);
3932	5096
3933	5097	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	5098	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +5101,7 @@
3937	5101	// {
3938	5102	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	5103	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	5104	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	5105	}
3942	5106	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	5107	System.out.println("DONE.");
..	..	@@ -3954,6 +5118,12 @@
3954	5118	void ClearMaterials()
3955	5119	{
3956	5120	group.selection.ClearMaterials();
	5121	+ refreshContents();
	5122	+ }
	5123	+
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
3957	5127	refreshContents();
3958	5128	}
3959	5129
..	..	@@ -3984,6 +5154,18 @@
3984	5154	void MarkLeaves(boolean hide)
3985	5155	{
3986	5156	group.selection.MarkLeaves(hide);
	5157	+ refreshContents();
	5158	+ }
	5159	+
	5160	+ void RewindLeaves(boolean hide)
	5161	+ {
	5162	+ group.selection.RewindLeaves(hide);
	5163	+ refreshContents();
	5164	+ }
	5165	+
	5166	+ void RandomLeaves(boolean hide)
	5167	+ {
	5168	+ group.selection.RandomLeaves(hide);
3987	5169	refreshContents();
3988	5170	}
3989	5171
..	..	@@ -4058,28 +5240,25 @@
4058	5240	// }
4059	5241	// }
4060	5242
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	5243	void EditSelection(boolean newWindow)
4066	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4067	5251	// aConstraints.gridy = 0;
4068	5252	for (int i=0; i<group.selection.size(); i++)
4069	5253	{
4070	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	5257
4074	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	5259	+ if(elem != group \|\| !newWindow)
4076	5260	{
4077		- // if (!(elem instanceof Composite))
4078		- // newWindow = false;
4079		- listUI.add(elem);
4080		- elem.openEditWindow(this, newWindow); //, false);
4081		- System.out.println("edit : " + elem);
4082		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4083	5262	}
4084	5263	}
4085	5264	}
..	..	@@ -4142,9 +5321,7 @@
4142	5321
4143	5322	freezemodel = false;
4144	5323	}
4145		-
4146		- boolean flashIt = true;
4147		-
	5324	+
4148	5325	public void valueChanged(TreeSelectionEvent e)
4149	5326	//public boolean handleEvent(Event event)
4150	5327	{
..	..	@@ -4154,7 +5331,8 @@
4154	5331	//new Exception().printStackTrace();
4155	5332
4156	5333	freezemodel = true;
4157		-
	5334	+ ClearUnpinned();
	5335	+
4158	5336	/**/
4159	5337	//switch (event.id)
4160	5338	{
..	..	@@ -4162,7 +5340,6 @@
4162	5340	//case 702: // Event.LIST_DESELECT
4163	5341	group.deselectAll();
4164	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	5343	if (tps != null)
4167	5344	{
4168	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +5348,8 @@
4171	5348
4172	5349	//if (child.parent != null)
4173	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
4174	5352	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	5353	}
4179	5354	}
4180	5355	// else
..	..	@@ -4184,20 +5359,28 @@
4184	5359	// System.err.println("info : " + group.GetPath());
4185	5360	// }
4186	5361
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5362	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	5363	CameraPane.flash = true;
4191	5364
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5365	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	5366	// a camera
4194	5367	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5369	+ {
	5370	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5371	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5372	+ }
4197	5373	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	5375	}
4200	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4201	5384	refreshContents();
4202	5385	//return true;
4203	5386	}
..	..	@@ -4206,6 +5389,53 @@
4206	5389
4207	5390	freezemodel = false;
4208	5391	}
	5392	+
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
	5416	+ }
	5417	+
	5418	+ void refreshContents(boolean cp)
	5419	+ {
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5423	+ {
	5424	+ objEditor.ClearInfo(); // .GetMaterial());
	5425	+
	5426	+ for (int i=0; i < group.selection.Size(); i++)
	5427	+ {
	5428	+ Object3D child = (Object3D) group.selection.get(i);
	5429	+
	5430	+ objEditor.AddInfo(child, this, true);
	5431	+// System.err.println("info : " + child.GetPath());
	5432	+ }
	5433	+
	5434	+ objEditor.SetText(); // jan 2014
	5435	+ }
	5436	+
	5437	+ super.refreshContents(cp);
	5438	+ }
4209	5439
4210	5440	void linkSomething(Object3D thing)
4211	5441	{
..	..	@@ -4277,16 +5507,19 @@
4277	5507	{
4278	5508	if (group.selection.isEmpty())
4279	5509	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	5510	+
	5511	+ Grafreed.clipboardIsTempGroup = false;
4281	5512	Composite tGroup = null;
4282	5513	if (group.selection.size() > 0) // 1)
4283	5514	{
4284	5515	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	5516	+ Grafreed.clipboardIsTempGroup = true;
4286	5517	}
4287	5518
4288	5519	if (cut)
4289	5520	{
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4290	5523	//int indices[] = jList.getSelectedIndices();
4291	5524	//for (int i = indices.length - 1; i >= 0; i--)
4292	5525	//jList.remove(indices[i]);
..	..	@@ -4322,16 +5555,16 @@
4322	5555	//System.out.println("cut " + child);
4323	5556	//System.out.println("parent = " + child.parent);
4324	5557	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	5558	+ if (Grafreed.clipboardIsTempGroup)
4326	5559	tGroup.add/Child/(tmp);
4327	5560	else
4328		- GrafreeD.clipboard = tmp;
	5561	+ Grafreed.clipboard = tmp;
4329	5562	}
4330	5563	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	5564	+ if (Grafreed.clipboardIsTempGroup)
4332	5565	tGroup.add/Child/(child);
4333	5566	else
4334		- GrafreeD.clipboard = child;
	5567	+ Grafreed.clipboard = child;
4335	5568	}
4336	5569
4337	5570	//ResetModel();
..	..	@@ -4363,21 +5596,23 @@
4363	5596	//System.out.println("cut " + elem);
4364	5597	//System.out.println("parent = " + elem.parent);
4365	5598	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	5599	+ if (Grafreed.clipboardIsTempGroup)
4367	5600	tGroup.add/Child/(tmp);
4368	5601	else
4369		- GrafreeD.clipboard = tmp;
	5602	+ Grafreed.clipboard = tmp;
4370	5603	}
4371	5604	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	5605	+ if (Grafreed.clipboardIsTempGroup)
4373	5606	tGroup.add/Child/(child);
4374	5607	else
4375		- GrafreeD.clipboard = child;
	5608	+ Grafreed.clipboard = child;
4376	5609	}
4377	5610
4378	5611	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	5612	+
	5613	+ if (Grafreed.clipboardIsTempGroup)
	5614	+ Grafreed.clipboard = tGroup;
	5615	+
4381	5616	if (cut)
4382	5617	{
4383	5618	ResetModel();
..	..	@@ -4387,11 +5622,15 @@
4387	5622
4388	5623	void paste(boolean expand)
4389	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4390	5629	// if (GrafreeD.clipboard == null)
4391	5630	// return;
4392	5631	boolean first = true;
4393	5632
4394		- if (GrafreeD.clipboardIsTempGroup)
	5633	+ if (Grafreed.clipboardIsTempGroup)
4395	5634	{
4396	5635	Composite temp;
4397	5636
..	..	@@ -4402,7 +5641,7 @@
4402	5641	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	5642	*/
4404	5643	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5644	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	5645	{
4407	5646	Object3D child = (Object3D)e.nextElement();
4408	5647
..	..	@@ -4436,16 +5675,17 @@
4436	5675	//Object3D cb = Applet3D.clipboard;
4437	5676	//temp.addChild(cb);
4438	5677	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5678	+ assert(Grafreed.clipboard.parent == null);
	5679	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5680	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5681	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5682	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	5683	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5684	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5685	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5686	}
4448	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4449	5689	ResetModel();
4450	5690	refreshContents();
4451	5691	}
..	..	@@ -4492,9 +5732,9 @@
4492	5732	{
4493	5733	boolean first = true;
4494	5734
4495		- if (GrafreeD.clipboardIsTempGroup)
	5735	+ if (Grafreed.clipboardIsTempGroup)
4496	5736	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5737	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5738	Object3D copy;
4499	5739	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5740	{
..	..	@@ -4504,7 +5744,7 @@
4504	5744	}
4505	5745	} else
4506	5746	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5747	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5748	}
4509	5749	}
4510	5750	}
..	..	@@ -4581,6 +5821,10 @@
4581	5821
4582	5822	void group(Object3D csg, boolean grab)
4583	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4584	5828	if (//false) // why??
4585	5829	!group.selection.isEmpty())
4586	5830	{
..	..	@@ -4694,10 +5938,15 @@
4694	5938	//node.add(csg);
4695	5939	//makeSomething(node);
4696	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4697	5942	}
4698	5943
4699	5944	void Ungroup(Object3D g)
4700	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4701	5950	if (g instanceof HiddenObject)
4702	5951	{
4703	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5963,7 @@
4714	5963	objEditor.makeSomething(g.get(i), false);
4715	5964	}
4716	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4717	5967	}
4718	5968
4719	5969	void ungroup()
..	..	@@ -4909,21 +6159,6 @@
4909	6159	}
4910	6160	*/
4911	6161
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	6162	/*
4928	6163	public void Callback(Object obj)
4929	6164	{
..	..	@@ -4947,26 +6182,9 @@
4947	6182	}
4948	6183	*/
4949	6184
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	6185	String GetFile(String dialogName)
4968	6186	{
4969		- if (GrafreeD.standAlone)
	6187	+ if (Grafreed.standAlone)
4970	6188	{
4971	6189	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	6190	browser.show();
..	..	@@ -5034,7 +6252,43 @@
5034	6252	cButton clearpanelButton;
5035	6253	cButton unselectButton;
5036	6254
	6255	+ cButton restoreCameraButton;
	6256	+
5037	6257	cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
5038	6292
5039	6293	cButton screenfitButton;
5040	6294	cButton screenfitpointButton;
..	..	@@ -5047,14 +6301,6 @@
5047	6301
5048	6302	cButton setsupportButton;
5049	6303
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	6304	//
5059	6305	//Composite
5060	6306	Object3D // to do !!
..	..	@@ -5064,10 +6310,12 @@
5064	6310	//JTree jTree;
5065	6311	private MenuItem lookAtItem;
5066	6312	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
5068		- private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
5070		- private MenuItem cloneItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
	6315	+ private MenuItem undoItem;
	6316	+ private MenuItem redoItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5071	6319	private MenuItem cloneSupportItem;
5072	6320	private MenuItem overwriteGeoItem;
5073	6321	private MenuItem overwriteMatItem;
..	..	@@ -5079,7 +6327,7 @@
5079	6327	private MenuItem linkverticesItem;
5080	6328	private MenuItem relinkverticesItem;
5081	6329	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	6330	+ private MenuItem resetAllItem;
5083	6331	private MenuItem stepAllItem;
5084	6332	private MenuItem revertMeshItem;
5085	6333	private MenuItem poseMeshItem;
..	..	@@ -5088,13 +6336,13 @@
5088	6336	private MenuItem cloneGeometriesItem;
5089	6337	private MenuItem shareGeometriesItem;
5090	6338	private MenuItem mergeGeometriesItem;
5091		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5092	6340	private MenuItem pasteItem;
5093		- private MenuItem pasteIntoItem;
5094		- private MenuItem pasteLinkItem;
5095		- private MenuItem pasteCloneItem;
5096		- private MenuItem pasteExpandItem;
5097		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5098	6346	private MenuItem clearAllItem;
5099	6347	private MenuItem genUVItem;
5100	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5120,6 +6368,7 @@
5120	6368	private MenuItem clipMeshItem;
5121	6369	private MenuItem smoothMeshItem;
5122	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5123	6372
5124	6373	private MenuItem liveleavesItem;
5125	6374	private MenuItem unliveleavesItem;
..	..	@@ -5129,6 +6378,10 @@
5129	6378	private MenuItem showleavesItem;
5130	6379	private MenuItem markleavesItem;
5131	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
5132	6385
5133	6386	private MenuItem flipVItem;
5134	6387	private MenuItem unflipVItem;
..	..	@@ -5139,16 +6392,21 @@
5139	6392	private MenuItem maxTexturesItem;
5140	6393	private MenuItem panoTexturesItem;
5141	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5142	6398	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	6399	+ private MenuItem resetCentroidXZItem;
5144	6400	private MenuItem resetTransformItem;
	6401	+ private MenuItem transformGeometryItem;
	6402	+ private MenuItem transformChildrenItem;
5145	6403	private MenuItem hideItem;
5146		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5147	6405	private MenuItem backItem;
5148	6406	private MenuItem frontItem;
5149	6407	private MenuItem cameraItem;
5150	6408	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5152	6410	private MenuItem physicsItem;
5153	6411	private MenuItem frameselectorItem;
5154	6412	private MenuItem scriptNodeItem;
..	..	@@ -5156,7 +6414,7 @@
5156	6414	private MenuItem switchTransfoItem;
5157	6415	private MenuItem morphItem;
5158	6416	private MenuItem linkerItem;
5159		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5160	6418	private MenuItem editItem;
5161	6419	private MenuItem openWindowItem;
5162	6420	private MenuItem editLeafItem;
..	..	@@ -5172,6 +6430,8 @@
5172	6430	private MenuItem attachBumpItem;
5173	6431	private MenuItem detachBumpItem;
5174	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5175	6435
5176	6436	private MenuItem particleItem;
5177	6437	private MenuItem ragdollItem;
..	..	@@ -5210,11 +6470,6 @@
5210	6470	private MenuItem doubleItem;
5211	6471	private MenuItem tripleItem;
5212	6472
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	6473	private MenuItem computeAOItem;
5219	6474	private MenuItem recompileItem;
5220	6475	private MenuItem editScriptItem;
..	..	@@ -5224,4 +6479,8 @@
5224	6479	private MenuItem analyzeItem;
5225	6480	private MenuItem dumpItem;
5226	6481	//boolean freezemodel = false;
	6482	+
	6483	+ Menu cameraMenu;
	6484	+ MenuItem editCameraItem;
	6485	+ MenuItem restoreCameraItem;
5227	6486	}