~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,17 +439,29 @@
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	{
86		- // Object3D keep = GraphreeD.clipboard;
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
	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();)
89	467	{
..	..	@@ -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(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.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,73 +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);
	699	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	700	+ relinkverticesItem.addActionListener(this);
	701	+
	702	+ if (Globals.ADVANCED)
	703	+ {
222	704	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	705	setMasterItem.addActionListener(this);
	706	+ }
224	707
225		- oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.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		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	712	+ frontItem = menu.add(new MenuItem("Front"));
	713	+ frontItem.addActionListener(this);
	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"));
	723	+ hideItem.addActionListener(this);
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
	726	+ ungroupItem.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	+ {
241	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	740	switchGeoItem.addActionListener(this);
243	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	742	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	743	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	752	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	753	+ }
251	754
252	755	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
	758	+ billboardItem = menu.add(new MenuItem("Billboard"));
	759	+ billboardItem.addActionListener(this);
255	760	csgItem = menu.add(new MenuItem("CSG"));
256	761	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	763	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	765	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
263	774	linkerItem = menu.add(new MenuItem("Linker"));
264	775	linkerItem.addActionListener(this);
265	776	templateItem = menu.add(new MenuItem("Template"));
266	777	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	779	pointflowItem.addActionListener(this);
	780	+ }
271	781	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	783	resetTransformItem.addActionListener(this);
276	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	785	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	792
281	793	oe.menuBar.add(menu = new Menu("Geometry"));
282	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +797,13 @@
285	797	genNormalsORGANItem.addActionListener(this);
286	798	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	799	genNormalsCADItem.addActionListener(this);
	800	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	801	+ genNormalsMESHItem.addActionListener(this);
	802	+ if (Globals.ADVANCED)
	803	+ {
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	805	+ genNormalsMINEItem.addActionListener(this);
	806	+ }
288	807	stripifyItem = menu.add(new MenuItem("Stripify"));
289	808	stripifyItem.addActionListener(this);
290	809	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,31 +825,50 @@
306	825	reduce34MeshItem.addActionListener(this);
307	826	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	827	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	828	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	829	clipMeshItem.addActionListener(this);
	830	+
	831	+ if (Globals.ADVANCED)
	832	+ {
	833	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	834	+ smoothMeshItem.addActionListener(this);
	835	+ }
313	836
314	837	oe.menuBar.add(menu = new Menu("Attributes"));
315	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	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);
317	844	menu.add("-");
318	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	846	liveleavesItem.addActionListener(this);
320	847	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	848	unliveleavesItem.addActionListener(this);
	849	+ if (Globals.ADVANCED)
	850	+ {
322	851	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	852	supportleavesItem.addActionListener(this);
324	853	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	854	unsupportleavesItem.addActionListener(this);
	855	+ }
326	856	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	857	hideleavesItem.addActionListener(this);
328	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
329	859	showleavesItem.addActionListener(this);
330		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
331	861	markleavesItem.addActionListener(this);
332		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
333	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);
334	872	menu.add("-");
335	873	flipVItem = menu.add(new MenuItem("Flip V"));
336	874	flipVItem.addActionListener(this);
..	..	@@ -356,53 +894,130 @@
356	894	attachBumpItem.addActionListener(this);
357	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
359	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	899	detachPigmentItem.addActionListener(this);
361	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	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);
363	906	menu.add("-");
364	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	908	sortbysizeItem.addActionListener(this);
366	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	910	sortbynameItem.addActionListener(this);
368	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.
369	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	923	extractGeometriesItem.addActionListener(this);
371	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	925	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	926	+ }
377	927
378	928	oe.menuBar.add(menu = new Menu("Insert"));
379	929	buildCreateMenu(menu);
380	930
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	931	oe.menuBar.add(menu = new Menu("Tools"));
393	932	buildToolsMenu(menu);
394	933	}
395	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	+
396	1004	void SetupUI2(ObjEditor oe)
397	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	+
398	1018	//new Exception().printStackTrace();
399	1019
400	1020	oe.radioPanel = new JPanel(new GridBagLayout());
401		- oe.aConstraints.weightx = 1;
402		- oe.aConstraints.weighty = 0;
403		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
404		- oe.aConstraints.gridwidth = 100;
405		- oe.aConstraints.gridheight = 1;
406	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	1022
408	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1038,269 @@
423	1038	oe.radioPanel.add(dummyButton);
424	1039	oe.buttonGroup.add(dummyButton);
425	1040	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1041	+ cGridBag versionManagerPanel = new cGridBag();
	1042	+
	1043	+ versionManagerPanel.preferredHeight = 4;
429	1044
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1045	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1046	+
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
	1050	+
	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);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
	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");
431	1147	liveCB.addItemListener(this);
432	1148
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1150	+ fastCB.setToolTipText("Fast mode");
451	1151	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.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);
458	1158
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1160	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	1161
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516		-
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- 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);
521	1169	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
523		- sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
525		- threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
528		- //
	1170	+ fourButton.setToolTipText("Show control panel only");
	1171	+ }
529	1172
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	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");
531	1178	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1179	+
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ closeButton.setToolTipText("Close tab");
534	1182	closeButton.addActionListener(this);
535	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1184	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	1185
546		- 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");
547	1280	uneditButton.addActionListener(this);
548	1281
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- 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");
561	1284	allParamsButton.addActionListener(this);
562	1285
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
568		- 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);
569	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	+
570	1304	// oe.aConstraints.gridx += 1;
571	1305	// oe.aConstraints.weighty = 0;
572	1306	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1312,34 @@
578	1312	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1313	// gcButton.addActionListener(this);
580	1314
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	1315	+ cGridBag jSPPanel = new cGridBag();
	1316	+
	1317	+ jSPPanel.preferredHeight = 20;
	1318	+
	1319	+ JScrollPane jSP;
592	1320	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1321	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1322	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	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	+
615	1336	//jList.addListSelectionListener(this);
616	1337	oe.jTree.addTreeSelectionListener(this);
617	1338	//jTree.setRootVisible(false);
618	1339	//jTree.setEditable(true);
619	1340	oe.jTree.setDragEnabled(true);
620	1341	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1342	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1343
623	1344	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1345
..	..	@@ -630,47 +1351,204 @@
630	1351	dgr.addDragGestureListener(this);
631	1352	}catch(Exception e) {}
632	1353	*/
633		- radio.layout = sevenButton;
	1354	+ radio.layout = threeButton; // sixButton;
634	1355	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1356	}
	1357	+
	1358	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1359	+ {
	1360	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1361	+ colorCB.setToolTipText("Copy color when dropped");
	1362	+ colorCB.addItemListener(this);
	1363	+
	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	+
	1392	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1393	+ // localCB.addItemListener(this);
	1394	+
	1395	+ panel.Return();
	1396	+
	1397	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1398	+ crowdCB.setToolTipText("Used for crowds");
	1399	+ crowdCB.addItemListener(this);
	1400	+
	1401	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1402	+ smoothCB.setToolTipText("Snapping delay");
	1403	+ smoothCB.addItemListener(this);
	1404	+
	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	+
	1412	+// constraints.gridy += 1;
	1413	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1414	+// speakerMocapCB.addItemListener(this);
	1415	+
	1416	+ panel.Return();
	1417	+
	1418	+ if (false)
	1419	+ {
	1420	+ // handled in scripts
	1421	+ //constraints.gridy += 1;
	1422	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1423	+ speakerCameraCB.addItemListener(this);
	1424	+
	1425	+ //constraints.gridy += 1;
	1426	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1427	+ speakerFocusCB.addItemListener(this);
	1428	+
	1429	+ //constraints.gridy += 1;
	1430	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1431	+ smoothfocusCB.addItemListener(this);
	1432	+ panel.Return();
	1433	+ }
	1434	+
	1435	+//constraints.gridx += 1;
	1436	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1437	+// debugCB.addItemListener(this);
	1438	+
	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");
	1445	+ oeilCB.addItemListener(this);
	1446	+
	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);
	1468	+ lookAtCB.setToolTipText("Look-at target");
	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);
	1484	+
	1485	+ }
636	1486
637	1487	void EditObject(Object3D obj)
638	1488	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	1489	+ assert(obj instanceof Composite);
	1490	+
	1491	+// if (obj.versionlist == null)
	1492	+// {
	1493	+// obj.versionlist = new Object3D[100];
	1494	+// obj.versionindex = -1;
	1495	+// }
	1496	+
	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	+
	1506	+ radioButton.SetObject(obj);
	1507	+ radioButton.layout = threeButton; // sixButton;
	1508	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1509	+ radioButton.addActionListener(this);
	1510	+ radioPanel.add(radioButton);
	1511	+ buttonGroup.add(radioButton);
	1512	+ radioButton.doClick();
647	1513	}
	1514	+
648	1515	void SetupViews(ObjEditor oe)
649	1516	{
	1517	+ theFrame = this;
	1518	+
650	1519	oe.SetupViews();
651	1520
	1521	+ if (Globals.DEBUG)
652	1522	System.out.println("SetupViews");
653	1523	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
654	1524	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
655	1525	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1526	}
657	1527
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- 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;
668	1543	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1544	+ cCheckBox speakerCameraCB;
	1545	+ cCheckBox speakerFocusCB;
	1546	+ cCheckBox debugCB;
	1547	+
	1548	+ cCheckBox oeilCB;
	1549	+ cCheckBox shadowCB;
	1550	+ cCheckBox autokeepCB;
	1551	+ cCheckBox lookAtCB;
674	1552
675	1553	// static int COLOR = 1;
676	1554	// static int MATERIAL = 2;
..	..	@@ -678,9 +1556,9 @@
678	1556
679	1557	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1558
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1559	+ cCheckBox colorCB;
	1560	+ cCheckBox materialCB;
	1561	+ cCheckBox textureCB;
684	1562
685	1563	public void itemStateChanged(ItemEvent e)
686	1564	{
..	..	@@ -705,10 +1583,10 @@
705	1583	dropAttributes \|= Object3D.TEXTURE;
706	1584	else
707	1585	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1586	+ } else if(e.getSource() == liveCB)
710	1587	{
711	1588	cameraView.ToggleLive();
	1589	+ refreshContents(false);
712	1590	}
713	1591	else if(e.getSource() == supportCB)
714	1592	{
..	..	@@ -724,6 +1602,12 @@
724	1602	{
725	1603	cameraView.ToggleInertia();
726	1604	cameraView.repaint();
	1605	+ }
	1606	+ else if(e.getSource() == minshaderCB)
	1607	+ {
	1608	+ Globals.MINSHADER ^= true;
	1609	+ cameraView.programInitialized = false;
	1610	+ cameraView.repaint();
727	1611	}
728	1612	else if(e.getSource() == localCB)
729	1613	{
..	..	@@ -743,6 +1627,10 @@
743	1627	Recompile();
744	1628	cameraView.repaint();
745	1629	// refreshContents();
	1630	+ }
	1631	+ else if(e.getSource() == zoomBoxCB)
	1632	+ {
	1633	+ cameraView.ToggleZoomBoxMode();
746	1634	}
747	1635	else if(e.getSource() == smoothfocusCB)
748	1636	{
..	..	@@ -769,6 +1657,18 @@
769	1657	{
770	1658	cameraView.ToggleOeil();
771	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	+ }
772	1672	else if(e.getSource() == lookAtCB)
773	1673	{
774	1674	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1685,8 @@
785	1685
786	1686	/**/
787	1687	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1688	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1689	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1690	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1691	// We can't move the root node or an empty selection
791	1692	return;
..	..	@@ -848,8 +1749,6 @@
848	1749	}
849	1750	}
850	1751
851		- String string = (String) object;
852		-
853	1752	System.out.println("Transfer = " + object + "; drop : " + target);
854	1753	// if( object instanceof java.io.File[])
855	1754	// {
..	..	@@ -857,7 +1756,11 @@
857	1756	// objEditor.DropFile((java.io.File[]) object, true);
858	1757	// return;
859	1758	// }
860		- 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) == ':')
861	1764	{
862	1765	// file(s)
863	1766	String[] names = string.split("\n");
..	..	@@ -884,7 +1787,7 @@
884	1787
885	1788	flashIt = false;
886	1789	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1790	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1791	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1792
890	1793	if (group.selection.size() == 1)
..	..	@@ -900,23 +1803,33 @@
900	1803
901	1804	assert target == objEditor.jTree;
902	1805	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1806	+ Object3D destinationLeaf;
903	1807	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1808	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1809	} catch (Exception e) {
906	1810	System.out.println("destinationPath : " + destinationPath);
907	1811	return;
908	1812	}
909	1813
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1814	+ for (int i=group.selection.size(); --i>=0;)
911	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	+// {
912	1825	loadClipboard(true);
913	1826	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1827	+ pasteInto(false, false);
	1828	+// } else {
	1829	+// loadClipboard(false);
	1830	+// objEditor.jTree.setSelectionPath(destinationPath);
	1831	+// pasteInto(false, false); // true); // ???
	1832	+// }
