~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)
..	..	@@ -115,11 +483,16 @@
115	483
116	484	Object3D parent = obj.parent;
117	485	obj.parent = null;
	486	+
118	487	// Object3D support = obj.support;
119	488	// obj.support = null;
120	489	if (!supports)
121	490	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	491	+
	492	+ Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
123	496	obj.parent = parent;
124	497	// obj.support = support;
125	498	// clone.support = support; // aout 2013
..	..	@@ -148,57 +521,53 @@
148	521
149	522	//JTextField nameField;
150	523
151		- void SetupMenu2(ObjEditor oe)
	524	+ void SetupMenu2(GroupEditor oe)
152	525	{
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		-
	526	+ oe.jTree = new cTree();
	527	+
168	528	Menu menu;
169	529	oe.menuBar.add(menu = new Menu("Edit"));
170	530	//editItem = menu.add(new MenuItem("Edit"));
171	531	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	532	+
	533	+// undoItem = menu.add(new MenuItem("Undo"));
	534	+// undoItem.addActionListener(this);
	535	+// redoItem = menu.add(new MenuItem("Redo"));
	536	+// redoItem.addActionListener(this);
	537	+// menu.add("-");
	538	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	539	duplicateItem.addActionListener(this);
174		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175	542	cloneItem.addActionListener(this);
176		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
177	544	{
178	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179	546	cloneSupportItem.addActionListener(this);
180	547	}
	548	+ oe.jTree.popup.addSeparator();
181	549	menu.add("-");
182		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183	551	cutItem.addActionListener(this);
184		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185	553	copyItem.addActionListener(this);
186	554	pasteItem = menu.add(new MenuItem("Paste"));
187	555	pasteItem.addActionListener(this);
188		- menu.add("-");
189	556
190		- menu.add("-");
191		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
192	560	pasteIntoItem.addActionListener(this);
193		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194	562	pasteLinkItem.addActionListener(this);
195		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196	564	pasteCloneItem.addActionListener(this);
197		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198		-// pasteExpandItem.addActionListener(this);
199		- menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
202	571
203	572	if (Globals.ADVANCED)
204	573	{
..	..	@@ -206,14 +575,95 @@
206	575	clearAllItem = menu.add(new MenuItem("Clear All"));
207	576	clearAllItem.addActionListener(this);
208	577	}
	578	+
	579	+ menuBar.add(cameraMenu = new Menu("View"));
	580	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	581	+ //zBufferItem.addActionListener(this);
	582	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	583	+ //normalLensItem.addActionListener(this);
	584	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	585	+ restoreCameraItem.addActionListener(this);
	586	+
	587	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	588	+// toggleFullScreenItem.addItemListener(this);
	589	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	590	+// cameraMenu.add("-");
	591	+//
	592	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	593	+// toggleTextureItem.addItemListener(this);
	594	+// toggleTextureItem.setState(CameraPane.textureon);
	595	+//
	596	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	597	+// toggleSwitchItem.addItemListener(this);
	598	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	599	+
	600	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	601	+ toggleHandleItem.addItemListener(this);
	602	+ toggleHandleItem.setState(CameraPane.HANDLES);
	603	+
	604	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	605	+ togglePaintItem.addItemListener(this);
	606	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	607	+
	608	+ if (Globals.ADVANCED)
	609	+ {
	610	+ cameraMenu.add("-");
	611	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	612	+ toggleLiveItem.addItemListener(this);
	613	+ toggleLiveItem.setState(Globals.isLIVE());
209	614
	615	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	616	+ stepItem.addActionListener(this);
	617	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	618	+ // toggleDLItem.addItemListener(this);
	619	+ // toggleDLItem.setState(false);
	620	+
	621	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	622	+ toggleRenderItem.addItemListener(this);
	623	+ toggleRenderItem.setState(!CameraPane.frozen);
	624	+
	625	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	626	+ toggleDebugItem.addItemListener(this);
	627	+ toggleDebugItem.setState(Globals.DEBUG);
	628	+
	629	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	630	+ toggleFrustumItem.addItemListener(this);
	631	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	632	+
	633	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	634	+ toggleFootContactItem.addItemListener(this);
	635	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	636	+
	637	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	638	+ toggleTimelineItem.addItemListener(this);
	639	+ }
	640	+
	641	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	642	+// toggleRootItem.addItemListener(this);
	643	+// toggleRootItem.setState(false);
	644	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	645	+// animationItem.addItemListener(this);
	646	+// animationItem.setState(CameraPane.ANIMATION);
	647	+ cameraMenu.add("-");
	648	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	649	+ editCameraItem.addActionListener(this);
	650	+
	651	+ if (Globals.ADVANCED)
	652	+ {
	653	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	654	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	655	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	656	+ oe.cameraMenu.add("-");
	657	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	658	+ openWindowItem.addActionListener(this);
	659	+ lookAtItem.addActionListener(this);
	660	+ //lookFromItem.addActinoListener(this);
	661	+ //switchViewItem.addActionListener(this);
	662	+ }
	663	+
210	664	oe.menuBar.add(menu = new Menu("Setting"));
211	665	if (Globals.ADVANCED)
212	666	{
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	667	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	668	revertMeshItem.addActionListener(this);
219	669	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -252,22 +702,37 @@
252	702	setMasterItem.addActionListener(this);
253	703	}
254	704
255		- oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
258	707	backItem = menu.add(new MenuItem("Back"));
259	708	backItem.addActionListener(this);
260	709	frontItem = menu.add(new MenuItem("Front"));
261	710	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
	717	+ if (Globals.ADVANCED)
	718	+ {
264	719	hideItem = menu.add(new MenuItem("Hidden Group"));
265	720	hideItem.addActionListener(this);
266		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	721	+ }
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
267	723	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
	729	+
	730	+// menu.add("-");
	731	+//
	732	+// switchItem = menu.add(new MenuItem("Switch node"));
	733	+// switchItem.addActionListener(this);
	734	+ if (Globals.ADVANCED)
	735	+ {
271	736	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	737	switchGeoItem.addActionListener(this);
273	738	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +740,6 @@
275	740	morphItem = menu.add(new MenuItem("Morph Group"));
276	741	morphItem.addActionListener(this);
277	742
278		- if (Globals.ADVANCED)
279		- {
280	743	menu.add("-");
281	744	physicsItem = menu.add(new MenuItem("Physics"));
282	745	physicsItem.addActionListener(this);
..	..	@@ -284,42 +747,52 @@
284	747	frameselectorItem.addActionListener(this);
285	748	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	749	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	750	}
290	751
291	752	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	753	+// textureItem = menu.add(new MenuItem("Texture"));
	754	+// textureItem.addActionListener(this);
294	755	billboardItem = menu.add(new MenuItem("Billboard"));
295	756	billboardItem.addActionListener(this);
296	757	csgItem = menu.add(new MenuItem("CSG"));
297	758	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	759	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	760	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	761	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	762	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	763	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	764	shadowZItem.addActionListener(this);
	765	+
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
304	768	if (Globals.ADVANCED)
305	769	{
306	770	menu.add("-");
307	771	linkerItem = menu.add(new MenuItem("Linker"));
308	772	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	773	templateItem = menu.add(new MenuItem("Template"));
312	774	templateItem.addActionListener(this);
313	775	pointflowItem = menu.add(new MenuItem("Point Flow"));
314	776	pointflowItem.addActionListener(this);
315	777	}
316	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
317	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
318	787	resetTransformItem.addActionListener(this);
319	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	789	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	791	+ resetCentroidXZItem.addActionListener(this);
	792	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	793	+ transformGeometryItem.addActionListener(this);
	794	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	795	+ transformChildrenItem.addActionListener(this);
323	796
324	797	oe.menuBar.add(menu = new Menu("Geometry"));
325	798	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -330,9 +803,9 @@
330	803	genNormalsCADItem.addActionListener(this);
331	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
332	805	genNormalsMESHItem.addActionListener(this);
333		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
334	807	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	809	genNormalsMINEItem.addActionListener(this);
337	810	}
338	811	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -366,8 +839,14 @@
366	839	}
367	840
368	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
369	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	845	clearMaterialsItem.addActionListener(this);
	846	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	847	+ resetAllItem.addActionListener(this);
	848	+ stepAllItem = menu.add(new MenuItem("Step All"));
	849	+ stepAllItem.addActionListener(this);
371	850	menu.add("-");
372	851	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	852	liveleavesItem.addActionListener(this);
..	..	@@ -384,10 +863,18 @@
384	863	hideleavesItem.addActionListener(this);
385	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
386	865	showleavesItem.addActionListener(this);
387		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
388	867	markleavesItem.addActionListener(this);
389		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
390	869	unmarkleavesItem.addActionListener(this);
	870	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	871	+ rewindleavesItem.addActionListener(this);
	872	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	873	+ unrewindleavesItem.addActionListener(this);
	874	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	875	+ randomleavesItem.addActionListener(this);
	876	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	877	+ unrandomleavesItem.addActionListener(this);
391	878	menu.add("-");
392	879	flipVItem = menu.add(new MenuItem("Flip V"));
393	880	flipVItem.addActionListener(this);
..	..	@@ -413,58 +900,140 @@
413	900	attachBumpItem.addActionListener(this);
414	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
416	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	905	detachPigmentItem.addActionListener(this);
418	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	907	detachBumpItem.addActionListener(this);
	908	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	909	+ embedTexturesItem.addActionListener(this);
	910	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	911	+ deEmbedTexturesItem.addActionListener(this);
420	912	menu.add("-");
421	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	914	sortbysizeItem.addActionListener(this);
423	915	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	916	sortbynameItem.addActionListener(this);
	917	+ menu.add("-");
	918	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	919	+ shareGeometriesItem.addActionListener(this);
	920	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	921	+ mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
425	925	if (Globals.ADVANCED)
426	926	{
427		- menu.add("-");
	927	+ // Pretty much the same as duplicate and clone.
428	928	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	929	extractGeometriesItem.addActionListener(this);
430	930	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	931	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	932	}
437	933
438	934	oe.menuBar.add(menu = new Menu("Insert"));
439	935	buildCreateMenu(menu);
440	936
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	937	oe.menuBar.add(menu = new Menu("Tools"));
455	938	buildToolsMenu(menu);
456	939	}
457	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
	1019	+
