~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,360 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	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	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
25	381	//ObjEditor objEditor;
26	382	public void closeUI2()
27	383	{
..	..	@@ -59,6 +415,16 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
62	428	if(ui)
63	429	SetupUI(objEditor);
64	430	}
..	..	@@ -73,16 +439,28 @@
73	439	this.copy = this.group = copy;
74	440	//selectees = this.group.selectees;
75	441
76		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
77	443	SetupUI2(objEditor);
78	444	objEditor.SetupUI(true);
79	445	SetupViews(objEditor);
80	446
81	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
82	456	}
83	457
84	458	void CloneSelection(boolean supports)
85	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
86	464	// Object3D keep = GrafreeD.clipboard;
87	465	//Object3D obj;
88	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +471,19 @@
93	471
94	472	makeSomething(clone, i==group.selection.size()-1);
95	473	}
	474	+ Globals.REPLACEONMAKE = keep;
96	475	}
97	476
98	477	void CloneClipboard(boolean supports)
99	478	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	484	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
108	487	}
109	488
110	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +497,7 @@
118	497	// obj.support = null;
119	498	if (!supports)
120	499	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	501	obj.parent = parent;
123	502	// obj.support = support;
124	503	// clone.support = support; // aout 2013
..	..	@@ -147,58 +526,153 @@
147	526
148	527	//JTextField nameField;
149	528
150		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
151	530	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	531	+ oe.jTree = new cTree();
	532	+
163	533	Menu menu;
164	534	oe.menuBar.add(menu = new Menu("Edit"));
165	535	//editItem = menu.add(new MenuItem("Edit"));
166	536	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	544	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	547	cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
172	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	551	cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
174	554	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	556	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	558	copyItem.addActionListener(this);
179	559	pasteItem = menu.add(new MenuItem("Paste"));
180	560	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	565	+ pasteIntoItem.addActionListener(this);
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	567	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	569	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	571	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
	574	+
	575	+ if (Globals.ADVANCED)
	576	+ {
	577	+ // Deletes the cameras...
189	578	clearAllItem = menu.add(new MenuItem("Clear All"));
190	579	clearAllItem.addActionListener(this);
	580	+ }
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
191	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
192	667	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	668	+ if (Globals.ADVANCED)
	669	+ {
197	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	671	revertMeshItem.addActionListener(this);
199	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	673	resetreferencesItem.addActionListener(this);
201	674	menu.add("-");
	675	+ }
202	676	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	677	overwriteGeoItem.addActionListener(this);
204	678	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +684,111 @@
210	684	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	685	overwriteUVItem.addActionListener(this);
212	686	menu.add("-");
	687	+ if (Globals.ADVANCED)
	688	+ {
213	689	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	690	generateMeshItem.addActionListener(this);
215	691	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	692	poseMeshItem.addActionListener(this);
217	693	menu.add("-");
	694	+ }
218	695	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	696	resetsupportItem.addActionListener(this);
220	697	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	698	linkverticesItem.addActionListener(this);
222	699	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	700	relinkverticesItem.addActionListener(this);
	701	+
	702	+ if (Globals.ADVANCED)
	703	+ {
224	704	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	705	setMasterItem.addActionListener(this);
	706	+ }
226	707
227		- oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
230	710	backItem = menu.add(new MenuItem("Back"));
231	711	backItem.addActionListener(this);
232	712	frontItem = menu.add(new MenuItem("Front"));
233	713	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
	722	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	723	hideItem.addActionListener(this);
238		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239	726	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
247	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	740	switchGeoItem.addActionListener(this);
249	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	742	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	743	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	744	morphItem.addActionListener(this);
	745	+
	746	+ menu.add("-");
	747	+ physicsItem = menu.add(new MenuItem("Physics"));
	748	+ physicsItem.addActionListener(this);
	749	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	750	+ frameselectorItem.addActionListener(this);
253	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	752	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	753	+ }
257	754
258	755	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
261	758	billboardItem = menu.add(new MenuItem("Billboard"));
262	759	billboardItem.addActionListener(this);
263	760	csgItem = menu.add(new MenuItem("CSG"));
264	761	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	763	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	765	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
271	774	linkerItem = menu.add(new MenuItem("Linker"));
272	775	linkerItem.addActionListener(this);
273	776	templateItem = menu.add(new MenuItem("Template"));
274	777	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	779	pointflowItem.addActionListener(this);
	780	+ }
279	781	menu.add("-");
280	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	783	resetTransformItem.addActionListener(this);
282	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	785	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
286	792
287	793	oe.menuBar.add(menu = new Menu("Geometry"));
288	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +799,11 @@
293	799	genNormalsCADItem.addActionListener(this);
294	800	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	801	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ if (Globals.ADVANCED)
	803	+ {
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	805	genNormalsMINEItem.addActionListener(this);
	806	+ }
298	807	stripifyItem = menu.add(new MenuItem("Stripify"));
299	808	stripifyItem.addActionListener(this);
300	809	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,31 +825,50 @@
316	825	reduce34MeshItem.addActionListener(this);
317	826	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	827	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	828	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	829	clipMeshItem.addActionListener(this);
	830	+
	831	+ if (Globals.ADVANCED)
	832	+ {
	833	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	834	+ smoothMeshItem.addActionListener(this);
	835	+ }
323	836
324	837	oe.menuBar.add(menu = new Menu("Attributes"));
325	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
327	844	menu.add("-");
328	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	846	liveleavesItem.addActionListener(this);
330	847	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	848	unliveleavesItem.addActionListener(this);
	849	+ if (Globals.ADVANCED)
	850	+ {
332	851	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	852	supportleavesItem.addActionListener(this);
334	853	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	854	unsupportleavesItem.addActionListener(this);
	855	+ }
336	856	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	857	hideleavesItem.addActionListener(this);
338	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
339	859	showleavesItem.addActionListener(this);
340		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
341	861	markleavesItem.addActionListener(this);
342		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
343	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
344	872	menu.add("-");
345	873	flipVItem = menu.add(new MenuItem("Flip V"));
346	874	flipVItem.addActionListener(this);
..	..	@@ -366,53 +894,130 @@
366	894	attachBumpItem.addActionListener(this);
367	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
369	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	899	detachPigmentItem.addActionListener(this);
371	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
373	906	menu.add("-");
374	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	908	sortbysizeItem.addActionListener(this);
376	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	910	sortbynameItem.addActionListener(this);
378	911	menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
	919	+ if (Globals.ADVANCED)
	920	+ {
	921	+ // Pretty much the same as duplicate and clone.
379	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	923	extractGeometriesItem.addActionListener(this);
381	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	925	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	926	+ }
387	927
388	928	oe.menuBar.add(menu = new Menu("Insert"));
389	929	buildCreateMenu(menu);
390	930
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	931	oe.menuBar.add(menu = new Menu("Tools"));
403	932	buildToolsMenu(menu);
404	933	}
405	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
406	1004	void SetupUI2(ObjEditor oe)
407	1005	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
408	1018	//new Exception().printStackTrace();
409	1019
410	1020	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1022
418	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,110 +1038,269 @@
433	1038	oe.radioPanel.add(dummyButton);
434	1039	oe.buttonGroup.add(dummyButton);
435	1040	*/
436		- aConstraints.gridy += 1;
	1041	+ cGridBag versionManagerPanel = new cGridBag();
	1042	+
	1043	+ versionManagerPanel.preferredHeight = 4;
437	1044
438	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	1046
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
442	1050
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
445		- liveCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
454	1102	screenfitButton.setToolTipText("Screen fit");
455	1103	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	1104	+
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
	1144	+
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1150	+ fastCB.setToolTipText("Fast mode");
	1151	+ fastCB.addItemListener(this);
	1152	+
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
	1158	+
457	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	1160	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	1161
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
473		-
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
482		- twoButton.setToolTipText("Show center view only");
483		- twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1162	+ if (Globals.ADVANCED)
	1163	+ {
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ snapobjectButton.addActionListener(this);
	1166	+ snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
485	1169	fourButton.addActionListener(this);
486		- fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
488		- sixButton.setToolTipText("2-column layout left");
489		- sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
491		- threeButton.setToolTipText("2-column layout right");
492		- threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- sevenButton.addActionListener(this);
496		- //
	1170	+ fourButton.setToolTipText("Show control panel only");
	1171	+ }
497	1172
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1174	+
	1175	+
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
500	1178	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1179	+
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
503	1181	closeButton.setToolTipText("Close tab");
504	1182	closeButton.addActionListener(this);
505	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	1184	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	1185
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ int tabCount = resourcecontainer.getTabCount();
	1263	+
	1264	+ if (tabCount > 0)
	1265	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1266	+
	1267	+ oe.toolboxPanel.add(textures);
	1268	+
	1269	+ textures.preferredHeight = 100;
	1270	+
	1271	+ CreateSkyboxPanel(oe.skyboxPanel);
	1272	+
	1273	+ // EDIT panel
	1274	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ editButton.setToolTipText("Pin selection controls");
	1276	+ editButton.addActionListener(this);
	1277	+
	1278	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ uneditButton.setToolTipText("Unpin and remove selection controls");
517	1280	uneditButton.addActionListener(this);
518	1281
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1282	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1283	+ allParamsButton.setToolTipText("Show all controls");
531	1284	allParamsButton.addActionListener(this);
532	1285
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
538		- unselectButton.addActionListener(this);
	1286	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ clearPanelButton.setToolTipText("Clear all controls");
	1288	+ clearPanelButton.addActionListener(this);
539	1289
	1290	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ //unselectButton.setToolTipText("Unselect");
	1292	+ //unselectButton.addActionListener(this);
	1293	+
	1294	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ flashSelectionButton.setToolTipText("Highlight selection");
	1296	+ flashSelectionButton.addActionListener(this);
	1297	+
	1298	+ editCommandsPanel.preferredHeight = 1;
	1299	+
	1300	+ SetPinStates(false);
	1301	+// oe.treePanel.add(commandsPanel);
	1302	+// oe.treePanel.Return();
	1303	+
540	1304	// oe.aConstraints.gridx += 1;
541	1305	// oe.aConstraints.weighty = 0;
542	1306	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +1312,34 @@
548	1312	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	1313	// gcButton.addActionListener(this);
550	1314
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	1315	+ cGridBag jSPPanel = new cGridBag();
	1316	+
	1317	+ jSPPanel.preferredHeight = 20;
	1318	+
	1319	+ JScrollPane jSP;