920	1833	}
921	1834	public void dropActionChanged(DropTargetDragEvent dtde)
922	1835	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1885,12 @@
972	1885	TreePath path;
973	1886
974	1887	public TransferableTreePath(TreePath tp) {
975		- 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);
976	1894	}
977	1895
978	1896	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1939,107 @@
1021	1939	{
1022	1940	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1941	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.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	+ {
	1960	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1961	+ kleinItem.addActionListener(this);
	1962	+ }
	1963	+
	1964	+// particleItem = menu.add(new MenuItem("Particle system"));
	1965	+// particleItem.addActionListener(this);
	1966	+ if (Globals.ADVANCED)
	1967	+ {
1038	1968	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1969	ragdollItem.addActionListener(this);
1040	1970	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1971	ragdoll2Item.addActionListener(this);
	1972	+ }
1042	1973	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1974	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1975	meshItem.addActionListener(this);
1045	1976	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1977	// meshGroupItem.addActionListener(this);
	1978	+ if (Globals.ADVANCED)
	1979	+ {
1047	1980	springItem = menu.add(new MenuItem("Spring"));
1048	1981	springItem.addActionListener(this);
1049	1982	flagItem = menu.add(new MenuItem("Flag"));
1050	1983	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1984	blobItem = menu.add(new MenuItem("Blob"));
1056	1985	blobItem.addActionListener(this);
1057	1986	latheItem = menu.add(new MenuItem("Lathe"));
1058	1987	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- 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);
1061	1995	menu.add("-");
1062	1996	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1997	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1998	+// loopItem = menu.add(new MenuItem("Loop"));
	1999	+// loopItem.addActionListener(this);
1066	2000	doubleItem = menu.add(new MenuItem("Fork"));
1067	2001	doubleItem.addActionListener(this);
	2002	+ if (Globals.ADVANCED)
	2003	+ {
1068	2004	tripleItem = menu.add(new MenuItem("Trident"));
1069	2005	tripleItem.addActionListener(this);
	2006	+ }
1070	2007	}
1071	2008
1072	2009	void buildToolsMenu(Menu menu)
1073	2010	{
1074	2011	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	2012	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	2013	+ animationItem.setState(Globals.ANIMATION);
	2014	+
	2015	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2016	+ archiveItem.addActionListener(this);
1077	2017
1078	2018	menu.add("-");
1079	2019	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	2020	parseverticesItem.addActionListener(this);
1081	2021	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	2022	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	2023	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	2024	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	2025	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	2026	reduceMorphItem.addActionListener(this);
1089	2027	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	2028	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	2029	menu.add("-");
1095		-
1096	2030	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	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("-");
1098	2040	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2041	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2042	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2043	dumpItem.addActionListener(this);
1102	2044	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2045	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2048,8 @@
1106	2048	resetParentItem.addActionListener(this);
1107	2049	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2050	repairParentItem.addActionListener(this);
	2051	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2052	+ repairShadowItem.addActionListener(this);
1109	2053	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2054	invariantsItem.addActionListener(this);
1111	2055	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2057,7 @@
1113	2057	menu.add("-");
1114	2058	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2059	editScriptItem.addActionListener(this);
	2060	+ }
1116	2061	}
1117	2062
1118	2063	void ScreenFit()
..	..	@@ -1235,9 +2180,38 @@
1235	2180	shadow.material = new cMaterial(obj.material);
1236	2181	shadow.material.diffuse = 0.0001f;
1237	2182	shadow.material.specular = 0.0001f;
	2183	+ shadow.material.opacity = 0.75f;
	2184	+
	2185	+ AllocProjectedVertices(shadow);
	2186	+
	2187	+ shadow.projectedVertices[1].x = 300;
1238	2188
1239	2189	makeSomething(shadow);
1240	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	+ }
1241	2215
1242	2216	/**
1243	2217	* applyExample
..	..	@@ -1441,9 +2415,9 @@
1441	2415
1442	2416	void Overwrite(int mask)
1443	2417	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2418	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2419	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2420	+ Object3D content = Grafreed.clipboard.get(0);
1447	2421
1448	2422	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2423	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2440,7 @@
1466	2440	//
1467	2441	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2442	{
	2443	+ Object source = event.getSource();
1469	2444	/*
1470	2445	if (event.getSource() == nameField)
1471	2446	{
..	..	@@ -1477,11 +2452,11 @@
1477	2452	}
1478	2453	else
1479	2454	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2455	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2456	{
1482	2457	ScreenFit();
1483	2458	} else
1484		- if (event.getSource() == switchItem)
	2459	+ if (source == switchViewItem)
1485	2460	{
1486	2461	cVector v1 = new cVector();
1487	2462	cVector v2 = new cVector();
..	..	@@ -1490,11 +2465,11 @@
1490	2465	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2466	objEditor.cameraView.repaint();
1492	2467	} else
1493		- if (event.getSource() == rectoidItem)
	2468	+ if (source == rectoidItem \|\| source == boxButton)
1494	2469	{
1495	2470	makeSomething(new Box());
1496	2471	} else
1497		- if (event.getSource() == particleItem)
	2472	+ if (source == particleItem \|\| source == particlesButton)
1498	2473	{
1499	2474	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2475	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2490,9 @@
1515	2490	applyExample(particleGeom, "SMOKE");
1516	2491	makeSomething(particleGeom);
1517	2492	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2493	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2494	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2495	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2496
1522	2497	ragdoll.toParent = LA.newMatrix();
1523	2498	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2510,7 @@
1535	2510	} else
1536	2511	/*
1537	2512	*/
1538		- if (event.getSource() == heightFieldItem)
	2513	+ if (source == heightFieldItem)
1539	2514	{
1540	2515	Object3D obj = new Object3D();
1541	2516
..	..	@@ -1573,27 +2548,31 @@
1573	2548
1574	2549	makeSomething(obj);
1575	2550	} else
1576		- if (event.getSource() == gridItem)
	2551	+ if (source == gridItem \|\| source == gridButton)
1577	2552	{
1578	2553	makeSomething(new Grid());
1579	2554	} else
1580		- if (event.getSource() == ellipsoidItem)
	2555	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2556	{
1582	2557	makeSomething(new Sphere());
1583	2558	} else
1584		- if (event.getSource() == coneItem)
	2559	+ if (source == coneItem \|\| source == coneButton)
1585	2560	{
1586	2561	makeSomething(new Cone());
1587	2562	} else
1588		- if (event.getSource() == torusItem)
	2563	+ if (source == torusItem \|\| source == torusButton)
1589	2564	{
1590	2565	makeSomething(new Torus());
1591	2566	} else
1592		- if (event.getSource() == superItem)
	2567	+ if (source == superItem \|\| source == superButton)
1593	2568	{
1594	2569	makeSomething(new Superellipsoid());
1595	2570	} else
1596		- if (event.getSource() == blobItem)
	2571	+ if (source == kleinItem \|\| source == kleinButton)
	2572	+ {
	2573	+ makeSomething(new Klein());
	2574	+ } else
	2575	+ if (source == blobItem)
1597	2576	{
1598	2577	Blob blob = new Blob();
1599	2578	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2580,15 @@
1601	2580	//blob.retile();
1602	2581	makeSomething(blob);
1603	2582	} else
1604		- if (event.getSource() == latheItem)
	2583	+ if (source == latheItem)
1605	2584	{
1606	2585	makeSomething(new Lathe());
1607	2586	} else
1608		- if (event.getSource() == bezierItem)
	2587	+ if (source == bezierItem)
1609	2588	{
1610	2589	makeSomething(new BezierSurface());
1611	2590	} else
1612		- if (event.getSource() == checkerItem)
	2591	+ if (source == overlayItem \|\| source == overlayButton)
1613	2592	{
1614	2593	/*
1615	2594	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2603,7 @@
1624	2603	*/
1625	2604	makeSomething(new Checker());
1626	2605	} else
1627		- if (event.getSource() == meshItem)
	2606	+ if (source == meshItem)
1628	2607	{
1629	2608	Object3D itemtomake = new Object3D();
1630	2609	Object3D child;
..	..	@@ -1645,35 +2624,52 @@
1645	2624	makeSomething(child);
1646	2625	}
1647	2626	} else
1648		- if (event.getSource() == springItem)
	2627	+ if (source == springItem)
1649	2628	{
1650	2629	cSpring s = new cSpring();
1651	2630	s.setup();
1652	2631	makeSomething(s);
1653	2632	} else
1654		- if (event.getSource() == flagItem)
	2633	+ if (source == flagItem)
1655	2634	{
1656	2635	cSpring s = new cFlag();
1657	2636	s.setup();
1658	2637	makeSomething(s);
1659	2638	} else
1660		- if (event.getSource() == lightItem)
	2639	+ if (source == lightItem \|\| source == lightButton)
1661	2640	{
1662	2641	makeSomething(new Light());
1663	2642	} else
1664		- if (event.getSource() == csgItem)
	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
	2660	+ if (source == csgItem)
1665	2661	{
1666	2662	group(new CSG());
1667	2663	} else
1668		- if (event.getSource() == templateItem)
	2664	+ if (source == templateItem)
1669	2665	{
1670	2666	group(new cTemplate());
1671	2667	} else
1672		- if (event.getSource() == attributeItem)
	2668	+ if (source == attributeItem)
1673	2669	{
1674	2670	makeSomething(new Attribute());
1675	2671	} else
1676		- if (event.getSource() == pointflowItem)
	2672	+ if (source == pointflowItem)
1677	2673	{
1678	2674	makeSomething(new PointFlow());
1679	2675	} else
..	..	@@ -1685,7 +2681,7 @@
1685	2681	} else
1686	2682	*/
1687	2683
1688		- if (event.getSource() == superLoopItem)
	2684	+ if (source == superLoopItem)
1689	2685	{
1690	2686	Composite g = new cGroup();
1691	2687	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2703,38 @@
1707	2703
1708	2704	group(g);
1709	2705	} else
1710		- if (event.getSource() == loopItem)
	2706	+ if (source == loopItem \|\| source == loopButton)