458	1020	void SetupUI2(ObjEditor oe)
459	1021	{
	1022	+ // June 2019
	1023	+ if (oe == null)
	1024	+ {
	1025	+ //super.SetupUI2(this);
	1026	+ //return;
	1027	+ }
	1028	+
	1029	+ if (copy != group)
	1030	+ {
	1031	+ //super.SetupUI2(this);
	1032	+ }
	1033	+
460	1034	//new Exception().printStackTrace();
461	1035
462	1036	oe.radioPanel = new JPanel(new GridBagLayout());
463		- oe.aConstraints.weightx = 1;
464		- oe.aConstraints.weighty = 0;
465		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
466		- oe.aConstraints.gridwidth = 100;
467		- oe.aConstraints.gridheight = 1;
468	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
469	1038
470	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -485,97 +1054,270 @@
485	1054	oe.radioPanel.add(dummyButton);
486	1055	oe.buttonGroup.add(dummyButton);
487	1056	*/
	1057	+ cGridBag versionManagerPanel = new cGridBag();
	1058	+
	1059	+ versionManagerPanel.preferredHeight = 4;
	1060	+
488	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	1062
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
492		- liveCB.addItemListener(this);
	1063	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ //minButton.setToolTipText("Minimize window");
	1065	+ //minButton.addActionListener(this);
	1066	+
	1067	+ if (Globals.ADVANCED)
	1068	+ {
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
	1072	+ }
	1073	+
	1074	+ cButton gcButton;
	1075	+
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ screenfitButton.setToolTipText("Screen fit");
	1119	+ screenfitButton.addActionListener(this);
493	1120
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1123	+ restoreCameraButton.addActionListener(this);
	1124	+
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
	1128	+
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
	1138	+
	1139	+ cGridBag updown = new cGridBag().setVertical(true);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
	1142	+ restoreButton.addActionListener(this);
	1143	+ restoreButton.setEnabled(false);
	1144	+
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
	1147	+ replaceButton.addActionListener(this);
	1148	+ replaceButton.setEnabled(false);
	1149	+
	1150	+ versionManagerPanel.add(updown);
	1151	+
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
495	1158	oneStepButton.setToolTipText("Animate one step forward");
496	1159	oneStepButton.addActionListener(this);
497	1160
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1161	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1162	+ liveCB.setToolTipText("Enable animation");
	1163	+ liveCB.addItemListener(this);
	1164	+
	1165	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	1166	fastCB.setToolTipText("Fast mode");
500	1167	fastCB.addItemListener(this);
501	1168
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- screenfitButton.addActionListener(this);
	1169	+ //oe.toolboxPanel.Return();
	1170	+
	1171	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1172	+// trackCB.setToolTipText("Enable tracking");
	1173	+// trackCB.addItemListener(this);
509	1174
510	1175	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	1176	// screenfitpointButton.addActionListener(this);
512	1177
513	1178	if (Globals.ADVANCED)
514	1179	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
516	1181	snapobjectButton.addActionListener(this);
517	1182	snapobjectButton.setToolTipText("Snap Object");
	1183	+
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ fourButton.addActionListener(this);
	1186	+ fourButton.setToolTipText("Show control panel only");
518	1187	}
519	1188
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	1189	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	1190
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
528		- twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- fourButton.addActionListener(this);
531		- fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- sixButton.setToolTipText("2-column layout left");
534		- sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
537		- threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- sevenButton.addActionListener(this);
541		- //
542	1191
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- rootButton.setToolTipText("Edit selection in new tab");
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ rootButton.setToolTipText("Open selection in new tab");
545	1194	rootButton.addActionListener(this);
546	1195
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
548	1197	closeButton.setToolTipText("Close tab");
549	1198	closeButton.addActionListener(this);
550	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	1200	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	1201	+
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
554	1204
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	1205	+ // INSERT
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
	1208	+ gridButton.addActionListener(this);
	1209	+
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ boxButton.setToolTipText("Create box");
	1212	+ boxButton.addActionListener(this);
	1213	+
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ superButton.setToolTipText("Create superellipsoid");
	1216	+ superButton.addActionListener(this);
	1217	+
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
	1231	+ {
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ kleinButton.setToolTipText("Create Klein bottle");
	1234	+ kleinButton.addActionListener(this);
	1235	+ }
	1236	+
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ particlesButton.setToolTipText("Create particle system");
	1239	+ particlesButton.addActionListener(this);
	1240	+
	1241	+ oe.toolboxPanel.add(row1);
	1242	+
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ groupButton.setToolTipText("Create group");
	1248	+ groupButton.addActionListener(this);
	1249	+
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ compositeButton.setToolTipText("Create composite");
	1252	+ compositeButton.addActionListener(this);
	1253	+
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ switchButton.setToolTipText("Create item switcher");
	1256	+ switchButton.addActionListener(this);
	1257	+
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ loopButton.setToolTipText("Create loop");
	1260	+ loopButton.addActionListener(this);
	1261	+
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ textureButton.setToolTipText("Create texture");
	1264	+ textureButton.addActionListener(this);
	1265	+
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ overlayButton.setToolTipText("Create overlay");
	1268	+ overlayButton.addActionListener(this);
	1269	+
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ lightButton.setToolTipText("Create light");
	1272	+ lightButton.addActionListener(this);
	1273	+
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
	1290	+
	1291	+ // EDIT panel
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ editButton.setToolTipText("Pin selection controls");
557	1294	editButton.addActionListener(this);
558	1295
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
561	1298	uneditButton.addActionListener(this);
562	1299
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	1300	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1301	+ allParamsButton.setToolTipText("Show all controls");
565	1302	allParamsButton.addActionListener(this);
566	1303
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
568		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
569	1306	clearPanelButton.addActionListener(this);
570	1307
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
572		- unselectButton.setToolTipText("Unselect");
573		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
574	1311
575		- commandsPanel.preferredHeight = 1;
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1313	+ flashSelectionButton.setToolTipText("Highlight selection");
	1314	+ flashSelectionButton.addActionListener(this);
576	1315
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	1316	+ editCommandsPanel.preferredHeight = 1;
	1317	+
	1318	+ SetPinStates(false);
	1319	+// oe.treePanel.add(commandsPanel);
	1320	+// oe.treePanel.Return();
579	1321
580	1322	// oe.aConstraints.gridx += 1;
581	1323	// oe.aConstraints.weighty = 0;
..	..	@@ -590,34 +1332,25 @@
590	1332
591	1333	cGridBag jSPPanel = new cGridBag();
592	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
593	1337	JScrollPane jSP;
594	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1339	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1340	ResetModel();
597	1341
598	1342	oe.treePanel.add(jSPPanel);
599	1343	oe.treePanel.Return();
600	1344
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
617	1346	oe.treePanel.Return();
618	1347
619		-// mainPanel.setDividerLocation(0.5); //1.0);
620		-// mainPanel.setResizeWeight(0.5);
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
621	1354
622	1355	//jList.addListSelectionListener(this);
623	1356	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -625,7 +1358,7 @@
625	1358	//jTree.setEditable(true);
626	1359	oe.jTree.setDragEnabled(true);
627	1360	//jTree.setPreferredSize(new Dimension(10,10));
628		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
629	1362
630	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
631	1364
..	..	@@ -637,120 +1370,203 @@
637	1370	dgr.addDragGestureListener(this);
638	1371	}catch(Exception e) {}
639	1372	*/
640		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
641	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	1375	}
643	1376
644	1377	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	1378	{
	1379	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1380	+ colorCB.setToolTipText("Copy color when dropped");
	1381	+ colorCB.addItemListener(this);
	1382	+
	1383	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1384	+ materialCB.setToolTipText("Copy material when dropped");
	1385	+ materialCB.addItemListener(this);
	1386	+
	1387	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1388	+ textureCB.setToolTipText("Copy texture when dropped");
	1389	+ textureCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+
646	1393	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	1394	boxCB.setToolTipText("Display bounding boxes");
648	1395	boxCB.addItemListener(this);
649	1396
650	1397	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1398	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	1399	zoomBoxCB.addItemListener(this);
653	1400
654		- if (Globals.ADVANCED)
	1401	+ if (true) // Globals.ADVANCED)
655	1402	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- supportCB.addItemListener(this);
	1403	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1404	+// supportCB.setToolTipText("Enable rigging");
	1405	+// supportCB.addItemListener(this);
	1406	+
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
	1408	+ freezeCB.setToolTipText("Fast moving camera");
	1409	+ freezeCB.addItemListener(this);
659	1410
660	1411	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	1412	// localCB.addItemListener(this);
662	1413
	1414	+ panel.Return();
	1415	+
	1416	+ if (Globals.ADVANCED)
	1417	+ {
663	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	1419	crowdCB.setToolTipText("Used for crowds");
665	1420	crowdCB.addItemListener(this);
	1421	+ }
666	1422
667	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
668	1424	smoothCB.setToolTipText("Snapping delay");
669	1425	smoothCB.addItemListener(this);
670	1426
671		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
672		- slowCB.setToolTipText("Smooth interpolation");
673		- slowCB.addItemListener(this);
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
674	1433
675		-// constraints.gridy += 1;
676	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	1435	// speakerMocapCB.addItemListener(this);
678	1436
679	1437	if (false)
680	1438	{
681	1439	// handled in scripts
682		- //constraints.gridy += 1;
683	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
684	1441	speakerCameraCB.addItemListener(this);
685	1442
686		- //constraints.gridy += 1;
687	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
688	1444	speakerFocusCB.addItemListener(this);
689	1445
690		- //constraints.gridy += 1;
691		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692		- smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
693	1447	}
694	1448
695		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
696	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	1455	// debugCB.addItemListener(this);
698	1456
	1457	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1458	+ trackCB.setToolTipText("Enable tracking target");
	1459	+ trackCB.addItemListener(this);
	1460	+
699	1461	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1462	+ oeilCB.setToolTipText("Move camera when tracking");
700	1463	oeilCB.addItemListener(this);
701	1464
	1465	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1466	+ shadowCB.setToolTipText("When live compute shadows");
	1467	+ shadowCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1471	+ toggleTextureCB.setToolTipText("Load textures");
	1472	+ toggleTextureCB.addItemListener(this);
	1473	+
	1474	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1475	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1476	+ toggleSwitchCB.addItemListener(this);
	1477	+
	1478	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1479	+ autokeepCB.setToolTipText("On structure change");
	1480	+ autokeepCB.addItemListener(this);
	1481	+
	1482	+ panel.Return();
	1483	+ if (Globals.ADVANCED)
	1484	+ {
702	1485	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	1486	lookAtCB.setToolTipText("Look-at target");
704	1487	lookAtCB.addItemListener(this);
	1488	+ }
705	1489
706	1490	}
707	1491
708	1492	cGridBag fill = new cGridBag();
709		-
710	1493	fill.preferredHeight = 200;
	1494	+ cGridBag fill2 = new cGridBag();
	1495	+ fill2.preferredHeight = 200;
	1496	+ cGridBag fill3 = new cGridBag();
	1497	+ fill3.preferredHeight = 200;