562	1320	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1321	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	1322	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	1323
	1324	+ oe.treePanel.add(jSPPanel);
	1325	+ oe.treePanel.Return();
	1326	+
	1327	+ oe.treePanel.add(versionManagerPanel);
	1328	+ oe.treePanel.Return();
	1329	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1330	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1331	+ versionSliderPane.preferredHeight = 3;
	1332	+
	1333	+// mainPanel.setDividerLocation(0.1); //1.0);
	1334	+ mainPanel.setResizeWeight(0.4);
	1335	+
585	1336	//jList.addListSelectionListener(this);
586	1337	oe.jTree.addTreeSelectionListener(this);
587	1338	//jTree.setRootVisible(false);
588	1339	//jTree.setEditable(true);
589	1340	oe.jTree.setDragEnabled(true);
590	1341	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	1342	+ //jSP.setPreferredSize(new Dimension(100,200));
592	1343
593	1344	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	1345
..	..	@@ -600,122 +1351,204 @@
600	1351	dgr.addDragGestureListener(this);
601	1352	}catch(Exception e) {}
602	1353	*/
603		- radio.layout = sevenButton;
	1354	+ radio.layout = threeButton; // sixButton;
604	1355	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1356	}
606	1357
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1358	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1359	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	1360	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1361	+ colorCB.setToolTipText("Copy color when dropped");
	1362	+ colorCB.addItemListener(this);
618	1363
619		- // constraints.gridy += 1;
	1364	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1365	+ materialCB.setToolTipText("Copy material when dropped");
	1366	+ materialCB.addItemListener(this);
	1367	+
	1368	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1369	+ textureCB.setToolTipText("Copy texture when dropped");
	1370	+ textureCB.addItemListener(this);
	1371	+
	1372	+ panel.Return();
	1373	+
	1374	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1375	+ boxCB.setToolTipText("Display bounding boxes");
	1376	+ boxCB.addItemListener(this);
	1377	+
	1378	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1379	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1380	+ zoomBoxCB.addItemListener(this);
	1381	+
	1382	+ if (true) // Globals.ADVANCED)
	1383	+ {
	1384	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1385	+// supportCB.setToolTipText("Enable rigging");
	1386	+// supportCB.addItemListener(this);
	1387	+
	1388	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1389	+ freezeCB.setToolTipText("Fast moving camera");
	1390	+ freezeCB.addItemListener(this);
	1391	+
620	1392	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1393	// localCB.addItemListener(this);
622	1394
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1395	+ panel.Return();
	1396	+
	1397	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1398	crowdCB.setToolTipText("Used for crowds");
626	1399	crowdCB.addItemListener(this);
627	1400
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1401	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1402	smoothCB.setToolTipText("Snapping delay");
631	1403	smoothCB.addItemListener(this);
632	1404
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	1405	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1406	+// slowCB.setToolTipText("Smooth interpolation");
	1407	+// slowCB.addItemListener(this);
	1408	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1409	+ minshaderCB.setToolTipText("Minimal fast shader");
	1410	+ minshaderCB.addItemListener(this);
	1411	+
646	1412	// constraints.gridy += 1;
647	1413	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1414	// speakerMocapCB.addItemListener(this);
649	1415
	1416	+ panel.Return();
	1417	+
650	1418	if (false)
651	1419	{
652	1420	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1421	+ //constraints.gridy += 1;
	1422	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1423	speakerCameraCB.addItemListener(this);
656	1424
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1425	+ //constraints.gridy += 1;
	1426	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1427	speakerFocusCB.addItemListener(this);
660	1428
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1429	+ //constraints.gridy += 1;
	1430	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1431	smoothfocusCB.addItemListener(this);
	1432	+ panel.Return();
664	1433	}
665	1434
666	1435	//constraints.gridx += 1;
667	1436	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1437	// debugCB.addItemListener(this);
669	1438
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1439	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1440	+ trackCB.setToolTipText("Enable tracking target");
	1441	+ trackCB.addItemListener(this);
	1442	+
	1443	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1444	+ oeilCB.setToolTipText("Move camera when tracking");
672	1445	oeilCB.addItemListener(this);
673	1446
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1447	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1448	+ shadowCB.setToolTipText("When live compute shadows");
	1449	+ shadowCB.addItemListener(this);
	1450	+
	1451	+ panel.Return();
	1452	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1453	+ toggleTextureCB.setToolTipText("Load textures");
	1454	+ toggleTextureCB.addItemListener(this);
	1455	+
	1456	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1457	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1458	+ toggleSwitchCB.addItemListener(this);
	1459	+
	1460	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1461	+ autokeepCB.setToolTipText("On structure change");
	1462	+ autokeepCB.addItemListener(this);
	1463	+
	1464	+ panel.Return();
	1465	+ if (Globals.ADVANCED)
	1466	+ {
	1467	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1468	lookAtCB.setToolTipText("Look-at target");
677	1469	lookAtCB.addItemListener(this);
	1470	+ }
	1471	+
	1472	+ }
	1473	+
	1474	+ cGridBag fill = new cGridBag();
	1475	+ fill.preferredHeight = 200;
	1476	+ cGridBag fill2 = new cGridBag();
	1477	+ fill2.preferredHeight = 200;
	1478	+ cGridBag fill3 = new cGridBag();
	1479	+ fill3.preferredHeight = 200;
	1480	+
	1481	+ panel.add(fill);
	1482	+ panel.add(fill2);
	1483	+ panel.add(fill3);
678	1484
679	1485	}
680	1486
681	1487	void EditObject(Object3D obj)
682	1488	{
	1489	+ assert(obj instanceof Composite);
	1490	+
	1491	+// if (obj.versionlist == null)
	1492	+// {
	1493	+// obj.versionlist = new Object3D[100];
	1494	+// obj.versionindex = -1;
	1495	+// }
	1496	+
683	1497	cRadio radioButton = new cRadio(obj.name);
	1498	+
	1499	+ // June 2019. Patch to avoid bug with transparency.
	1500	+ radioButton.hadMaterial = obj.material != null;
	1501	+ if (!radioButton.hadMaterial)
	1502	+ {
	1503	+ obj.material = new cMaterial();
	1504	+ }
	1505	+
684	1506	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1507	+ radioButton.layout = threeButton; // sixButton;
686	1508	radioButton.SetCamera(cameraView.renderCamera, false);
687	1509	radioButton.addActionListener(this);
688	1510	radioPanel.add(radioButton);
689	1511	buttonGroup.add(radioButton);
690	1512	radioButton.doClick();
691	1513	}
	1514	+
692	1515	void SetupViews(ObjEditor oe)
693	1516	{
	1517	+ theFrame = this;
	1518	+
694	1519	oe.SetupViews();
695	1520
	1521	+ if (Globals.DEBUG)
696	1522	System.out.println("SetupViews");
697	1523	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
698	1524	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
699	1525	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1526	}
701	1527
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1528	+ cToggleButton liveCB;
	1529	+ cCheckBox supportCB;
	1530	+ cCheckBox localCB;
	1531	+ cCheckBox crowdCB;
	1532	+ cCheckBox smoothCB;
	1533	+ cCheckBox minshaderCB;
	1534	+
	1535	+ cToggleButton fastCB;
	1536	+ cCheckBox slowCB;
	1537	+ cCheckBox boxCB;
	1538	+ cCheckBox zoomBoxCB;
	1539	+ cCheckBox freezeCB;
	1540	+ //cToggleButton trackCB;
	1541	+ cCheckBox trackCB;
	1542	+ cCheckBox smoothfocusCB;
713	1543	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1544	+ cCheckBox speakerCameraCB;
	1545	+ cCheckBox speakerFocusCB;
	1546	+ cCheckBox debugCB;
	1547	+
	1548	+ cCheckBox oeilCB;
	1549	+ cCheckBox shadowCB;
	1550	+ cCheckBox autokeepCB;
	1551	+ cCheckBox lookAtCB;
719	1552
720	1553	// static int COLOR = 1;
721	1554	// static int MATERIAL = 2;
..	..	@@ -723,9 +1556,9 @@
723	1556
724	1557	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1558
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1559	+ cCheckBox colorCB;
	1560	+ cCheckBox materialCB;
	1561	+ cCheckBox textureCB;