1711	2707	{
	2708	+ if (!group.selection.isEmpty())
	2709	+ {
1712	2710	Composite csg = new GroupLeaf();
1713	2711	csg.count = 5;
1714		- group(csg);
1715		- Composite child = new cGroup();
	2712	+ Composite child = new cGroup("Branch");
1716	2713	csg.addChild(child);
1717	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
1718	2717	} else
1719		- if (event.getSource() == doubleItem)
	2718	+ if (source == doubleItem)
1720	2719	{
1721		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Fork");
1722	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);
1723	2730	group(csg);
1724		- Composite child = new cGroup();
1725		- csg.addChild(child);
1726		- child.addChild(csg);
1727		- child = new cGroup();
1728		- csg.addChild(child);
1729		- child.addChild(csg);
	2731	+ }
1730	2732	} else
1731		- if (event.getSource() == tripleItem)
	2733	+ if (source == tripleItem)
1732	2734	{
1733		- Composite csg = new GroupLeaf();
	2735	+ if (!group.selection.isEmpty())
	2736	+ {
	2737	+ Composite csg = new GroupLeaf("Trident");
1734	2738	csg.count = 4;
1735	2739	group(csg);
1736	2740	Composite child = new cGroup();
..	..	@@ -1742,74 +2746,119 @@
1742	2746	child = new cGroup();
1743	2747	csg.addChild(child);
1744	2748	child.addChild(csg);
	2749	+ }
1745	2750	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2751	+ if (source == computeAOItem)
1748	2752	{
1749		- ImportGFD();
	2753	+ Globals.drawMode = CameraPane.OCCLUSION;
	2754	+ cameraView.repaint();
1750	2755	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2756	+ if (source == recompileItem)
1769	2757	{
1770	2758	Recompile();
1771	2759	refreshContents();
1772	2760	} else
1773		- if (event.getSource() == editScriptItem)
	2761	+ if (source == editScriptItem)
1774	2762	{
1775	2763	OpenDialog();
1776	2764	refreshContents();
1777	2765	} else
1778		- if (event.getSource() == invariantsItem)
	2766	+ if (source == invariantsItem)
1779	2767	{
1780	2768	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2769	+ Grafreed.grafreed.universe.invariants();
1782	2770	} else
1783		- if (event.getSource() == memoryItem)
	2771	+ if (source == memoryItem)
1784	2772	{
1785	2773	//System.out.println("Invariants:");
1786	2774	PrintMemory();
1787	2775	} else
1788		- if (event.getSource() == pathItem)
	2776	+ if (source == pathItem)
1789	2777	{
1790	2778	PrintPath();
1791	2779	} else
1792		- if (event.getSource() == analyzeItem)
	2780	+ if (source == analyzeItem)
1793	2781	{
1794	2782	AnalyzeObject();
1795	2783	} else
1796		- if (event.getSource() == dumpItem)
	2784	+ if (source == dumpItem)
1797	2785	{
1798	2786	DumpObject();
1799	2787	} else
1800		- if (event.getSource() == screenfitButton)
	2788	+ if (source == minButton)
1801	2789	{
1802		- //Reload(lastConverter, lastFilename, true);
	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
	2852	+ if (source == screenfitButton)
	2853	+ {
1803	2854	ScreenFit();
1804	2855	} else
1805		- if (event.getSource() == screenfitpointButton)
	2856	+ if (source == screenfitpointButton)
1806	2857	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2858	ScreenFitPoint();
1809	2859	} else
1810		- if (event.getSource() == snapobjectButton)
	2860	+ if (source == snapobjectButton)
1811	2861	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2862	SnapObject();
1814	2863	} else
1815	2864	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2867,13 @@
1818	2867	// Recompile();
1819	2868	// refreshContents();
1820	2869	// } else
1821		- if (event.getSource() == gcButton)
	2870	+ if (source == gcButton)
1822	2871	{
1823	2872	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2873	System.gc();
1825	2874	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2875	} else
1827		- if (event.getSource() == editLeafItem)
	2876	+ if (source == editLeafItem)
1828	2877	{
1829	2878	Object3D obj;
1830	2879	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2887,78 @@
1838	2887	}
1839	2888	refreshContents(true);
1840	2889	} else
1841		- if (event.getSource() == openWindowItem)
	2890	+ if (source == openWindowItem)
1842	2891	{
1843	2892	EditSelection(true);
1844	2893	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2894	+ if (source == cutItem \|\| source == clearButton)
1846	2895	{
1847	2896	loadClipboard(true);
1848	2897	} else
1849		- if (event.getSource() == duplicateItem)
	2898	+ if (source == undoItem)
1850	2899	{
1851		- Object3D keep = GraphreeD.clipboard;
	2900	+ PreviousVersion();
	2901	+ } else
	2902	+ if (source == redoItem)
	2903	+ {
	2904	+ NextVersion();
	2905	+ } else
	2906	+ if (source == duplicateItem)
	2907	+ {
	2908	+ Object3D keep = Grafreed.clipboard;
1852	2909	loadClipboard(false);
1853	2910	paste(false);
1854		- GraphreeD.clipboard = keep;
	2911	+ Grafreed.clipboard = keep;
1855	2912	} else
1856		- if (event.getSource() == cloneItem)
	2913	+ if (source == cloneItem)
1857	2914	{
1858	2915	CloneSelection(false);
1859	2916	} else
1860		- if (event.getSource() == cloneSupportItem)
	2917	+ if (source == cloneSupportItem)
1861	2918	{
1862	2919	CloneSelection(true);
1863	2920	} else
1864		- if (event.getSource() == copyItem)
	2921	+ if (source == copyItem)
1865	2922	{
1866	2923	loadClipboard(false);
1867	2924	} else
1868		- if (event.getSource() == pasteItem)
	2925	+ if (source == pasteItem)
1869	2926	{
1870	2927	paste(false);
1871	2928	} else
1872		- if (event.getSource() == pasteLinkItem)
	2929	+ if (source == pasteIntoItem)
1873	2930	{
1874		- pasteInto(false);
	2931	+ pasteInto(true, false);
1875	2932	} else
1876		- if (event.getSource() == pasteCloneItem)
	2933	+ if (source == pasteLinkItem)
1877	2934	{
1878		- pasteInto(true);
	2935	+ pasteInto(false, false);
1879	2936	} else
1880		- if (event.getSource() == pasteExpandItem)
	2937	+ if (source == pasteCloneItem)
	2938	+ {
	2939	+ pasteInto(true, true);
	2940	+ } else
	2941	+ if (source == pasteExpandItem)
1881	2942	{
1882	2943	paste(true);
1883	2944	} else
1884		- if (event.getSource() == synchronizeItem)
	2945	+ if (source == synchronizeItem)
1885	2946	{
1886	2947	Overwrite(Object3D.TRANSFORM);
1887	2948	} else
1888		- if (event.getSource() == overwriteNameItem)
	2949	+ if (source == overwriteNameItem)
1889	2950	{
1890	2951	Overwrite(Object3D.NAME);
1891	2952	} else
1892		- if (event.getSource() == overwriteUVItem)
	2953	+ if (source == overwriteUVItem)
1893	2954	{
1894	2955	Overwrite(Object3D.UV);
1895	2956	} else
1896		- if (event.getSource() == overwriteMatItem)
	2957	+ if (source == overwriteMatItem)
1897	2958	{
	2959	+ /* july 2015
1898	2960	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2961	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2962	else
1901	2963	{
1902	2964	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2970,16 @@
1908	2970	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2971	}
1910	2972	}
	2973	+ */
	2974	+
	2975	+ Overwrite(dropAttributes);
1911	2976	}
1912		- if (event.getSource() == overwriteGeoItem)
	2977	+ if (source == overwriteGeoItem)
1913	2978	{
1914	2979	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2980	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2981	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2982	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2983	//
1919	2984	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2985	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2991,7 @@
1926	2991	// refreshContents();
1927	2992	// }
1928	2993	} else
1929		- if (event.getSource() == generateMeshItem)
	2994	+ if (source == generateMeshItem)
1930	2995	{
1931	2996	//if (group.selection.size() == 1)
1932	2997	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +3002,7 @@
1937	3002	ResetModel();
1938	3003	refreshContents();
1939	3004	} else
1940		- if (event.getSource() == extractGeometriesItem)
	3005	+ if (source == extractGeometriesItem)
1941	3006	{
1942	3007	boolean one = false;
1943	3008
..	..	@@ -1964,7 +3029,7 @@
1964	3029	ResetModel();
1965	3030	refreshContents();
1966	3031	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	3032	+ if (source == cloneGeometriesItem)
1968	3033	{
1969	3034	boolean one = false;
1970	3035
..	..	@@ -1990,32 +3055,37 @@
1990	3055	ResetModel();
1991	3056	refreshContents();
1992	3057	} else
1993		- if (event.getSource() == shareGeometriesItem)
	3058	+ if (source == shareGeometriesItem)
1994	3059	{
1995	3060	boolean one = false;
1996	3061
1997	3062	if (group.selection.size() == 1)
1998	3063	one = true;
1999	3064
	3065	+ Object3D merge = null;
	3066	+
2000	3067	Object3D content = new cGroup();
2001	3068
2002	3069	for (int i=0; i<group.selection.size(); i++)
2003	3070	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	3071	+ merge = new Merge(group.selection.get(i));
2005	3072
2006	3073	if (one)
2007		- makeSomething(sel, false);
	3074	+ makeSomething(merge, false);
2008	3075	else
2009		- content.addChild(sel);
	3076	+ content.addChild(merge);
2010	3077	}
2011	3078
2012	3079	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	3080	+ makeSomething(content, true);
	3081	+ else
	3082	+ {
	3083	+ ResetModel();
	3084	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3085	+ refreshContents();
	3086	+ }
2017	3087	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	3088	+ if (source == mergeGeometriesItem)
2019	3089	{
2020	3090	boolean one = false;
2021	3091
..	..	@@ -2045,11 +3115,11 @@
2045	3115	ResetModel();
2046	3116	refreshContents();
2047	3117	} else
2048		- if (event.getSource() == linkverticesItem)
	3118	+ if (source == linkverticesItem)
2049	3119	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3120	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	3121	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	3122	+// Object3D content = GrafreeD.clipboard.get(0);
2053	3123	//
2054	3124	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	3125	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +3128,48 @@
2058	3128	// group.selection.get(0).setMasterThis(content); // should be identity
2059	3129	// refreshContents();
2060	3130	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3131	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	3132	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	3133	+ Object3D content = Grafreed.clipboard.get(0);
2064	3134
2065	3135	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	3136	content = ((cGroup)content).get(0);
2067	3137
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3138	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	3139	for (int i=0; i<group.selection.size(); i++)
2070	3140	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	3141	+ boolean random = CameraPane.SWITCH;
	3142	+ CameraPane.SWITCH = false; // parse all random nodes
2073	3143	group.selection.get(i).linkVerticesThis(content);
2074	3144	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	3145	+ CameraPane.SWITCH = random;
2076	3146	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3147	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	3148	refreshContents();
2079	3149	}
2080	3150	} else
2081		- if (event.getSource() == resetsupportItem)
	3151	+ if (source == resetsupportItem)