711	1498
712	1499	panel.add(fill);
	1500	+ panel.add(fill2);
	1501	+ panel.add(fill3);
713	1502
714	1503	}
715	1504
716	1505	void EditObject(Object3D obj)
717	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
718	1515	cRadio radioButton = new cRadio(obj.name);
	1516	+
	1517	+ // June 2019. Patch to avoid bug with transparency.
	1518	+ radioButton.hadMaterial = obj.material != null;
	1519	+ if (!radioButton.hadMaterial)
	1520	+ {
	1521	+ obj.material = new cMaterial();
	1522	+ }
	1523	+
719	1524	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
721	1526	radioButton.SetCamera(cameraView.renderCamera, false);
722	1527	radioButton.addActionListener(this);
723	1528	radioPanel.add(radioButton);
724	1529	buttonGroup.add(radioButton);
725	1530	radioButton.doClick();
726	1531	}
	1532	+
727	1533	void SetupViews(ObjEditor oe)
728	1534	{
	1535	+ theFrame = this;
	1536	+
729	1537	oe.SetupViews();
730	1538
	1539	+ if (Globals.DEBUG)
731	1540	System.out.println("SetupViews");
732	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
733	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
734	1543	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1544	}
736	1545
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	1546	+ cToggleButton liveCB;
	1547	+ cCheckBox supportCB;
	1548	+ cCheckBox localCB;
	1549	+ cCheckBox crowdCB;
	1550	+ cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
	1553	+ cToggleButton fastCB;
	1554	+ cCheckBox slowCB;
	1555	+ cCheckBox boxCB;
	1556	+ cCheckBox zoomBoxCB;
	1557	+ cCheckBox freezeCB;
	1558	+ //cToggleButton trackCB;
	1559	+ cCheckBox trackCB;
	1560	+ cCheckBox smoothfocusCB;
748	1561	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1562	+ cCheckBox speakerCameraCB;
	1563	+ cCheckBox speakerFocusCB;
	1564	+ cCheckBox debugCB;
	1565	+
	1566	+ cCheckBox oeilCB;
	1567	+ cCheckBox shadowCB;
	1568	+ cCheckBox autokeepCB;
	1569	+ cCheckBox lookAtCB;
754	1570
755	1571	// static int COLOR = 1;
756	1572	// static int MATERIAL = 2;
..	..	@@ -758,9 +1574,9 @@
758	1574
759	1575	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1576
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1577	+ cCheckBox colorCB;
	1578	+ cCheckBox materialCB;
	1579	+ cCheckBox textureCB;
764	1580
765	1581	public void itemStateChanged(ItemEvent e)
766	1582	{
..	..	@@ -788,6 +1604,7 @@
788	1604	} else if(e.getSource() == liveCB)
789	1605	{
790	1606	cameraView.ToggleLive();
	1607	+ refreshContents(false);
791	1608	}
792	1609	else if(e.getSource() == supportCB)
793	1610	{
..	..	@@ -803,6 +1620,12 @@
803	1620	{
804	1621	cameraView.ToggleInertia();
805	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
806	1629	}
807	1630	else if(e.getSource() == localCB)
808	1631	{
..	..	@@ -852,6 +1675,18 @@
852	1675	{
853	1676	cameraView.ToggleOeil();
854	1677	}
	1678	+ else if(e.getSource() == shadowCB)
	1679	+ {
	1680	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == freezeCB)
	1683	+ {
	1684	+ Globals.FREEZEONMOVE ^= true;
	1685	+ }
	1686	+ else if(e.getSource() == autokeepCB)
	1687	+ {
	1688	+ Globals.REPLACEONMAKE ^= true;
	1689	+ }
855	1690	else if(e.getSource() == lookAtCB)
856	1691	{
857	1692	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1703,8 @@
868	1703
869	1704	/**/
870	1705	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1706	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1707	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1708	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1709	// We can't move the root node or an empty selection
874	1710	return;
..	..	@@ -931,8 +1767,6 @@
931	1767	}
932	1768	}
933	1769
934		- String string = (String) object;
935		-
936	1770	System.out.println("Transfer = " + object + "; drop : " + target);
937	1771	// if( object instanceof java.io.File[])
938	1772	// {
..	..	@@ -940,6 +1774,8 @@
940	1774	// objEditor.DropFile((java.io.File[]) object, true);
941	1775	// return;
942	1776	// }
	1777	+
	1778	+ String string = object.toString();
943	1779
944	1780	// File path for Mac and Windows
945	1781	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -969,7 +1805,7 @@
969	1805
970	1806	flashIt = false;
971	1807	CameraPane pane = (CameraPane) target;
972		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1808	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
973	1809	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
974	1810
975	1811	if (group.selection.size() == 1)
..	..	@@ -985,23 +1821,33 @@
985	1821
986	1822	assert target == objEditor.jTree;
987	1823	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1824	+ Object3D destinationLeaf;
988	1825	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1826	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1827	} catch (Exception e) {
991	1828	System.out.println("destinationPath : " + destinationPath);
992	1829	return;
993	1830	}
994	1831
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1832	+ for (int i=group.selection.size(); --i>=0;)
996	1833	{
	1834	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1835	+
	1836	+ // Cannot move into itself
	1837	+ if (child == destinationLeaf)
	1838	+ return;
	1839	+ }
	1840	+
	1841	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1842	+// {
997	1843	loadClipboard(true);
998	1844	objEditor.jTree.setSelectionPath(destinationPath);
999	1845	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1846	+// } else {
	1847	+// loadClipboard(false);
	1848	+// objEditor.jTree.setSelectionPath(destinationPath);
	1849	+// pasteInto(false, false); // true); // ???
	1850	+// }
1005	1851	}
1006	1852	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1853	// Called if the user has modified the current drop gesture
..	..	@@ -1057,7 +1903,12 @@
1057	1903	TreePath path;
1058	1904
1059	1905	public TransferableTreePath(TreePath tp) {
1060		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1061	1912	}
1062	1913
1063	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1106,22 +1957,30 @@
1106	1957	{
1107	1958	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1959	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- superItem.addActionListener(this);
	1960	+// gridItem = menu.add(new MenuItem("Grid"));
	1961	+// gridItem.addActionListener(this);
	1962	+// rectoidItem = menu.add(new MenuItem("Box"));
	1963	+// rectoidItem.addActionListener(this);
	1964	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1965	+// ellipsoidItem.addActionListener(this);
	1966	+// coneItem = menu.add(new MenuItem("Cone"));
	1967	+// coneItem.addActionListener(this);
	1968	+// torusItem = menu.add(new MenuItem("Torus"));
	1969	+// torusItem.addActionListener(this);
	1970	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1971	+// superItem.addActionListener(this);
	1972	+
	1973	+ cameraItem = menu.add(new MenuItem("Camera"));
	1974	+ cameraItem.addActionListener(this);
	1975	+
	1976	+ if (!Globals.ADVANCED)
	1977	+ {
1121	1978	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1979	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1980	+ }
	1981	+
	1982	+// particleItem = menu.add(new MenuItem("Particle system"));
	1983	+// particleItem.addActionListener(this);
1125	1984	if (Globals.ADVANCED)
1126	1985	{
1127	1986	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +2006,15 @@
1147	2006	}
1148	2007	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	2008	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- lightItem.addActionListener(this);
	2009	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2010	+// overlayItem.addActionListener(this);
	2011	+// lightItem = menu.add(new MenuItem("Light"));
	2012	+// lightItem.addActionListener(this);
1154	2013	menu.add("-");
1155	2014	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	2015	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	2016	+// loopItem = menu.add(new MenuItem("Loop"));
	2017	+// loopItem.addActionListener(this);
1159	2018	doubleItem = menu.add(new MenuItem("Fork"));
1160	2019	doubleItem.addActionListener(this);
1161	2020	if (Globals.ADVANCED)
..	..	@@ -1171,6 +2030,9 @@
1171	2030	animationItem.addItemListener(this);
1172	2031	animationItem.setState(Globals.ANIMATION);
1173	2032
	2033	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2034	+ archiveItem.addActionListener(this);
	2035	+
1174	2036	menu.add("-");
1175	2037	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1176	2038	parseverticesItem.addActionListener(this);
..	..	@@ -1183,6 +2045,8 @@
1183	2045	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1184	2046	reduce34MorphItem.addActionListener(this);
1185	2047	menu.add("-");
	2048	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2049	+ memoryItem.addActionListener(this);
1186	2050	menu.add(computeAOItem = new MenuItem("Compute AO"));
1187	2051	computeAOItem.addActionListener(this);
1188	2052
..	..	@@ -1191,11 +2055,9 @@
1191	2055	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192	2056	mirrorItem.addActionListener(this);
1193	2057	menu.add("-");
1194		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1195		- memoryItem.addActionListener(this);
1196	2058	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	2059	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	2060	+ menu.add(dumpItem = new MenuItem("Print"));
1199	2061	dumpItem.addActionListener(this);
1200	2062	// menu.add(pathItem = new MenuItem("From-to path"));
1201	2063	// pathItem.addActionListener(this);
..	..	@@ -1227,7 +2089,7 @@
1227	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1228	2090	objEditor.ScreenFit(obj, false);
1229	2091
1230		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1231	2093	refreshContents();
1232	2094	}
1233	2095
..	..	@@ -1264,7 +2126,7 @@
1264	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1265	2127	}
1266	2128
1267		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1268	2130
1269	2131	shadow.toParent = LA.newMatrix();
1270	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1278,24 +2140,24 @@
1278	2140	switch(axis)
1279	2141	{
1280	2142	case 0 :
1281		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1282		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1283		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1284		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1285	2147	norm = cVector.X;
1286	2148	break;
1287	2149	case 1 :
1288		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1289		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1290		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1291		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1292	2154	norm = cVector.Y;
1293	2155	break;
1294	2156	case 2 :
1295		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1296		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1297		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1298		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1299	2161	norm = cVector.Z;
1300	2162	break;
1301	2163	}
..	..	@@ -1336,9 +2198,38 @@
1336	2198	shadow.material = new cMaterial(obj.material);
1337	2199	shadow.material.diffuse = 0.0001f;
1338	2200	shadow.material.specular = 0.0001f;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1339	2206
1340	2207	makeSomething(shadow);
1341	2208	}
	2209	+
	2210	+ private void ClearUnpinned()
	2211	+ {
	2212	+ //for (Object3D obj : listUI)
	2213	+ for (int i=listUI.size(); --i>=0;)
	2214	+ {
	2215	+ Object3D obj = listUI.elementAt(i);
	2216	+ if (!obj.pinned)
	2217	+ {
	2218	+ obj.CloseUI();
	2219	+ listUI.remove(i);
	2220	+ }
	2221	+ }
	2222	+ }
	2223	+
	2224	+ private void EditElement(Object3D elem, boolean newWindow)
	2225	+ {
	2226	+ // if (!(elem instanceof Composite))
	2227	+ // newWindow = false;
	2228	+ listUI.add(elem);
	2229	+ elem.openEditWindow(this, newWindow); //, false);
	2230	+ System.out.println("edit : " + elem);
	2231	+ elem.editWindow.refreshContents(true); // ? new
	2232	+ }