729	1562
730	1563	public void itemStateChanged(ItemEvent e)
731	1564	{
..	..	@@ -753,6 +1586,7 @@
753	1586	} else if(e.getSource() == liveCB)
754	1587	{
755	1588	cameraView.ToggleLive();
	1589	+ refreshContents(false);
756	1590	}
757	1591	else if(e.getSource() == supportCB)
758	1592	{
..	..	@@ -768,6 +1602,12 @@
768	1602	{
769	1603	cameraView.ToggleInertia();
770	1604	cameraView.repaint();
	1605	+ }
	1606	+ else if(e.getSource() == minshaderCB)
	1607	+ {
	1608	+ Globals.MINSHADER ^= true;
	1609	+ cameraView.programInitialized = false;
	1610	+ cameraView.repaint();
771	1611	}
772	1612	else if(e.getSource() == localCB)
773	1613	{
..	..	@@ -817,6 +1657,18 @@
817	1657	{
818	1658	cameraView.ToggleOeil();
819	1659	}
	1660	+ else if(e.getSource() == shadowCB)
	1661	+ {
	1662	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1663	+ }
	1664	+ else if(e.getSource() == freezeCB)
	1665	+ {
	1666	+ Globals.FREEZEONMOVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == autokeepCB)
	1669	+ {
	1670	+ Globals.REPLACEONMAKE ^= true;
	1671	+ }
820	1672	else if(e.getSource() == lookAtCB)
821	1673	{
822	1674	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1685,8 @@
833	1685
834	1686	/**/
835	1687	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1688	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1689	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1690	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1691	// We can't move the root node or an empty selection
839	1692	return;
..	..	@@ -896,8 +1749,6 @@
896	1749	}
897	1750	}
898	1751
899		- String string = (String) object;
900		-
901	1752	System.out.println("Transfer = " + object + "; drop : " + target);
902	1753	// if( object instanceof java.io.File[])
903	1754	// {
..	..	@@ -905,7 +1756,11 @@
905	1756	// objEditor.DropFile((java.io.File[]) object, true);
906	1757	// return;
907	1758	// }
908		- if (string.charAt(0) == '/')
	1759	+
	1760	+ String string = object.toString();
	1761	+
	1762	+ // File path for Mac and Windows
	1763	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1764	{
910	1765	// file(s)
911	1766	String[] names = string.split("\n");
..	..	@@ -932,7 +1787,7 @@
932	1787
933	1788	flashIt = false;
934	1789	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1790	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1791	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1792
938	1793	if (group.selection.size() == 1)
..	..	@@ -948,23 +1803,33 @@
948	1803
949	1804	assert target == objEditor.jTree;
950	1805	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1806	+ Object3D destinationLeaf;
951	1807	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1808	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1809	} catch (Exception e) {
954	1810	System.out.println("destinationPath : " + destinationPath);
955	1811	return;
956	1812	}
957	1813
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+ for (int i=group.selection.size(); --i>=0;)
959	1815	{
	1816	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1817	+
	1818	+ // Cannot move into itself
	1819	+ if (child == destinationLeaf)
	1820	+ return;
	1821	+ }
	1822	+
	1823	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1824	+// {
960	1825	loadClipboard(true);
961	1826	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1827	+ pasteInto(false, false);
	1828	+// } else {
	1829	+// loadClipboard(false);
	1830	+// objEditor.jTree.setSelectionPath(destinationPath);
	1831	+// pasteInto(false, false); // true); // ???
	1832	+// }
968	1833	}
969	1834	public void dropActionChanged(DropTargetDragEvent dtde)
970	1835	// Called if the user has modified the current drop gesture
..	..	@@ -1020,7 +1885,12 @@
1020	1885	TreePath path;
1021	1886
1022	1887	public TransferableTreePath(TreePath tp) {
1023		- path = tp;
	1888	+ Object[] objs = new Object[tp.getPathCount()];
	1889	+ for (int i=0; i<objs.length; i++)
	1890	+ {
	1891	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1892	+ }
	1893	+ path = new TreePath(objs);
1024	1894	}
1025	1895
1026	1896	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1069,85 +1939,107 @@
1069	1939	{
1070	1940	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1941	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1942	+// gridItem = menu.add(new MenuItem("Grid"));
	1943	+// gridItem.addActionListener(this);
	1944	+// rectoidItem = menu.add(new MenuItem("Box"));
	1945	+// rectoidItem.addActionListener(this);
	1946	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1947	+// ellipsoidItem.addActionListener(this);
	1948	+// coneItem = menu.add(new MenuItem("Cone"));
	1949	+// coneItem.addActionListener(this);
	1950	+// torusItem = menu.add(new MenuItem("Torus"));
	1951	+// torusItem.addActionListener(this);
	1952	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1953	+// superItem.addActionListener(this);
	1954	+
	1955	+ cameraItem = menu.add(new MenuItem("Camera"));
	1956	+ cameraItem.addActionListener(this);
	1957	+
	1958	+ if (!Globals.ADVANCED)
	1959	+ {
1084	1960	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1961	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1962	+ }
	1963	+
	1964	+// particleItem = menu.add(new MenuItem("Particle system"));
	1965	+// particleItem.addActionListener(this);
	1966	+ if (Globals.ADVANCED)
	1967	+ {
1088	1968	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1969	ragdollItem.addActionListener(this);
1090	1970	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1971	ragdoll2Item.addActionListener(this);
	1972	+ }
1092	1973	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1974	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1975	meshItem.addActionListener(this);
1095	1976	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1977	// meshGroupItem.addActionListener(this);
	1978	+ if (Globals.ADVANCED)
	1979	+ {
1097	1980	springItem = menu.add(new MenuItem("Spring"));
1098	1981	springItem.addActionListener(this);
1099	1982	flagItem = menu.add(new MenuItem("Flag"));
1100	1983	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1984	blobItem = menu.add(new MenuItem("Blob"));
1106	1985	blobItem.addActionListener(this);
1107	1986	latheItem = menu.add(new MenuItem("Lathe"));
1108	1987	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1988	+ }
	1989	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1990	+ bezierItem.addActionListener(this);
	1991	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1992	+// overlayItem.addActionListener(this);
	1993	+// lightItem = menu.add(new MenuItem("Light"));
	1994	+// lightItem.addActionListener(this);
1111	1995	menu.add("-");
1112	1996	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1997	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1998	+// loopItem = menu.add(new MenuItem("Loop"));
	1999	+// loopItem.addActionListener(this);
1116	2000	doubleItem = menu.add(new MenuItem("Fork"));
1117	2001	doubleItem.addActionListener(this);
	2002	+ if (Globals.ADVANCED)
	2003	+ {
1118	2004	tripleItem = menu.add(new MenuItem("Trident"));
1119	2005	tripleItem.addActionListener(this);
	2006	+ }
1120	2007	}
1121	2008
1122	2009	void buildToolsMenu(Menu menu)
1123	2010	{
1124	2011	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	2012	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	2013	+ animationItem.setState(Globals.ANIMATION);
	2014	+
	2015	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2016	+ archiveItem.addActionListener(this);
1127	2017
1128	2018	menu.add("-");
1129	2019	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	2020	parseverticesItem.addActionListener(this);
1131	2021	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	2022	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	2023	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	2024	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	2025	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	2026	reduceMorphItem.addActionListener(this);
1139	2027	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	2028	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	2029	menu.add("-");
1145		-
1146	2030	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	2031	memoryItem.addActionListener(this);
	2032	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2033	+ computeAOItem.addActionListener(this);
	2034	+
	2035	+ if (Globals.ADVANCED)
	2036	+ {
	2037	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2038	+ mirrorItem.addActionListener(this);
	2039	+ menu.add("-");
1148	2040	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	2041	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	2042	+ menu.add(dumpItem = new MenuItem("Print"));
1151	2043	dumpItem.addActionListener(this);
1152	2044	// menu.add(pathItem = new MenuItem("From-to path"));
1153	2045	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +2057,7 @@
1165	2057	menu.add("-");
1166	2058	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	2059	editScriptItem.addActionListener(this);
	2060	+ }
1168	2061	}
1169	2062
1170	2063	void ScreenFit()
..	..	@@ -1287,9 +2180,38 @@
1287	2180	shadow.material = new cMaterial(obj.material);
1288	2181	shadow.material.diffuse = 0.0001f;
1289	2182	shadow.material.specular = 0.0001f;
	2183	+ shadow.material.opacity = 0.75f;
	2184	+
	2185	+ AllocProjectedVertices(shadow);
	2186	+
	2187	+ shadow.projectedVertices[1].x = 300;
1290	2188
1291	2189	makeSomething(shadow);
1292	2190	}
	2191	+
	2192	+ private void ClearUnpinned()
	2193	+ {
	2194	+ //for (Object3D obj : listUI)
	2195	+ for (int i=listUI.size(); --i>=0;)
	2196	+ {
	2197	+ Object3D obj = listUI.elementAt(i);
	2198	+ if (!obj.pinned)
	2199	+ {
	2200	+ obj.CloseUI();
	2201	+ listUI.remove(i);
	2202	+ }
	2203	+ }
	2204	+ }
	2205	+
	2206	+ private void EditElement(Object3D elem, boolean newWindow)
	2207	+ {
	2208	+ // if (!(elem instanceof Composite))
	2209	+ // newWindow = false;
	2210	+ listUI.add(elem);
	2211	+ elem.openEditWindow(this, newWindow); //, false);
	2212	+ System.out.println("edit : " + elem);
	2213	+ elem.editWindow.refreshContents(true); // ? new
	2214	+ }