2082	3152	{
2083	3153	for (int i=0; i<group.selection.size(); i++)
2084	3154	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2087	3157	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	3158	+ CameraPane.SWITCH = random;
2089	3159	}
2090	3160
2091	3161	refreshContents();
2092	3162	} else
2093		- if (event.getSource() == resetreferencesItem)
	3163	+ if (source == relinkverticesItem)
	3164	+ {
	3165	+ boolean random = CameraPane.SWITCH;
	3166	+ CameraPane.SWITCH = false; // parse all random nodes
	3167	+ group.selection.RelinkToSupport();
	3168	+ CameraPane.SWITCH = random;
	3169	+
	3170	+ refreshContents();
	3171	+ } else
	3172	+ if (source == resetreferencesItem)
2094	3173	{
2095	3174	for (int i=0; i<group.selection.size(); i++)
2096	3175	{
..	..	@@ -2099,11 +3178,11 @@
2099	3178
2100	3179	refreshContents();
2101	3180	} else
2102		- if (event.getSource() == setMasterItem)
	3181	+ if (source == setMasterItem)
2103	3182	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3183	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	3184	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	3185	+ Object3D content = Grafreed.clipboard.get(0);
2107	3186
2108	3187	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	3188	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +3191,13 @@
2112	3191	refreshContents();
2113	3192	}
2114	3193	} else
2115		- if (event.getSource() == poseMeshItem)
	3194	+ if (source == poseMeshItem)
2116	3195	{
2117	3196	if (group.selection.size() == 1)
2118	3197	{
2119		- if (GraphreeD.clipboard.size() == 1)
	3198	+ if (Grafreed.clipboard.size() == 1)
2120	3199	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	3200	+ Object3D content = Grafreed.clipboard.get(0);
2122	3201
2123	3202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	3203	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +3210,19 @@
2131	3210	}
2132	3211
2133	3212	} else
2134		- if (event.getSource() == revertMeshItem)
	3213	+ if (source == revertMeshItem)
2135	3214	{
2136	3215	RevertMeshes();
2137	3216	} else
2138		- if (event.getSource() == resetMeshItem)
	3217	+ if (source == resetAllItem)
2139	3218	{
2140	3219	ResetAll();
2141	3220	} else
2142		- if (event.getSource() == stepAllItem)
	3221	+ if (source == stepAllItem)