1342	2233
1343	2234	/**
1344	2235	* applyExample
..	..	@@ -1542,9 +2433,9 @@
1542	2433
1543	2434	void Overwrite(int mask)
1544	2435	{
1545		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1546	2437	{
1547		- Object3D content = GrafreeD.clipboard.get(0);
	2438	+ Object3D content = Grafreed.clipboard.get(0);
1548	2439
1549	2440	if (content instanceof cGroup && ((cGroup)content).transientlink )
1550	2441	content = ((cGroup)content).get(0);
..	..	@@ -1583,7 +2474,7 @@
1583	2474	{
1584	2475	ScreenFit();
1585	2476	} else
1586		- if (source == switchItem)
	2477	+ if (source == switchViewItem)
1587	2478	{
1588	2479	cVector v1 = new cVector();
1589	2480	cVector v2 = new cVector();
..	..	@@ -1592,11 +2483,11 @@
1592	2483	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	2484	objEditor.cameraView.repaint();
1594	2485	} else
1595		- if (source == rectoidItem)
	2486	+ if (source == rectoidItem \|\| source == boxButton)
1596	2487	{
1597	2488	makeSomething(new Box());
1598	2489	} else
1599		- if (source == particleItem)
	2490	+ if (source == particleItem \|\| source == particlesButton)
1600	2491	{
1601	2492	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	2493	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +2566,27 @@
1675	2566
1676	2567	makeSomething(obj);
1677	2568	} else
1678		- if (source == gridItem)
	2569	+ if (source == gridItem \|\| source == gridButton)
1679	2570	{
1680	2571	makeSomething(new Grid());
1681	2572	} else
1682		- if (source == ellipsoidItem)
	2573	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	2574	{
1684	2575	makeSomething(new Sphere());
1685	2576	} else
1686		- if (source == coneItem)
	2577	+ if (source == coneItem \|\| source == coneButton)
1687	2578	{
1688	2579	makeSomething(new Cone());
1689	2580	} else
1690		- if (source == torusItem)
	2581	+ if (source == torusItem \|\| source == torusButton)
1691	2582	{
1692	2583	makeSomething(new Torus());
1693	2584	} else
1694		- if (source == superItem)
	2585	+ if (source == superItem \|\| source == superButton)
1695	2586	{
1696	2587	makeSomething(new Superellipsoid());
1697	2588	} else
1698		- if (source == kleinItem)
	2589	+ if (source == kleinItem \|\| source == kleinButton)
1699	2590	{
1700	2591	makeSomething(new Klein());
1701	2592	} else
..	..	@@ -1715,7 +2606,7 @@
1715	2606	{
1716	2607	makeSomething(new BezierSurface());
1717	2608	} else
1718		- if (source == overlayItem)
	2609	+ if (source == overlayItem \|\| source == overlayButton)
1719	2610	{
1720	2611	/*
1721	2612	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,10 +2654,27 @@
1763	2654	s.setup();
1764	2655	makeSomething(s);
1765	2656	} else
1766		- if (source == lightItem)
	2657	+ if (source == lightItem \|\| source == lightButton)
1767	2658	{
1768	2659	makeSomething(new Light());
1769	2660	} else
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
1770	2678	if (source == csgItem)
1771	2679	{
1772	2680	group(new CSG());
..	..	@@ -1813,30 +2721,38 @@
1813	2721
1814	2722	group(g);
1815	2723	} else
1816		- if (source == loopItem)
	2724	+ if (source == loopItem \|\| source == loopButton)
1817	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
1818	2728	Composite csg = new GroupLeaf();
1819		- csg.count = 5;
1820	2729	group(csg);
1821		- Composite child = new cGroup();
	2730	+ csg.count = 5;
	2731	+ Composite child = new cGroup("Branch");
1822	2732	csg.addChild(child);
1823	2733	child.addChild(csg);
	2734	+ }
1824	2735	} else
1825	2736	if (source == doubleItem)
1826	2737	{
1827		- Composite csg = new GroupLeaf();
1828		- csg.count = 5;
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
	2740	+ Composite csg = new GroupLeaf("Fork");
1829	2741	group(csg);
1830		- Composite child = new cGroup();
	2742	+ csg.count = 5;
	2743	+ Composite child = new cGroup("Branch A");
1831	2744	csg.addChild(child);
1832	2745	child.addChild(csg);
1833		- child = new cGroup();
	2746	+ child = new cGroup("Branch B");
1834	2747	csg.addChild(child);
1835	2748	child.addChild(csg);
	2749	+ }
1836	2750	} else
1837	2751	if (source == tripleItem)
1838	2752	{
1839		- Composite csg = new GroupLeaf();
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
	2755	+ Composite csg = new GroupLeaf("Trident");
1840	2756	csg.count = 4;
1841	2757	group(csg);
1842	2758	Composite child = new cGroup();
..	..	@@ -1848,36 +2764,12 @@
1848	2764	child = new cGroup();
1849	2765	csg.addChild(child);
1850	2766	child.addChild(csg);
1851		- } else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
	2767	+ }
1876	2768	} else
1877	2769	if (source == computeAOItem)
1878	2770	{
1879	2771	Globals.drawMode = CameraPane.OCCLUSION;
1880		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
1881	2773	} else
1882	2774	if (source == recompileItem)
1883	2775	{
..	..	@@ -1892,7 +2784,7 @@
1892	2784	if (source == invariantsItem)
1893	2785	{
1894	2786	System.out.println("Invariants:");
1895		- GrafreeD.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
1896	2788	} else
1897	2789	if (source == memoryItem)
1898	2790	{
..	..	@@ -1911,6 +2803,65 @@
1911	2803	{
1912	2804	DumpObject();
1913	2805	} else
	2806	+ if (source == minButton)
	2807	+ {
	2808	+ Minimize();
	2809	+ } else
	2810	+ if (source == maxButton)
	2811	+ {
	2812	+ Maximize();
	2813	+ } else
	2814	+ if (source == fullScreenButton)
	2815	+ {
	2816	+ ToggleFullScreen();
	2817	+ } else
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
	2831	+ {
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
	2836	+ } else
	2837	+ if (source == restoreButton)
	2838	+ {
	2839	+ // Restore current version
	2840	+ Restore();
	2841	+ //restoreButton.setEnabled(false);
	2842	+ } else
	2843	+ if (source == replaceButton)
	2844	+ {
	2845	+ // Overwrite current version
	2846	+ Replace();
	2847	+ //replaceButton.setEnabled(false);
	2848	+ } else
	2849	+ if (source == nextVersionButton)
	2850	+ {
	2851	+ // Go to next version
	2852	+ NextVersion();
	2853	+ } else
	2854	+ if (source == saveVersionButton)
	2855	+ {
	2856	+ // Save a new version
	2857	+ if (!DuplicateVersion()) //true))
	2858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
	2864	+ } else
1914	2865	if (source == oneStepButton)
1915	2866	{
1916	2867	Globals.ONESTEP = true;
..	..	@@ -1918,17 +2869,14 @@
1918	2869	} else
1919	2870	if (source == screenfitButton)
1920	2871	{
1921		- //Reload(lastConverter, lastFilename, true);
1922	2872	ScreenFit();
1923	2873	} else
1924	2874	if (source == screenfitpointButton)
1925	2875	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2876	ScreenFitPoint();
1928	2877	} else
1929	2878	if (source == snapobjectButton)
1930	2879	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2880	SnapObject();
1933	2881	} else
1934	2882	// if (event.getSource() == recompileButton)
..	..	@@ -1965,12 +2913,20 @@
1965	2913	{
1966	2914	loadClipboard(true);
1967	2915	} else
	2916	+ if (source == undoItem)
	2917	+ {
	2918	+ PreviousVersion();
	2919	+ } else
	2920	+ if (source == redoItem)
	2921	+ {
	2922	+ NextVersion();
	2923	+ } else
1968	2924	if (source == duplicateItem)
1969	2925	{
1970		- Object3D keep = GrafreeD.clipboard;
	2926	+ Object3D keep = Grafreed.clipboard;
1971	2927	loadClipboard(false);
1972	2928	paste(false);
1973		- GrafreeD.clipboard = keep;
	2929	+ Grafreed.clipboard = keep;
1974	2930	} else
1975	2931	if (source == cloneItem)
1976	2932	{
..	..	@@ -2190,9 +3146,9 @@
2190	3146	// group.selection.get(0).setMasterThis(content); // should be identity
2191	3147	// refreshContents();
2192	3148	// }
2193		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3149	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2194	3150	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	3151	+ Object3D content = Grafreed.clipboard.get(0);
2196	3152
2197	3153	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	3154	content = ((cGroup)content).get(0);
..	..	@@ -2242,9 +3198,9 @@
2242	3198	} else
2243	3199	if (source == setMasterItem)
2244	3200	{
2245		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3201	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2246	3202	{
2247		- Object3D content = GrafreeD.clipboard.get(0);
	3203	+ Object3D content = Grafreed.clipboard.get(0);
2248	3204
2249	3205	if (content instanceof cGroup && ((cGroup)content).transientlink )
2250	3206	content = ((cGroup)content).get(0);
..	..	@@ -2257,9 +3213,9 @@
2257	3213	{
2258	3214	if (group.selection.size() == 1)
2259	3215	{
2260		- if (GrafreeD.clipboard.size() == 1)
	3216	+ if (Grafreed.clipboard.size() == 1)
2261	3217	{
2262		- Object3D content = GrafreeD.clipboard.get(0);
	3218	+ Object3D content = Grafreed.clipboard.get(0);
2263	3219
2264	3220	if (content instanceof cGroup && ((cGroup)content).transientlink )
2265	3221	content = ((cGroup)content).get(0);
..	..	@@ -2276,7 +3232,7 @@
2276	3232	{
2277	3233	RevertMeshes();
2278	3234	} else
2279		- if (source == resetMeshItem)
	3235	+ if (source == resetAllItem)
2280	3236	{
2281	3237	ResetAll();
2282	3238	} else
..	..	@@ -2284,7 +3240,7 @@
2284	3240	{
2285	3241	StepAll();
2286	3242	} else
2287		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2288	3244	{
2289	3245	//int indices[] = jList.getSelectedIndices();
2290	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2296,9 +3252,9 @@
2296	3252	{
2297	3253	ClearSelection(true);
2298	3254	} else
2299		- if (source == grabItem)
	3255	+ if (source == grabItem \|\| source == groupButton)
2300	3256	{
2301		- group(new cGroup(), true);
	3257	+ group(new cGroup(), false); // true);
2302	3258	} else
2303	3259	if (source == hideItem)
2304	3260	{
..	..	@@ -2316,11 +3272,11 @@
2316	3272	{
2317	3273	makeSomething(new Camera());
2318	3274	} else
2319		- if (source == compositeItem)
	3275	+ if (source == compositeItem \|\| source == compositeButton)
2320	3276	{
2321	3277	group(new Composite());
2322	3278	} else
2323		- if (source == randomItem)
	3279	+ if (source == switchItem \|\| source == switchButton)
2324	3280	{
2325	3281	RandomNode random = new RandomNode();
2326	3282	group(random);
..	..	@@ -2422,7 +3378,7 @@
2422	3378	{
2423	3379	group(new cLinker());
2424	3380	} else
2425		- if (source == textureItem)
	3381	+ if (source == textureItem \|\| source == textureButton)
2426	3382	{
2427	3383	group(new TextureNode());
2428	3384	} else
..	..	@@ -2442,17 +3398,42 @@
2442	3398	{
2443	3399	CastShadow(2);
2444	3400	} else
2445		- if (source == ungroupItem)
	3401	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	3402	{
2447		- //ungroup();
	3403	+ boolean canUngroup = true;
	3404	+
2448	3405	for (int i=0; i<group.selection.size(); i++)
2449	3406	{
2450		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
	3410	+ {
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
	3420	+ break;
	3421	+ }
2451	3422	}
2452	3423
2453		- ClearSelection(false);
2454		-
2455		- refreshContents();
	3424	+ if (canUngroup)
	3425	+ {
	3426	+ for (int i=0; i<group.selection.size(); i++)
	3427	+ {
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
	3431	+ }
	3432	+
	3433	+ ClearSelection(false);
	3434	+
	3435	+ refreshContents();
	3436	+ }
2456	3437	} else
2457	3438	if (source == genUVItem)
2458	3439	{
..	..	@@ -2464,7 +3445,7 @@
2464	3445	} else
2465	3446	if (source == genNormalsMESHItem)
2466	3447	{
2467		- GenNormals(true); // TODO
	3448	+ GenNormalsMESH();
2468	3449	} else
2469	3450	if (source == genNormalsORGANItem)
2470	3451	{
..	..	@@ -2498,6 +3479,10 @@
2498	3479	{
2499	3480	ClearMaterials();
2500	3481	} else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
2501	3486	if (source == liveleavesItem)
2502	3487	{
2503	3488	LiveLeaves(true);
..	..	@@ -2529,6 +3514,22 @@
2529	3514	if (source == unmarkleavesItem)
2530	3515	{
2531	3516	MarkLeaves(false);
	3517	+ } else
	3518	+ if (source == rewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(true);
	3521	+ } else
	3522	+ if (source == unrewindleavesItem)
	3523	+ {
	3524	+ RewindLeaves(false);
	3525	+ } else
	3526	+ if (source == randomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(true);
	3529	+ } else
	3530	+ if (source == unrandomleavesItem)
	3531	+ {
	3532	+ RandomLeaves(false);
2532	3533	} else
2533	3534	if (source == flipVItem)
2534	3535	{
..	..	@@ -2614,9 +3615,25 @@
2614	3615	{
2615	3616	SmoothMesh();
2616	3617	} else
2617		- if (source == transformgeometryItem)
	3618	+ if (source == transformGeometryItem)
2618	3619	{
2619	3620	TransformGeometry();
	3621	+ } else
	3622	+ if (source == transformChildrenItem)
	3623	+ {
	3624	+ TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
2620	3637	} else
2621	3638	if (source == resetTransformItem)
2622	3639	{
..	..	@@ -2624,7 +3641,11 @@
2624	3641	} else
2625	3642	if (source == resetCentroidItem)
2626	3643	{
2627		- ResetCentroid();
	3644	+ ResetCentroid(true);
	3645	+ } else
	3646	+ if (source == resetCentroidXZItem)
	3647	+ {
	3648	+ ResetCentroid(false);
2628	3649	} else
2629	3650	if (source == resetParentItem)
2630	3651	{
..	..	@@ -2729,7 +3750,7 @@
2729	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2730	3751	{
2731	3752	obj = (Object3D)e.nextElement();
2732		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
2733	3754	}
2734	3755
2735	3756	refreshContents();
..	..	@@ -2745,6 +3766,31 @@
2745	3766
2746	3767	refreshContents();
2747	3768	} else
	3769	+ if (source == embedTexturesItem)
	3770	+ {
	3771	+ Object3D obj;
	3772	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3773	+ {
	3774	+ obj = (Object3D)e.nextElement();
	3775	+ obj.EmbedTextures(true);
	3776	+ }
	3777	+
	3778	+ refreshContents();
	3779	+ } else
	3780	+ if (source == deEmbedTexturesItem)
	3781	+ {
	3782	+ Object3D obj;
	3783	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3784	+ {
	3785	+ obj = (Object3D)e.nextElement();
	3786	+ obj.EmbedTextures(false);
	3787	+ }
	3788	+
	3789	+ CameraPane.texturepigment.clear();
	3790	+ CameraPane.texturebump.clear();
	3791	+
	3792	+ refreshContents();
	3793	+ } else
2748	3794	if (source == flashSelectionButton)
2749	3795	{
2750	3796	CameraPane.flash = true;
..	..	@@ -2756,42 +3802,36 @@
2756	3802	if (source == twoButton)
2757	3803	{
2758	3804	radio.layout = twoButton;
2759		- // bug
2760		- //gridPanel.setDividerLocation(1.0);
2761		- //bigPanel.setDividerLocation(0.0);
2762		-// bigThree.remove(scenePanel);
2763		-// bigThree.remove(centralPanel);
2764		-// bigThree.remove(XYZPanel);
2765		-// aWindowConstraints.gridx = 0;
2766		-// aWindowConstraints.gridy = 0;
2767		-// aWindowConstraints.gridwidth = 1;
2768		-// // aConstraints.gridheight = 3;
2769		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2770		-// aWindowConstraints.weightx = 0;
2771		-// aWindowConstraints.weighty = 1;
2772		-// //bigThree.add(jtp, aWindowConstraints);
2773		-// aWindowConstraints.weightx = 1;
2774		-// aWindowConstraints.gridwidth = 3;
2775		-// // aConstraints.gridheight = 3;
2776		-// aWindowConstraints.gridx = 1;
2777		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2778		-// bigThree.add(centralPanel, aWindowConstraints);
2779		-// aWindowConstraints.weightx = 0;
2780		-// aWindowConstraints.gridx = 4;
2781		-// aWindowConstraints.gridwidth = 1;
2782		-// // aConstraints.gridheight = 3;
2783		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2784		-// //bigThree.add(XYZPanel, aWindowConstraints);
2785		-// scenePanel.setVisible(false);
2786		-// centralPanel.setVisible(true);
2787		-// XYZPanel.setVisible(false);
2788		- bigThree.ClearUI();
2789		- bigThree.add(centralPanel);
2790		- bigThree.FlushUI();
	3805	+
	3806	+ if (CameraPane.FULLSCREEN)
	3807	+ fullscreenLayout = radio.layout;
	3808	+
	3809	+ Show3DView();
	3810	+
	3811	+ cameraView.requestFocusInWindow();
	3812	+
	3813	+// refreshContents(true);
	3814	+//
	3815	+// try
	3816	+// {
	3817	+// java.awt.Robot bot = new java.awt.Robot();
	3818	+// int mask = InputEvent.BUTTON1_MASK;
	3819	+// bot.mouseMove(100, 100);
	3820	+// bot.mousePress(mask);
	3821	+// bot.mouseRelease(mask);
	3822	+// }
	3823	+// catch (Exception e)
	3824	+// {
	3825	+//
	3826	+// }
	3827	+
2791	3828	} else
2792	3829	if (source == threeButton)
2793	3830	{
2794	3831	radio.layout = threeButton;
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
2795	3835
2796	3836	// bigThree.remove(scenePanel);
2797	3837	// bigThree.remove(centralPanel);
..	..	@@ -2821,13 +3861,18 @@
2821	3861	// centralPanel.setVisible(true);
2822	3862	// XYZPanel.setVisible(true);
2823	3863	bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
2824	3865	bigThree.add(centralPanel);
2825		- bigThree.add(XYZPanel);
2826	3866	bigThree.FlushUI();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2827	3869	} else
2828	3870	if (source == fourButton)
2829	3871	{
2830	3872	radio.layout = fourButton;
	3873	+
	3874	+ if (CameraPane.FULLSCREEN)
	3875	+ fullscreenLayout = radio.layout;
2831	3876
2832	3877	// bigThree.remove(scenePanel);
2833	3878	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3904,15 @@
2859	3904	bigThree.ClearUI();
2860	3905	bigThree.add(scenePanel);
2861	3906	bigThree.FlushUI();
	3907	+
	3908	+ cameraView.requestFocusInWindow();
2862	3909	} else
2863	3910	if (source == sixButton)
2864	3911	{
2865	3912	radio.layout = sixButton;
	3913	+
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
2866	3916
2867	3917	// bigThree.remove(scenePanel);
2868	3918	// bigThree.remove(centralPanel);
..	..	@@ -2892,13 +3942,18 @@
2892	3942	// centralPanel.setVisible(true);
2893	3943	// XYZPanel.setVisible(false);
2894	3944	bigThree.ClearUI();
2895		- bigThree.add(scenePanel);
2896	3945	bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
2897	3947	bigThree.FlushUI();
	3948	+
	3949	+ cameraView.requestFocusInWindow();
2898	3950	} else
2899	3951	if (source == sevenButton)
2900	3952	{
2901	3953	radio.layout = sevenButton;
	3954	+
	3955	+ if (CameraPane.FULLSCREEN)
	3956	+ fullscreenLayout = radio.layout;
2902	3957
2903	3958	// bigThree.remove(scenePanel);
2904	3959	// bigThree.remove(centralPanel);
..	..	@@ -2932,9 +3987,12 @@
2932	3987	bigThree.add(centralPanel);
2933	3988	bigThree.add(XYZPanel);
2934	3989	bigThree.FlushUI();
	3990	+
	3991	+ cameraView.requestFocusInWindow();
2935	3992	} else
2936	3993	if (source == rootButton)
2937	3994	{
	3995	+ Replace();
2938	3996	Object3D obj;
2939	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2940	3998	{
..	..	@@ -2943,31 +4001,50 @@
2943	4001	EditObject(obj);
2944	4002	}
2945	4003
	4004	+ cameraView.requestFocusInWindow();
2946	4005	refreshContents(true);
2947	4006	} else
2948	4007	if (source == closeButton)
2949	4008	{
2950	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
2951	4013	cRadio ab;
2952	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	4015	{
2954	4016	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4017	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	4018	{
	4019	+ // Patch to avoid bug with transparency.
	4020	+ if (!ab.hadMaterial)
	4021	+ {
	4022	+ ab.object.material = null;
	4023	+ }
	4024	+
2957	4025	buttonGroup.remove(ab);
2958	4026	radioPanel.remove(ab);
2959	4027
2960		- ab.GetObject().editWindow = null;
	4028	+ //ab.GetObject().editWindow = null;
	4029	+ ab.GetObject().manipWindow = null;
2961	4030	// ab.GetObject().objectUI = null; // ?????????
2962	4031
2963	4032	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	4033	break;
2965	4034	}
2966	4035	}
	4036	+
	4037	+ cameraView.requestFocusInWindow();
2967	4038	refreshContents(true);
2968	4039	} else
2969	4040	if (source == editItem \|\| source == editButton)
2970	4041	{
	4042	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4043	+ {
	4044	+ Object3D child = (Object3D)e.nextElement();
	4045	+ child.pinned = true;
	4046	+ }
	4047	+
2971	4048	EditSelection(false);
2972	4049	} else
2973	4050	if (source == uneditButton)
..	..	@@ -2976,11 +4053,12 @@
2976	4053	{
2977	4054	Object3D child = (Object3D)e.nextElement();
2978	4055	if(child.editWindow != null)
2979		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4056	+ child.pinned = false;
2980	4057	child.CloseUI();
2981	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2982	4060
2983		- child.editWindow = null; // ???????????
	4061	+ //child.editWindow = null; // ???????????
2984	4062	}
2985	4063	objEditor.ctrlPanel.FlushUI();
2986	4064	//objEditor.jTree.clearSelection();
..	..	@@ -2993,16 +4071,18 @@
2993	4071	//copy.ClearUI();
2994	4072	for (Object3D obj : listUI)
2995	4073	{
	4074	+ obj.pinned = false;
2996	4075	obj.CloseUI();
2997	4076	}
2998	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
2999	4079	refreshContents(true);
3000	4080	} else
3001	4081	if (source == allParamsButton)
3002	4082	{
3003	4083	assert(copy == group);
3004	4084
3005		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4085	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3006	4086
3007	4087	for (Object3D obj : listUI)
3008	4088	{
..	..	@@ -3028,6 +4108,9 @@
3028	4108	} else
3029	4109	if(source instanceof cRadio)
3030	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3031	4114	group.parent = keepparent;
3032	4115	group.attributes = 0;
3033	4116	//group.editWindow = null;
..	..	@@ -3051,6 +4134,7 @@
3051	4134	}
3052	4135
3053	4136	copy = group;
	4137	+
3054	4138	//Globals.theRenderer.object = group;
3055	4139	if(!useclient)
3056	4140	{
..	..	@@ -3066,20 +4150,75 @@
3066	4150	frontView.object = group;
3067	4151	sideView.object = group;
3068	4152	}
3069		- group.editWindow = this;
	4153	+
	4154	+// fix "+" issue
	4155	+ //group.editWindow = this;
	4156	+ group.manipWindow = this;
	4157	+
3070	4158	/*
3071	4159	currentLayout = radio.layout;
3072	4160	if (currentLayout == null)
3073	4161	currentLayout = sevenButton;
3074	4162	*/
3075	4163	radio.layout.doClick();
	4164	+
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
	4191	+ ClearUnpinned();
	4192	+
	4193	+ //Grafreed.Assert(group != null);
	4194	+ //Grafreed.Assert(group.selection != null);
	4195	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4196	+ if (group.selection == null \|\| group.selection.size() == 1)
	4197	+ EditSelection(false);