1293	2215
1294	2216	/**
1295	2217	* applyExample
..	..	@@ -1493,9 +2415,9 @@
1493	2415
1494	2416	void Overwrite(int mask)
1495	2417	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2418	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2419	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2420	+ Object3D content = Grafreed.clipboard.get(0);
1499	2421
1500	2422	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2423	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +2456,7 @@
1534	2456	{
1535	2457	ScreenFit();
1536	2458	} else
1537		- if (source == switchItem)
	2459	+ if (source == switchViewItem)
1538	2460	{
1539	2461	cVector v1 = new cVector();
1540	2462	cVector v2 = new cVector();
..	..	@@ -1543,11 +2465,11 @@
1543	2465	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	2466	objEditor.cameraView.repaint();
1545	2467	} else
1546		- if (source == rectoidItem)
	2468	+ if (source == rectoidItem \|\| source == boxButton)
1547	2469	{
1548	2470	makeSomething(new Box());
1549	2471	} else
1550		- if (source == particleItem)
	2472	+ if (source == particleItem \|\| source == particlesButton)
1551	2473	{
1552	2474	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	2475	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2548,27 @@
1626	2548
1627	2549	makeSomething(obj);
1628	2550	} else
1629		- if (source == gridItem)
	2551	+ if (source == gridItem \|\| source == gridButton)
1630	2552	{
1631	2553	makeSomething(new Grid());
1632	2554	} else
1633		- if (source == ellipsoidItem)
	2555	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2556	{
1635	2557	makeSomething(new Sphere());
1636	2558	} else
1637		- if (source == coneItem)
	2559	+ if (source == coneItem \|\| source == coneButton)
1638	2560	{
1639	2561	makeSomething(new Cone());
1640	2562	} else
1641		- if (source == torusItem)
	2563	+ if (source == torusItem \|\| source == torusButton)
1642	2564	{
1643	2565	makeSomething(new Torus());
1644	2566	} else
1645		- if (source == superItem)
	2567	+ if (source == superItem \|\| source == superButton)
1646	2568	{
1647	2569	makeSomething(new Superellipsoid());
1648	2570	} else
1649		- if (source == kleinItem)
	2571	+ if (source == kleinItem \|\| source == kleinButton)
1650	2572	{
1651	2573	makeSomething(new Klein());
1652	2574	} else
..	..	@@ -1666,7 +2588,7 @@
1666	2588	{
1667	2589	makeSomething(new BezierSurface());
1668	2590	} else
1669		- if (source == checkerItem)
	2591	+ if (source == overlayItem \|\| source == overlayButton)
1670	2592	{
1671	2593	/*
1672	2594	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,10 +2636,27 @@
1714	2636	s.setup();
1715	2637	makeSomething(s);
1716	2638	} else
1717		- if (source == lightItem)
	2639	+ if (source == lightItem \|\| source == lightButton)
1718	2640	{
1719	2641	makeSomething(new Light());
1720	2642	} else
	2643	+// if (source == skybox1Button \|\|
	2644	+// source == skybox2Button \|\|
	2645	+// source == skybox3Button \|\|
	2646	+// source == skybox4Button \|\|
	2647	+// source == skybox5Button \|\|
	2648	+// source == skybox6Button \|\|
	2649	+// source == skybox7Button \|\|
	2650	+// source == skybox11Button \|\|
	2651	+// source == skybox12Button \|\|
	2652	+// source == skybox13Button \|\|
	2653	+// source == skybox14Button \|\|
	2654	+// source == skybox15Button \|\|
	2655	+// source == skybox16Button \|\|
	2656	+// source == skybox17Button)
	2657	+// {
	2658	+// ChangeSkybox(source);
	2659	+// } else
1721	2660	if (source == csgItem)
1722	2661	{
1723	2662	group(new CSG());
..	..	@@ -1764,30 +2703,38 @@
1764	2703
1765	2704	group(g);
1766	2705	} else
1767		- if (source == loopItem)
	2706	+ if (source == loopItem \|\| source == loopButton)
1768	2707	{
	2708	+ if (!group.selection.isEmpty())
	2709	+ {
1769	2710	Composite csg = new GroupLeaf();
1770	2711	csg.count = 5;
1771		- group(csg);
1772		- Composite child = new cGroup();
	2712	+ Composite child = new cGroup("Branch");
1773	2713	csg.addChild(child);
1774	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
1775	2717	} else
1776	2718	if (source == doubleItem)
1777	2719	{
1778		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Fork");
1779	2723	csg.count = 5;
	2724	+ Composite child = new cGroup("Branch A");
	2725	+ csg.addChild(child);
	2726	+ child.addChild(csg);
	2727	+ child = new cGroup("Branch B");
	2728	+ csg.addChild(child);
	2729	+ child.addChild(csg);
1780	2730	group(csg);
1781		- Composite child = new cGroup();
1782		- csg.addChild(child);
1783		- child.addChild(csg);
1784		- child = new cGroup();
1785		- csg.addChild(child);
1786		- child.addChild(csg);
	2731	+ }
1787	2732	} else
1788	2733	if (source == tripleItem)
1789	2734	{
1790		- Composite csg = new GroupLeaf();
	2735	+ if (!group.selection.isEmpty())
	2736	+ {
	2737	+ Composite csg = new GroupLeaf("Trident");
1791	2738	csg.count = 4;
1792	2739	group(csg);
1793	2740	Composite child = new cGroup();
..	..	@@ -1799,28 +2746,12 @@
1799	2746	child = new cGroup();
1800	2747	csg.addChild(child);
1801	2748	child.addChild(csg);
1802		- } else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2749	+ }
1819	2750	} else
1820	2751	if (source == computeAOItem)
1821	2752	{
1822	2753	Globals.drawMode = CameraPane.OCCLUSION;
1823		- Globals.theRenderer.repaint();
	2754	+ cameraView.repaint();
1824	2755	} else
1825	2756	if (source == recompileItem)
1826	2757	{
..	..	@@ -1835,7 +2766,7 @@
1835	2766	if (source == invariantsItem)
1836	2767	{
1837	2768	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2769	+ Grafreed.grafreed.universe.invariants();
1839	2770	} else
1840	2771	if (source == memoryItem)
1841	2772	{
..	..	@@ -1854,19 +2785,80 @@
1854	2785	{
1855	2786	DumpObject();
1856	2787	} else
	2788	+ if (source == minButton)
	2789	+ {
	2790	+ Minimize();
	2791	+ } else
	2792	+ if (source == maxButton)
	2793	+ {
	2794	+ Maximize();
	2795	+ } else
	2796	+ if (source == fullButton)
	2797	+ {
	2798	+ ToggleFullScreen();
	2799	+ } else
	2800	+ if (source == collapseButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == maximize3DButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ radio.layout = twoButton;
	2809	+ Show3DView();
	2810	+ CollapseToolbar();
	2811	+ } else
	2812	+ if (source == previousVersionButton)
	2813	+ {
	2814	+ // Go to previous version
	2815	+ //if (!Undo())
	2816	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2817	+ PreviousVersion();
	2818	+ } else
	2819	+ if (source == restoreButton)
	2820	+ {
	2821	+ // Restore current version
	2822	+ Restore();
	2823	+ //restoreButton.setEnabled(false);
	2824	+ } else
	2825	+ if (source == replaceButton)
	2826	+ {
	2827	+ // Overwrite current version
	2828	+ Replace();
	2829	+ //replaceButton.setEnabled(false);
	2830	+ } else
	2831	+ if (source == nextVersionButton)
	2832	+ {
	2833	+ // Go to next version
	2834	+ NextVersion();
	2835	+ } else
	2836	+ if (source == saveVersionButton)
	2837	+ {
	2838	+ // Save a new version
	2839	+ if (!Save(true))
	2840	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2841	+ } else
	2842	+ if (source == deleteVersionButton)
	2843	+ {
	2844	+ // Delete a new version
	2845	+ DeleteVersion();
	2846	+ } else
	2847	+ if (source == oneStepButton)
	2848	+ {
	2849	+ Globals.ONESTEP = true;
	2850	+ cameraView.repaint();
	2851	+ } else
1857	2852	if (source == screenfitButton)
1858	2853	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2854	ScreenFit();
1861	2855	} else
1862	2856	if (source == screenfitpointButton)
1863	2857	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2858	ScreenFitPoint();
1866	2859	} else
1867	2860	if (source == snapobjectButton)
1868	2861	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2862	SnapObject();
1871	2863	} else
1872	2864	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2895,20 @@
1903	2895	{
1904	2896	loadClipboard(true);
1905	2897	} else
	2898	+ if (source == undoItem)
	2899	+ {
	2900	+ PreviousVersion();
	2901	+ } else
	2902	+ if (source == redoItem)
	2903	+ {
	2904	+ NextVersion();
	2905	+ } else
1906	2906	if (source == duplicateItem)
1907	2907	{
1908		- Object3D keep = GrafreeD.clipboard;
	2908	+ Object3D keep = Grafreed.clipboard;
1909	2909	loadClipboard(false);
1910	2910	paste(false);
1911		- GrafreeD.clipboard = keep;
	2911	+ Grafreed.clipboard = keep;
1912	2912	} else
1913	2913	if (source == cloneItem)
1914	2914	{
..	..	@@ -1926,13 +2926,17 @@
1926	2926	{
1927	2927	paste(false);
1928	2928	} else
	2929	+ if (source == pasteIntoItem)
	2930	+ {
	2931	+ pasteInto(true, false);
	2932	+ } else
1929	2933	if (source == pasteLinkItem)
1930	2934	{
1931		- pasteInto(false);
	2935	+ pasteInto(false, false);
1932	2936	} else
1933	2937	if (source == pasteCloneItem)
1934	2938	{
1935		- pasteInto(true);
	2939	+ pasteInto(true, true);
1936	2940	} else
1937	2941	if (source == pasteExpandItem)
1938	2942	{
..	..	@@ -2124,9 +3128,9 @@
2124	3128	// group.selection.get(0).setMasterThis(content); // should be identity
2125	3129	// refreshContents();
2126	3130	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3131	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	3132	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	3133	+ Object3D content = Grafreed.clipboard.get(0);
2130	3134
2131	3135	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	3136	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +3138,11 @@
2134	3138	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	3139	for (int i=0; i<group.selection.size(); i++)
2136	3140	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	3141	+ boolean random = CameraPane.SWITCH;
	3142	+ CameraPane.SWITCH = false; // parse all random nodes
2139	3143	group.selection.get(i).linkVerticesThis(content);
2140	3144	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	3145	+ CameraPane.SWITCH = random;
2142	3146	}
2143	3147	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	3148	refreshContents();
..	..	@@ -2148,20 +3152,20 @@
2148	3152	{
2149	3153	for (int i=0; i<group.selection.size(); i++)
2150	3154	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2153	3157	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	3158	+ CameraPane.SWITCH = random;
2155	3159	}
2156	3160
2157	3161	refreshContents();
2158	3162	} else
2159	3163	if (source == relinkverticesItem)
2160	3164	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	3165	+ boolean random = CameraPane.SWITCH;
	3166	+ CameraPane.SWITCH = false; // parse all random nodes
2163	3167	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	3168	+ CameraPane.SWITCH = random;
2165	3169
2166	3170	refreshContents();
2167	3171	} else
..	..	@@ -2176,9 +3180,9 @@
2176	3180	} else
2177	3181	if (source == setMasterItem)
2178	3182	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3183	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	3184	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	3185	+ Object3D content = Grafreed.clipboard.get(0);
2182	3186
2183	3187	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	3188	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +3195,9 @@
2191	3195	{
2192	3196	if (group.selection.size() == 1)
2193	3197	{
2194		- if (GrafreeD.clipboard.size() == 1)
	3198	+ if (Grafreed.clipboard.size() == 1)
2195	3199	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	3200	+ Object3D content = Grafreed.clipboard.get(0);
2197	3201
2198	3202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	3203	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +3214,7 @@
2210	3214	{
2211	3215	RevertMeshes();
2212	3216	} else
2213		- if (source == resetMeshItem)
	3217	+ if (source == resetAllItem)
2214	3218	{
2215	3219	ResetAll();
2216	3220	} else
..	..	@@ -2218,7 +3222,7 @@
2218	3222	{
2219	3223	StepAll();
2220	3224	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3225	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	3226	{
2223	3227	//int indices[] = jList.getSelectedIndices();
2224	3228	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +3234,9 @@
2230	3234	{
2231	3235	ClearSelection(true);
2232	3236	} else
2233		- if (source == grabItem)
	3237	+ if (source == grabItem \|\| source == groupButton)
2234	3238	{
2235		- group(new cGroup(), true);
	3239	+ group(new cGroup(), false); // true);
2236	3240	} else
2237	3241	if (source == hideItem)
2238	3242	{
..	..	@@ -2250,16 +3254,16 @@
2250	3254	{
2251	3255	makeSomething(new Camera());
2252	3256	} else
2253		- if (source == compositeItem)
	3257	+ if (source == compositeItem \|\| source == compositeButton)
2254	3258	{
2255	3259	group(new Composite());
2256	3260	} else
2257		- if (source == randomItem)
	3261	+ if (source == switchItem \|\| source == switchButton)
2258	3262	{
2259	3263	RandomNode random = new RandomNode();
2260	3264	group(random);
2261	3265	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	3266	+ random.name = random.get(0).name + "Switch";
2263	3267	} else
2264	3268	if (source == physicsItem)
2265	3269	{
..	..	@@ -2356,7 +3360,7 @@
2356	3360	{
2357	3361	group(new cLinker());
2358	3362	} else
2359		- if (source == textureItem)
	3363	+ if (source == textureItem \|\| source == textureButton)
2360	3364	{
2361	3365	group(new TextureNode());
2362	3366	} else
..	..	@@ -2376,17 +3380,42 @@
2376	3380	{
2377	3381	CastShadow(2);
2378	3382	} else
2379		- if (source == ungroupItem)
	3383	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	3384	{
2381		- //ungroup();
	3385	+ boolean canUngroup = true;
	3386	+
2382	3387	for (int i=0; i<group.selection.size(); i++)
2383	3388	{
2384		- Ungroup(group.selection.get(i));
	3389	+ Object3D selectedItem = group.selection.get(i);
	3390	+
	3391	+ if (selectedItem.Size() == 0)
	3392	+ {
	3393	+ // Cannot ungroup leaves
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
	3397	+
	3398	+ if (selectedItem == group)
	3399	+ {
	3400	+ // Cannot ungroup root
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
2385	3404	}
2386	3405
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	3406	+ if (canUngroup)
	3407	+ {
	3408	+ for (int i=0; i<group.selection.size(); i++)
	3409	+ {
	3410	+ Object3D selectedItem = group.selection.get(i);
	3411	+
	3412	+ Ungroup(selectedItem);
	3413	+ }
	3414	+
	3415	+ ClearSelection(false);
	3416	+
	3417	+ refreshContents();
	3418	+ }
2390	3419	} else
2391	3420	if (source == genUVItem)
2392	3421	{
..	..	@@ -2398,7 +3427,7 @@
2398	3427	} else
2399	3428	if (source == genNormalsMESHItem)
2400	3429	{
2401		- GenNormals(true); // TODO
	3430	+ GenNormalsMESH();
2402	3431	} else
2403	3432	if (source == genNormalsORGANItem)
2404	3433	{
..	..	@@ -2463,6 +3492,22 @@
2463	3492	if (source == unmarkleavesItem)
2464	3493	{
2465	3494	MarkLeaves(false);
	3495	+ } else
	3496	+ if (source == rewindleavesItem)
	3497	+ {
	3498	+ RewindLeaves(true);
	3499	+ } else
	3500	+ if (source == unrewindleavesItem)
	3501	+ {
	3502	+ RewindLeaves(false);
	3503	+ } else
	3504	+ if (source == randomleavesItem)
	3505	+ {
	3506	+ RandomLeaves(true);
	3507	+ } else
	3508	+ if (source == unrandomleavesItem)
	3509	+ {
	3510	+ RandomLeaves(false);
2466	3511	} else
2467	3512	if (source == flipVItem)
2468	3513	{
..	..	@@ -2548,9 +3593,13 @@
2548	3593	{
2549	3594	SmoothMesh();
2550	3595	} else
2551		- if (source == transformgeometryItem)
	3596	+ if (source == transformGeometryItem)
2552	3597	{
2553	3598	TransformGeometry();
	3599	+ } else
	3600	+ if (source == transformChildrenItem)
	3601	+ {
	3602	+ TransformChildren();
2554	3603	} else
2555	3604	if (source == resetTransformItem)
2556	3605	{
..	..	@@ -2558,7 +3607,11 @@
2558	3607	} else
2559	3608	if (source == resetCentroidItem)
2560	3609	{
2561		- ResetCentroid();
	3610	+ ResetCentroid(true);
	3611	+ } else
	3612	+ if (source == resetCentroidXZItem)
	3613	+ {
	3614	+ ResetCentroid(false);
2562	3615	} else
2563	3616	if (source == resetParentItem)
2564	3617	{
..	..	@@ -2663,7 +3716,7 @@
2663	3716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3717	{
2665	3718	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3719	+ obj.ResetBumpTexture();
2667	3720	}
2668	3721
2669	3722	refreshContents();
..	..	@@ -2679,6 +3732,31 @@
2679	3732
2680	3733	refreshContents();
2681	3734	} else
	3735	+ if (source == embedTexturesItem)
	3736	+ {
	3737	+ Object3D obj;
	3738	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3739	+ {
	3740	+ obj = (Object3D)e.nextElement();
	3741	+ obj.EmbedTextures(true);
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == deEmbedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(false);
	3753	+ }
	3754	+
	3755	+ CameraPane.texturepigment.clear();
	3756	+ CameraPane.texturebump.clear();
	3757	+
	3758	+ refreshContents();
	3759	+ } else
2682	3760	if (source == flashSelectionButton)
2683	3761	{
2684	3762	CameraPane.flash = true;
..	..	@@ -2690,42 +3768,36 @@
2690	3768	if (source == twoButton)
2691	3769	{
2692	3770	radio.layout = twoButton;
2693		- // bug
2694		- //gridPanel.setDividerLocation(1.0);
2695		- //bigPanel.setDividerLocation(0.0);
2696		-// bigThree.remove(scenePanel);
2697		-// bigThree.remove(centralPanel);
2698		-// bigThree.remove(XYZPanel);
2699		-// aWindowConstraints.gridx = 0;
2700		-// aWindowConstraints.gridy = 0;
2701		-// aWindowConstraints.gridwidth = 1;
2702		-// // aConstraints.gridheight = 3;
2703		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2704		-// aWindowConstraints.weightx = 0;
2705		-// aWindowConstraints.weighty = 1;
2706		-// //bigThree.add(jtp, aWindowConstraints);
2707		-// aWindowConstraints.weightx = 1;
2708		-// aWindowConstraints.gridwidth = 3;
2709		-// // aConstraints.gridheight = 3;
2710		-// aWindowConstraints.gridx = 1;
2711		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2712		-// bigThree.add(centralPanel, aWindowConstraints);
2713		-// aWindowConstraints.weightx = 0;
2714		-// aWindowConstraints.gridx = 4;
2715		-// aWindowConstraints.gridwidth = 1;
2716		-// // aConstraints.gridheight = 3;
2717		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2718		-// //bigThree.add(XYZPanel, aWindowConstraints);
2719		-// scenePanel.setVisible(false);
2720		-// centralPanel.setVisible(true);
2721		-// XYZPanel.setVisible(false);
2722		- bigThree.ClearUI();
2723		- bigThree.add(centralPanel);
2724		- bigThree.FlushUI();
	3771	+
	3772	+ if (CameraPane.FULLSCREEN)
	3773	+ fullscreenLayout = radio.layout;
	3774	+
	3775	+ Show3DView();
	3776	+
	3777	+ cameraView.requestFocusInWindow();
	3778	+
	3779	+// refreshContents(true);
	3780	+//
	3781	+// try
	3782	+// {
	3783	+// java.awt.Robot bot = new java.awt.Robot();
	3784	+// int mask = InputEvent.BUTTON1_MASK;
	3785	+// bot.mouseMove(100, 100);
	3786	+// bot.mousePress(mask);
	3787	+// bot.mouseRelease(mask);
	3788	+// }
	3789	+// catch (Exception e)
	3790	+// {
	3791	+//
	3792	+// }
	3793	+
2725	3794	} else
2726	3795	if (source == threeButton)
2727	3796	{
2728	3797	radio.layout = threeButton;
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
2729	3801
2730	3802	// bigThree.remove(scenePanel);
2731	3803	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3827,18 @@
2755	3827	// centralPanel.setVisible(true);
2756	3828	// XYZPanel.setVisible(true);
2757	3829	bigThree.ClearUI();
	3830	+ bigThree.add(scenePanel);
2758	3831	bigThree.add(centralPanel);
2759		- bigThree.add(XYZPanel);
2760	3832	bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2761	3835	} else
2762	3836	if (source == fourButton)
2763	3837	{
2764	3838	radio.layout = fourButton;
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
2765	3842
2766	3843	// bigThree.remove(scenePanel);
2767	3844	// bigThree.remove(centralPanel);
..	..	@@ -2793,10 +3870,15 @@
2793	3870	bigThree.ClearUI();
2794	3871	bigThree.add(scenePanel);
2795	3872	bigThree.FlushUI();
	3873	+
	3874	+ cameraView.requestFocusInWindow();
2796	3875	} else
2797	3876	if (source == sixButton)
2798	3877	{
2799	3878	radio.layout = sixButton;
	3879	+
	3880	+ if (CameraPane.FULLSCREEN)
	3881	+ fullscreenLayout = radio.layout;
2800	3882
2801	3883	// bigThree.remove(scenePanel);
2802	3884	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3908,18 @@
2826	3908	// centralPanel.setVisible(true);
2827	3909	// XYZPanel.setVisible(false);
2828	3910	bigThree.ClearUI();
2829		- bigThree.add(scenePanel);
2830	3911	bigThree.add(centralPanel);
	3912	+ bigThree.add(scenePanel);
2831	3913	bigThree.FlushUI();
	3914	+
	3915	+ cameraView.requestFocusInWindow();
2832	3916	} else
2833	3917	if (source == sevenButton)
2834	3918	{
2835	3919	radio.layout = sevenButton;
	3920	+
	3921	+ if (CameraPane.FULLSCREEN)
	3922	+ fullscreenLayout = radio.layout;
2836	3923
2837	3924	// bigThree.remove(scenePanel);
2838	3925	// bigThree.remove(centralPanel);
..	..	@@ -2866,9 +3953,12 @@
2866	3953	bigThree.add(centralPanel);
2867	3954	bigThree.add(XYZPanel);
2868	3955	bigThree.FlushUI();
	3956	+
	3957	+ cameraView.requestFocusInWindow();
2869	3958	} else
2870	3959	if (source == rootButton)
2871	3960	{
	3961	+ Replace();
2872	3962	Object3D obj;
2873	3963	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2874	3964	{
..	..	@@ -2877,31 +3967,49 @@
2877	3967	EditObject(obj);
2878	3968	}
2879	3969
	3970	+ cameraView.requestFocusInWindow();
2880	3971	refreshContents(true);
2881	3972	} else
2882	3973	if (source == closeButton)
2883	3974	{
2884	3975	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3976	+ Replace();
	3977	+
2885	3978	cRadio ab;
2886	3979	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3980	{
2888	3981	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3982	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3983	{
	3984	+ // Patch to avoid bug with transparency.
	3985	+ if (!ab.hadMaterial)
	3986	+ {
	3987	+ ab.object.material = null;
	3988	+ }
	3989	+
2891	3990	buttonGroup.remove(ab);
2892	3991	radioPanel.remove(ab);
2893	3992
2894		- ab.GetObject().editWindow = null;
	3993	+ //ab.GetObject().editWindow = null;
	3994	+ ab.GetObject().manipWindow = null;
2895	3995	// ab.GetObject().objectUI = null; // ?????????
2896	3996
2897	3997	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3998	break;
2899	3999	}
2900	4000	}
	4001	+
	4002	+ cameraView.requestFocusInWindow();
2901	4003	refreshContents(true);
2902	4004	} else
2903	4005	if (source == editItem \|\| source == editButton)
2904	4006	{
	4007	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4008	+ {
	4009	+ Object3D child = (Object3D)e.nextElement();
	4010	+ child.pinned = true;
	4011	+ }
	4012	+
2905	4013	EditSelection(false);
2906	4014	} else
2907	4015	if (source == uneditButton)
..	..	@@ -2910,13 +4018,14 @@
2910	4018	{
2911	4019	Object3D child = (Object3D)e.nextElement();
2912	4020	if(child.editWindow != null)
2913		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4021	+ child.pinned = false;
2914	4022	child.CloseUI();
2915	4023	listUI.remove(child);
	4024	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	4025
2917		- child.editWindow = null; // ???????????
	4026	+ //child.editWindow = null; // ???????????
2918	4027	}
2919		- objEditor.ctrlPanel.revalidate();
	4028	+ objEditor.ctrlPanel.FlushUI();
2920	4029	//objEditor.jTree.clearSelection();
2921	4030	//objEditor.ResetSliders();
2922	4031	refreshContents(true);
..	..	@@ -2927,16 +4036,18 @@
2927	4036	//copy.ClearUI();
2928	4037	for (Object3D obj : listUI)
2929	4038	{
	4039	+ obj.pinned = false;
2930	4040	obj.CloseUI();
2931	4041	}
2932	4042	listUI.clear();
	4043	+ SetPinStates(group.selection.size() > 0);
2933	4044	refreshContents(true);
2934	4045	} else
2935	4046	if (source == allParamsButton)
2936	4047	{
2937	4048	assert(copy == group);
2938	4049
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4050	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	4051
2941	4052	for (Object3D obj : listUI)
2942	4053	{
..	..	@@ -2962,6 +4073,8 @@
2962	4073	} else
2963	4074	if(source instanceof cRadio)
2964	4075	{
	4076	+ Replace();
	4077	+
2965	4078	group.parent = keepparent;
2966	4079	group.attributes = 0;
2967	4080	//group.editWindow = null;
..	..	@@ -2985,6 +4098,7 @@
2985	4098	}
2986	4099
2987	4100	copy = group;
	4101	+
2988	4102	//Globals.theRenderer.object = group;
2989	4103	if(!useclient)
2990	4104	{
..	..	@@ -3000,20 +4114,72 @@
3000	4114	frontView.object = group;
3001	4115	sideView.object = group;
3002	4116	}
3003		- group.editWindow = this;
	4117	+
	4118	+// fix "+" issue
	4119	+ //group.editWindow = this;
	4120	+ group.manipWindow = this;
	4121	+
3004	4122	/*
3005	4123	currentLayout = radio.layout;
3006	4124	if (currentLayout == null)
3007	4125	currentLayout = sevenButton;
3008	4126	*/
3009	4127	radio.layout.doClick();
	4128	+
	4129	+ assert(copy instanceof Composite);
	4130	+
	4131	+ if (copy.versionlist == null)
	4132	+ {
	4133	+ copy.versionindex = -1;
	4134	+
	4135	+ // Cannot work with loops
	4136	+ // To fix this issue, we first mark all nodes above the root,
	4137	+ // and check if any of these nodes are reachable below the root.
	4138	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4139	+
	4140	+ if (!copy.HasTags())
	4141	+ {
	4142	+ copy.versionlist = new Object3D[100];
	4143	+
	4144	+ Save(true);
	4145	+ }
	4146	+
	4147	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4148	+ }
	4149	+
	4150	+ SetVersionStates();
	4151	+
	4152	+ ClearUnpinned();
	4153	+
	4154	+ //Grafreed.Assert(group != null);
	4155	+ //Grafreed.Assert(group.selection != null);
	4156	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4157	+ if (group.selection == null \|\| group.selection.size() == 1)
	4158	+ EditSelection(false);