2143	3222	{
2144	3223	StepAll();
2145	3224	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3225	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	3226	{
2148	3227	//int indices[] = jList.getSelectedIndices();
2149	3228	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +3230,46 @@
2151	3230
2152	3231	ClearSelection(false);
2153	3232	} else
2154		- if (event.getSource() == clearAllItem)
	3233	+ if (source == clearAllItem)
2155	3234	{
2156	3235	ClearSelection(true);
2157	3236	} else
2158		- if (event.getSource() == grabItem)
	3237	+ if (source == grabItem \|\| source == groupButton)
2159	3238	{
2160		- group(new cGroup(), true);
	3239	+ group(new cGroup(), false); // true);
2161	3240	} else
2162		- if (event.getSource() == frontItem)
	3241	+ if (source == hideItem)
	3242	+ {
	3243	+ group(new HiddenObject());
	3244	+ } else
	3245	+ if (source == frontItem)
2163	3246	{
2164	3247	front();
2165	3248	} else
2166		- if (event.getSource() == backItem)
	3249	+ if (source == backItem)
2167	3250	{
2168	3251	back();
2169	3252	} else
2170		- if (event.getSource() == cameraItem)
	3253	+ if (source == cameraItem)
2171	3254	{
2172	3255	makeSomething(new Camera());
2173	3256	} else
2174		- if (event.getSource() == compositeItem)
	3257	+ if (source == compositeItem \|\| source == compositeButton)
2175	3258	{
2176	3259	group(new Composite());
2177	3260	} else
2178		- if (event.getSource() == randomItem)
	3261	+ if (source == switchItem \|\| source == switchButton)
2179	3262	{
2180	3263	RandomNode random = new RandomNode();
2181	3264	group(random);
2182	3265	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	3266	+ random.name = random.get(0).name + "Switch";
2184	3267	} else
2185		- if (event.getSource() == physicsItem)
	3268	+ if (source == physicsItem)
2186	3269	{
2187	3270	group(new PhysicsNode());
2188	3271	} else
2189		- if (event.getSource() == frameselectorItem)
	3272	+ if (source == frameselectorItem)
2190	3273	{
2191	3274	for (int i=0; i<group.selection.size(); i++)
2192	3275	{
..	..	@@ -2198,7 +3281,7 @@
2198	3281	ResetModel();
2199	3282	refreshContents();
2200	3283	} else
2201		- if (event.getSource() == switchGeoItem)
	3284	+ if (source == switchGeoItem)
2202	3285	{
2203	3286	for (int i=0; i<group.selection.size(); i++)
2204	3287	{
..	..	@@ -2210,7 +3293,7 @@
2210	3293	ResetModel();
2211	3294	refreshContents();
2212	3295	} else
2213		- if (event.getSource() == switchTransfoItem)
	3296	+ if (source == switchTransfoItem)
2214	3297	{
2215	3298	for (int i=0; i<group.selection.size(); i++)
2216	3299	{
..	..	@@ -2222,7 +3305,7 @@
2222	3305	ResetModel();
2223	3306	refreshContents();
2224	3307	} else
2225		- if (event.getSource() == morphItem)
	3308	+ if (source == morphItem)
2226	3309	{
2227	3310	for (int i=0; i<group.selection.size(); i++)
2228	3311	{
..	..	@@ -2234,7 +3317,7 @@
2234	3317	ResetModel();
2235	3318	refreshContents();
2236	3319	} else
2237		- if (event.getSource() == scriptNodeItem)
	3320	+ if (source == scriptNodeItem)
2238	3321	{
2239	3322	boolean atleastone = false;
2240	3323
..	..	@@ -2273,195 +3356,264 @@
2273	3356	}
2274	3357	}
2275	3358	} else
2276		- if (event.getSource() == linkerItem)
	3359	+ if (source == linkerItem)
2277	3360	{
2278	3361	group(new cLinker());
2279	3362	} else
2280		- if (event.getSource() == textureItem)
	3363	+ if (source == textureItem \|\| source == textureButton)
2281	3364	{
2282	3365	group(new TextureNode());
2283	3366	} else
2284		- if (event.getSource() == shadowXItem)
	3367	+ if (source == billboardItem)
	3368	+ {
	3369	+ group(new BillboardNode());
	3370	+ } else
	3371	+ if (source == shadowXItem)
2285	3372	{
2286	3373	CastShadow(0);
2287	3374	} else
2288		- if (event.getSource() == shadowYItem)
	3375	+ if (source == shadowYItem)
2289	3376	{
2290	3377	CastShadow(1);
2291	3378	} else
2292		- if (event.getSource() == shadowZItem)
	3379	+ if (source == shadowZItem)
2293	3380	{
2294	3381	CastShadow(2);
2295	3382	} else
2296		- if (event.getSource() == ungroupItem)
	3383	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3384	{
2298		- ungroup();
	3385	+ boolean canUngroup = true;
	3386	+
	3387	+ for (int i=0; i<group.selection.size(); i++)
	3388	+ {
	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	+ }
	3404	+ }
	3405	+
	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	+ }
2299	3419	} else
2300		- if (event.getSource() == genUVItem)
	3420	+ if (source == genUVItem)
2301	3421	{
2302	3422	GenUV();
2303	3423	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3424	+ if (source == genNormalsCADItem)
2305	3425	{
2306	3426	GenNormals(true);
2307	3427	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3428	+ if (source == genNormalsMESHItem)
	3429	+ {
	3430	+ GenNormalsMESH();
	3431	+ } else
	3432	+ if (source == genNormalsORGANItem)
2309	3433	{
2310	3434	GenNormals(false);
2311	3435	} else
2312		- if (event.getSource() == stripifyItem)
	3436	+ if (source == genNormalsMINEItem)
	3437	+ {
	3438	+ GenNormalsMINE();
	3439	+ } else
	3440	+ if (source == stripifyItem)
2313	3441	{
2314	3442	Stripify();
2315	3443	} else
2316		- if (event.getSource() == unstripifyItem)
	3444	+ if (source == unstripifyItem)
2317	3445	{
2318	3446	Unstripify();
2319	3447	} else
2320		- if (event.getSource() == trimItem)
	3448	+ if (source == trimItem)
2321	3449	{
2322	3450	Trim();
2323	3451	} else
2324		- if (event.getSource() == untrimItem)
	3452	+ if (source == untrimItem)
2325	3453	{
2326	3454	Untrim();
2327	3455	} else
2328		- if (event.getSource() == clearColorsItem)
	3456	+ if (source == clearColorsItem)
2329	3457	{
2330	3458	ClearColors();
2331	3459	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3460	+ if (source == clearMaterialsItem)
2333	3461	{
2334	3462	ClearMaterials();
2335	3463	} else
2336		- if (event.getSource() == liveleavesItem)
	3464	+ if (source == liveleavesItem)
2337	3465	{
2338	3466	LiveLeaves(true);
2339	3467	} else
2340		- if (event.getSource() == unliveleavesItem)
	3468	+ if (source == unliveleavesItem)
2341	3469	{
2342	3470	LiveLeaves(false);
2343	3471	} else
2344		- if (event.getSource() == supportleavesItem)
	3472	+ if (source == supportleavesItem)
2345	3473	{
2346	3474	SupportLeaves(true);
2347	3475	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3476	+ if (source == unsupportleavesItem)
2349	3477	{
2350	3478	SupportLeaves(false);
2351	3479	} else
2352		- if (event.getSource() == hideleavesItem)
	3480	+ if (source == hideleavesItem)
2353	3481	{
2354	3482	HideLeaves(true);
2355	3483	} else
2356		- if (event.getSource() == showleavesItem)
	3484	+ if (source == showleavesItem)
2357	3485	{
2358	3486	HideLeaves(false);
2359	3487	} else
2360		- if (event.getSource() == markleavesItem)
	3488	+ if (source == markleavesItem)
2361	3489	{
2362	3490	MarkLeaves(true);
2363	3491	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3492	+ if (source == unmarkleavesItem)
2365	3493	{
2366	3494	MarkLeaves(false);
2367	3495	} else
2368		- if (event.getSource() == flipVItem)
	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);
	3511	+ } else
	3512	+ if (source == flipVItem)
2369	3513	{
2370	3514	FlipV(true);
2371	3515	} else
2372		- if (event.getSource() == unflipVItem)
	3516	+ if (source == unflipVItem)
2373	3517	{
2374	3518	FlipV(false);
2375	3519	} else
2376		- if (event.getSource() == lowTexturesItem)
	3520	+ if (source == lowTexturesItem)
2377	3521	{
2378	3522	SetTexRes(0);
2379	3523	} else
2380		- if (event.getSource() == normalTexturesItem)
	3524	+ if (source == normalTexturesItem)
2381	3525	{
2382	3526	SetTexRes(1);
2383	3527	} else
2384		- if (event.getSource() == highTexturesItem)
	3528	+ if (source == highTexturesItem)
2385	3529	{
2386	3530	SetTexRes(2);
2387	3531	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3532	+ if (source == veryhighTexturesItem)
2389	3533	{
2390	3534	SetTexRes(3);
2391	3535	} else
2392		- if (event.getSource() == maxTexturesItem)
	3536	+ if (source == maxTexturesItem)
2393	3537	{
2394	3538	SetTexRes(4);
2395	3539	} else
2396		- if (event.getSource() == panoTexturesItem)
	3540	+ if (source == panoTexturesItem)
2397	3541	{
2398	3542	SetTexRes(5);
2399	3543	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3544	+ if (source == reverseNormalsItem)
2401	3545	{
2402	3546	ReverseNormals();
2403	3547	} else
2404		- if (event.getSource() == parseverticesItem)
	3548	+ if (source == parseverticesItem)
2405	3549	{
2406	3550	ParseVertices();
2407	3551	} else
2408		- if (event.getSource() == textureFieldItem)
	3552	+ if (source == textureFieldItem)
2409	3553	{
2410	3554	TextureVertices();
2411	3555	} else
2412		- if (event.getSource() == alignItem)
	3556	+ if (source == alignItem)
2413	3557	{
2414	3558	Align();
2415	3559	} else
2416		- if (event.getSource() == mirrorItem)
	3560	+ if (source == mirrorItem)
2417	3561	{
2418	3562	MirrorPoses();
2419	3563	} else
2420		- if (event.getSource() == reduceMorphItem)
	3564	+ if (source == reduceMorphItem)
2421	3565	{
2422	3566	MeshReduction(false);
2423	3567	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3568	+ if (source == reduce34MorphItem)
2425	3569	{
2426	3570	MeshReduction(true);
2427	3571	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3572	+ if (source == reverseTrianglesItem)
2429	3573	{
2430	3574	ReverseTriangles();
2431	3575	} else
2432		- if (event.getSource() == reduceMeshItem)
	3576	+ if (source == reduceMeshItem)
2433	3577	{
2434	3578	ReduceMesh(false);
2435	3579	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3580	+ if (source == reduce34MeshItem)
2437	3581	{
2438	3582	ReduceMesh(true);
2439	3583	} else
2440		- if (event.getSource() == increaseMeshItem)
	3584	+ if (source == increaseMeshItem)
2441	3585	{
2442	3586	IncreaseMesh();
2443	3587	} else
2444		- if (event.getSource() == clipMeshItem)
	3588	+ if (source == clipMeshItem)
2445	3589	{
2446	3590	ClipMesh();
2447	3591	} else
2448		- if (event.getSource() == smoothMeshItem)
	3592	+ if (source == smoothMeshItem)
2449	3593	{
2450	3594	SmoothMesh();
2451	3595	} else
2452		- if (event.getSource() == transformgeometryItem)
	3596	+ if (source == transformGeometryItem)
2453	3597	{
2454	3598	TransformGeometry();
2455	3599	} else
2456		- if (event.getSource() == resetTransformItem)
	3600	+ if (source == transformChildrenItem)
	3601	+ {
	3602	+ TransformChildren();
	3603	+ } else
	3604	+ if (source == resetTransformItem)
2457	3605	{
2458	3606	ResetTransform();
2459	3607	} else
2460		- if (event.getSource() == resetCentroidItem)
	3608	+ if (source == resetCentroidItem)
2461	3609	{
2462		- ResetCentroid();
	3610	+ ResetCentroid(true);
2463	3611	} else
2464		- if (event.getSource() == resetParentItem)
	3612	+ if (source == resetCentroidXZItem)
	3613	+ {
	3614	+ ResetCentroid(false);
	3615	+ } else
	3616	+ if (source == resetParentItem)
2465	3617	{
2466	3618	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3619	{
..	..	@@ -2471,7 +3623,7 @@
2471	3623
2472	3624	refreshContents();
2473	3625	} else
2474		- if (event.getSource() == repairParentItem)
	3626	+ if (source == repairParentItem)
2475	3627	{
2476	3628	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3629	{
..	..	@@ -2485,7 +3637,21 @@
2485	3637
2486	3638	refreshContents();
2487	3639	} else
2488		- if (event.getSource() == sortbysizeItem)
	3640	+ if (source == repairShadowItem)
	3641	+ {
	3642	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3643	+ {
	3644	+ Object3D obj = (Object3D)e.nextElement();
	3645	+ obj.RepairShadow();
	3646	+// for (int i=0; i<obj.size(); i++)
	3647	+// {
	3648	+// obj.get(i).parent = obj;
	3649	+// }
	3650	+ }
	3651	+
	3652	+ refreshContents();
	3653	+ } else
	3654	+ if (source == sortbysizeItem)
2489	3655	{
2490	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3657	{
..	..	@@ -2497,7 +3663,7 @@
2497	3663	ResetModel();
2498	3664	refreshContents();
2499	3665	} else
2500		- if (event.getSource() == sortbynameItem)
	3666	+ if (source == sortbynameItem)
2501	3667	{
2502	3668	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3669	{
..	..	@@ -2509,7 +3675,7 @@
2509	3675	ResetModel();
2510	3676	refreshContents();
2511	3677	} else
2512		- if (event.getSource() == attachPigmentItem)
	3678	+ if (source == attachPigmentItem)
2513	3679	{
2514	3680	String texture = GetFile("Attach pigment");
2515	3681	Object3D obj;
..	..	@@ -2521,7 +3687,7 @@
2521	3687
2522	3688	refreshContents();
2523	3689	} else
2524		- if (event.getSource() == detachPigmentItem)
	3690	+ if (source == detachPigmentItem)
2525	3691	{
2526	3692	Object3D obj;
2527	3693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3698,7 @@
2532	3698
2533	3699	refreshContents();
2534	3700	} else
2535		- if (event.getSource() == attachBumpItem)
	3701	+ if (source == attachBumpItem)
2536	3702	{
2537	3703	String texture = GetFile("Attach bump");
2538	3704	Object3D obj;
..	..	@@ -2544,18 +3710,18 @@
2544	3710
2545	3711	refreshContents();
2546	3712	} else
2547		- if (event.getSource() == detachBumpItem)
	3713	+ if (source == detachBumpItem)
2548	3714	{
2549	3715	Object3D obj;
2550	3716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3717	{
2552	3718	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3719	+ obj.ResetBumpTexture();
2554	3720	}
2555	3721
2556	3722	refreshContents();
2557	3723	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3724	+ if (source == pigmentBumpItem)
2559	3725	{
2560	3726	Object3D obj;
2561	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,159 +3732,233 @@
2566	3732
2567	3733	refreshContents();
2568	3734	} else
2569		- if (event.getSource() == flashSelectionButton)
	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
	3760	+ if (source == flashSelectionButton)
2570	3761	{
2571	3762	CameraPane.flash = true;
2572	3763	refreshContents();
2573	3764	} else
2574		- if (event.getSource() == oneButton)
	3765	+ if (source == oneButton)
2575	3766	{
2576	3767	} else
2577		- if (event.getSource() == twoButton)
	3768	+ if (source == twoButton)
2578	3769	{
2579	3770	radio.layout = twoButton;
2580		- // bug
2581		- //gridPanel.setDividerLocation(1.0);
2582		- //bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	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	+
2607	3794	} else
2608		- if (event.getSource() == threeButton)
	3795	+ if (source == threeButton)
2609	3796	{
2610	3797	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	3798	+
	3799	+ if (CameraPane.FULLSCREEN)
	3800	+ fullscreenLayout = radio.layout;
	3801	+
	3802	+// bigThree.remove(scenePanel);
	3803	+// bigThree.remove(centralPanel);
	3804	+// bigThree.remove(XYZPanel);
	3805	+// aWindowConstraints.gridx = 0;
	3806	+// aWindowConstraints.gridy = 0;
	3807	+// aWindowConstraints.gridwidth = 1;
	3808	+// // aConstraints.gridheight = 3;
	3809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3810	+// aWindowConstraints.weightx = 0;
	3811	+// aWindowConstraints.weighty = 1;
	3812	+// //bigThree.add(jtp, aWindowConstraints);
	3813	+// aWindowConstraints.weightx = 1;
	3814	+// aWindowConstraints.gridwidth = 3;
	3815	+// // aConstraints.gridheight = 3;
	3816	+// aWindowConstraints.gridx = 1;
	3817	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3818	+// bigThree.add(centralPanel, aWindowConstraints);
	3819	+// aWindowConstraints.weightx = 0;
	3820	+// aWindowConstraints.gridx = 4;
	3821	+// aWindowConstraints.gridwidth = 1;
	3822	+// // aConstraints.gridheight = 3;
	3823	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3824	+// bigThree.add(XYZPanel, aWindowConstraints);
	3825	+// bigThree.validate();
	3826	+// scenePanel.setVisible(false);
	3827	+// centralPanel.setVisible(true);
	3828	+// XYZPanel.setVisible(true);
	3829	+ bigThree.ClearUI();
	3830	+ bigThree.add(scenePanel);
	3831	+ bigThree.add(centralPanel);
	3832	+ bigThree.FlushUI();
	3833	+
	3834	+ cameraView.requestFocusInWindow();
2635	3835	} else
2636		- if (event.getSource() == fourButton)
	3836	+ if (source == fourButton)
2637	3837	{
2638	3838	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3839	+
	3840	+ if (CameraPane.FULLSCREEN)
	3841	+ fullscreenLayout = radio.layout;
	3842	+
	3843	+// bigThree.remove(scenePanel);
	3844	+// bigThree.remove(centralPanel);
	3845	+// bigThree.remove(XYZPanel);
	3846	+// aWindowConstraints.gridx = 0;
	3847	+// aWindowConstraints.gridy = 0;
	3848	+// aWindowConstraints.gridwidth = 1;
	3849	+// // aWindowConstraints.gridheight = 3;
	3850	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3851	+// aWindowConstraints.weightx = 1;
	3852	+// aWindowConstraints.weighty = 1;
	3853	+// bigThree.add(scenePanel, aWindowConstraints);
	3854	+// aWindowConstraints.weightx = 1;
	3855	+// aWindowConstraints.gridwidth = 3;
	3856	+// // aConstraints.gridheight = 3;
	3857	+// aWindowConstraints.gridx = 1;
	3858	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3859	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3860	+// aWindowConstraints.weightx = 0;
	3861	+// aWindowConstraints.gridx = 4;
	3862	+// aWindowConstraints.gridwidth = 1;
	3863	+// // aWindowConstraints.gridheight = 3;
	3864	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3865	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3866	+// bigThree.validate();
	3867	+// scenePanel.setVisible(true);
	3868	+// centralPanel.setVisible(false);
	3869	+// XYZPanel.setVisible(false);
	3870	+ bigThree.ClearUI();
	3871	+ bigThree.add(scenePanel);
	3872	+ bigThree.FlushUI();
	3873	+
	3874	+ cameraView.requestFocusInWindow();
2663	3875	} else
2664		- if (event.getSource() == sixButton)
	3876	+ if (source == sixButton)
2665	3877	{
2666	3878	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	3879	+
	3880	+ if (CameraPane.FULLSCREEN)
	3881	+ fullscreenLayout = radio.layout;
	3882	+
	3883	+// bigThree.remove(scenePanel);
	3884	+// bigThree.remove(centralPanel);
	3885	+// bigThree.remove(XYZPanel);
	3886	+// aWindowConstraints.gridx = 0;
	3887	+// aWindowConstraints.gridy = 0;
	3888	+// aWindowConstraints.gridwidth = 1;
	3889	+// // aConstraints.gridheight = 3;
	3890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3891	+// aWindowConstraints.weightx = 0;
	3892	+// aWindowConstraints.weighty = 1;
	3893	+// bigThree.add(scenePanel, aWindowConstraints);
	3894	+// aWindowConstraints.weightx = 1;
	3895	+// aWindowConstraints.gridwidth = 3;
	3896	+// // aWindowConstraints.gridheight = 3;
	3897	+// aWindowConstraints.gridx = 1;
	3898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3899	+// bigThree.add(centralPanel, aWindowConstraints);
	3900	+// aWindowConstraints.weightx = 0;
	3901	+// aWindowConstraints.gridx = 4;
	3902	+// aWindowConstraints.gridwidth = 1;
	3903	+// // aWindowConstraints.gridheight = 3;
	3904	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3905	+// //bigThree.add(XYZPanel, aConstraints);
	3906	+// bigThree.validate();
	3907	+// scenePanel.setVisible(true);
	3908	+// centralPanel.setVisible(true);
	3909	+// XYZPanel.setVisible(false);
	3910	+ bigThree.ClearUI();
	3911	+ bigThree.add(centralPanel);
	3912	+ bigThree.add(scenePanel);
	3913	+ bigThree.FlushUI();
	3914	+
	3915	+ cameraView.requestFocusInWindow();
2691	3916	} else
2692		- if (event.getSource() == sevenButton)
	3917	+ if (source == sevenButton)
2693	3918	{
2694	3919	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3920	+
	3921	+ if (CameraPane.FULLSCREEN)
	3922	+ fullscreenLayout = radio.layout;
	3923	+
	3924	+// bigThree.remove(scenePanel);
	3925	+// bigThree.remove(centralPanel);
	3926	+// bigThree.remove(XYZPanel);
	3927	+// aWindowConstraints.gridx = 0;
	3928	+// aWindowConstraints.gridy = 0;
	3929	+// aWindowConstraints.gridwidth = 1;
	3930	+// // aWindowConstraints.gridheight = 3;
	3931	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3932	+// aWindowConstraints.weightx = 0;
	3933	+// aWindowConstraints.weighty = 1;
	3934	+// bigThree.add(scenePanel, aWindowConstraints);
	3935	+// aWindowConstraints.weightx = 1;
	3936	+// aWindowConstraints.gridwidth = 3;
	3937	+// // aWindowConstraints.gridheight = 3;
	3938	+// aWindowConstraints.gridx = 1;
	3939	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3940	+// bigThree.add(centralPanel, aWindowConstraints);
	3941	+// aWindowConstraints.weightx = 0;
	3942	+// aWindowConstraints.gridx = 4;
	3943	+// aWindowConstraints.gridwidth = 1;
	3944	+// // aConstraints.gridheight = 3;
	3945	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3946	+// bigThree.add(XYZPanel, aWindowConstraints);
	3947	+// bigThree.validate();
	3948	+// scenePanel.setVisible(true);
	3949	+// centralPanel.setVisible(true);
	3950	+// XYZPanel.setVisible(true);
	3951	+ bigThree.ClearUI();
	3952	+ bigThree.add(scenePanel);
	3953	+ bigThree.add(centralPanel);
	3954	+ bigThree.add(XYZPanel);
	3955	+ bigThree.FlushUI();
	3956	+
	3957	+ cameraView.requestFocusInWindow();
2719	3958	} else
2720		- if (event.getSource() == rootButton)
	3959	+ if (source == rootButton)
2721	3960	{
	3961	+ Replace();
2722	3962	Object3D obj;
2723	3963	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2724	3964	{
..	..	@@ -2727,66 +3967,87 @@
2727	3967	EditObject(obj);
2728	3968	}
2729	3969
	3970	+ cameraView.requestFocusInWindow();
2730	3971	refreshContents(true);
2731	3972	} else
2732		- if (event.getSource() == closeButton)
	3973	+ if (source == closeButton)
2733	3974	{
2734	3975	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3976	+ Replace();
	3977	+
2735	3978	cRadio ab;
2736	3979	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3980	{
2738	3981	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3982	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3983	{
	3984	+ // Patch to avoid bug with transparency.
	3985	+ if (!ab.hadMaterial)
	3986	+ {
	3987	+ ab.object.material = null;
	3988	+ }
	3989	+
2741	3990	buttonGroup.remove(ab);
2742	3991	radioPanel.remove(ab);
2743	3992
2744		- ab.GetObject().editWindow = null;
	3993	+ //ab.GetObject().editWindow = null;
	3994	+ ab.GetObject().manipWindow = null;
2745	3995	// ab.GetObject().objectUI = null; // ?????????
2746	3996
2747	3997	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3998	break;
2749	3999	}
2750	4000	}
	4001	+
	4002	+ cameraView.requestFocusInWindow();
2751	4003	refreshContents(true);
2752	4004	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	4005	+ if (source == editItem \|\| source == editButton)
2754	4006	{
	4007	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4008	+ {
	4009	+ Object3D child = (Object3D)e.nextElement();
	4010	+ child.pinned = true;
	4011	+ }
	4012	+
2755	4013	EditSelection(false);
2756	4014	} else
2757		- if (event.getSource() == uneditButton)
	4015	+ if (source == uneditButton)
2758	4016	{
2759	4017	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	4018	{
2761	4019	Object3D child = (Object3D)e.nextElement();
2762	4020	if(child.editWindow != null)
2763		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4021	+ child.pinned = false;
2764	4022	child.CloseUI();
2765	4023	listUI.remove(child);
	4024	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2766	4025
2767		- child.editWindow = null; // ???????????
	4026	+ //child.editWindow = null; // ???????????
2768	4027	}
2769		- objEditor.ctrlPanel.revalidate();
	4028	+ objEditor.ctrlPanel.FlushUI();
2770	4029	//objEditor.jTree.clearSelection();
2771	4030	//objEditor.ResetSliders();
2772	4031	refreshContents(true);
2773	4032	} else
2774		- if (event.getSource() == clearPanelButton)
	4033	+ if (source == clearPanelButton)
2775	4034	{
2776	4035	assert(copy == group);
2777	4036	//copy.ClearUI();
2778	4037	for (Object3D obj : listUI)
2779	4038	{
	4039	+ obj.pinned = false;
2780	4040	obj.CloseUI();
2781	4041	}
2782	4042	listUI.clear();
	4043	+ SetPinStates(group.selection.size() > 0);
2783	4044	refreshContents(true);
2784	4045	} else
2785		- if (event.getSource() == allParamsButton)
	4046	+ if (source == allParamsButton)
2786	4047	{
2787	4048	assert(copy == group);
2788	4049
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4050	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	4051
2791	4052	for (Object3D obj : listUI)
2792	4053	{
..	..	@@ -2803,19 +4064,21 @@
2803	4064
2804	4065	refreshContents(true);
2805	4066	} else
2806		- if (event.getSource() == unselectButton)
	4067	+ if (source == unselectButton)
2807	4068	{
2808	4069	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4070	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	4071	objEditor.ResetSliders();
2811	4072	refreshContents(true);
2812	4073	} else
2813		- if(event.getSource() instanceof cRadio)
	4074	+ if(source instanceof cRadio)
2814	4075	{
	4076	+ Replace();
	4077	+
2815	4078	group.parent = keepparent;
2816	4079	group.attributes = 0;
2817	4080	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	4081	+ /cRadio/ radio = (cRadio)source;
2819	4082	Object3D obj = radio.GetObject();
2820	4083	System.out.println("Edit " + obj);
2821	4084	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +4098,8 @@
2835	4098	}
2836	4099
2837	4100	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	4101	+
	4102	+ //Globals.theRenderer.object = group;
2839	4103	if(!useclient)
2840	4104	{
2841	4105	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +4108,78 @@
2844	4108	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	4109	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	4110	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	4111	+ //cameraView.lighttouched = true;
	4112	+ Globals.lighttouched = true;
2848	4113	topView.object = group;
2849	4114	frontView.object = group;
2850	4115	sideView.object = group;
2851	4116	}
2852		- group.editWindow = this;
	4117	+
	4118	+// fix "+" issue
	4119	+ //group.editWindow = this;
	4120	+ group.manipWindow = this;
	4121	+
2853	4122	/*
2854	4123	currentLayout = radio.layout;
2855	4124	if (currentLayout == null)
2856	4125	currentLayout = sevenButton;
2857	4126	*/
2858	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);
2859	4159	keepparent = group.parent;
2860	4160	// PARENT = NULL or not???
2861	4161	//group.parent = null; // ROOT
2862	4162	//group.attributes = -1;
2863	4163	ResetModel();
	4164	+
	4165	+ cameraView.requestFocusInWindow();
2864	4166	refreshContents(true);
2865		- }
	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	+ }
2866	4183	else
2867	4184	{
2868	4185	//return super.action(event, arg);
..	..	@@ -2871,7 +4188,6 @@
2871	4188	}
2872	4189
2873	4190	boolean useclient = false;
2874		- cRadio radio;
2875	4191
2876	4192	void ToggleRoot()
2877	4193	{
..	..	@@ -2880,7 +4196,7 @@
2880	4196	if (useclient)
2881	4197	{
2882	4198	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	4199	+ Globals.lighttouched = true;
2884	4200	//topView.object = client;
2885	4201	//frontView.object = client;
2886	4202	//sideView.object = client;
..	..	@@ -2888,7 +4204,7 @@
2888	4204	else
2889	4205	{
2890	4206	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	4207	+ Globals.lighttouched = true;
2892	4208	//topView.object = group;
2893	4209	//frontView.object = group;
2894	4210	//sideView.object = group;
..	..	@@ -2923,6 +4239,28 @@
2923	4239	refreshContents();
2924	4240	}
2925	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	+ }
2926	4264
2927	4265	void ResetTransform()
2928	4266	{
..	..	@@ -2954,7 +4292,7 @@
2954	4292	TouchTransform(obj);
2955	4293	continue;
2956	4294	}
2957		- if ((mask&2) != 0) // Scale
	4295	+ if ((mask&2) != 0) // Scale/rotation
2958	4296	{
2959	4297	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
2960	4298	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -2962,10 +4300,6 @@
2962	4300	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
2963	4301	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
2964	4302	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
2965		- }
2966		- if ((mask&4) != 0) // Rotation
2967		- {
2968		- // ?
2969	4303	}
2970	4304	if ((mask&1) != 0) // Translation
2971	4305	{
..	..	@@ -3035,7 +4369,7 @@
3035	4369	refreshContents();
3036	4370	}
3037	4371
3038		- void ResetCentroid()
	4372	+ void ResetCentroid(boolean full)
3039	4373	{
3040	4374	Object3D obj;
3041	4375	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4384,16 @@
3050	4384	LA.matIdentity(Object3D.mat);
3051	4385	obj.getBounds(minima, maxima, false);
3052	4386	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4387	+ if (full)
	4388	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4389	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4390	obj.TransformMesh(Object3D.mat);
	4391	+
3056	4392	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4393	+ if (full)
	4394	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4395	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4396	+
3059	4397	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4398	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4399	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4422,8 @@
3084	4422
3085	4423	int size = obj.MemorySize();
3086	4424
3087		- 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)");
3088	4427	}
3089	4428	}
3090	4429	catch (Exception e)
..	..	@@ -3121,9 +4460,9 @@
3121	4460	obj = (Object3D)e.nextElement();
3122	4461
3123	4462	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4463	+ Grafreed.AnalyzeObject(obj);
3125	4464	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4465	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4466
3128	4467	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4468	}
..	..	@@ -3165,6 +4504,20 @@
3165	4504	void GenNormals(boolean crease)
3166	4505	{
3167	4506	group.GenNormalsS(crease);
	4507	+
	4508	+ refreshContents();
	4509	+ }
	4510	+
	4511	+ void GenNormalsMESH()
	4512	+ {
	4513	+ group.GenNormalsMeshS();
	4514	+
	4515	+ refreshContents();
	4516	+ }
	4517	+
	4518	+ void GenNormalsMINE()
	4519	+ {
	4520	+ group.selection.GenNormalsMINE();
3168	4521
3169	4522	refreshContents();
3170	4523	}
..	..	@@ -3250,7 +4603,7 @@
3250	4603	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4604	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4605	//
3253		-// g.add(GraphreeD.clipboard);
	4606	+// g.add(GrafreeD.clipboard);
3254	4607	//
3255	4608	// buffer.add(g);
3256	4609	// }
..	..	@@ -3269,8 +4622,8 @@
3269	4622	// nodes = new Object3D();
3270	4623	// vertices = new Vector<Vertex>();
3271	4624	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4625	+// boolean epsequal = GrafreeD.epsequal;
	4626	+// GrafreeD.epsequal = true;
3274	4627	//
3275	4628	// for (int i=0; i<group.selection.size(); i++)
3276	4629	// {
..	..	@@ -3311,7 +4664,7 @@
3311	4664	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4665	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4666	//
3314		-// g.add(GraphreeD.clipboard);
	4667	+// g.add(GrafreeD.clipboard);
3315	4668	//
3316	4669	// buffer.add(g);
3317	4670	// }
..	..	@@ -3319,7 +4672,7 @@
3319	4672	// makeSomething(buffer, i==group.selection.size()-1);
3320	4673	// }
3321	4674	//
3322		-// GraphreeD.epsequal = epsequal;
	4675	+// GrafreeD.epsequal = epsequal;
3323	4676	//
3324	4677	// //buffer = null;
3325	4678	// temprep = null;
..	..	@@ -3330,8 +4683,8 @@
3330	4683
3331	4684	void ParseVertices()
3332	4685	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4686	+ boolean epsequal = Grafreed.epsequal;
	4687	+ Grafreed.epsequal = true;
3335	4688
3336	4689	for (int i=0; i<group.selection.size(); i++)
3337	4690	{
..	..	@@ -3356,7 +4709,7 @@
3356	4709	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4710	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4711
3359		- g.add(GraphreeD.clipboard);
	4712	+ g.add(Grafreed.clipboard);
3360	4713
3361	4714	buffer.add(g);
3362	4715	}
..	..	@@ -3371,7 +4724,7 @@
3371	4724	makeSomething(buffer, i==group.selection.size()-1);
3372	4725	}
3373	4726
3374		- GraphreeD.epsequal = epsequal;
	4727	+ Grafreed.epsequal = epsequal;
3375	4728
3376	4729	refreshContents();
3377	4730	}
..	..	@@ -3389,7 +4742,16 @@
3389	4742	String pigment = Object3D.GetPigment(tex);
3390	4743	//String bump = Object3D.GetBump(tex);
3391	4744
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.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	+ }
3393	4755
3394	4756	double s = v.s;
3395	4757
..	..	@@ -3416,7 +4778,7 @@
3416	4778	scale /= 3;
3417	4779
3418	4780	scale /= 0xFF;
3419		- scale /= 4;
	4781	+ // c'est quoi ca? scale /= 4;
3420	4782
3421	4783	//v.AO = scale;
3422	4784
..	..	@@ -3437,12 +4799,26 @@
3437	4799
3438	4800	void Align()
3439	4801	{
	4802	+ if (group.selection.size() == 0)
	4803	+ return;
	4804	+
	4805	+ cVector bbmin = new cVector();
	4806	+ cVector bbmax = new cVector();
	4807	+
	4808	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4809	+
	4810	+ double dx = bbmax.x - bbmin.x;
	4811	+ double dy = bbmax.y - bbmin.y;
	4812	+ double dz = bbmax.z - bbmin.z;
	4813	+
	4814	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4815	+
3440	4816	for (int i=0; i<group.selection.size(); i++)
3441	4817	{
3442	4818	Object3D obj = group.selection.get(i);
3443	4819
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4820	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4821	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4822	}
3447	4823
3448	4824	refreshContents();
..	..	@@ -3455,7 +4831,7 @@
3455	4831	// ref.SaveSupports();
3456	4832	// Object3D par = ref.parent;
3457	4833	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4834	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4835	// ref.parent = par;
3460	4836	// ref.RestoreSupports();
3461	4837
..	..	@@ -3463,11 +4839,11 @@
3463	4839
3464	4840	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4841
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4842	+ boolean random = CameraPane.SWITCH;
	4843	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4844	lowres.linkVerticesThis(null);
3469	4845	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4846	+ CameraPane.SWITCH = random;
3471	4847
3472	4848	System.err.flush();
3473	4849
..	..	@@ -3485,7 +4861,7 @@
3485	4861	// lowres.SaveSupports();
3486	4862	// par = lowres.parent;
3487	4863	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4864	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4865	Object3D newlow = CloneObject(lowres, false);
3490	4866	newlow.name = sn.switchobject.get(i).name;
3491	4867	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4883,7 @@
3507	4883	return;
3508	4884
3509	4885	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4886	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4887
3512	4888	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4889
..	..	@@ -3676,7 +5052,7 @@
3676	5052	group.selection.RelinkToSupport(); // july 2014
3677	5053	System.out.println("DONE.");
3678	5054	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5055	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	5056	}
3681	5057
3682	5058	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +5077,20 @@
3701	5077
3702	5078	void ClipMesh()
3703	5079	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5080	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	5081	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	5082	+ Object3D content = Grafreed.clipboard.get(0);
3707	5083
3708	5084	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	5085	content = ((cGroup)content).get(0);
3710	5086
3711	5087	// for (int i=0; i<group.selection.size(); i++)
3712	5088	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5089	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	5090	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	5091	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	5092	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5093	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	5094	System.out.println("DONE.");
3719	5095	refreshContents();
3720	5096	}
..	..	@@ -3759,6 +5135,18 @@
3759	5135	void MarkLeaves(boolean hide)
3760	5136	{
3761	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);
3762	5150	refreshContents();
3763	5151	}
3764	5152
..	..	@@ -3833,28 +5221,25 @@
3833	5221	// }
3834	5222	// }
3835	5223
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	5224	void EditSelection(boolean newWindow)
3841	5225	{
	5226	+ if (group.selection == null)
	5227	+ {
	5228	+ EditElement(group, newWindow); // ? new
	5229	+ return;
	5230	+ }
	5231	+
3842	5232	// aConstraints.gridy = 0;
3843	5233	for (int i=0; i<group.selection.size(); i++)
3844	5234	{
3845	5235	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	5236	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5237	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	5238
3849	5239	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	5240	+ if(elem != group \|\| !newWindow)
3851	5241	{
3852		- // if (!(elem instanceof Composite))
3853		- // newWindow = false;
3854		- listUI.add(elem);
3855		- elem.openEditWindow(this, newWindow); //, false);
3856		- System.out.println("edit : " + elem);
3857		- elem.editWindow.refreshContents(true); // ? new
	5242	+ EditElement(elem, newWindow); // ? new
3858	5243	}
3859	5244	}
3860	5245	}
..	..	@@ -3917,9 +5302,7 @@
3917	5302
3918	5303	freezemodel = false;
3919	5304	}
3920		-
3921		- boolean flashIt = true;
3922		-
	5305	+
3923	5306	public void valueChanged(TreeSelectionEvent e)
3924	5307	//public boolean handleEvent(Event event)
3925	5308	{
..	..	@@ -3929,7 +5312,8 @@
3929	5312	//new Exception().printStackTrace();
3930	5313
3931	5314	freezemodel = true;
3932		-
	5315	+ ClearUnpinned();
	5316	+
3933	5317	/**/
3934	5318	//switch (event.id)
3935	5319	{
..	..	@@ -3937,7 +5321,6 @@
3937	5321	//case 702: // Event.LIST_DESELECT
3938	5322	group.deselectAll();
3939	5323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5324	if (tps != null)
3942	5325	{
3943	5326	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5329,39 @@
3946	5329
3947	5330	//if (child.parent != null)
3948	5331	//child.parent.addSelectee(child);
	5332	+ objEditor.SetMaterial(child);
3949	5333	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5334	}
3954	5335	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5336	+// else
	5337	+// {
	5338	+// objEditor.SetMaterial(group); // .GetMaterial());
	5339	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5340	+// System.err.println("info : " + group.GetPath());
	5341	+// }
3961	5342
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.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))
3965	5344	CameraPane.flash = true;
3966	5345
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5347	// a camera
3969	5348	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	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	+ }
	5354	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5355	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5356	}
3975	5357
	5358	+ if (tps != null && tps.length == 1)
	5359	+ {
	5360	+ EditSelection(false);
	5361	+ }
	5362	+
	5363	+ SetPinStates(tps != null && tps.length > 0);
	5364	+
3976	5365	refreshContents();
3977	5366	//return true;
3978	5367	}
..	..	@@ -3981,6 +5370,53 @@
3981	5370
3982	5371	freezemodel = false;
3983	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	+ }
3984	5420
3985	5421	void linkSomething(Object3D thing)
3986	5422	{
..	..	@@ -4052,16 +5488,19 @@
4052	5488	{
4053	5489	if (group.selection.isEmpty())
4054	5490	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5491	+
	5492	+ Grafreed.clipboardIsTempGroup = false;
4056	5493	Composite tGroup = null;
4057	5494	if (group.selection.size() > 0) // 1)
4058	5495	{
4059	5496	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5497	+ Grafreed.clipboardIsTempGroup = true;
4061	5498	}
4062	5499
4063	5500	if (cut)
4064	5501	{
	5502	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5503	+// Save();
4065	5504	//int indices[] = jList.getSelectedIndices();
4066	5505	//for (int i = indices.length - 1; i >= 0; i--)
4067	5506	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5536,16 @@
4097	5536	//System.out.println("cut " + child);
4098	5537	//System.out.println("parent = " + child.parent);
4099	5538	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5539	+ if (Grafreed.clipboardIsTempGroup)
4101	5540	tGroup.add/Child/(tmp);
4102	5541	else
4103		- GraphreeD.clipboard = tmp;
	5542	+ Grafreed.clipboard = tmp;
4104	5543	}
4105	5544	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5545	+ if (Grafreed.clipboardIsTempGroup)
4107	5546	tGroup.add/Child/(child);
4108	5547	else
4109		- GraphreeD.clipboard = child;
	5548	+ Grafreed.clipboard = child;
4110	5549	}
4111	5550
4112	5551	//ResetModel();
..	..	@@ -4138,21 +5577,23 @@
4138	5577	//System.out.println("cut " + elem);
4139	5578	//System.out.println("parent = " + elem.parent);
4140	5579	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5580	+ if (Grafreed.clipboardIsTempGroup)
4142	5581	tGroup.add/Child/(tmp);
4143	5582	else
4144		- GraphreeD.clipboard = tmp;
	5583	+ Grafreed.clipboard = tmp;
4145	5584	}
4146	5585	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5586	+ if (Grafreed.clipboardIsTempGroup)
4148	5587	tGroup.add/Child/(child);
4149	5588	else
4150		- GraphreeD.clipboard = child;
	5589	+ Grafreed.clipboard = child;
4151	5590	}
4152	5591
4153	5592	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5593	+
	5594	+ if (Grafreed.clipboardIsTempGroup)
	5595	+ Grafreed.clipboard = tGroup;
	5596	+