3076	4198	keepparent = group.parent;
3077	4199	// PARENT = NULL or not???
3078	4200	//group.parent = null; // ROOT
3079	4201	//group.attributes = -1;
3080	4202	ResetModel();
	4203	+
	4204	+ cameraView.requestFocusInWindow();
3081	4205	refreshContents(true);
3082		- }
	4206	+ } else if (event.getSource() == editCameraItem)
	4207	+ {
	4208	+ cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
	4210	+ cameraView.repaint();
	4211	+ return;
	4212	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4213	+ {
	4214	+ cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
	4216	+ cameraView.repaint();
	4217	+ return;
	4218	+ // } else if (event.getSource() == textureButton)
	4219	+ // {
	4220	+ // return; // true;
	4221	+ }
3083	4222	else
3084	4223	{
3085	4224	//return super.action(event, arg);
..	..	@@ -3088,7 +4227,6 @@
3088	4227	}
3089	4228
3090	4229	boolean useclient = false;
3091		- cRadio radio;
3092	4230
3093	4231	void ToggleRoot()
3094	4232	{
..	..	@@ -3140,10 +4278,69 @@
3140	4278	refreshContents();
3141	4279	}
3142	4280
	4281	+ void TransformChildren()
	4282	+ {
	4283	+ Object3D obj;
	4284	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4285	+ {
	4286	+ obj = (Object3D)e.nextElement();
	4287	+ obj.KeepTextureMatrices();
	4288	+ obj.TransformChildren();
	4289	+ obj.RestoreTextureMatrices();
	4290	+
	4291	+// if (obj.parent == null)
	4292	+// {
	4293	+// System.out.println("NULL PARENT!");
	4294	+// new Exception().printStackTrace();
	4295	+// }
	4296	+// else
	4297	+// TouchTransform(obj);
	4298	+// //obj.parent.Touch();
	4299	+ }
	4300	+
	4301	+ refreshContents();
	4302	+ }
	4303	+
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
3143	4315
3144	4316	void ResetTransform()
3145	4317	{
3146	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3147	4344	}
3148	4345
3149	4346	void ResetTransform(int mask)
..	..	@@ -3156,42 +4353,8 @@
3156	4353	if (obj.toParent == null)
3157	4354	continue;
3158	4355
3159		- if (mask == -1)
3160		- {
3161		- if (obj instanceof Camera) // jan 2014
3162		- {
3163		- LA.matIdentity(obj.toParent);
3164		- LA.matIdentity(obj.fromParent);
3165		- }
3166		- else
3167		- {
3168		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3169		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3170		- }
3171		- TouchTransform(obj);
3172		- continue;
3173		- }
3174		- if ((mask&2) != 0) // Scale
3175		- {
3176		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3177		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3178		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3179		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3180		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3181		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3182		- }
3183		- if ((mask&4) != 0) // Rotation
3184		- {
3185		- // ?
3186		- }
3187		- if ((mask&1) != 0) // Translation
3188		- {
3189		- if (obj.toParent != null)
3190		- {
3191		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3192		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3193		- }
3194		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3195	4358	if (obj.parent == null)
3196	4359	{
3197	4360	System.out.println("NULL PARENT!");
..	..	@@ -3252,7 +4415,7 @@
3252	4415	refreshContents();
3253	4416	}
3254	4417
3255		- void ResetCentroid()
	4418	+ void ResetCentroid(boolean full)
3256	4419	{
3257	4420	Object3D obj;
3258	4421	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +4430,16 @@
3267	4430	LA.matIdentity(Object3D.mat);
3268	4431	obj.getBounds(minima, maxima, false);
3269	4432	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4433	+ if (full)
	4434	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	4435	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	4436	obj.TransformMesh(Object3D.mat);
	4437	+
3273	4438	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4439	+ if (full)
	4440	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	4441	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4442	+
3276	4443	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	4444	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	4445	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +4468,8 @@
3301	4468
3302	4469	int size = obj.MemorySize();
3303	4470
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	4471	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4472	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	4473	}
3306	4474	}
3307	4475	catch (Exception e)
..	..	@@ -3338,9 +4506,9 @@
3338	4506	obj = (Object3D)e.nextElement();
3339	4507
3340	4508	System.out.println("Object is: " + obj);
3341		- GrafreeD.AnalyzeObject(obj);
	4509	+ Grafreed.AnalyzeObject(obj);
3342	4510	System.out.println("Boundary rep: " + obj.bRep);
3343		- GrafreeD.AnalyzeObject(obj.bRep);
	4511	+ Grafreed.AnalyzeObject(obj.bRep);
3344	4512
3345	4513	// System.err.println((size/1024) + " KB is the size of " + obj);
3346	4514	}
..	..	@@ -3382,6 +4550,13 @@
3382	4550	void GenNormals(boolean crease)
3383	4551	{
3384	4552	group.GenNormalsS(crease);
	4553	+
	4554	+ refreshContents();
	4555	+ }
	4556	+
	4557	+ void GenNormalsMESH()
	4558	+ {
	4559	+ group.GenNormalsMeshS();
3385	4560
3386	4561	refreshContents();
3387	4562	}
..	..	@@ -3554,8 +4729,8 @@
3554	4729
3555	4730	void ParseVertices()
3556	4731	{
3557		- boolean epsequal = GrafreeD.epsequal;
3558		- GrafreeD.epsequal = true;
	4732	+ boolean epsequal = Grafreed.epsequal;
	4733	+ Grafreed.epsequal = true;
3559	4734
3560	4735	for (int i=0; i<group.selection.size(); i++)
3561	4736	{
..	..	@@ -3580,7 +4755,7 @@
3580	4755	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3581	4756	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3582	4757
3583		- g.add(GrafreeD.clipboard);
	4758	+ g.add(Grafreed.clipboard);
3584	4759
3585	4760	buffer.add(g);
3586	4761	}
..	..	@@ -3595,7 +4770,7 @@
3595	4770	makeSomething(buffer, i==group.selection.size()-1);
3596	4771	}
3597	4772
3598		- GrafreeD.epsequal = epsequal;
	4773	+ Grafreed.epsequal = epsequal;