3010	4159	keepparent = group.parent;
3011	4160	// PARENT = NULL or not???
3012	4161	//group.parent = null; // ROOT
3013	4162	//group.attributes = -1;
3014	4163	ResetModel();
	4164	+
	4165	+ cameraView.requestFocusInWindow();
3015	4166	refreshContents(true);
3016		- }
	4167	+ } else if (event.getSource() == editCameraItem)
	4168	+ {
	4169	+ cameraView.ProtectCamera();
	4170	+ cameraView.requestFocusInWindow();
	4171	+ cameraView.repaint();
	4172	+ return;
	4173	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4174	+ {
	4175	+ cameraView.RevertCamera();
	4176	+ cameraView.requestFocusInWindow();
	4177	+ cameraView.repaint();
	4178	+ return;
	4179	+ // } else if (event.getSource() == textureButton)
	4180	+ // {
	4181	+ // return; // true;
	4182	+ }
3017	4183	else
3018	4184	{
3019	4185	//return super.action(event, arg);
..	..	@@ -3022,7 +4188,6 @@
3022	4188	}
3023	4189
3024	4190	boolean useclient = false;
3025		- cRadio radio;
3026	4191
3027	4192	void ToggleRoot()
3028	4193	{
..	..	@@ -3074,6 +4239,28 @@
3074	4239	refreshContents();
3075	4240	}
3076	4241
	4242	+ void TransformChildren()
	4243	+ {
	4244	+ Object3D obj;
	4245	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4246	+ {
	4247	+ obj = (Object3D)e.nextElement();
	4248	+ obj.KeepTextureMatrices();
	4249	+ obj.TransformChildren();
	4250	+ obj.RestoreTextureMatrices();
	4251	+
	4252	+// if (obj.parent == null)
	4253	+// {
	4254	+// System.out.println("NULL PARENT!");
	4255	+// new Exception().printStackTrace();
	4256	+// }
	4257	+// else
	4258	+// TouchTransform(obj);
	4259	+// //obj.parent.Touch();
	4260	+ }
	4261	+
	4262	+ refreshContents();
	4263	+ }
3077	4264
3078	4265	void ResetTransform()
3079	4266	{
..	..	@@ -3105,7 +4292,7 @@
3105	4292	TouchTransform(obj);
3106	4293	continue;
3107	4294	}
3108		- if ((mask&2) != 0) // Scale
	4295	+ if ((mask&2) != 0) // Scale/rotation
3109	4296	{
3110	4297	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3111	4298	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3113,10 +4300,6 @@
3113	4300	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3114	4301	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3115	4302	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3116		- }
3117		- if ((mask&4) != 0) // Rotation
3118		- {
3119		- // ?
3120	4303	}
3121	4304	if ((mask&1) != 0) // Translation
3122	4305	{
..	..	@@ -3186,7 +4369,7 @@
3186	4369	refreshContents();
3187	4370	}
3188	4371
3189		- void ResetCentroid()
	4372	+ void ResetCentroid(boolean full)
3190	4373	{
3191	4374	Object3D obj;
3192	4375	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +4384,16 @@
3201	4384	LA.matIdentity(Object3D.mat);
3202	4385	obj.getBounds(minima, maxima, false);
3203	4386	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4387	+ if (full)
	4388	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	4389	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	4390	obj.TransformMesh(Object3D.mat);
	4391	+
3207	4392	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4393	+ if (full)
	4394	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	4395	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4396	+
3210	4397	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	4398	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	4399	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +4422,8 @@
3235	4422
3236	4423	int size = obj.MemorySize();
3237	4424
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	4425	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4426	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	4427	}
3240	4428	}
3241	4429	catch (Exception e)
..	..	@@ -3272,9 +4460,9 @@
3272	4460	obj = (Object3D)e.nextElement();
3273	4461
3274	4462	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	4463	+ Grafreed.AnalyzeObject(obj);
3276	4464	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	4465	+ Grafreed.AnalyzeObject(obj.bRep);
3278	4466
3279	4467	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	4468	}
..	..	@@ -3316,6 +4504,13 @@
3316	4504	void GenNormals(boolean crease)
3317	4505	{
3318	4506	group.GenNormalsS(crease);
	4507	+
	4508	+ refreshContents();
	4509	+ }
	4510	+
	4511	+ void GenNormalsMESH()
	4512	+ {
	4513	+ group.GenNormalsMeshS();
3319	4514
3320	4515	refreshContents();
3321	4516	}
..	..	@@ -3488,8 +4683,8 @@
3488	4683
3489	4684	void ParseVertices()
3490	4685	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4686	+ boolean epsequal = Grafreed.epsequal;
	4687	+ Grafreed.epsequal = true;