4156	5597	if (cut)
4157	5598	{
4158	5599	ResetModel();
..	..	@@ -4162,11 +5603,15 @@
4162	5603
4163	5604	void paste(boolean expand)
4164	5605	{
4165		- // if (GraphreeD.clipboard == null)
	5606	+ if (Globals.REPLACEONMAKE)
	5607	+ Save();
	5608	+ boolean keep = Globals.REPLACEONMAKE;
	5609	+ Globals.REPLACEONMAKE = false;
	5610	+ // if (GrafreeD.clipboard == null)
4166	5611	// return;
4167	5612	boolean first = true;
4168	5613
4169		- if (GraphreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4170	5615	{
4171	5616	Composite temp;
4172	5617
..	..	@@ -4177,7 +5622,7 @@
4177	5622	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5623	*/
4179	5624	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5625	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5626	{
4182	5627	Object3D child = (Object3D)e.nextElement();
4183	5628
..	..	@@ -4191,7 +5636,7 @@
4191	5636	else
4192	5637	elem = child.deepCopy(); // ?
4193	5638	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5639	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5640	// elem = elem.get(0);
4196	5641	makeSomething(elem, true); // ?? first);
4197	5642	//group.addChild(elem);
..	..	@@ -4211,23 +5656,24 @@
4211	5656	//Object3D cb = Applet3D.clipboard;
4212	5657	//temp.addChild(cb);
4213	5658	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.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());
4219	5664	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5665	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5666	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5667	}
4223	5668
	5669	+ Globals.REPLACEONMAKE = keep;
4224	5670	ResetModel();
4225	5671	refreshContents();
4226	5672	}
4227	5673
4228		- void pasteInto(boolean copyit)
	5674	+ void pasteInto(boolean copyit, boolean clone)
4229	5675	{
4230		-// if (GraphreeD.clipboard == null)
	5676	+// if (GrafreeD.clipboard == null)
4231	5677	// return;
4232	5678
4233	5679	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5700,22 @@
4254	5700	if (copyit)
4255	5701	{
4256	5702	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5703	+ if (clone)
	5704	+ {
	5705	+ CloneClipboard(false); // sept 2014
	5706	+ }
	5707	+ else
	5708	+ {
	5709	+ paste(false);
	5710	+ }
4258	5711	}
4259	5712	else
4260	5713	{
4261	5714	boolean first = true;
4262	5715
4263		- if (GraphreeD.clipboardIsTempGroup)
	5716	+ if (Grafreed.clipboardIsTempGroup)
4264	5717	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5718	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5719	Object3D copy;
4267	5720	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5721	{
..	..	@@ -4272,7 +5725,7 @@
4272	5725	}
4273	5726	} else
4274	5727	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5728	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5729	}
4277	5730	}
4278	5731	}
..	..	@@ -4349,6 +5802,10 @@
4349	5802
4350	5803	void group(Object3D csg, boolean grab)
4351	5804	{
	5805	+ if (Globals.REPLACEONMAKE)
	5806	+ Save();
	5807	+ boolean keep = Globals.REPLACEONMAKE;
	5808	+ Globals.REPLACEONMAKE = false;
4352	5809	if (//false) // why??
4353	5810	!group.selection.isEmpty())
4354	5811	{
..	..	@@ -4462,8 +5919,34 @@
4462	5919	//node.add(csg);
4463	5920	//makeSomething(node);
4464	5921	makeSomething(csg);
	5922	+ Globals.REPLACEONMAKE = keep;
4465	5923	}
4466	5924
	5925	+ void Ungroup(Object3D g)
	5926	+ {
	5927	+ if (Globals.REPLACEONMAKE)
	5928	+ Save();
	5929	+ boolean keep = Globals.REPLACEONMAKE;
	5930	+ Globals.REPLACEONMAKE = false;
	5931	+ if (g instanceof HiddenObject)
	5932	+ {
	5933	+ HiddenObject h = (HiddenObject) g;
	5934	+
	5935	+ for (int i=0; i<h.ActualSize(); i++)
	5936	+ {
	5937	+ objEditor.makeSomething(h.get(i), false);
	5938	+ }
	5939	+ }
	5940	+ else
	5941	+ {
	5942	+ for (int i=0; i<g.Size(); i++)
	5943	+ {
	5944	+ objEditor.makeSomething(g.get(i), false);
	5945	+ }
	5946	+ }
	5947	+ Globals.REPLACEONMAKE = keep;
	5948	+ }
	5949	+
4467	5950	void ungroup()
4468	5951	{
4469	5952	/*
..	..	@@ -4657,21 +6140,6 @@
4657	6140	}
4658	6141	*/
4659	6142
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	6143	/*
4676	6144	public void Callback(Object obj)
4677	6145	{
..	..	@@ -4695,26 +6163,9 @@
4695	6163	}
4696	6164	*/
4697	6165
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	6166	String GetFile(String dialogName)
4716	6167	{
4717		- if (GraphreeD.standAlone)
	6168	+ if (Grafreed.standAlone)
4718	6169	{
4719	6170	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	6171	browser.show();
..	..	@@ -4778,10 +6229,48 @@
4778	6229	cButton flashSelectionButton;
4779	6230	cButton editButton;
4780	6231	cButton uneditButton;
	6232	+ JCheckBox allParamsButton;
4781	6233	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	6234	cButton unselectButton;
4784	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	+
4785	6274	cButton screenfitButton;
4786	6275	cButton screenfitpointButton;
4787	6276	cButton snapobjectButton;
..	..	@@ -4793,14 +6282,6 @@
4793	6282
4794	6283	cButton setsupportButton;
4795	6284
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	6285	//
4805	6286	//Composite
4806	6287	Object3D // to do !!
..	..	@@ -4810,10 +6291,12 @@
4810	6291	//JTree jTree;
4811	6292	private MenuItem lookAtItem;
4812	6293	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
4814		- private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
4816		- 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;
4817	6300	private MenuItem cloneSupportItem;
4818	6301	private MenuItem overwriteGeoItem;
4819	6302	private MenuItem overwriteMatItem;
..	..	@@ -4823,8 +6306,9 @@
4823	6306	private MenuItem resetsupportItem;
4824	6307	private MenuItem resetreferencesItem;
4825	6308	private MenuItem linkverticesItem;
	6309	+ private MenuItem relinkverticesItem;
4826	6310	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6311	+ private MenuItem resetAllItem;
4828	6312	private MenuItem stepAllItem;
4829	6313	private MenuItem revertMeshItem;
4830	6314	private MenuItem poseMeshItem;
..	..	@@ -4833,16 +6317,19 @@
4833	6317	private MenuItem cloneGeometriesItem;
4834	6318	private MenuItem shareGeometriesItem;
4835	6319	private MenuItem mergeGeometriesItem;
4836		- private MenuItem copyItem;
	6320	+ private JMenuItem copyItem;
4837	6321	private MenuItem pasteItem;
4838		- private MenuItem pasteLinkItem;
4839		- private MenuItem pasteCloneItem;
4840		- private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6322	+ private JMenuItem pasteIntoItem;
	6323	+ private JMenuItem pasteLinkItem;
	6324	+ private JMenuItem pasteCloneItem;
	6325	+ private JMenuItem pasteExpandItem;
	6326	+ private JMenuItem deleteItem;
4842	6327	private MenuItem clearAllItem;
4843	6328	private MenuItem genUVItem;
	6329	+ private MenuItem genNormalsMESHItem;
4844	6330	private MenuItem genNormalsCADItem;
4845	6331	private MenuItem genNormalsORGANItem;
	6332	+ private MenuItem genNormalsMINEItem;
4846	6333	private MenuItem stripifyItem;
4847	6334	private MenuItem unstripifyItem;
4848	6335	private MenuItem trimItem;
..	..	@@ -4871,6 +6358,10 @@
4871	6358	private MenuItem showleavesItem;
4872	6359	private MenuItem markleavesItem;
4873	6360	private MenuItem unmarkleavesItem;
	6361	+ private MenuItem rewindleavesItem;
	6362	+ private MenuItem unrewindleavesItem;
	6363	+ private MenuItem randomleavesItem;
	6364	+ private MenuItem unrandomleavesItem;
4874	6365
4875	6366	private MenuItem flipVItem;
4876	6367	private MenuItem unflipVItem;
..	..	@@ -4882,14 +6373,17 @@
4882	6373	private MenuItem panoTexturesItem;
4883	6374
4884	6375	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6376	+ private MenuItem resetCentroidXZItem;
4886	6377	private MenuItem resetTransformItem;
4887		- private MenuItem grabItem;
	6378	+ private MenuItem transformGeometryItem;
	6379	+ private MenuItem transformChildrenItem;
	6380	+ private MenuItem hideItem;
	6381	+ private JMenuItem grabItem;
4888	6382	private MenuItem backItem;
4889	6383	private MenuItem frontItem;
4890	6384	private MenuItem cameraItem;
4891	6385	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6386	+ private MenuItem switchItem;
4893	6387	private MenuItem physicsItem;
4894	6388	private MenuItem frameselectorItem;
4895	6389	private MenuItem scriptNodeItem;
..	..	@@ -4897,13 +6391,14 @@
4897	6391	private MenuItem switchTransfoItem;
4898	6392	private MenuItem morphItem;
4899	6393	private MenuItem linkerItem;
4900		- private MenuItem ungroupItem;
	6394	+ private JMenuItem ungroupItem;
4901	6395	private MenuItem editItem;
4902	6396	private MenuItem openWindowItem;
4903	6397	private MenuItem editLeafItem;
4904	6398
4905	6399	private MenuItem resetParentItem;
4906	6400	private MenuItem repairParentItem;
	6401	+ private MenuItem repairShadowItem;
4907	6402	private MenuItem sortbysizeItem;
4908	6403	private MenuItem sortbynameItem;
4909	6404
..	..	@@ -4912,6 +6407,8 @@
4912	6407	private MenuItem attachBumpItem;
4913	6408	private MenuItem detachBumpItem;
4914	6409	private MenuItem pigmentBumpItem;
	6410	+ private MenuItem embedTexturesItem;
	6411	+ private MenuItem deEmbedTexturesItem;
4915	6412
4916	6413	private MenuItem particleItem;
4917	6414	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6421,11 @@
4924	6421	private MenuItem coneItem;
4925	6422	private MenuItem torusItem;
4926	6423	private MenuItem superItem;
	6424	+ private MenuItem kleinItem;
4927	6425	private MenuItem blobItem;
4928	6426	private MenuItem latheItem;
4929	6427	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6428	+ private MenuItem overlayItem;
4931	6429	private MenuItem meshItem;
4932	6430	// private MenuItem meshGroupItem;
4933	6431	private MenuItem springItem;
..	..	@@ -4936,6 +6434,7 @@
4936	6434	private MenuItem csgItem;
4937	6435	private MenuItem templateItem;
4938	6436	private MenuItem textureItem;
	6437	+ private MenuItem billboardItem;
4939	6438	private MenuItem shadowXItem;
4940	6439	private MenuItem shadowYItem;
4941	6440	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6447,6 @@
4948	6447	private MenuItem doubleItem;
4949	6448	private MenuItem tripleItem;
4950	6449
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6450	private MenuItem computeAOItem;
4957	6451	private MenuItem recompileItem;
4958	6452	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6456,8 @@
4962	6456	private MenuItem analyzeItem;
4963	6457	private MenuItem dumpItem;
4964	6458	//boolean freezemodel = false;
	6459	+
	6460	+ Menu cameraMenu;
	6461	+ MenuItem editCameraItem;
	6462	+ MenuItem restoreCameraItem;
4965	6463	}