3599	4774
3600	4775	refreshContents();
3601	4776	}
..	..	@@ -3613,7 +4788,16 @@
3613	4788	String pigment = Object3D.GetPigment(tex);
3614	4789	//String bump = Object3D.GetBump(tex);
3615	4790
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4791	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4792	+
	4793	+ try
	4794	+ {
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4796	+ }
	4797	+ catch (Exception e)
	4798	+ {
	4799	+ System.err.println("FAIL: " + node);
	4800	+ }
3617	4801
3618	4802	double s = v.s;
3619	4803
..	..	@@ -3679,10 +4863,17 @@
3679	4863	{
3680	4864	Object3D obj = group.selection.get(i);
3681	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
3682	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3683	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3684	4874	}
3685	4875
	4876	+ Globals.lighttouched = true;
3686	4877	refreshContents();
3687	4878	}
3688	4879
..	..	@@ -3745,7 +4936,7 @@
3745	4936	return;
3746	4937
3747	4938	Object3D poses = group.selection.get(0);
3748		- Object3D ref = GrafreeD.clipboard.get(0);
	4939	+ Object3D ref = Grafreed.clipboard.get(0);
3749	4940
3750	4941	Object3D newgroup = new Object3D("Po:" + poses.name);
3751	4942
..	..	@@ -3939,9 +5130,9 @@
3939	5130
3940	5131	void ClipMesh()
3941	5132	{
3942		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5133	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3943	5134	{
3944		- Object3D content = GrafreeD.clipboard.get(0);
	5135	+ Object3D content = Grafreed.clipboard.get(0);
3945	5136
3946	5137	if (content instanceof cGroup && ((cGroup)content).transientlink )
3947	5138	content = ((cGroup)content).get(0);
..	..	@@ -3950,7 +5141,7 @@
3950	5141	// {
3951	5142	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3952	5143	// }
3953		- group.selection.ClipMesh(GrafreeD.clipboard);
	5144	+ group.selection.ClipMesh(Grafreed.clipboard);
3954	5145	}
3955	5146	// group.selection.ClipMesh(GrafreeD.clipboard);
3956	5147	System.out.println("DONE.");
..	..	@@ -3967,6 +5158,12 @@
3967	5158	void ClearMaterials()
3968	5159	{
3969	5160	group.selection.ClearMaterials();
	5161	+ refreshContents();
	5162	+ }
	5163	+
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
3970	5167	refreshContents();
3971	5168	}
3972	5169
..	..	@@ -3997,6 +5194,18 @@
3997	5194	void MarkLeaves(boolean hide)
3998	5195	{
3999	5196	group.selection.MarkLeaves(hide);
	5197	+ refreshContents();
	5198	+ }
	5199	+
	5200	+ void RewindLeaves(boolean hide)
	5201	+ {
	5202	+ group.selection.RewindLeaves(hide);
	5203	+ refreshContents();
	5204	+ }
	5205	+
	5206	+ void RandomLeaves(boolean hide)
	5207	+ {
	5208	+ group.selection.RandomLeaves(hide);
4000	5209	refreshContents();
4001	5210	}
4002	5211
..	..	@@ -4071,28 +5280,25 @@
4071	5280	// }
4072	5281	// }
4073	5282
4074		- static boolean allparams = true;
4075		-
4076		- static Vector<Object3D> listUI = new Vector<Object3D>();
4077		-
4078	5283	void EditSelection(boolean newWindow)
4079	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
4080	5291	// aConstraints.gridy = 0;
4081	5292	for (int i=0; i<group.selection.size(); i++)
4082	5293	{
4083	5294	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	5295	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5296	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	5297
4087	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	5299	+ if(elem != group \|\| !newWindow)
4089	5300	{
4090		- // if (!(elem instanceof Composite))
4091		- // newWindow = false;
4092		- listUI.add(elem);
4093		- elem.openEditWindow(this, newWindow); //, false);
4094		- System.out.println("edit : " + elem);
4095		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
4096	5302	}
4097	5303	}
4098	5304	}
..	..	@@ -4155,9 +5361,7 @@
4155	5361
4156	5362	freezemodel = false;
4157	5363	}
4158		-
4159		- boolean flashIt = true;
4160		-
	5364	+