3493	4688
3494	4689	for (int i=0; i<group.selection.size(); i++)
3495	4690	{
..	..	@@ -3514,7 +4709,7 @@
3514	4709	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4710	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4711
3517		- g.add(GrafreeD.clipboard);
	4712	+ g.add(Grafreed.clipboard);
3518	4713
3519	4714	buffer.add(g);
3520	4715	}
..	..	@@ -3529,7 +4724,7 @@
3529	4724	makeSomething(buffer, i==group.selection.size()-1);
3530	4725	}
3531	4726
3532		- GrafreeD.epsequal = epsequal;
	4727	+ Grafreed.epsequal = epsequal;
3533	4728
3534	4729	refreshContents();
3535	4730	}
..	..	@@ -3547,7 +4742,16 @@
3547	4742	String pigment = Object3D.GetPigment(tex);
3548	4743	//String bump = Object3D.GetBump(tex);
3549	4744
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4745	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4746	+
	4747	+ try
	4748	+ {
	4749	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4750	+ }
	4751	+ catch (Exception e)
	4752	+ {
	4753	+ System.err.println("FAIL: " + node);
	4754	+ }
3551	4755
3552	4756	double s = v.s;
3553	4757
..	..	@@ -3635,11 +4839,11 @@
3635	4839
3636	4840	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4841
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4842	+ boolean random = CameraPane.SWITCH;
	4843	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4844	lowres.linkVerticesThis(null);