4161	5365	public void valueChanged(TreeSelectionEvent e)
4162	5366	//public boolean handleEvent(Event event)
4163	5367	{
..	..	@@ -4167,7 +5371,8 @@
4167	5371	//new Exception().printStackTrace();
4168	5372
4169	5373	freezemodel = true;
4170		-
	5374	+ ClearUnpinned();
	5375	+
4171	5376	/**/
4172	5377	//switch (event.id)
4173	5378	{
..	..	@@ -4175,7 +5380,6 @@
4175	5380	//case 702: // Event.LIST_DESELECT
4176	5381	group.deselectAll();
4177	5382	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	5383	if (tps != null)
4180	5384	{
4181	5385	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +5388,8 @@
4184	5388
4185	5389	//if (child.parent != null)
4186	5390	//child.parent.addSelectee(child);
	5391	+ objEditor.SetMaterial(child);
4187	5392	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	5393	}
4192	5394	}
4193	5395	// else
..	..	@@ -4197,20 +5399,28 @@
4197	5399	// System.err.println("info : " + group.GetPath());
4198	5400	// }
4199	5401
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5402	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	5403	CameraPane.flash = true;
4204	5404
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5405	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	5406	// a camera
4207	5407	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5409	+ {
	5410	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
	5412	+ }
4210	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	5415	}
4213	5416
	5417	+ if (tps != null && tps.length == 1)
	5418	+ {
	5419	+ EditSelection(false);
	5420	+ }
	5421	+
	5422	+ SetPinStates(tps != null && tps.length > 0);
	5423	+
4214	5424	refreshContents();
4215	5425	//return true;
4216	5426	}
..	..	@@ -4219,6 +5429,53 @@
4219	5429
4220	5430	freezemodel = false;
4221	5431	}
	5432	+
	5433	+ void SetPinStates(boolean enabled)
	5434	+ {
	5435	+ editButton.setEnabled(enabled);
	5436	+ uneditButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
	5438	+ flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
	5456	+ }
	5457	+
	5458	+ void refreshContents(boolean cp)
	5459	+ {
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5462	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5463	+ {
	5464	+ objEditor.ClearInfo(); // .GetMaterial());
	5465	+
	5466	+ for (int i=0; i < group.selection.Size(); i++)
	5467	+ {
	5468	+ Object3D child = (Object3D) group.selection.get(i);
	5469	+
	5470	+ objEditor.AddInfo(child, this, true);
	5471	+// System.err.println("info : " + child.GetPath());
	5472	+ }
	5473	+
	5474	+ objEditor.SetText(); // jan 2014
	5475	+ }
	5476	+
	5477	+ super.refreshContents(cp);
	5478	+ }
4222	5479
4223	5480	void linkSomething(Object3D thing)
4224	5481	{
..	..	@@ -4290,16 +5547,19 @@
4290	5547	{
4291	5548	if (group.selection.isEmpty())
4292	5549	return;
4293		- GrafreeD.clipboardIsTempGroup = false;
	5550	+
	5551	+ Grafreed.clipboardIsTempGroup = false;
4294	5552	Composite tGroup = null;
4295	5553	if (group.selection.size() > 0) // 1)
4296	5554	{
4297	5555	tGroup = new cGroup();
4298		- GrafreeD.clipboardIsTempGroup = true;
	5556	+ Grafreed.clipboardIsTempGroup = true;
4299	5557	}
4300	5558
4301	5559	if (cut)
4302	5560	{
	5561	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5562	+// Save();
4303	5563	//int indices[] = jList.getSelectedIndices();
4304	5564	//for (int i = indices.length - 1; i >= 0; i--)
4305	5565	//jList.remove(indices[i]);
..	..	@@ -4335,16 +5595,16 @@
4335	5595	//System.out.println("cut " + child);
4336	5596	//System.out.println("parent = " + child.parent);
4337	5597	// tmp.addChild(child);
4338		- if (GrafreeD.clipboardIsTempGroup)
	5598	+ if (Grafreed.clipboardIsTempGroup)
4339	5599	tGroup.add/Child/(tmp);
4340	5600	else
4341		- GrafreeD.clipboard = tmp;
	5601	+ Grafreed.clipboard = tmp;
4342	5602	}
4343	5603	else
4344		- if (GrafreeD.clipboardIsTempGroup)
	5604	+ if (Grafreed.clipboardIsTempGroup)
4345	5605	tGroup.add/Child/(child);
4346	5606	else
4347		- GrafreeD.clipboard = child;
	5607	+ Grafreed.clipboard = child;
4348	5608	}
4349	5609
4350	5610	//ResetModel();
..	..	@@ -4376,21 +5636,23 @@
4376	5636	//System.out.println("cut " + elem);
4377	5637	//System.out.println("parent = " + elem.parent);
4378	5638	// tmp.addChild(elem);
4379		- if (GrafreeD.clipboardIsTempGroup)
	5639	+ if (Grafreed.clipboardIsTempGroup)
4380	5640	tGroup.add/Child/(tmp);
4381	5641	else
4382		- GrafreeD.clipboard = tmp;
	5642	+ Grafreed.clipboard = tmp;
4383	5643	}
4384	5644	else
4385		- if (GrafreeD.clipboardIsTempGroup)
	5645	+ if (Grafreed.clipboardIsTempGroup)
4386	5646	tGroup.add/Child/(child);
4387	5647	else
4388		- GrafreeD.clipboard = child;
	5648	+ Grafreed.clipboard = child;