3641	4845	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4846	+ CameraPane.SWITCH = random;
3643	4847
3644	4848	System.err.flush();
3645	4849
..	..	@@ -3679,7 +4883,7 @@
3679	4883	return;
3680	4884
3681	4885	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4886	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4887
3684	4888	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4889
..	..	@@ -3873,9 +5077,9 @@
3873	5077
3874	5078	void ClipMesh()
3875	5079	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5080	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	5081	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	5082	+ Object3D content = Grafreed.clipboard.get(0);
3879	5083
3880	5084	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	5085	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +5088,7 @@
3884	5088	// {
3885	5089	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	5090	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	5091	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	5092	}
3889	5093	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	5094	System.out.println("DONE.");
..	..	@@ -3931,6 +5135,18 @@
3931	5135	void MarkLeaves(boolean hide)
3932	5136	{
3933	5137	group.selection.MarkLeaves(hide);
	5138	+ refreshContents();
	5139	+ }
	5140	+
	5141	+ void RewindLeaves(boolean hide)
	5142	+ {
	5143	+ group.selection.RewindLeaves(hide);
	5144	+ refreshContents();
	5145	+ }
	5146	+
	5147	+ void RandomLeaves(boolean hide)
	5148	+ {
	5149	+ group.selection.RandomLeaves(hide);
3934	5150	refreshContents();
3935	5151	}
3936	5152
..	..	@@ -4005,28 +5221,25 @@
4005	5221	// }
4006	5222	// }
4007	5223
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	5224	void EditSelection(boolean newWindow)
4013	5225	{
	5226	+ if (group.selection == null)
	5227	+ {
	5228	+ EditElement(group, newWindow); // ? new
	5229	+ return;
	5230	+ }
	5231	+
4014	5232	// aConstraints.gridy = 0;
4015	5233	for (int i=0; i<group.selection.size(); i++)
4016	5234	{
4017	5235	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	5236	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5237	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	5238
4021	5239	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	5240	+ if(elem != group \|\| !newWindow)
4023	5241	{
4024		- // if (!(elem instanceof Composite))
4025		- // newWindow = false;
4026		- listUI.add(elem);
4027		- elem.openEditWindow(this, newWindow); //, false);
4028		- System.out.println("edit : " + elem);
4029		- elem.editWindow.refreshContents(true); // ? new
	5242	+ EditElement(elem, newWindow); // ? new
4030	5243	}
4031	5244	}
4032	5245	}
..	..	@@ -4089,9 +5302,7 @@
4089	5302
4090	5303	freezemodel = false;
4091	5304	}
4092		-
4093		- boolean flashIt = true;
4094		-
	5305	+
4095	5306	public void valueChanged(TreeSelectionEvent e)
4096	5307	//public boolean handleEvent(Event event)
4097	5308	{
..	..	@@ -4101,7 +5312,8 @@
4101	5312	//new Exception().printStackTrace();
4102	5313
4103	5314	freezemodel = true;
4104		-
	5315	+ ClearUnpinned();
	5316	+
4105	5317	/**/
4106	5318	//switch (event.id)
4107	5319	{
..	..	@@ -4109,7 +5321,6 @@
4109	5321	//case 702: // Event.LIST_DESELECT
4110	5322	group.deselectAll();
4111	5323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	5324	if (tps != null)
4114	5325	{
4115	5326	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +5329,39 @@
4118	5329
4119	5330	//if (child.parent != null)
4120	5331	//child.parent.addSelectee(child);
	5332	+ objEditor.SetMaterial(child);
4121	5333	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	5334	}
4126	5335	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	5336	+// else
	5337	+// {
	5338	+// objEditor.SetMaterial(group); // .GetMaterial());
	5339	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5340	+// System.err.println("info : " + group.GetPath());
	5341	+// }
4133	5342
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	5344	CameraPane.flash = true;
4138	5345
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	5347	// a camera
4141	5348	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5350	+ {
	5351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5353	+ }
4144	5354	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	5355	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	5356	}
4147	5357
	5358	+ if (tps != null && tps.length == 1)
	5359	+ {
	5360	+ EditSelection(false);
	5361	+ }
	5362	+
	5363	+ SetPinStates(tps != null && tps.length > 0);
	5364	+
4148	5365	refreshContents();
4149	5366	//return true;
4150	5367	}
..	..	@@ -4153,6 +5370,53 @@
4153	5370
4154	5371	freezemodel = false;
4155	5372	}
	5373	+
	5374	+ void SetPinStates(boolean enabled)
	5375	+ {
	5376	+ editButton.setEnabled(enabled);
	5377	+ uneditButton.setEnabled(enabled);
	5378	+ //unselectButton.setEnabled(enabled);
	5379	+ flashSelectionButton.setEnabled(enabled);
	5380	+
	5381	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5382	+
	5383	+ boolean allComposites = true;
	5384	+
	5385	+ if (group.selection != null)
	5386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5387	+ {
	5388	+ Object next = e.nextElement();
	5389	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5390	+ {
	5391	+ allComposites = false;
	5392	+ break;
	5393	+ }
	5394	+ }
	5395	+
	5396	+ rootButton.setEnabled(allComposites);
	5397	+ }
	5398	+
	5399	+ void refreshContents(boolean cp)
	5400	+ {
	5401	+ if (Globals.ADVANCED)
	5402	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5403	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5404	+ {
	5405	+ objEditor.ClearInfo(); // .GetMaterial());
	5406	+
	5407	+ for (int i=0; i < group.selection.Size(); i++)
	5408	+ {
	5409	+ Object3D child = (Object3D) group.selection.get(i);
	5410	+
	5411	+ objEditor.AddInfo(child, this, true);
	5412	+// System.err.println("info : " + child.GetPath());
	5413	+ }
	5414	+
	5415	+ objEditor.SetText(); // jan 2014
	5416	+ }
	5417	+
	5418	+ super.refreshContents(cp);
	5419	+ }
4156	5420
4157	5421	void linkSomething(Object3D thing)
4158	5422	{
..	..	@@ -4224,16 +5488,19 @@
4224	5488	{
4225	5489	if (group.selection.isEmpty())
4226	5490	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	5491	+
	5492	+ Grafreed.clipboardIsTempGroup = false;
4228	5493	Composite tGroup = null;
4229	5494	if (group.selection.size() > 0) // 1)
4230	5495	{
4231	5496	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	5497	+ Grafreed.clipboardIsTempGroup = true;
4233	5498	}
4234	5499
4235	5500	if (cut)
4236	5501	{
	5502	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5503	+// Save();
4237	5504	//int indices[] = jList.getSelectedIndices();
4238	5505	//for (int i = indices.length - 1; i >= 0; i--)
4239	5506	//jList.remove(indices[i]);
..	..	@@ -4269,16 +5536,16 @@
4269	5536	//System.out.println("cut " + child);
4270	5537	//System.out.println("parent = " + child.parent);
4271	5538	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	5539	+ if (Grafreed.clipboardIsTempGroup)
4273	5540	tGroup.add/Child/(tmp);
4274	5541	else
4275		- GrafreeD.clipboard = tmp;
	5542	+ Grafreed.clipboard = tmp;
4276	5543	}
4277	5544	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	5545	+ if (Grafreed.clipboardIsTempGroup)
4279	5546	tGroup.add/Child/(child);
4280	5547	else
4281		- GrafreeD.clipboard = child;
	5548	+ Grafreed.clipboard = child;
4282	5549	}
4283	5550
4284	5551	//ResetModel();
..	..	@@ -4310,21 +5577,23 @@
4310	5577	//System.out.println("cut " + elem);
4311	5578	//System.out.println("parent = " + elem.parent);
4312	5579	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5580	+ if (Grafreed.clipboardIsTempGroup)
4314	5581	tGroup.add/Child/(tmp);
4315	5582	else
4316		- GrafreeD.clipboard = tmp;
	5583	+ Grafreed.clipboard = tmp;
4317	5584	}
4318	5585	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5586	+ if (Grafreed.clipboardIsTempGroup)
4320	5587	tGroup.add/Child/(child);
4321	5588	else
4322		- GrafreeD.clipboard = child;
	5589	+ Grafreed.clipboard = child;
4323	5590	}
4324	5591
4325	5592	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5593	+
	5594	+ if (Grafreed.clipboardIsTempGroup)
	5595	+ Grafreed.clipboard = tGroup;
	5596	+
4328	5597	if (cut)
4329	5598	{
4330	5599	ResetModel();
..	..	@@ -4334,11 +5603,15 @@
4334	5603
4335	5604	void paste(boolean expand)
4336	5605	{
	5606	+ if (Globals.REPLACEONMAKE)
	5607	+ Save();
	5608	+ boolean keep = Globals.REPLACEONMAKE;
	5609	+ Globals.REPLACEONMAKE = false;
4337	5610	// if (GrafreeD.clipboard == null)
4338	5611	// return;
4339	5612	boolean first = true;
4340	5613
4341		- if (GrafreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4342	5615	{
4343	5616	Composite temp;
4344	5617
..	..	@@ -4349,7 +5622,7 @@
4349	5622	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5623	*/
4351	5624	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5625	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5626	{
4354	5627	Object3D child = (Object3D)e.nextElement();
4355	5628
..	..	@@ -4383,21 +5656,22 @@
4383	5656	//Object3D cb = Applet3D.clipboard;
4384	5657	//temp.addChild(cb);
4385	5658	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5659	+ assert(Grafreed.clipboard.parent == null);
	5660	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5661	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5662	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5663	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5664	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5665	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5666	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5667	}
4395	5668
	5669	+ Globals.REPLACEONMAKE = keep;
4396	5670	ResetModel();
4397	5671	refreshContents();
4398	5672	}
4399	5673
4400		- void pasteInto(boolean copyit)
	5674	+ void pasteInto(boolean copyit, boolean clone)
4401	5675	{
4402	5676	// if (GrafreeD.clipboard == null)
4403	5677	// return;
..	..	@@ -4426,15 +5700,22 @@
4426	5700	if (copyit)
4427	5701	{
4428	5702	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5703	+ if (clone)
	5704	+ {
	5705	+ CloneClipboard(false); // sept 2014
	5706	+ }
	5707	+ else
	5708	+ {
	5709	+ paste(false);
	5710	+ }
4430	5711	}
4431	5712	else
4432	5713	{
4433	5714	boolean first = true;
4434	5715
4435		- if (GrafreeD.clipboardIsTempGroup)
	5716	+ if (Grafreed.clipboardIsTempGroup)
4436	5717	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5718	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5719	Object3D copy;
4439	5720	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5721	{
..	..	@@ -4444,7 +5725,7 @@
4444	5725	}
4445	5726	} else
4446	5727	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5728	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5729	}
4449	5730	}
4450	5731	}
..	..	@@ -4521,6 +5802,10 @@
4521	5802
4522	5803	void group(Object3D csg, boolean grab)
4523	5804	{
	5805	+ if (Globals.REPLACEONMAKE)
	5806	+ Save();
	5807	+ boolean keep = Globals.REPLACEONMAKE;
	5808	+ Globals.REPLACEONMAKE = false;
4524	5809	if (//false) // why??
4525	5810	!group.selection.isEmpty())
4526	5811	{
..	..	@@ -4634,10 +5919,15 @@
4634	5919	//node.add(csg);
4635	5920	//makeSomething(node);
4636	5921	makeSomething(csg);
	5922	+ Globals.REPLACEONMAKE = keep;
4637	5923	}
4638	5924
4639	5925	void Ungroup(Object3D g)
4640	5926	{
	5927	+ if (Globals.REPLACEONMAKE)
	5928	+ Save();
	5929	+ boolean keep = Globals.REPLACEONMAKE;
	5930	+ Globals.REPLACEONMAKE = false;
4641	5931	if (g instanceof HiddenObject)
4642	5932	{
4643	5933	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5944,7 @@
4654	5944	objEditor.makeSomething(g.get(i), false);
4655	5945	}
4656	5946	}
	5947	+ Globals.REPLACEONMAKE = keep;
4657	5948	}
4658	5949
4659	5950	void ungroup()
..	..	@@ -4849,21 +6140,6 @@
4849	6140	}
4850	6141	*/
4851	6142
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	6143	/*
4868	6144	public void Callback(Object obj)
4869	6145	{
..	..	@@ -4887,26 +6163,9 @@
4887	6163	}
4888	6164	*/
4889	6165
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	6166	String GetFile(String dialogName)
4908	6167	{
4909		- if (GrafreeD.standAlone)
	6168	+ if (Grafreed.standAlone)
4910	6169	{
4911	6170	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	6171	browser.show();
..	..	@@ -4970,10 +6229,48 @@
4970	6229	cButton flashSelectionButton;
4971	6230	cButton editButton;
4972	6231	cButton uneditButton;
	6232	+ JCheckBox allParamsButton;
4973	6233	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	6234	cButton unselectButton;
4976	6235
	6236	+ cButton restoreCameraButton;
	6237	+
	6238	+ cButton oneStepButton;
	6239	+
	6240	+ cButton groupButton;
	6241	+ cButton ungroupButton;
	6242	+ cButton compositeButton;
	6243	+ cButton switchButton;
	6244	+ cButton loopButton;
	6245	+ cButton textureButton;
	6246	+
	6247	+ cButton skybox1Button;
	6248	+ cButton skybox2Button;
	6249	+ cButton skybox3Button;
	6250	+ cButton skybox4Button;
	6251	+ cButton skybox5Button;
	6252	+ cButton skybox6Button;
	6253	+ cButton skybox7Button;
	6254	+
	6255	+ cButton skybox11Button;
	6256	+ cButton skybox12Button;
	6257	+ cButton skybox13Button;
	6258	+ cButton skybox14Button;
	6259	+ cButton skybox15Button;
	6260	+ cButton skybox16Button;
	6261	+ cButton skybox17Button;
	6262	+
	6263	+ cButton gridButton;
	6264	+ cButton boxButton;
	6265	+ cButton sphereButton;
	6266	+ cButton coneButton;
	6267	+ cButton torusButton;
	6268	+ cButton superButton;
	6269	+ cButton kleinButton;
	6270	+ cButton particlesButton;
	6271	+ cButton overlayButton;
	6272	+ cButton lightButton;
	6273	+
4977	6274	cButton screenfitButton;
4978	6275	cButton screenfitpointButton;
4979	6276	cButton snapobjectButton;
..	..	@@ -4985,14 +6282,6 @@
4985	6282
4986	6283	cButton setsupportButton;
4987	6284
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	6285	//
4997	6286	//Composite
4998	6287	Object3D // to do !!
..	..	@@ -5002,10 +6291,12 @@
5002	6291	//JTree jTree;
5003	6292	private MenuItem lookAtItem;
5004	6293	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
5006		- private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
5008		- private MenuItem cloneItem;
	6294	+ private MenuItem switchViewItem;
	6295	+ private JMenuItem cutItem;
	6296	+ private MenuItem undoItem;
	6297	+ private MenuItem redoItem;
	6298	+ private JMenuItem duplicateItem;
	6299	+ private JMenuItem cloneItem;
5009	6300	private MenuItem cloneSupportItem;
5010	6301	private MenuItem overwriteGeoItem;
5011	6302	private MenuItem overwriteMatItem;
..	..	@@ -5017,7 +6308,7 @@
5017	6308	private MenuItem linkverticesItem;
5018	6309	private MenuItem relinkverticesItem;
5019	6310	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	6311	+ private MenuItem resetAllItem;
5021	6312	private MenuItem stepAllItem;
5022	6313	private MenuItem revertMeshItem;
5023	6314	private MenuItem poseMeshItem;
..	..	@@ -5026,12 +6317,13 @@
5026	6317	private MenuItem cloneGeometriesItem;
5027	6318	private MenuItem shareGeometriesItem;
5028	6319	private MenuItem mergeGeometriesItem;
5029		- private MenuItem copyItem;
	6320	+ private JMenuItem copyItem;
5030	6321	private MenuItem pasteItem;
5031		- private MenuItem pasteLinkItem;
5032		- private MenuItem pasteCloneItem;
5033		- private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	6322	+ private JMenuItem pasteIntoItem;
	6323	+ private JMenuItem pasteLinkItem;
	6324	+ private JMenuItem pasteCloneItem;
	6325	+ private JMenuItem pasteExpandItem;
	6326	+ private JMenuItem deleteItem;
5035	6327	private MenuItem clearAllItem;
5036	6328	private MenuItem genUVItem;
5037	6329	private MenuItem genNormalsMESHItem;
..	..	@@ -5066,6 +6358,10 @@
5066	6358	private MenuItem showleavesItem;
5067	6359	private MenuItem markleavesItem;
5068	6360	private MenuItem unmarkleavesItem;
	6361	+ private MenuItem rewindleavesItem;
	6362	+ private MenuItem unrewindleavesItem;
	6363	+ private MenuItem randomleavesItem;
	6364	+ private MenuItem unrandomleavesItem;
5069	6365
5070	6366	private MenuItem flipVItem;
5071	6367	private MenuItem unflipVItem;
..	..	@@ -5077,15 +6373,17 @@
5077	6373	private MenuItem panoTexturesItem;
5078	6374
5079	6375	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	6376	+ private MenuItem resetCentroidXZItem;
5081	6377	private MenuItem resetTransformItem;
	6378	+ private MenuItem transformGeometryItem;
	6379	+ private MenuItem transformChildrenItem;
5082	6380	private MenuItem hideItem;
5083		- private MenuItem grabItem;
	6381	+ private JMenuItem grabItem;
5084	6382	private MenuItem backItem;
5085	6383	private MenuItem frontItem;
5086	6384	private MenuItem cameraItem;
5087	6385	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	6386	+ private MenuItem switchItem;
5089	6387	private MenuItem physicsItem;
5090	6388	private MenuItem frameselectorItem;
5091	6389	private MenuItem scriptNodeItem;
..	..	@@ -5093,7 +6391,7 @@
5093	6391	private MenuItem switchTransfoItem;
5094	6392	private MenuItem morphItem;
5095	6393	private MenuItem linkerItem;
5096		- private MenuItem ungroupItem;
	6394	+ private JMenuItem ungroupItem;
5097	6395	private MenuItem editItem;
5098	6396	private MenuItem openWindowItem;
5099	6397	private MenuItem editLeafItem;
..	..	@@ -5109,6 +6407,8 @@
5109	6407	private MenuItem attachBumpItem;
5110	6408	private MenuItem detachBumpItem;
5111	6409	private MenuItem pigmentBumpItem;
	6410	+ private MenuItem embedTexturesItem;
	6411	+ private MenuItem deEmbedTexturesItem;
5112	6412
5113	6413	private MenuItem particleItem;
5114	6414	private MenuItem ragdollItem;
..	..	@@ -5125,7 +6425,7 @@
5125	6425	private MenuItem blobItem;
5126	6426	private MenuItem latheItem;
5127	6427	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	6428	+ private MenuItem overlayItem;
5129	6429	private MenuItem meshItem;
5130	6430	// private MenuItem meshGroupItem;
5131	6431	private MenuItem springItem;
..	..	@@ -5147,11 +6447,6 @@
5147	6447	private MenuItem doubleItem;
5148	6448	private MenuItem tripleItem;
5149	6449
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	6450	private MenuItem computeAOItem;
5156	6451	private MenuItem recompileItem;
5157	6452	private MenuItem editScriptItem;
..	..	@@ -5161,4 +6456,8 @@
5161	6456	private MenuItem analyzeItem;
5162	6457	private MenuItem dumpItem;
5163	6458	//boolean freezemodel = false;
	6459	+
	6460	+ Menu cameraMenu;
	6461	+ MenuItem editCameraItem;
	6462	+ MenuItem restoreCameraItem;
5164	6463	}