4389	5649	}
4390	5650
4391	5651	}
4392		- if (GrafreeD.clipboardIsTempGroup)
4393		- GrafreeD.clipboard = tGroup;
	5652	+
	5653	+ if (Grafreed.clipboardIsTempGroup)
	5654	+ Grafreed.clipboard = tGroup;
	5655	+
4394	5656	if (cut)
4395	5657	{
4396	5658	ResetModel();
..	..	@@ -4400,11 +5662,15 @@
4400	5662
4401	5663	void paste(boolean expand)
4402	5664	{
	5665	+ if (Globals.REPLACEONMAKE)
	5666	+ Save();
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
4403	5669	// if (GrafreeD.clipboard == null)
4404	5670	// return;
4405	5671	boolean first = true;
4406	5672
4407		- if (GrafreeD.clipboardIsTempGroup)
	5673	+ if (Grafreed.clipboardIsTempGroup)
4408	5674	{
4409	5675	Composite temp;
4410	5676
..	..	@@ -4415,7 +5681,7 @@
4415	5681	temp = (Composite)Applet3D.clipboard.deepCopy();
4416	5682	*/
4417	5683	Object3D elem;
4418		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5684	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4419	5685	{
4420	5686	Object3D child = (Object3D)e.nextElement();
4421	5687
..	..	@@ -4449,16 +5715,17 @@
4449	5715	//Object3D cb = Applet3D.clipboard;
4450	5716	//temp.addChild(cb);
4451	5717	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4452		- assert(GrafreeD.clipboard.parent == null);
4453		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4454		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4455		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4456		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5718	+ assert(Grafreed.clipboard.parent == null);
	5719	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5720	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5721	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5722	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4457	5723	else
4458		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459		- GrafreeD.clipboard.get(0).parent = keepparent;
	5724	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5725	+ Grafreed.clipboard.get(0).parent = keepparent;
4460	5726	}
4461	5727
	5728	+ Globals.REPLACEONMAKE = keep;
4462	5729	ResetModel();
4463	5730	refreshContents();
4464	5731	}
..	..	@@ -4505,9 +5772,9 @@
4505	5772	{
4506	5773	boolean first = true;
4507	5774
4508		- if (GrafreeD.clipboardIsTempGroup)
	5775	+ if (Grafreed.clipboardIsTempGroup)
4509	5776	{
4510		- Composite temp = (Composite)GrafreeD.clipboard;
	5777	+ Composite temp = (Composite)Grafreed.clipboard;
4511	5778	Object3D copy;
4512	5779	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4513	5780	{
..	..	@@ -4517,7 +5784,7 @@
4517	5784	}
4518	5785	} else
4519	5786	{
4520		- linkSomething(GrafreeD.clipboard); //.get(0));
	5787	+ linkSomething(Grafreed.clipboard); //.get(0));
4521	5788	}
4522	5789	}
4523	5790	}
..	..	@@ -4594,6 +5861,10 @@
4594	5861
4595	5862	void group(Object3D csg, boolean grab)
4596	5863	{
	5864	+ if (Globals.REPLACEONMAKE)
	5865	+ Save();
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
4597	5868	if (//false) // why??
4598	5869	!group.selection.isEmpty())
4599	5870	{
..	..	@@ -4707,10 +5978,15 @@
4707	5978	//node.add(csg);
4708	5979	//makeSomething(node);
4709	5980	makeSomething(csg);
	5981	+ Globals.REPLACEONMAKE = keep;
4710	5982	}
4711	5983
4712	5984	void Ungroup(Object3D g)
4713	5985	{
	5986	+ if (Globals.REPLACEONMAKE)
	5987	+ Save();
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
4714	5990	if (g instanceof HiddenObject)
4715	5991	{
4716	5992	HiddenObject h = (HiddenObject) g;
..	..	@@ -4727,6 +6003,7 @@
4727	6003	objEditor.makeSomething(g.get(i), false);
4728	6004	}
4729	6005	}
	6006	+ Globals.REPLACEONMAKE = keep;
4730	6007	}
4731	6008
4732	6009	void ungroup()
..	..	@@ -4922,21 +6199,6 @@
4922	6199	}
4923	6200	*/
4924	6201
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	6202	/*
4941	6203	public void Callback(Object obj)
4942	6204	{
..	..	@@ -4960,26 +6222,9 @@
4960	6222	}
4961	6223	*/
4962	6224
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (GrafreeD.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	6225	String GetFile(String dialogName)
4981	6226	{
4982		- if (GrafreeD.standAlone)
	6227	+ if (Grafreed.standAlone)
4983	6228	{
4984	6229	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4985	6230	browser.show();
..	..	@@ -5047,7 +6292,43 @@
5047	6292	cButton clearpanelButton;
5048	6293	cButton unselectButton;
5049	6294
	6295	+ cButton restoreCameraButton;
	6296	+
5050	6297	cButton oneStepButton;
	6298	+
	6299	+ cButton groupButton;
	6300	+ cButton ungroupButton;
	6301	+ cButton compositeButton;
	6302	+ cButton switchButton;
	6303	+ cButton loopButton;
	6304	+ cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
	6321	+
	6322	+ cButton gridButton;
	6323	+ cButton boxButton;
	6324	+ cButton sphereButton;
	6325	+ cButton coneButton;
	6326	+ cButton torusButton;
	6327	+ cButton superButton;
	6328	+ cButton kleinButton;
	6329	+ cButton particlesButton;
	6330	+ cButton overlayButton;
	6331	+ cButton lightButton;
5051	6332
5052	6333	cButton screenfitButton;
5053	6334	cButton screenfitpointButton;
..	..	@@ -5060,14 +6341,6 @@
5060	6341
5061	6342	cButton setsupportButton;
5062	6343
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	6344	//
5072	6345	//Composite
5073	6346	Object3D // to do !!
..	..	@@ -5077,10 +6350,12 @@
5077	6350	//JTree jTree;
5078	6351	private MenuItem lookAtItem;
5079	6352	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
5081		- private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
5083		- private MenuItem cloneItem;
	6353	+ private MenuItem switchViewItem;
	6354	+ private JMenuItem cutItem;
	6355	+ private MenuItem undoItem;
	6356	+ private MenuItem redoItem;
	6357	+ private JMenuItem duplicateItem;
	6358	+ private JMenuItem cloneItem;
5084	6359	private MenuItem cloneSupportItem;
5085	6360	private MenuItem overwriteGeoItem;
5086	6361	private MenuItem overwriteMatItem;
..	..	@@ -5092,7 +6367,7 @@
5092	6367	private MenuItem linkverticesItem;
5093	6368	private MenuItem relinkverticesItem;
5094	6369	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	6370	+ private MenuItem resetAllItem;
5096	6371	private MenuItem stepAllItem;
5097	6372	private MenuItem revertMeshItem;
5098	6373	private MenuItem poseMeshItem;
..	..	@@ -5101,13 +6376,13 @@
5101	6376	private MenuItem cloneGeometriesItem;
5102	6377	private MenuItem shareGeometriesItem;
5103	6378	private MenuItem mergeGeometriesItem;
5104		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5105	6380	private MenuItem pasteItem;
5106		- private MenuItem pasteIntoItem;
5107		- private MenuItem pasteLinkItem;
5108		- private MenuItem pasteCloneItem;
5109		- private MenuItem pasteExpandItem;
5110		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5111	6386	private MenuItem clearAllItem;
5112	6387	private MenuItem genUVItem;
5113	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5133,6 +6408,7 @@
5133	6408	private MenuItem clipMeshItem;
5134	6409	private MenuItem smoothMeshItem;
5135	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5136	6412
5137	6413	private MenuItem liveleavesItem;
5138	6414	private MenuItem unliveleavesItem;
..	..	@@ -5142,6 +6418,10 @@
5142	6418	private MenuItem showleavesItem;
5143	6419	private MenuItem markleavesItem;
5144	6420	private MenuItem unmarkleavesItem;
	6421	+ private MenuItem rewindleavesItem;
	6422	+ private MenuItem unrewindleavesItem;
	6423	+ private MenuItem randomleavesItem;
	6424	+ private MenuItem unrandomleavesItem;
5145	6425
5146	6426	private MenuItem flipVItem;
5147	6427	private MenuItem unflipVItem;
..	..	@@ -5152,16 +6432,21 @@
5152	6432	private MenuItem maxTexturesItem;
5153	6433	private MenuItem panoTexturesItem;
5154	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5155	6438	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	6439	+ private MenuItem resetCentroidXZItem;
5157	6440	private MenuItem resetTransformItem;
	6441	+ private MenuItem transformGeometryItem;
	6442	+ private MenuItem transformChildrenItem;
5158	6443	private MenuItem hideItem;
5159		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5160	6445	private MenuItem backItem;
5161	6446	private MenuItem frontItem;
5162	6447	private MenuItem cameraItem;
5163	6448	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	6449	+ private MenuItem switchItem;
5165	6450	private MenuItem physicsItem;
5166	6451	private MenuItem frameselectorItem;
5167	6452	private MenuItem scriptNodeItem;
..	..	@@ -5169,7 +6454,7 @@
5169	6454	private MenuItem switchTransfoItem;
5170	6455	private MenuItem morphItem;
5171	6456	private MenuItem linkerItem;
5172		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5173	6458	private MenuItem editItem;
5174	6459	private MenuItem openWindowItem;
5175	6460	private MenuItem editLeafItem;
..	..	@@ -5185,6 +6470,8 @@
5185	6470	private MenuItem attachBumpItem;
5186	6471	private MenuItem detachBumpItem;
5187	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
5188	6475
5189	6476	private MenuItem particleItem;
5190	6477	private MenuItem ragdollItem;
..	..	@@ -5223,11 +6510,6 @@
5223	6510	private MenuItem doubleItem;
5224	6511	private MenuItem tripleItem;
5225	6512
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	6513	private MenuItem computeAOItem;
5232	6514	private MenuItem recompileItem;
5233	6515	private MenuItem editScriptItem;
..	..	@@ -5237,4 +6519,8 @@
5237	6519	private MenuItem analyzeItem;
5238	6520	private MenuItem dumpItem;
5239	6521	//boolean freezemodel = false;
	6522	+
	6523	+ Menu cameraMenu;
	6524	+ MenuItem editCameraItem;
	6525	+ MenuItem restoreCameraItem;
5240	6526	}