~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", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
25	381	//ObjEditor objEditor;
26	382	public void closeUI2()
27	383	{
..	..	@@ -59,6 +415,14 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
62	426	if(ui)
63	427	SetupUI(objEditor);
64	428	}
..	..	@@ -73,16 +437,28 @@
73	437	this.copy = this.group = copy;
74	438	//selectees = this.group.selectees;
75	439
76		- SetupMenu2(objEditor);
	440	+ SetupMenu2(this); //objEditor);
77	441	SetupUI2(objEditor);
78	442	objEditor.SetupUI(true);
79	443	SetupViews(objEditor);
80	444
81	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
82	454	}
83	455
84	456	void CloneSelection(boolean supports)
85	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
86	462	// Object3D keep = GrafreeD.clipboard;
87	463	//Object3D obj;
88	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +469,19 @@
93	469
94	470	makeSomething(clone, i==group.selection.size()-1);
95	471	}
	472	+ Globals.REPLACEONMAKE = keep;
96	473	}
97	474
98	475	void CloneClipboard(boolean supports)
99	476	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	477	+ assert(Grafreed.clipboard.parent == null);
	478	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	479	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	480	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	481	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	482	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	483	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	484	+ Grafreed.clipboard.get(0).parent = keepparent;
108	485	}
109	486
110	487	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +495,7 @@
118	495	// obj.support = null;
119	496	if (!supports)
120	497	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	498	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	499	obj.parent = parent;
123	500	// obj.support = support;
124	501	// clone.support = support; // aout 2013
..	..	@@ -147,58 +524,156 @@
147	524
148	525	//JTextField nameField;
149	526
150		- void SetupMenu2(ObjEditor oe)
	527	+ void SetupMenu2(GroupEditor oe)
151	528	{
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);
	529	+ oe.jTree = new cTree();
	530	+
163	531	Menu menu;
164	532	oe.menuBar.add(menu = new Menu("Edit"));
165	533	//editItem = menu.add(new MenuItem("Edit"));
166	534	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	542	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	545	cloneItem.addActionListener(this);
	546	+ //if (Globals.ADVANCED)
	547	+ {
172	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	549	cloneSupportItem.addActionListener(this);
	550	+ }
	551	+ oe.jTree.popup.addSeparator();
174	552	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	554	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	556	copyItem.addActionListener(this);
179	557	pasteItem = menu.add(new MenuItem("Paste"));
180	558	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	559	+
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	563	+ pasteIntoItem.addActionListener(this);
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	565	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	567	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	569	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
	575	+
	576	+ if (Globals.ADVANCED)
	577	+ {
	578	+ // Deletes the cameras...
189	579	clearAllItem = menu.add(new MenuItem("Clear All"));
190	580	clearAllItem.addActionListener(this);
	581	+ }
	582	+
	583	+ menuBar.add(cameraMenu = new Menu("View"));
	584	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	585	+ //zBufferItem.addActionListener(this);
	586	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	587	+ //normalLensItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
	590	+
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	603	+
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	605	+ toggleHandleItem.addItemListener(this);
	606	+ toggleHandleItem.setState(CameraPane.HANDLES);
	607	+
	608	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	609	+ togglePaintItem.addItemListener(this);
	610	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ cameraMenu.add("-");
	615	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	616	+ toggleLiveItem.addItemListener(this);
	617	+ toggleLiveItem.setState(Globals.isLIVE());
191	618
	619	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	620	+ stepItem.addActionListener(this);
	621	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	622	+ // toggleDLItem.addItemListener(this);
	623	+ // toggleDLItem.setState(false);
	624	+
	625	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	626	+ toggleRenderItem.addItemListener(this);
	627	+ toggleRenderItem.setState(!CameraPane.frozen);
	628	+
	629	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	630	+ toggleDebugItem.addItemListener(this);
	631	+ toggleDebugItem.setState(Globals.DEBUG);
	632	+
	633	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	634	+ toggleFrustumItem.addItemListener(this);
	635	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	636	+
	637	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	638	+ toggleFootContactItem.addItemListener(this);
	639	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	640	+
	641	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	642	+ toggleTimelineItem.addItemListener(this);
	643	+ }
	644	+
	645	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	646	+// toggleRootItem.addItemListener(this);
	647	+// toggleRootItem.setState(false);
	648	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	649	+// animationItem.addItemListener(this);
	650	+// animationItem.setState(CameraPane.ANIMATION);
	651	+ cameraMenu.add("-");
	652	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	653	+ editCameraItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	658	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	660	+ oe.cameraMenu.add("-");
	661	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	662	+ openWindowItem.addActionListener(this);
	663	+ lookAtItem.addActionListener(this);
	664	+ //lookFromItem.addActinoListener(this);
	665	+ //switchViewItem.addActionListener(this);
	666	+ }
	667	+
192	668	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);
	669	+ if (Globals.ADVANCED)
	670	+ {
197	671	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	672	revertMeshItem.addActionListener(this);
199	673	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	674	resetreferencesItem.addActionListener(this);
201	675	menu.add("-");
	676	+ }
202	677	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	678	overwriteGeoItem.addActionListener(this);
204	679	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +685,104 @@
210	685	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	686	overwriteUVItem.addActionListener(this);
212	687	menu.add("-");
	688	+ if (Globals.ADVANCED)
	689	+ {
213	690	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	691	generateMeshItem.addActionListener(this);
215	692	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	693	poseMeshItem.addActionListener(this);
217	694	menu.add("-");
	695	+ }
218	696	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	697	resetsupportItem.addActionListener(this);
220	698	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	699	linkverticesItem.addActionListener(this);
222	700	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	701	relinkverticesItem.addActionListener(this);
	702	+
	703	+ if (Globals.ADVANCED)
	704	+ {
224	705	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	706	setMasterItem.addActionListener(this);
	707	+ }
226	708
227	709	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
230	712	backItem = menu.add(new MenuItem("Back"));
231	713	backItem.addActionListener(this);
232	714	frontItem = menu.add(new MenuItem("Front"));
233	715	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
	721	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	722	hideItem.addActionListener(this);
238		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239	725	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
247	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	734	switchGeoItem.addActionListener(this);
249	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	736	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	737	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	738	morphItem.addActionListener(this);
	739	+
	740	+ menu.add("-");
	741	+ physicsItem = menu.add(new MenuItem("Physics"));
	742	+ physicsItem.addActionListener(this);
	743	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	744	+ frameselectorItem.addActionListener(this);
253	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	746	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	747	+ }
257	748
258	749	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
261	752	billboardItem = menu.add(new MenuItem("Billboard"));
262	753	billboardItem.addActionListener(this);
263	754	csgItem = menu.add(new MenuItem("CSG"));
264	755	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	757	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	759	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
	765	+ if (Globals.ADVANCED)
	766	+ {
	767	+ menu.add("-");
271	768	linkerItem = menu.add(new MenuItem("Linker"));
272	769	linkerItem.addActionListener(this);
273	770	templateItem = menu.add(new MenuItem("Template"));
274	771	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	773	pointflowItem.addActionListener(this);
	774	+ }
279	775	menu.add("-");
280	776	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	777	resetTransformItem.addActionListener(this);
282	778	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	779	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	780	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	781	+ resetCentroidXZItem.addActionListener(this);
	782	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	783	+ transformGeometryItem.addActionListener(this);
	784	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	785	+ transformChildrenItem.addActionListener(this);
286	786
287	787	oe.menuBar.add(menu = new Menu("Geometry"));
288	788	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +793,11 @@
293	793	genNormalsCADItem.addActionListener(this);
294	794	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	795	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	796	+ if (Globals.ADVANCED)
	797	+ {
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	799	genNormalsMINEItem.addActionListener(this);
	800	+ }
298	801	stripifyItem = menu.add(new MenuItem("Stripify"));
299	802	stripifyItem.addActionListener(this);
300	803	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +819,34 @@
316	819	reduce34MeshItem.addActionListener(this);
317	820	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	821	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	822	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	823	clipMeshItem.addActionListener(this);
	824	+
	825	+ if (Globals.ADVANCED)
	826	+ {
	827	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	828	+ smoothMeshItem.addActionListener(this);
	829	+ }
323	830
324	831	oe.menuBar.add(menu = new Menu("Attributes"));
325	832	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	833	clearMaterialsItem.addActionListener(this);
	834	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	835	+ resetAllItem.addActionListener(this);
	836	+ stepAllItem = menu.add(new MenuItem("Step All"));
	837	+ stepAllItem.addActionListener(this);
327	838	menu.add("-");
328	839	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	840	liveleavesItem.addActionListener(this);
330	841	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	842	unliveleavesItem.addActionListener(this);
	843	+ if (Globals.ADVANCED)
	844	+ {
332	845	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	846	supportleavesItem.addActionListener(this);
334	847	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	848	unsupportleavesItem.addActionListener(this);
	849	+ }
336	850	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	851	hideleavesItem.addActionListener(this);
338	852	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +855,14 @@
341	855	markleavesItem.addActionListener(this);
342	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	857	unmarkleavesItem.addActionListener(this);
	858	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	859	+ rewindleavesItem.addActionListener(this);
	860	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	861	+ unrewindleavesItem.addActionListener(this);
	862	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	863	+ randomleavesItem.addActionListener(this);
	864	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	865	+ unrandomleavesItem.addActionListener(this);
344	866	menu.add("-");
345	867	flipVItem = menu.add(new MenuItem("Flip V"));
346	868	flipVItem.addActionListener(this);
..	..	@@ -366,53 +888,130 @@
366	888	attachBumpItem.addActionListener(this);
367	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
369	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	893	detachPigmentItem.addActionListener(this);
371	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
373	900	menu.add("-");
374	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	902	sortbysizeItem.addActionListener(this);
376	903	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	904	sortbynameItem.addActionListener(this);
378	905	menu.add("-");
	906	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	907	+ shareGeometriesItem.addActionListener(this);
	908	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	909	+ mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
	913	+ if (Globals.ADVANCED)
	914	+ {
	915	+ // Pretty much the same as duplicate and clone.
379	916	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	917	extractGeometriesItem.addActionListener(this);
381	918	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	919	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	920	+ }
387	921
388	922	oe.menuBar.add(menu = new Menu("Insert"));
389	923	buildCreateMenu(menu);
390	924
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	925	oe.menuBar.add(menu = new Menu("Tools"));
403	926	buildToolsMenu(menu);
404	927	}
405	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
406	998	void SetupUI2(ObjEditor oe)
407	999	{
	1000	+ // June 2019
	1001	+ if (oe == null)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ //return;
	1005	+ }
	1006	+
	1007	+ if (copy != group)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ }
	1011	+
408	1012	//new Exception().printStackTrace();
409	1013
410	1014	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1016
418	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,153 +1032,263 @@
433	1032	oe.radioPanel.add(dummyButton);
434	1033	oe.buttonGroup.add(dummyButton);
435	1034	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
439	1038
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	1039	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1040	+
	1041	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ //minButton.setToolTipText("Minimize window");
	1043	+ //minButton.addActionListener(this);
	1044	+
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	1050	+ }
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
	1090	+
	1091	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ fullButton.setToolTipText("Full-screen window");
	1093	+ fullButton.addActionListener(this);
	1094	+
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
	1098	+
	1099	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1101	+ restoreCameraButton.addActionListener(this);
	1102	+
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
	1115	+
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
	1121	+
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
	1126	+
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ oneStepButton.setToolTipText("Animate one step forward");
	1136	+ oneStepButton.addActionListener(this);
	1137	+
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
441	1140	liveCB.addItemListener(this);
442	1141
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1143	+ fastCB.setToolTipText("Fast mode");
461	1144	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	1145	+
	1146	+ //oe.toolboxPanel.Return();
	1147	+
	1148	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1149	+// trackCB.setToolTipText("Enable tracking");
	1150	+// trackCB.addItemListener(this);
468	1151
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	1153	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	1154
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		-
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
532		- twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1155	+ if (Globals.ADVANCED)
	1156	+ {
	1157	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ snapobjectButton.addActionListener(this);
	1159	+ snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	1162	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
536		- sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
538		- threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
540		- sevenButton.addActionListener(this);
541		- //
	1163	+ fourButton.setToolTipText("Show control panel only");
	1164	+ }
542	1165
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1166	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1167	+
	1168	+
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
544	1171	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1172	+
	1173	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ closeButton.setToolTipText("Close tab");
547	1175	closeButton.addActionListener(this);
548	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	1177	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	1178
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1179	+ cGridBag row1 = new cGridBag();
	1180	+
	1181	+ // INSERT
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
	1184	+ gridButton.addActionListener(this);
	1185	+
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ boxButton.setToolTipText("Create box");
	1188	+ boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ sphereButton.setToolTipText("Create sphere");
	1192	+ sphereButton.addActionListener(this);
	1193	+
	1194	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ coneButton.setToolTipText("Create cone");
	1196	+ coneButton.addActionListener(this);
	1197	+
	1198	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ torusButton.setToolTipText("Create torus");
	1200	+ torusButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ if (Globals.ADVANCED)
	1207	+ {
	1208	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ kleinButton.setToolTipText("Create Klein bottle");
	1210	+ kleinButton.addActionListener(this);
	1211	+ }
	1212	+
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ particlesButton.setToolTipText("Create particle system");
	1215	+ particlesButton.addActionListener(this);
	1216	+
	1217	+ oe.toolboxPanel.add(row1);
	1218	+
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ groupButton.setToolTipText("Create group");
	1223	+ groupButton.addActionListener(this);
	1224	+
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ compositeButton.setToolTipText("Create composite");
	1227	+ compositeButton.addActionListener(this);
	1228	+
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ switchButton.setToolTipText("Create item switcher");
	1231	+ switchButton.addActionListener(this);
	1232	+
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ loopButton.setToolTipText("Create loop");
	1235	+ loopButton.addActionListener(this);
	1236	+
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ textureButton.setToolTipText("Create texture");
	1239	+ textureButton.addActionListener(this);
	1240	+
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ overlayButton.setToolTipText("Create overlay");
	1243	+ overlayButton.addActionListener(this);
	1244	+
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ lightButton.setToolTipText("Create light");
	1247	+ lightButton.addActionListener(this);
	1248	+
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
	1260	+
	1261	+ // EDIT panel
	1262	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ editButton.setToolTipText("Pin selection controls");
	1264	+ editButton.addActionListener(this);
	1265	+
	1266	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
560	1268	uneditButton.addActionListener(this);
561	1269
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1270	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1271	+ allParamsButton.setToolTipText("Show all controls");
574	1272	allParamsButton.addActionListener(this);
575	1273
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
581		- unselectButton.addActionListener(this);
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
	1276	+ clearPanelButton.addActionListener(this);
582	1277
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
	1281	+
	1282	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ flashSelectionButton.setToolTipText("Highlight selection");
	1284	+ flashSelectionButton.addActionListener(this);
	1285	+
	1286	+ editCommandsPanel.preferredHeight = 1;
	1287	+
	1288	+ SetPinStates(false);
	1289	+// oe.treePanel.add(commandsPanel);
	1290	+// oe.treePanel.Return();
	1291	+
583	1292	// oe.aConstraints.gridx += 1;
584	1293	// oe.aConstraints.weighty = 0;
585	1294	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1300,32 @@
591	1300	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1301	// gcButton.addActionListener(this);
593	1302
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	1303	+ cGridBag jSPPanel = new cGridBag();
	1304	+
	1305	+ JScrollPane jSP;
605	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1308	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	1309
	1310	+ oe.treePanel.add(jSPPanel);
	1311	+ oe.treePanel.Return();
	1312	+
	1313	+ oe.treePanel.add(copyOptionsPanel);
	1314	+ oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
	1318	+
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
	1321	+
628	1322	//jList.addListSelectionListener(this);
629	1323	oe.jTree.addTreeSelectionListener(this);
630	1324	//jTree.setRootVisible(false);
631	1325	//jTree.setEditable(true);
632	1326	oe.jTree.setDragEnabled(true);
633	1327	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1329
636	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1331
..	..	@@ -643,23 +1337,171 @@
643	1337	dgr.addDragGestureListener(this);
644	1338	}catch(Exception e) {}
645	1339	*/
646		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
647	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	1342	}
	1343	+
	1344	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1345	+ {
	1346	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1347	+ colorCB.setToolTipText("Copy color when dropped");
	1348	+ colorCB.addItemListener(this);
	1349	+
	1350	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1351	+ materialCB.setToolTipText("Copy material when dropped");
	1352	+ materialCB.addItemListener(this);
	1353	+
	1354	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1355	+ textureCB.setToolTipText("Copy texture when dropped");
	1356	+ textureCB.addItemListener(this);
	1357	+
	1358	+ panel.Return();
	1359	+
	1360	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1361	+ boxCB.setToolTipText("Display bounding boxes");
	1362	+ boxCB.addItemListener(this);
	1363	+
	1364	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1365	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1366	+ zoomBoxCB.addItemListener(this);
	1367	+
	1368	+ if (true) // Globals.ADVANCED)
	1369	+ {
	1370	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1371	+// supportCB.setToolTipText("Enable rigging");
	1372	+// supportCB.addItemListener(this);
	1373	+
	1374	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1375	+ freezeCB.setToolTipText("Fast moving camera");
	1376	+ freezeCB.addItemListener(this);
	1377	+
	1378	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1379	+ // localCB.addItemListener(this);
	1380	+
	1381	+ panel.Return();
	1382	+
	1383	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1384	+ crowdCB.setToolTipText("Used for crowds");
	1385	+ crowdCB.addItemListener(this);
	1386	+
	1387	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1388	+ smoothCB.setToolTipText("Snapping delay");
	1389	+ smoothCB.addItemListener(this);
	1390	+
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
	1397	+
	1398	+// constraints.gridy += 1;
	1399	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1400	+// speakerMocapCB.addItemListener(this);
	1401	+
	1402	+ panel.Return();
	1403	+
	1404	+ if (false)
	1405	+ {
	1406	+ // handled in scripts
	1407	+ //constraints.gridy += 1;
	1408	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1409	+ speakerCameraCB.addItemListener(this);
	1410	+
	1411	+ //constraints.gridy += 1;
	1412	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1413	+ speakerFocusCB.addItemListener(this);
	1414	+
	1415	+ //constraints.gridy += 1;
	1416	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1417	+ smoothfocusCB.addItemListener(this);
	1418	+ panel.Return();
	1419	+ }
	1420	+
	1421	+//constraints.gridx += 1;
	1422	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1423	+// debugCB.addItemListener(this);
	1424	+
	1425	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1426	+ trackCB.setToolTipText("Enable tracking target");
	1427	+ trackCB.addItemListener(this);
	1428	+
	1429	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1430	+ oeilCB.setToolTipText("Move camera when tracking");
	1431	+ oeilCB.addItemListener(this);
	1432	+
	1433	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1434	+ shadowCB.setToolTipText("When live compute shadows");
	1435	+ shadowCB.addItemListener(this);
	1436	+
	1437	+ panel.Return();
	1438	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1439	+ toggleTextureCB.setToolTipText("Load textures");
	1440	+ toggleTextureCB.addItemListener(this);
	1441	+
	1442	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1443	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1444	+ toggleSwitchCB.addItemListener(this);
	1445	+
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
	1449	+
	1450	+ panel.Return();
	1451	+ if (Globals.ADVANCED)
	1452	+ {
	1453	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1454	+ lookAtCB.setToolTipText("Look-at target");
	1455	+ lookAtCB.addItemListener(this);
	1456	+ }
	1457	+
	1458	+ }
	1459	+
	1460	+ cGridBag fill = new cGridBag();
	1461	+ fill.preferredHeight = 200;
	1462	+ cGridBag fill2 = new cGridBag();
	1463	+ fill2.preferredHeight = 200;
	1464	+ cGridBag fill3 = new cGridBag();
	1465	+ fill3.preferredHeight = 200;
	1466	+
	1467	+ panel.add(fill);
	1468	+ panel.add(fill2);
	1469	+ panel.add(fill3);
	1470	+
	1471	+ }
649	1472
650	1473	void EditObject(Object3D obj)
651	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
652	1483	cRadio radioButton = new cRadio(obj.name);
	1484	+
	1485	+ // June 2019. Patch to avoid bug with transparency.
	1486	+ radioButton.hadMaterial = obj.material != null;
	1487	+ if (!radioButton.hadMaterial)
	1488	+ {
	1489	+ obj.material = new cMaterial();
	1490	+ }
	1491	+
653	1492	radioButton.SetObject(obj);
654		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
655	1494	radioButton.SetCamera(cameraView.renderCamera, false);
656	1495	radioButton.addActionListener(this);
657	1496	radioPanel.add(radioButton);
658	1497	buttonGroup.add(radioButton);
659	1498	radioButton.doClick();
660	1499	}
	1500	+
661	1501	void SetupViews(ObjEditor oe)
662	1502	{
	1503	+ theFrame = this;
	1504	+
663	1505	oe.SetupViews();
664	1506
665	1507	System.out.println("SetupViews");
..	..	@@ -668,22 +1510,30 @@
668	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1511	}
670	1512
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	1513	+ cToggleButton liveCB;
	1514	+ cCheckBox supportCB;
	1515	+ cCheckBox localCB;
	1516	+ cCheckBox crowdCB;
	1517	+ cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
	1520	+ cToggleButton fastCB;
	1521	+ cCheckBox slowCB;
	1522	+ cCheckBox boxCB;
	1523	+ cCheckBox zoomBoxCB;
	1524	+ cCheckBox freezeCB;
	1525	+ //cToggleButton trackCB;
	1526	+ cCheckBox trackCB;
	1527	+ cCheckBox smoothfocusCB;
681	1528	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
687	1537
688	1538	// static int COLOR = 1;
689	1539	// static int MATERIAL = 2;
..	..	@@ -691,9 +1541,9 @@
691	1541
692	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1543
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
697	1547
698	1548	public void itemStateChanged(ItemEvent e)
699	1549	{
..	..	@@ -721,6 +1571,7 @@
721	1571	} else if(e.getSource() == liveCB)
722	1572	{
723	1573	cameraView.ToggleLive();
	1574	+ refreshContents(false);
724	1575	}
725	1576	else if(e.getSource() == supportCB)
726	1577	{
..	..	@@ -736,6 +1587,12 @@
736	1587	{
737	1588	cameraView.ToggleInertia();
738	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
739	1596	}
740	1597	else if(e.getSource() == localCB)
741	1598	{
..	..	@@ -755,6 +1612,10 @@
755	1612	Recompile();
756	1613	cameraView.repaint();
757	1614	// refreshContents();
	1615	+ }
	1616	+ else if(e.getSource() == zoomBoxCB)
	1617	+ {
	1618	+ cameraView.ToggleZoomBoxMode();
758	1619	}
759	1620	else if(e.getSource() == smoothfocusCB)
760	1621	{
..	..	@@ -781,6 +1642,18 @@
781	1642	{
782	1643	cameraView.ToggleOeil();
783	1644	}
	1645	+ else if(e.getSource() == shadowCB)
	1646	+ {
	1647	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1648	+ }
	1649	+ else if(e.getSource() == freezeCB)
	1650	+ {
	1651	+ Globals.FREEZEONMOVE ^= true;
	1652	+ }
	1653	+ else if(e.getSource() == autokeepCB)
	1654	+ {
	1655	+ Globals.REPLACEONMAKE ^= true;
	1656	+ }
784	1657	else if(e.getSource() == lookAtCB)
785	1658	{
786	1659	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1670,8 @@
797	1670
798	1671	/**/
799	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1676	// We can't move the root node or an empty selection
803	1677	return;
..	..	@@ -860,8 +1734,6 @@
860	1734	}
861	1735	}
862	1736
863		- String string = (String) object;
864		-
865	1737	System.out.println("Transfer = " + object + "; drop : " + target);
866	1738	// if( object instanceof java.io.File[])
867	1739	// {
..	..	@@ -869,7 +1741,11 @@
869	1741	// objEditor.DropFile((java.io.File[]) object, true);
870	1742	// return;
871	1743	// }
872		- if (string.charAt(0) == '/')
	1744	+
	1745	+ String string = object.toString();
	1746	+
	1747	+ // File path for Mac and Windows
	1748	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1749	{
874	1750	// file(s)
875	1751	String[] names = string.split("\n");
..	..	@@ -896,7 +1772,7 @@
896	1772
897	1773	flashIt = false;
898	1774	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1775	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1776	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1777
902	1778	if (group.selection.size() == 1)
..	..	@@ -912,23 +1788,33 @@
912	1788
913	1789	assert target == objEditor.jTree;
914	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
915	1792	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1794	} catch (Exception e) {
918	1795	System.out.println("destinationPath : " + destinationPath);
919	1796	return;
920	1797	}
921	1798
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
923	1800	{
	1801	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1802	+
	1803	+ // Cannot move into itself
	1804	+ if (child == destinationLeaf)
	1805	+ return;
	1806	+ }
	1807	+
	1808	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+// {
924	1810	loadClipboard(true);
925	1811	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1812	+ pasteInto(false, false);
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
932	1818	}
933	1819	public void dropActionChanged(DropTargetDragEvent dtde)
934	1820	// Called if the user has modified the current drop gesture
..	..	@@ -984,7 +1870,12 @@
984	1870	TreePath path;
985	1871
986	1872	public TransferableTreePath(TreePath tp) {
987		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
988	1879	}
989	1880
990	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1033,85 +1924,107 @@
1033	1924	{
1034	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1926	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1927	+// gridItem = menu.add(new MenuItem("Grid"));
	1928	+// gridItem.addActionListener(this);
	1929	+// rectoidItem = menu.add(new MenuItem("Box"));
	1930	+// rectoidItem.addActionListener(this);
	1931	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1932	+// ellipsoidItem.addActionListener(this);
	1933	+// coneItem = menu.add(new MenuItem("Cone"));
	1934	+// coneItem.addActionListener(this);
	1935	+// torusItem = menu.add(new MenuItem("Torus"));
	1936	+// torusItem.addActionListener(this);
	1937	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1938	+// superItem.addActionListener(this);
	1939	+
	1940	+ cameraItem = menu.add(new MenuItem("Camera"));
	1941	+ cameraItem.addActionListener(this);
	1942	+
	1943	+ if (!Globals.ADVANCED)
	1944	+ {
1048	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1946	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
	1951	+ if (Globals.ADVANCED)
	1952	+ {
1052	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1954	ragdollItem.addActionListener(this);
1054	1955	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1956	ragdoll2Item.addActionListener(this);
	1957	+ }
1056	1958	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1959	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1960	meshItem.addActionListener(this);
1059	1961	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1962	// meshGroupItem.addActionListener(this);
	1963	+ if (Globals.ADVANCED)
	1964	+ {
1061	1965	springItem = menu.add(new MenuItem("Spring"));
1062	1966	springItem.addActionListener(this);
1063	1967	flagItem = menu.add(new MenuItem("Flag"));
1064	1968	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1969	blobItem = menu.add(new MenuItem("Blob"));
1070	1970	blobItem.addActionListener(this);
1071	1971	latheItem = menu.add(new MenuItem("Lathe"));
1072	1972	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1973	+ }
	1974	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1975	+ bezierItem.addActionListener(this);
	1976	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1977	+// overlayItem.addActionListener(this);
	1978	+// lightItem = menu.add(new MenuItem("Light"));
	1979	+// lightItem.addActionListener(this);
1075	1980	menu.add("-");
1076	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1982	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1080	1985	doubleItem = menu.add(new MenuItem("Fork"));
1081	1986	doubleItem.addActionListener(this);
	1987	+ if (Globals.ADVANCED)
	1988	+ {
1082	1989	tripleItem = menu.add(new MenuItem("Trident"));
1083	1990	tripleItem.addActionListener(this);
	1991	+ }
1084	1992	}
1085	1993
1086	1994	void buildToolsMenu(Menu menu)
1087	1995	{
1088	1996	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1997	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1998	+ animationItem.setState(Globals.ANIMATION);
	1999	+
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
1091	2002
1092	2003	menu.add("-");
1093	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	2005	parseverticesItem.addActionListener(this);
1095	2006	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	2007	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	2008	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	2009	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	2010	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	2011	reduceMorphItem.addActionListener(this);
1103	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	2013	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	2014	menu.add("-");
1109		-
1110	2015	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	2016	memoryItem.addActionListener(this);
	2017	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2018	+ computeAOItem.addActionListener(this);
	2019	+
	2020	+ if (Globals.ADVANCED)
	2021	+ {
	2022	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2023	+ mirrorItem.addActionListener(this);
	2024	+ menu.add("-");
1112	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	2026	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	2027	+ menu.add(dumpItem = new MenuItem("Print"));
1115	2028	dumpItem.addActionListener(this);
1116	2029	// menu.add(pathItem = new MenuItem("From-to path"));
1117	2030	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +2042,7 @@
1129	2042	menu.add("-");
1130	2043	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	2044	editScriptItem.addActionListener(this);
	2045	+ }
1132	2046	}
1133	2047
1134	2048	void ScreenFit()
..	..	@@ -1251,9 +2165,34 @@
1251	2165	shadow.material = new cMaterial(obj.material);
1252	2166	shadow.material.diffuse = 0.0001f;
1253	2167	shadow.material.specular = 0.0001f;
	2168	+ //shadow.projectedVertices[1].x = 300;
1254	2169
1255	2170	makeSomething(shadow);
1256	2171	}
	2172	+
	2173	+ private void ClearUnpinned()
	2174	+ {
	2175	+ //for (Object3D obj : listUI)
	2176	+ for (int i=listUI.size(); --i>=0;)
	2177	+ {
	2178	+ Object3D obj = listUI.elementAt(i);
	2179	+ if (!obj.pinned)
	2180	+ {
	2181	+ obj.CloseUI();
	2182	+ listUI.remove(i);
	2183	+ }
	2184	+ }
	2185	+ }
	2186	+
	2187	+ private void EditElement(Object3D elem, boolean newWindow)
	2188	+ {
	2189	+ // if (!(elem instanceof Composite))
	2190	+ // newWindow = false;
	2191	+ listUI.add(elem);
	2192	+ elem.openEditWindow(this, newWindow); //, false);
	2193	+ System.out.println("edit : " + elem);
	2194	+ elem.editWindow.refreshContents(true); // ? new
	2195	+ }
1257	2196
1258	2197	/**
1259	2198	* applyExample
..	..	@@ -1457,9 +2396,9 @@
1457	2396
1458	2397	void Overwrite(int mask)
1459	2398	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2399	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	2400	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
1463	2402
1464	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	2404	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +2421,7 @@
1482	2421	//
1483	2422	public void actionPerformed(ActionEvent event) // , Object arg)
1484	2423	{
	2424	+ Object source = event.getSource();
1485	2425	/*
1486	2426	if (event.getSource() == nameField)
1487	2427	{
..	..	@@ -1493,11 +2433,11 @@
1493	2433	}
1494	2434	else
1495	2435	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2436	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	2437	{
1498	2438	ScreenFit();
1499	2439	} else
1500		- if (event.getSource() == switchItem)
	2440	+ if (source == switchViewItem)
1501	2441	{
1502	2442	cVector v1 = new cVector();
1503	2443	cVector v2 = new cVector();
..	..	@@ -1506,11 +2446,11 @@
1506	2446	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	2447	objEditor.cameraView.repaint();
1508	2448	} else
1509		- if (event.getSource() == rectoidItem)
	2449	+ if (source == rectoidItem \|\| source == boxButton)
1510	2450	{
1511	2451	makeSomething(new Box());
1512	2452	} else
1513		- if (event.getSource() == particleItem)
	2453	+ if (source == particleItem \|\| source == particlesButton)
1514	2454	{
1515	2455	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	2456	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +2471,9 @@
1531	2471	applyExample(particleGeom, "SMOKE");
1532	2472	makeSomething(particleGeom);
1533	2473	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2474	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	2475	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2476	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	2477
1538	2478	ragdoll.toParent = LA.newMatrix();
1539	2479	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +2491,7 @@
1551	2491	} else
1552	2492	/*
1553	2493	*/
1554		- if (event.getSource() == heightFieldItem)
	2494	+ if (source == heightFieldItem)
1555	2495	{
1556	2496	Object3D obj = new Object3D();
1557	2497
..	..	@@ -1589,31 +2529,31 @@
1589	2529
1590	2530	makeSomething(obj);
1591	2531	} else
1592		- if (event.getSource() == gridItem)
	2532	+ if (source == gridItem \|\| source == gridButton)
1593	2533	{
1594	2534	makeSomething(new Grid());
1595	2535	} else
1596		- if (event.getSource() == ellipsoidItem)
	2536	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	2537	{
1598	2538	makeSomething(new Sphere());
1599	2539	} else
1600		- if (event.getSource() == coneItem)
	2540	+ if (source == coneItem \|\| source == coneButton)
1601	2541	{
1602	2542	makeSomething(new Cone());
1603	2543	} else
1604		- if (event.getSource() == torusItem)
	2544	+ if (source == torusItem \|\| source == torusButton)
1605	2545	{
1606	2546	makeSomething(new Torus());
1607	2547	} else
1608		- if (event.getSource() == superItem)
	2548	+ if (source == superItem \|\| source == superButton)
1609	2549	{
1610	2550	makeSomething(new Superellipsoid());
1611	2551	} else
1612		- if (event.getSource() == kleinItem)
	2552	+ if (source == kleinItem \|\| source == kleinButton)
1613	2553	{
1614	2554	makeSomething(new Klein());
1615	2555	} else
1616		- if (event.getSource() == blobItem)
	2556	+ if (source == blobItem)
1617	2557	{
1618	2558	Blob blob = new Blob();
1619	2559	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2561,15 @@
1621	2561	//blob.retile();
1622	2562	makeSomething(blob);
1623	2563	} else
1624		- if (event.getSource() == latheItem)
	2564	+ if (source == latheItem)
1625	2565	{
1626	2566	makeSomething(new Lathe());
1627	2567	} else
1628		- if (event.getSource() == bezierItem)
	2568	+ if (source == bezierItem)
1629	2569	{
1630	2570	makeSomething(new BezierSurface());
1631	2571	} else
1632		- if (event.getSource() == checkerItem)
	2572	+ if (source == overlayItem \|\| source == overlayButton)
1633	2573	{
1634	2574	/*
1635	2575	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2584,7 @@
1644	2584	*/
1645	2585	makeSomething(new Checker());
1646	2586	} else
1647		- if (event.getSource() == meshItem)
	2587	+ if (source == meshItem)
1648	2588	{
1649	2589	Object3D itemtomake = new Object3D();
1650	2590	Object3D child;
..	..	@@ -1665,35 +2605,52 @@
1665	2605	makeSomething(child);
1666	2606	}
1667	2607	} else
1668		- if (event.getSource() == springItem)
	2608	+ if (source == springItem)
1669	2609	{
1670	2610	cSpring s = new cSpring();
1671	2611	s.setup();
1672	2612	makeSomething(s);
1673	2613	} else
1674		- if (event.getSource() == flagItem)
	2614	+ if (source == flagItem)
1675	2615	{
1676	2616	cSpring s = new cFlag();
1677	2617	s.setup();
1678	2618	makeSomething(s);
1679	2619	} else
1680		- if (event.getSource() == lightItem)
	2620	+ if (source == lightItem \|\| source == lightButton)
1681	2621	{
1682	2622	makeSomething(new Light());
1683	2623	} else
1684		- if (event.getSource() == csgItem)
	2624	+// if (source == skybox1Button \|\|
	2625	+// source == skybox2Button \|\|
	2626	+// source == skybox3Button \|\|
	2627	+// source == skybox4Button \|\|
	2628	+// source == skybox5Button \|\|
	2629	+// source == skybox6Button \|\|
	2630	+// source == skybox7Button \|\|
	2631	+// source == skybox11Button \|\|
	2632	+// source == skybox12Button \|\|
	2633	+// source == skybox13Button \|\|
	2634	+// source == skybox14Button \|\|
	2635	+// source == skybox15Button \|\|
	2636	+// source == skybox16Button \|\|
	2637	+// source == skybox17Button)
	2638	+// {
	2639	+// ChangeSkybox(source);
	2640	+// } else
	2641	+ if (source == csgItem)
1685	2642	{
1686	2643	group(new CSG());
1687	2644	} else
1688		- if (event.getSource() == templateItem)
	2645	+ if (source == templateItem)
1689	2646	{
1690	2647	group(new cTemplate());
1691	2648	} else
1692		- if (event.getSource() == attributeItem)
	2649	+ if (source == attributeItem)
1693	2650	{
1694	2651	makeSomething(new Attribute());
1695	2652	} else
1696		- if (event.getSource() == pointflowItem)
	2653	+ if (source == pointflowItem)
1697	2654	{
1698	2655	makeSomething(new PointFlow());
1699	2656	} else
..	..	@@ -1705,7 +2662,7 @@
1705	2662	} else
1706	2663	*/
1707	2664
1708		- if (event.getSource() == superLoopItem)
	2665	+ if (source == superLoopItem)
1709	2666	{
1710	2667	Composite g = new cGroup();
1711	2668	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2684,38 @@
1727	2684
1728	2685	group(g);
1729	2686	} else
1730		- if (event.getSource() == loopItem)
	2687	+ if (source == loopItem \|\| source == loopButton)
1731	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
1732	2691	Composite csg = new GroupLeaf();
1733	2692	csg.count = 5;
1734		- group(csg);
1735		- Composite child = new cGroup();
	2693	+ Composite child = new cGroup("Branch");
1736	2694	csg.addChild(child);
1737	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
1738	2698	} else
1739		- if (event.getSource() == doubleItem)
	2699	+ if (source == doubleItem)
1740	2700	{
1741		- Composite csg = new GroupLeaf();
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
	2703	+ Composite csg = new GroupLeaf("Fork");
1742	2704	csg.count = 5;
	2705	+ Composite child = new cGroup("Branch A");
	2706	+ csg.addChild(child);
	2707	+ child.addChild(csg);
	2708	+ child = new cGroup("Branch B");
	2709	+ csg.addChild(child);
	2710	+ child.addChild(csg);
1743	2711	group(csg);
1744		- Composite child = new cGroup();
1745		- csg.addChild(child);
1746		- child.addChild(csg);
1747		- child = new cGroup();
1748		- csg.addChild(child);
1749		- child.addChild(csg);
	2712	+ }
1750	2713	} else
1751		- if (event.getSource() == tripleItem)
	2714	+ if (source == tripleItem)
1752	2715	{
1753		- Composite csg = new GroupLeaf();
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
	2718	+ Composite csg = new GroupLeaf("Trident");
1754	2719	csg.count = 4;
1755	2720	group(csg);
1756	2721	Composite child = new cGroup();
..	..	@@ -1762,74 +2727,119 @@
1762	2727	child = new cGroup();
1763	2728	csg.addChild(child);
1764	2729	child.addChild(csg);
	2730	+ }
1765	2731	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	2732	+ if (source == computeAOItem)
1784	2733	{
1785	2734	Globals.drawMode = CameraPane.OCCLUSION;
1786		- Globals.theRenderer.repaint();
	2735	+ cameraView.repaint();
1787	2736	} else
1788		- if (event.getSource() == recompileItem)
	2737	+ if (source == recompileItem)
1789	2738	{
1790	2739	Recompile();
1791	2740	refreshContents();
1792	2741	} else
1793		- if (event.getSource() == editScriptItem)
	2742	+ if (source == editScriptItem)
1794	2743	{
1795	2744	OpenDialog();
1796	2745	refreshContents();
1797	2746	} else
1798		- if (event.getSource() == invariantsItem)
	2747	+ if (source == invariantsItem)
1799	2748	{
1800	2749	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
1802	2751	} else
1803		- if (event.getSource() == memoryItem)
	2752	+ if (source == memoryItem)
1804	2753	{
1805	2754	//System.out.println("Invariants:");
1806	2755	PrintMemory();
1807	2756	} else
1808		- if (event.getSource() == pathItem)
	2757	+ if (source == pathItem)
1809	2758	{
1810	2759	PrintPath();
1811	2760	} else
1812		- if (event.getSource() == analyzeItem)
	2761	+ if (source == analyzeItem)
1813	2762	{
1814	2763	AnalyzeObject();
1815	2764	} else
1816		- if (event.getSource() == dumpItem)
	2765	+ if (source == dumpItem)
1817	2766	{
1818	2767	DumpObject();
1819	2768	} else
1820		- if (event.getSource() == screenfitButton)
	2769	+ if (source == minButton)
1821	2770	{
1822		- //Reload(lastConverter, lastFilename, true);
	2771	+ Minimize();
	2772	+ } else
	2773	+ if (source == maxButton)
	2774	+ {
	2775	+ Maximize();
	2776	+ } else
	2777	+ if (source == fullButton)
	2778	+ {
	2779	+ ToggleFullScreen();
	2780	+ } else
	2781	+ if (source == collapseButton)
	2782	+ {
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
	2785	+ } else
	2786	+ if (source == maximize3DButton)
	2787	+ {
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
	2792	+ } else
	2793	+ if (source == previousVersionButton)
	2794	+ {
	2795	+ // Go to previous version
	2796	+ //if (!Undo())
	2797	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ PreviousVersion();
	2799	+ } else
	2800	+ if (source == restoreButton)
	2801	+ {
	2802	+ // Restore current version
	2803	+ Restore();
	2804	+ //restoreButton.setEnabled(false);
	2805	+ } else
	2806	+ if (source == replaceButton)
	2807	+ {
	2808	+ // Overwrite current version
	2809	+ Replace();
	2810	+ //replaceButton.setEnabled(false);
	2811	+ } else
	2812	+ if (source == nextVersionButton)
	2813	+ {
	2814	+ // Go to next version
	2815	+ NextVersion();
	2816	+ } else
	2817	+ if (source == saveVersionButton)
	2818	+ {
	2819	+ // Save a new version
	2820	+ if (!Save(true))
	2821	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
	2827	+ } else
	2828	+ if (source == oneStepButton)
	2829	+ {
	2830	+ Globals.ONESTEP = true;
	2831	+ cameraView.repaint();
	2832	+ } else
	2833	+ if (source == screenfitButton)
	2834	+ {
1823	2835	ScreenFit();
1824	2836	} else
1825		- if (event.getSource() == screenfitpointButton)
	2837	+ if (source == screenfitpointButton)
1826	2838	{
1827		- //Reload(lastConverter, lastFilename, true);
1828	2839	ScreenFitPoint();
1829	2840	} else
1830		- if (event.getSource() == snapobjectButton)
	2841	+ if (source == snapobjectButton)
1831	2842	{
1832		- //Reload(lastConverter, lastFilename, true);
1833	2843	SnapObject();
1834	2844	} else
1835	2845	// if (event.getSource() == recompileButton)
..	..	@@ -1838,13 +2848,13 @@
1838	2848	// Recompile();
1839	2849	// refreshContents();
1840	2850	// } else
1841		- if (event.getSource() == gcButton)
	2851	+ if (source == gcButton)
1842	2852	{
1843	2853	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2854	System.gc();
1845	2855	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2856	} else
1847		- if (event.getSource() == editLeafItem)
	2857	+ if (source == editLeafItem)
1848	2858	{
1849	2859	Object3D obj;
1850	2860	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2868,74 @@
1858	2868	}
1859	2869	refreshContents(true);
1860	2870	} else
1861		- if (event.getSource() == openWindowItem)
	2871	+ if (source == openWindowItem)
1862	2872	{
1863	2873	EditSelection(true);
1864	2874	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2875	+ if (source == cutItem \|\| source == clearButton)
1866	2876	{
1867	2877	loadClipboard(true);
1868	2878	} else
1869		- if (event.getSource() == duplicateItem)
	2879	+ if (source == undoItem)
1870	2880	{
1871		- Object3D keep = GrafreeD.clipboard;
	2881	+ PreviousVersion();
	2882	+ } else
	2883	+ if (source == redoItem)
	2884	+ {
	2885	+ NextVersion();
	2886	+ } else
	2887	+ if (source == duplicateItem)
	2888	+ {
	2889	+ Object3D keep = Grafreed.clipboard;
1872	2890	loadClipboard(false);
1873	2891	paste(false);
1874		- GrafreeD.clipboard = keep;
	2892	+ Grafreed.clipboard = keep;
1875	2893	} else
1876		- if (event.getSource() == cloneItem)
	2894	+ if (source == cloneItem)
1877	2895	{
1878	2896	CloneSelection(false);
1879	2897	} else
1880		- if (event.getSource() == cloneSupportItem)
	2898	+ if (source == cloneSupportItem)
1881	2899	{
1882	2900	CloneSelection(true);
1883	2901	} else
1884		- if (event.getSource() == copyItem)
	2902	+ if (source == copyItem)
1885	2903	{
1886	2904	loadClipboard(false);
1887	2905	} else
1888		- if (event.getSource() == pasteItem)
	2906	+ if (source == pasteItem)
1889	2907	{
1890	2908	paste(false);
1891	2909	} else
1892		- if (event.getSource() == pasteLinkItem)
	2910	+ if (source == pasteIntoItem)
1893	2911	{
1894		- pasteInto(false);
	2912	+ pasteInto(true, false);
1895	2913	} else
1896		- if (event.getSource() == pasteCloneItem)
	2914	+ if (source == pasteLinkItem)
1897	2915	{
1898		- pasteInto(true);
	2916	+ pasteInto(false, false);
1899	2917	} else
1900		- if (event.getSource() == pasteExpandItem)
	2918	+ if (source == pasteCloneItem)
	2919	+ {
	2920	+ pasteInto(true, true);
	2921	+ } else
	2922	+ if (source == pasteExpandItem)
1901	2923	{
1902	2924	paste(true);
1903	2925	} else
1904		- if (event.getSource() == synchronizeItem)
	2926	+ if (source == synchronizeItem)
1905	2927	{
1906	2928	Overwrite(Object3D.TRANSFORM);
1907	2929	} else
1908		- if (event.getSource() == overwriteNameItem)
	2930	+ if (source == overwriteNameItem)
1909	2931	{
1910	2932	Overwrite(Object3D.NAME);
1911	2933	} else
1912		- if (event.getSource() == overwriteUVItem)
	2934	+ if (source == overwriteUVItem)
1913	2935	{
1914	2936	Overwrite(Object3D.UV);
1915	2937	} else
1916		- if (event.getSource() == overwriteMatItem)
	2938	+ if (source == overwriteMatItem)
1917	2939	{
1918	2940	/* july 2015
1919	2941	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2955,7 @@
1933	2955
1934	2956	Overwrite(dropAttributes);
1935	2957	}
1936		- if (event.getSource() == overwriteGeoItem)
	2958	+ if (source == overwriteGeoItem)
1937	2959	{
1938	2960	Overwrite(Object3D.GEOMETRY);
1939	2961	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2972,7 @@
1950	2972	// refreshContents();
1951	2973	// }
1952	2974	} else
1953		- if (event.getSource() == generateMeshItem)
	2975	+ if (source == generateMeshItem)
1954	2976	{
1955	2977	//if (group.selection.size() == 1)
1956	2978	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2983,7 @@
1961	2983	ResetModel();
1962	2984	refreshContents();
1963	2985	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2986	+ if (source == extractGeometriesItem)
1965	2987	{
1966	2988	boolean one = false;
1967	2989
..	..	@@ -1988,7 +3010,7 @@
1988	3010	ResetModel();
1989	3011	refreshContents();
1990	3012	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	3013	+ if (source == cloneGeometriesItem)
1992	3014	{
1993	3015	boolean one = false;
1994	3016
..	..	@@ -2014,7 +3036,7 @@
2014	3036	ResetModel();
2015	3037	refreshContents();
2016	3038	} else
2017		- if (event.getSource() == shareGeometriesItem)
	3039	+ if (source == shareGeometriesItem)
2018	3040	{
2019	3041	boolean one = false;
2020	3042
..	..	@@ -2044,7 +3066,7 @@
2044	3066	refreshContents();
2045	3067	}
2046	3068	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	3069	+ if (source == mergeGeometriesItem)
2048	3070	{
2049	3071	boolean one = false;
2050	3072
..	..	@@ -2074,7 +3096,7 @@
2074	3096	ResetModel();
2075	3097	refreshContents();
2076	3098	} else
2077		- if (event.getSource() == linkverticesItem)
	3099	+ if (source == linkverticesItem)
2078	3100	{
2079	3101	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	3102	// {
..	..	@@ -2087,9 +3109,9 @@
2087	3109	// group.selection.get(0).setMasterThis(content); // should be identity
2088	3110	// refreshContents();
2089	3111	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	3113	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	3114	+ Object3D content = Grafreed.clipboard.get(0);
2093	3115
2094	3116	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	3117	content = ((cGroup)content).get(0);
..	..	@@ -2097,38 +3119,38 @@
2097	3119	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	3120	for (int i=0; i<group.selection.size(); i++)
2099	3121	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	3122	+ boolean random = CameraPane.SWITCH;
	3123	+ CameraPane.SWITCH = false; // parse all random nodes
2102	3124	group.selection.get(i).linkVerticesThis(content);
2103	3125	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	3126	+ CameraPane.SWITCH = random;
2105	3127	}
2106	3128	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	3129	refreshContents();
2108	3130	}
2109	3131	} else
2110		- if (event.getSource() == resetsupportItem)
	3132	+ if (source == resetsupportItem)
2111	3133	{
2112	3134	for (int i=0; i<group.selection.size(); i++)
2113	3135	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	3136	+ boolean random = CameraPane.SWITCH;
	3137	+ CameraPane.SWITCH = false; // parse all random nodes
2116	3138	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	3139	+ CameraPane.SWITCH = random;
2118	3140	}
2119	3141
2120	3142	refreshContents();
2121	3143	} else
2122		- if (event.getSource() == relinkverticesItem)
	3144	+ if (source == relinkverticesItem)
2123	3145	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	3146	+ boolean random = CameraPane.SWITCH;
	3147	+ CameraPane.SWITCH = false; // parse all random nodes
2126	3148	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	3149	+ CameraPane.SWITCH = random;
2128	3150
2129	3151	refreshContents();
2130	3152	} else
2131		- if (event.getSource() == resetreferencesItem)
	3153	+ if (source == resetreferencesItem)
2132	3154	{
2133	3155	for (int i=0; i<group.selection.size(); i++)
2134	3156	{
..	..	@@ -2137,11 +3159,11 @@
2137	3159
2138	3160	refreshContents();
2139	3161	} else
2140		- if (event.getSource() == setMasterItem)
	3162	+ if (source == setMasterItem)
2141	3163	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3164	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	3165	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	3166	+ Object3D content = Grafreed.clipboard.get(0);
2145	3167
2146	3168	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	3169	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +3172,13 @@
2150	3172	refreshContents();
2151	3173	}
2152	3174	} else
2153		- if (event.getSource() == poseMeshItem)
	3175	+ if (source == poseMeshItem)
2154	3176	{
2155	3177	if (group.selection.size() == 1)
2156	3178	{
2157		- if (GrafreeD.clipboard.size() == 1)
	3179	+ if (Grafreed.clipboard.size() == 1)
2158	3180	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	3181	+ Object3D content = Grafreed.clipboard.get(0);
2160	3182
2161	3183	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	3184	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +3191,19 @@
2169	3191	}
2170	3192
2171	3193	} else
2172		- if (event.getSource() == revertMeshItem)
	3194	+ if (source == revertMeshItem)
2173	3195	{
2174	3196	RevertMeshes();
2175	3197	} else
2176		- if (event.getSource() == resetMeshItem)
	3198	+ if (source == resetAllItem)
2177	3199	{
2178	3200	ResetAll();
2179	3201	} else
2180		- if (event.getSource() == stepAllItem)
	3202	+ if (source == stepAllItem)
2181	3203	{
2182	3204	StepAll();
2183	3205	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3206	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2185	3207	{
2186	3208	//int indices[] = jList.getSelectedIndices();
2187	3209	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +3211,46 @@
2189	3211
2190	3212	ClearSelection(false);
2191	3213	} else
2192		- if (event.getSource() == clearAllItem)
	3214	+ if (source == clearAllItem)
2193	3215	{
2194	3216	ClearSelection(true);
2195	3217	} else
2196		- if (event.getSource() == grabItem)
	3218	+ if (source == grabItem \|\| source == groupButton)
2197	3219	{
2198		- group(new cGroup(), true);
	3220	+ group(new cGroup(), false); // true);
2199	3221	} else
2200		- if (event.getSource() == hideItem)
	3222	+ if (source == hideItem)
2201	3223	{
2202	3224	group(new HiddenObject());
2203	3225	} else
2204		- if (event.getSource() == frontItem)
	3226	+ if (source == frontItem)
2205	3227	{
2206	3228	front();
2207	3229	} else
2208		- if (event.getSource() == backItem)
	3230	+ if (source == backItem)
2209	3231	{
2210	3232	back();
2211	3233	} else
2212		- if (event.getSource() == cameraItem)
	3234	+ if (source == cameraItem)
2213	3235	{
2214	3236	makeSomething(new Camera());
2215	3237	} else
2216		- if (event.getSource() == compositeItem)
	3238	+ if (source == compositeItem \|\| source == compositeButton)
2217	3239	{
2218	3240	group(new Composite());
2219	3241	} else
2220		- if (event.getSource() == randomItem)
	3242	+ if (source == switchItem \|\| source == switchButton)
2221	3243	{
2222	3244	RandomNode random = new RandomNode();
2223	3245	group(random);
2224	3246	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	3247	+ random.name = random.get(0).name + "Switch";
2226	3248	} else
2227		- if (event.getSource() == physicsItem)
	3249	+ if (source == physicsItem)
2228	3250	{
2229	3251	group(new PhysicsNode());
2230	3252	} else
2231		- if (event.getSource() == frameselectorItem)
	3253	+ if (source == frameselectorItem)
2232	3254	{
2233	3255	for (int i=0; i<group.selection.size(); i++)
2234	3256	{
..	..	@@ -2240,7 +3262,7 @@
2240	3262	ResetModel();
2241	3263	refreshContents();
2242	3264	} else
2243		- if (event.getSource() == switchGeoItem)
	3265	+ if (source == switchGeoItem)
2244	3266	{
2245	3267	for (int i=0; i<group.selection.size(); i++)
2246	3268	{
..	..	@@ -2252,7 +3274,7 @@
2252	3274	ResetModel();
2253	3275	refreshContents();
2254	3276	} else
2255		- if (event.getSource() == switchTransfoItem)
	3277	+ if (source == switchTransfoItem)
2256	3278	{
2257	3279	for (int i=0; i<group.selection.size(); i++)
2258	3280	{
..	..	@@ -2264,7 +3286,7 @@
2264	3286	ResetModel();
2265	3287	refreshContents();
2266	3288	} else
2267		- if (event.getSource() == morphItem)
	3289	+ if (source == morphItem)
2268	3290	{
2269	3291	for (int i=0; i<group.selection.size(); i++)
2270	3292	{
..	..	@@ -2276,7 +3298,7 @@
2276	3298	ResetModel();
2277	3299	refreshContents();
2278	3300	} else
2279		- if (event.getSource() == scriptNodeItem)
	3301	+ if (source == scriptNodeItem)
2280	3302	{
2281	3303	boolean atleastone = false;
2282	3304
..	..	@@ -2315,215 +3337,264 @@
2315	3337	}
2316	3338	}
2317	3339	} else
2318		- if (event.getSource() == linkerItem)
	3340	+ if (source == linkerItem)
2319	3341	{
2320	3342	group(new cLinker());
2321	3343	} else
2322		- if (event.getSource() == textureItem)
	3344	+ if (source == textureItem \|\| source == textureButton)
2323	3345	{
2324	3346	group(new TextureNode());
2325	3347	} else
2326		- if (event.getSource() == billboardItem)
	3348	+ if (source == billboardItem)
2327	3349	{
2328	3350	group(new BillboardNode());
2329	3351	} else
2330		- if (event.getSource() == shadowXItem)
	3352	+ if (source == shadowXItem)
2331	3353	{
2332	3354	CastShadow(0);
2333	3355	} else
2334		- if (event.getSource() == shadowYItem)
	3356	+ if (source == shadowYItem)
2335	3357	{
2336	3358	CastShadow(1);
2337	3359	} else
2338		- if (event.getSource() == shadowZItem)
	3360	+ if (source == shadowZItem)
2339	3361	{
2340	3362	CastShadow(2);
2341	3363	} else
2342		- if (event.getSource() == ungroupItem)
	3364	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	3365	{
2344		- //ungroup();
	3366	+ boolean canUngroup = true;
	3367	+
2345	3368	for (int i=0; i<group.selection.size(); i++)
2346	3369	{
2347		- Ungroup(group.selection.get(i));
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
	3373	+ {
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
	3383	+ break;
	3384	+ }
2348	3385	}
2349	3386
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	3387	+ if (canUngroup)
	3388	+ {
	3389	+ for (int i=0; i<group.selection.size(); i++)
	3390	+ {
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
	3394	+ }
	3395	+
	3396	+ ClearSelection(false);
	3397	+
	3398	+ refreshContents();
	3399	+ }
2353	3400	} else
2354		- if (event.getSource() == genUVItem)
	3401	+ if (source == genUVItem)
2355	3402	{
2356	3403	GenUV();
2357	3404	} else
2358		- if (event.getSource() == genNormalsCADItem)
	3405	+ if (source == genNormalsCADItem)
2359	3406	{
2360	3407	GenNormals(true);
2361	3408	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	3409	+ if (source == genNormalsMESHItem)
2363	3410	{
2364		- GenNormals(true); // TODO
	3411	+ GenNormalsMESH();
2365	3412	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	3413	+ if (source == genNormalsORGANItem)
2367	3414	{
2368	3415	GenNormals(false);
2369	3416	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	3417	+ if (source == genNormalsMINEItem)
2371	3418	{
2372	3419	GenNormalsMINE();
2373	3420	} else
2374		- if (event.getSource() == stripifyItem)
	3421	+ if (source == stripifyItem)
2375	3422	{
2376	3423	Stripify();
2377	3424	} else
2378		- if (event.getSource() == unstripifyItem)
	3425	+ if (source == unstripifyItem)
2379	3426	{
2380	3427	Unstripify();
2381	3428	} else
2382		- if (event.getSource() == trimItem)
	3429	+ if (source == trimItem)
2383	3430	{
2384	3431	Trim();
2385	3432	} else
2386		- if (event.getSource() == untrimItem)
	3433	+ if (source == untrimItem)
2387	3434	{
2388	3435	Untrim();
2389	3436	} else
2390		- if (event.getSource() == clearColorsItem)
	3437	+ if (source == clearColorsItem)
2391	3438	{
2392	3439	ClearColors();
2393	3440	} else
2394		- if (event.getSource() == clearMaterialsItem)
	3441	+ if (source == clearMaterialsItem)
2395	3442	{
2396	3443	ClearMaterials();
2397	3444	} else
2398		- if (event.getSource() == liveleavesItem)
	3445	+ if (source == liveleavesItem)
2399	3446	{
2400	3447	LiveLeaves(true);
2401	3448	} else
2402		- if (event.getSource() == unliveleavesItem)
	3449	+ if (source == unliveleavesItem)
2403	3450	{
2404	3451	LiveLeaves(false);
2405	3452	} else
2406		- if (event.getSource() == supportleavesItem)
	3453	+ if (source == supportleavesItem)
2407	3454	{
2408	3455	SupportLeaves(true);
2409	3456	} else
2410		- if (event.getSource() == unsupportleavesItem)
	3457	+ if (source == unsupportleavesItem)
2411	3458	{
2412	3459	SupportLeaves(false);
2413	3460	} else
2414		- if (event.getSource() == hideleavesItem)
	3461	+ if (source == hideleavesItem)
2415	3462	{
2416	3463	HideLeaves(true);
2417	3464	} else
2418		- if (event.getSource() == showleavesItem)
	3465	+ if (source == showleavesItem)
2419	3466	{
2420	3467	HideLeaves(false);
2421	3468	} else
2422		- if (event.getSource() == markleavesItem)
	3469	+ if (source == markleavesItem)
2423	3470	{
2424	3471	MarkLeaves(true);
2425	3472	} else
2426		- if (event.getSource() == unmarkleavesItem)
	3473	+ if (source == unmarkleavesItem)
2427	3474	{
2428	3475	MarkLeaves(false);
2429	3476	} else
2430		- if (event.getSource() == flipVItem)
	3477	+ if (source == rewindleavesItem)
	3478	+ {
	3479	+ RewindLeaves(true);
	3480	+ } else
	3481	+ if (source == unrewindleavesItem)
	3482	+ {
	3483	+ RewindLeaves(false);
	3484	+ } else
	3485	+ if (source == randomleavesItem)
	3486	+ {
	3487	+ RandomLeaves(true);
	3488	+ } else
	3489	+ if (source == unrandomleavesItem)
	3490	+ {
	3491	+ RandomLeaves(false);
	3492	+ } else
	3493	+ if (source == flipVItem)
2431	3494	{
2432	3495	FlipV(true);
2433	3496	} else
2434		- if (event.getSource() == unflipVItem)
	3497	+ if (source == unflipVItem)
2435	3498	{
2436	3499	FlipV(false);
2437	3500	} else
2438		- if (event.getSource() == lowTexturesItem)
	3501	+ if (source == lowTexturesItem)
2439	3502	{
2440	3503	SetTexRes(0);
2441	3504	} else
2442		- if (event.getSource() == normalTexturesItem)
	3505	+ if (source == normalTexturesItem)
2443	3506	{
2444	3507	SetTexRes(1);
2445	3508	} else
2446		- if (event.getSource() == highTexturesItem)
	3509	+ if (source == highTexturesItem)
2447	3510	{
2448	3511	SetTexRes(2);
2449	3512	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	3513	+ if (source == veryhighTexturesItem)
2451	3514	{
2452	3515	SetTexRes(3);
2453	3516	} else
2454		- if (event.getSource() == maxTexturesItem)
	3517	+ if (source == maxTexturesItem)
2455	3518	{
2456	3519	SetTexRes(4);
2457	3520	} else
2458		- if (event.getSource() == panoTexturesItem)
	3521	+ if (source == panoTexturesItem)
2459	3522	{
2460	3523	SetTexRes(5);
2461	3524	} else
2462		- if (event.getSource() == reverseNormalsItem)
	3525	+ if (source == reverseNormalsItem)
2463	3526	{
2464	3527	ReverseNormals();
2465	3528	} else
2466		- if (event.getSource() == parseverticesItem)
	3529	+ if (source == parseverticesItem)
2467	3530	{
2468	3531	ParseVertices();
2469	3532	} else
2470		- if (event.getSource() == textureFieldItem)
	3533	+ if (source == textureFieldItem)
2471	3534	{
2472	3535	TextureVertices();
2473	3536	} else
2474		- if (event.getSource() == alignItem)
	3537	+ if (source == alignItem)
2475	3538	{
2476	3539	Align();
2477	3540	} else
2478		- if (event.getSource() == mirrorItem)
	3541	+ if (source == mirrorItem)
2479	3542	{
2480	3543	MirrorPoses();
2481	3544	} else
2482		- if (event.getSource() == reduceMorphItem)
	3545	+ if (source == reduceMorphItem)
2483	3546	{
2484	3547	MeshReduction(false);
2485	3548	} else
2486		- if (event.getSource() == reduce34MorphItem)
	3549	+ if (source == reduce34MorphItem)
2487	3550	{
2488	3551	MeshReduction(true);
2489	3552	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	3553	+ if (source == reverseTrianglesItem)
2491	3554	{
2492	3555	ReverseTriangles();
2493	3556	} else
2494		- if (event.getSource() == reduceMeshItem)
	3557	+ if (source == reduceMeshItem)
2495	3558	{
2496	3559	ReduceMesh(false);
2497	3560	} else
2498		- if (event.getSource() == reduce34MeshItem)
	3561	+ if (source == reduce34MeshItem)
2499	3562	{
2500	3563	ReduceMesh(true);
2501	3564	} else
2502		- if (event.getSource() == increaseMeshItem)
	3565	+ if (source == increaseMeshItem)
2503	3566	{
2504	3567	IncreaseMesh();
2505	3568	} else
2506		- if (event.getSource() == clipMeshItem)
	3569	+ if (source == clipMeshItem)
2507	3570	{
2508	3571	ClipMesh();
2509	3572	} else
2510		- if (event.getSource() == smoothMeshItem)
	3573	+ if (source == smoothMeshItem)
2511	3574	{
2512	3575	SmoothMesh();
2513	3576	} else
2514		- if (event.getSource() == transformgeometryItem)
	3577	+ if (source == transformGeometryItem)
2515	3578	{
2516	3579	TransformGeometry();
2517	3580	} else
2518		- if (event.getSource() == resetTransformItem)
	3581	+ if (source == transformChildrenItem)
	3582	+ {
	3583	+ TransformChildren();
	3584	+ } else
	3585	+ if (source == resetTransformItem)
2519	3586	{
2520	3587	ResetTransform();
2521	3588	} else
2522		- if (event.getSource() == resetCentroidItem)
	3589	+ if (source == resetCentroidItem)
2523	3590	{
2524		- ResetCentroid();
	3591	+ ResetCentroid(true);
2525	3592	} else
2526		- if (event.getSource() == resetParentItem)
	3593	+ if (source == resetCentroidXZItem)
	3594	+ {
	3595	+ ResetCentroid(false);
	3596	+ } else
	3597	+ if (source == resetParentItem)
2527	3598	{
2528	3599	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	3600	{
..	..	@@ -2533,7 +3604,7 @@
2533	3604
2534	3605	refreshContents();
2535	3606	} else
2536		- if (event.getSource() == repairParentItem)
	3607	+ if (source == repairParentItem)
2537	3608	{
2538	3609	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3610	{
..	..	@@ -2547,7 +3618,7 @@
2547	3618
2548	3619	refreshContents();
2549	3620	} else
2550		- if (event.getSource() == repairShadowItem)
	3621	+ if (source == repairShadowItem)
2551	3622	{
2552	3623	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3624	{
..	..	@@ -2561,7 +3632,7 @@
2561	3632
2562	3633	refreshContents();
2563	3634	} else
2564		- if (event.getSource() == sortbysizeItem)
	3635	+ if (source == sortbysizeItem)
2565	3636	{
2566	3637	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3638	{
..	..	@@ -2573,7 +3644,7 @@
2573	3644	ResetModel();
2574	3645	refreshContents();
2575	3646	} else
2576		- if (event.getSource() == sortbynameItem)
	3647	+ if (source == sortbynameItem)
2577	3648	{
2578	3649	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3650	{
..	..	@@ -2585,7 +3656,7 @@
2585	3656	ResetModel();
2586	3657	refreshContents();
2587	3658	} else
2588		- if (event.getSource() == attachPigmentItem)
	3659	+ if (source == attachPigmentItem)
2589	3660	{
2590	3661	String texture = GetFile("Attach pigment");
2591	3662	Object3D obj;
..	..	@@ -2597,7 +3668,7 @@
2597	3668
2598	3669	refreshContents();
2599	3670	} else
2600		- if (event.getSource() == detachPigmentItem)
	3671	+ if (source == detachPigmentItem)
2601	3672	{
2602	3673	Object3D obj;
2603	3674	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3679,7 @@
2608	3679
2609	3680	refreshContents();
2610	3681	} else
2611		- if (event.getSource() == attachBumpItem)
	3682	+ if (source == attachBumpItem)
2612	3683	{
2613	3684	String texture = GetFile("Attach bump");
2614	3685	Object3D obj;
..	..	@@ -2620,18 +3691,18 @@
2620	3691
2621	3692	refreshContents();
2622	3693	} else
2623		- if (event.getSource() == detachBumpItem)
	3694	+ if (source == detachBumpItem)
2624	3695	{
2625	3696	Object3D obj;
2626	3697	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2627	3698	{
2628	3699	obj = (Object3D)e.nextElement();
2629		- obj.SetBumpTexture(null);
	3700	+ obj.ResetBumpTexture();
2630	3701	}
2631	3702
2632	3703	refreshContents();
2633	3704	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3705	+ if (source == pigmentBumpItem)
2635	3706	{
2636	3707	Object3D obj;
2637	3708	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,159 +3713,233 @@
2642	3713
2643	3714	refreshContents();
2644	3715	} else
2645		- if (event.getSource() == flashSelectionButton)
	3716	+ if (source == embedTexturesItem)
	3717	+ {
	3718	+ Object3D obj;
	3719	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3720	+ {
	3721	+ obj = (Object3D)e.nextElement();
	3722	+ obj.EmbedTextures(true);
	3723	+ }
	3724	+
	3725	+ refreshContents();
	3726	+ } else
	3727	+ if (source == deEmbedTexturesItem)
	3728	+ {
	3729	+ Object3D obj;
	3730	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3731	+ {
	3732	+ obj = (Object3D)e.nextElement();
	3733	+ obj.EmbedTextures(false);
	3734	+ }
	3735	+
	3736	+ CameraPane.texturepigment.clear();
	3737	+ CameraPane.texturebump.clear();
	3738	+
	3739	+ refreshContents();
	3740	+ } else
	3741	+ if (source == flashSelectionButton)
2646	3742	{
2647	3743	CameraPane.flash = true;
2648	3744	refreshContents();
2649	3745	} else
2650		- if (event.getSource() == oneButton)
	3746	+ if (source == oneButton)
2651	3747	{
2652	3748	} else
2653		- if (event.getSource() == twoButton)
	3749	+ if (source == twoButton)
2654	3750	{
2655	3751	radio.layout = twoButton;
2656		- // bug
2657		- //gridPanel.setDividerLocation(1.0);
2658		- //bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
	3755	+
	3756	+ Show3DView();
	3757	+
	3758	+ cameraView.requestFocusInWindow();
	3759	+
	3760	+// refreshContents(true);
	3761	+//
	3762	+// try
	3763	+// {
	3764	+// java.awt.Robot bot = new java.awt.Robot();
	3765	+// int mask = InputEvent.BUTTON1_MASK;
	3766	+// bot.mouseMove(100, 100);
	3767	+// bot.mousePress(mask);
	3768	+// bot.mouseRelease(mask);
	3769	+// }
	3770	+// catch (Exception e)
	3771	+// {
	3772	+//
	3773	+// }
	3774	+
2683	3775	} else
2684		- if (event.getSource() == threeButton)
	3776	+ if (source == threeButton)
2685	3777	{
2686	3778	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3779	+
	3780	+ if (CameraPane.FULLSCREEN)
	3781	+ fullscreenLayout = radio.layout;
	3782	+
	3783	+// bigThree.remove(scenePanel);
	3784	+// bigThree.remove(centralPanel);
	3785	+// bigThree.remove(XYZPanel);
	3786	+// aWindowConstraints.gridx = 0;
	3787	+// aWindowConstraints.gridy = 0;
	3788	+// aWindowConstraints.gridwidth = 1;
	3789	+// // aConstraints.gridheight = 3;
	3790	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3791	+// aWindowConstraints.weightx = 0;
	3792	+// aWindowConstraints.weighty = 1;
	3793	+// //bigThree.add(jtp, aWindowConstraints);
	3794	+// aWindowConstraints.weightx = 1;
	3795	+// aWindowConstraints.gridwidth = 3;
	3796	+// // aConstraints.gridheight = 3;
	3797	+// aWindowConstraints.gridx = 1;
	3798	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3799	+// bigThree.add(centralPanel, aWindowConstraints);
	3800	+// aWindowConstraints.weightx = 0;
	3801	+// aWindowConstraints.gridx = 4;
	3802	+// aWindowConstraints.gridwidth = 1;
	3803	+// // aConstraints.gridheight = 3;
	3804	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3805	+// bigThree.add(XYZPanel, aWindowConstraints);
	3806	+// bigThree.validate();
	3807	+// scenePanel.setVisible(false);
	3808	+// centralPanel.setVisible(true);
	3809	+// XYZPanel.setVisible(true);
	3810	+ bigThree.ClearUI();
	3811	+ bigThree.add(scenePanel);
	3812	+ bigThree.add(centralPanel);
	3813	+ bigThree.FlushUI();
	3814	+
	3815	+ cameraView.requestFocusInWindow();
2711	3816	} else
2712		- if (event.getSource() == fourButton)
	3817	+ if (source == fourButton)
2713	3818	{
2714	3819	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3820	+
	3821	+ if (CameraPane.FULLSCREEN)
	3822	+ fullscreenLayout = radio.layout;
	3823	+
	3824	+// bigThree.remove(scenePanel);
	3825	+// bigThree.remove(centralPanel);
	3826	+// bigThree.remove(XYZPanel);
	3827	+// aWindowConstraints.gridx = 0;
	3828	+// aWindowConstraints.gridy = 0;
	3829	+// aWindowConstraints.gridwidth = 1;
	3830	+// // aWindowConstraints.gridheight = 3;
	3831	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3832	+// aWindowConstraints.weightx = 1;
	3833	+// aWindowConstraints.weighty = 1;
	3834	+// bigThree.add(scenePanel, aWindowConstraints);
	3835	+// aWindowConstraints.weightx = 1;
	3836	+// aWindowConstraints.gridwidth = 3;
	3837	+// // aConstraints.gridheight = 3;
	3838	+// aWindowConstraints.gridx = 1;
	3839	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3840	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3841	+// aWindowConstraints.weightx = 0;
	3842	+// aWindowConstraints.gridx = 4;
	3843	+// aWindowConstraints.gridwidth = 1;
	3844	+// // aWindowConstraints.gridheight = 3;
	3845	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3846	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3847	+// bigThree.validate();
	3848	+// scenePanel.setVisible(true);
	3849	+// centralPanel.setVisible(false);
	3850	+// XYZPanel.setVisible(false);
	3851	+ bigThree.ClearUI();
	3852	+ bigThree.add(scenePanel);
	3853	+ bigThree.FlushUI();
	3854	+
	3855	+ cameraView.requestFocusInWindow();
2739	3856	} else
2740		- if (event.getSource() == sixButton)
	3857	+ if (source == sixButton)
2741	3858	{
2742	3859	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	3860	+
	3861	+ if (CameraPane.FULLSCREEN)
	3862	+ fullscreenLayout = radio.layout;
	3863	+
	3864	+// bigThree.remove(scenePanel);
	3865	+// bigThree.remove(centralPanel);
	3866	+// bigThree.remove(XYZPanel);
	3867	+// aWindowConstraints.gridx = 0;
	3868	+// aWindowConstraints.gridy = 0;
	3869	+// aWindowConstraints.gridwidth = 1;
	3870	+// // aConstraints.gridheight = 3;
	3871	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3872	+// aWindowConstraints.weightx = 0;
	3873	+// aWindowConstraints.weighty = 1;
	3874	+// bigThree.add(scenePanel, aWindowConstraints);
	3875	+// aWindowConstraints.weightx = 1;
	3876	+// aWindowConstraints.gridwidth = 3;
	3877	+// // aWindowConstraints.gridheight = 3;
	3878	+// aWindowConstraints.gridx = 1;
	3879	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3880	+// bigThree.add(centralPanel, aWindowConstraints);
	3881	+// aWindowConstraints.weightx = 0;
	3882	+// aWindowConstraints.gridx = 4;
	3883	+// aWindowConstraints.gridwidth = 1;
	3884	+// // aWindowConstraints.gridheight = 3;
	3885	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3886	+// //bigThree.add(XYZPanel, aConstraints);
	3887	+// bigThree.validate();
	3888	+// scenePanel.setVisible(true);
	3889	+// centralPanel.setVisible(true);
	3890	+// XYZPanel.setVisible(false);
	3891	+ bigThree.ClearUI();
	3892	+ bigThree.add(centralPanel);
	3893	+ bigThree.add(scenePanel);
	3894	+ bigThree.FlushUI();
	3895	+
	3896	+ cameraView.requestFocusInWindow();
2767	3897	} else
2768		- if (event.getSource() == sevenButton)
	3898	+ if (source == sevenButton)
2769	3899	{
2770	3900	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	3901	+
	3902	+ if (CameraPane.FULLSCREEN)
	3903	+ fullscreenLayout = radio.layout;
	3904	+
	3905	+// bigThree.remove(scenePanel);
	3906	+// bigThree.remove(centralPanel);
	3907	+// bigThree.remove(XYZPanel);
	3908	+// aWindowConstraints.gridx = 0;
	3909	+// aWindowConstraints.gridy = 0;
	3910	+// aWindowConstraints.gridwidth = 1;
	3911	+// // aWindowConstraints.gridheight = 3;
	3912	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3913	+// aWindowConstraints.weightx = 0;
	3914	+// aWindowConstraints.weighty = 1;
	3915	+// bigThree.add(scenePanel, aWindowConstraints);
	3916	+// aWindowConstraints.weightx = 1;
	3917	+// aWindowConstraints.gridwidth = 3;
	3918	+// // aWindowConstraints.gridheight = 3;
	3919	+// aWindowConstraints.gridx = 1;
	3920	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3921	+// bigThree.add(centralPanel, aWindowConstraints);
	3922	+// aWindowConstraints.weightx = 0;
	3923	+// aWindowConstraints.gridx = 4;
	3924	+// aWindowConstraints.gridwidth = 1;
	3925	+// // aConstraints.gridheight = 3;
	3926	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3927	+// bigThree.add(XYZPanel, aWindowConstraints);
	3928	+// bigThree.validate();
	3929	+// scenePanel.setVisible(true);
	3930	+// centralPanel.setVisible(true);
	3931	+// XYZPanel.setVisible(true);
	3932	+ bigThree.ClearUI();
	3933	+ bigThree.add(scenePanel);
	3934	+ bigThree.add(centralPanel);
	3935	+ bigThree.add(XYZPanel);
	3936	+ bigThree.FlushUI();
	3937	+
	3938	+ cameraView.requestFocusInWindow();
2795	3939	} else
2796		- if (event.getSource() == rootButton)
	3940	+ if (source == rootButton)
2797	3941	{
	3942	+ Replace();
2798	3943	Object3D obj;
2799	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2800	3945	{
..	..	@@ -2803,66 +3948,85 @@
2803	3948	EditObject(obj);
2804	3949	}
2805	3950
	3951	+ cameraView.requestFocusInWindow();
2806	3952	refreshContents(true);
2807	3953	} else
2808		- if (event.getSource() == closeButton)
	3954	+ if (source == closeButton)
2809	3955	{
2810	3956	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3957	cRadio ab;
2812	3958	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3959	{
2814	3960	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3961	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3962	{
	3963	+ // Patch to avoid bug with transparency.
	3964	+ if (!ab.hadMaterial)
	3965	+ {
	3966	+ ab.object.material = null;
	3967	+ }
	3968	+
2817	3969	buttonGroup.remove(ab);
2818	3970	radioPanel.remove(ab);
2819	3971
2820		- ab.GetObject().editWindow = null;
	3972	+ //ab.GetObject().editWindow = null;
	3973	+ ab.GetObject().manipWindow = null;
2821	3974	// ab.GetObject().objectUI = null; // ?????????
2822	3975
2823	3976	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3977	break;
2825	3978	}
2826	3979	}
	3980	+
	3981	+ cameraView.requestFocusInWindow();
2827	3982	refreshContents(true);
2828	3983	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3984	+ if (source == editItem \|\| source == editButton)
2830	3985	{
	3986	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3987	+ {
	3988	+ Object3D child = (Object3D)e.nextElement();
	3989	+ child.pinned = true;
	3990	+ }
	3991	+
2831	3992	EditSelection(false);
2832	3993	} else
2833		- if (event.getSource() == uneditButton)
	3994	+ if (source == uneditButton)
2834	3995	{
2835	3996	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3997	{
2837	3998	Object3D child = (Object3D)e.nextElement();
2838	3999	if(child.editWindow != null)
2839		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4000	+ child.pinned = false;
2840	4001	child.CloseUI();
2841	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2842	4004
2843		- child.editWindow = null; // ???????????
	4005	+ //child.editWindow = null; // ???????????
2844	4006	}
2845		- objEditor.ctrlPanel.revalidate();
	4007	+ objEditor.ctrlPanel.FlushUI();
2846	4008	//objEditor.jTree.clearSelection();
2847	4009	//objEditor.ResetSliders();
2848	4010	refreshContents(true);
2849	4011	} else
2850		- if (event.getSource() == clearPanelButton)
	4012	+ if (source == clearPanelButton)
2851	4013	{
2852	4014	assert(copy == group);
2853	4015	//copy.ClearUI();
2854	4016	for (Object3D obj : listUI)
2855	4017	{
	4018	+ obj.pinned = false;
2856	4019	obj.CloseUI();
2857	4020	}
2858	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
2859	4023	refreshContents(true);
2860	4024	} else
2861		- if (event.getSource() == allParamsButton)
	4025	+ if (source == allParamsButton)
2862	4026	{
2863	4027	assert(copy == group);
2864	4028
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4029	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	4030
2867	4031	for (Object3D obj : listUI)
2868	4032	{
..	..	@@ -2879,19 +4043,19 @@
2879	4043
2880	4044	refreshContents(true);
2881	4045	} else
2882		- if (event.getSource() == unselectButton)
	4046	+ if (source == unselectButton)
2883	4047	{
2884	4048	objEditor.jTree.clearSelection();
2885	4049	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	4050	objEditor.ResetSliders();
2887	4051	refreshContents(true);
2888	4052	} else
2889		- if(event.getSource() instanceof cRadio)
	4053	+ if(source instanceof cRadio)
2890	4054	{
2891	4055	group.parent = keepparent;
2892	4056	group.attributes = 0;
2893	4057	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	4058	+ /cRadio/ radio = (cRadio)source;
2895	4059	Object3D obj = radio.GetObject();
2896	4060	System.out.println("Edit " + obj);
2897	4061	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,6 +4075,7 @@
2911	4075	}
2912	4076
2913	4077	copy = group;
	4078	+
2914	4079	//Globals.theRenderer.object = group;
2915	4080	if(!useclient)
2916	4081	{
..	..	@@ -2926,20 +4091,61 @@
2926	4091	frontView.object = group;
2927	4092	sideView.object = group;
2928	4093	}
2929		- group.editWindow = this;
	4094	+
	4095	+// fix "+" issue
	4096	+ //group.editWindow = this;
	4097	+ group.manipWindow = this;
	4098	+
2930	4099	/*
2931	4100	currentLayout = radio.layout;
2932	4101	if (currentLayout == null)
2933	4102	currentLayout = sevenButton;
2934	4103	*/
2935	4104	radio.layout.doClick();
	4105	+
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
	4118	+ ClearUnpinned();
	4119	+
	4120	+ //Grafreed.Assert(group != null);
	4121	+ //Grafreed.Assert(group.selection != null);
	4122	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4123	+ if (group.selection == null \|\| group.selection.size() == 1)
	4124	+ EditSelection(false);
2936	4125	keepparent = group.parent;
2937	4126	// PARENT = NULL or not???
2938	4127	//group.parent = null; // ROOT
2939	4128	//group.attributes = -1;
2940	4129	ResetModel();
	4130	+
	4131	+ cameraView.requestFocusInWindow();
2941	4132	refreshContents(true);
2942		- }
	4133	+ } else if (event.getSource() == editCameraItem)
	4134	+ {
	4135	+ cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
	4137	+ cameraView.repaint();
	4138	+ return;
	4139	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4140	+ {
	4141	+ cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
	4143	+ cameraView.repaint();
	4144	+ return;
	4145	+ // } else if (event.getSource() == textureButton)
	4146	+ // {
	4147	+ // return; // true;
	4148	+ }
2943	4149	else
2944	4150	{
2945	4151	//return super.action(event, arg);
..	..	@@ -2948,7 +4154,6 @@
2948	4154	}
2949	4155
2950	4156	boolean useclient = false;
2951		- cRadio radio;
2952	4157
2953	4158	void ToggleRoot()
2954	4159	{
..	..	@@ -3000,6 +4205,28 @@
3000	4205	refreshContents();
3001	4206	}
3002	4207
	4208	+ void TransformChildren()
	4209	+ {
	4210	+ Object3D obj;
	4211	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4212	+ {
	4213	+ obj = (Object3D)e.nextElement();
	4214	+ obj.KeepTextureMatrices();
	4215	+ obj.TransformChildren();
	4216	+ obj.RestoreTextureMatrices();
	4217	+
	4218	+// if (obj.parent == null)
	4219	+// {
	4220	+// System.out.println("NULL PARENT!");
	4221	+// new Exception().printStackTrace();
	4222	+// }
	4223	+// else
	4224	+// TouchTransform(obj);
	4225	+// //obj.parent.Touch();
	4226	+ }
	4227	+
	4228	+ refreshContents();
	4229	+ }
3003	4230
3004	4231	void ResetTransform()
3005	4232	{
..	..	@@ -3112,7 +4339,7 @@
3112	4339	refreshContents();
3113	4340	}
3114	4341
3115		- void ResetCentroid()
	4342	+ void ResetCentroid(boolean full)
3116	4343	{
3117	4344	Object3D obj;
3118	4345	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +4354,16 @@
3127	4354	LA.matIdentity(Object3D.mat);
3128	4355	obj.getBounds(minima, maxima, false);
3129	4356	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4357	+ if (full)
	4358	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	4359	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	4360	obj.TransformMesh(Object3D.mat);
	4361	+
3133	4362	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4363	+ if (full)
	4364	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	4365	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4366	+
3136	4367	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	4368	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	4369	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +4392,8 @@
3161	4392
3162	4393	int size = obj.MemorySize();
3163	4394
3164		- System.err.println((size/1024) + " KB is the size of " + obj);
	4395	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4396	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3165	4397	}
3166	4398	}
3167	4399	catch (Exception e)
..	..	@@ -3198,9 +4430,9 @@
3198	4430	obj = (Object3D)e.nextElement();
3199	4431
3200	4432	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	4433	+ Grafreed.AnalyzeObject(obj);
3202	4434	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	4435	+ Grafreed.AnalyzeObject(obj.bRep);
3204	4436
3205	4437	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	4438	}
..	..	@@ -3242,6 +4474,13 @@
3242	4474	void GenNormals(boolean crease)
3243	4475	{
3244	4476	group.GenNormalsS(crease);
	4477	+
	4478	+ refreshContents();
	4479	+ }
	4480	+
	4481	+ void GenNormalsMESH()
	4482	+ {
	4483	+ group.GenNormalsMeshS();
3245	4484
3246	4485	refreshContents();
3247	4486	}
..	..	@@ -3414,8 +4653,8 @@
3414	4653
3415	4654	void ParseVertices()
3416	4655	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	4656	+ boolean epsequal = Grafreed.epsequal;
	4657	+ Grafreed.epsequal = true;
3419	4658
3420	4659	for (int i=0; i<group.selection.size(); i++)
3421	4660	{
..	..	@@ -3440,7 +4679,7 @@
3440	4679	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	4680	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	4681
3443		- g.add(GrafreeD.clipboard);
	4682	+ g.add(Grafreed.clipboard);
3444	4683
3445	4684	buffer.add(g);
3446	4685	}
..	..	@@ -3455,7 +4694,7 @@
3455	4694	makeSomething(buffer, i==group.selection.size()-1);
3456	4695	}
3457	4696
3458		- GrafreeD.epsequal = epsequal;
	4697	+ Grafreed.epsequal = epsequal;
3459	4698
3460	4699	refreshContents();
3461	4700	}
..	..	@@ -3473,7 +4712,16 @@
3473	4712	String pigment = Object3D.GetPigment(tex);
3474	4713	//String bump = Object3D.GetBump(tex);
3475	4714
3476		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4715	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4716	+
	4717	+ try
	4718	+ {
	4719	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4720	+ }
	4721	+ catch (Exception e)
	4722	+ {
	4723	+ System.err.println("FAIL: " + node);
	4724	+ }
3477	4725
3478	4726	double s = v.s;
3479	4727
..	..	@@ -3561,11 +4809,11 @@
3561	4809
3562	4810	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	4811
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	4812	+ boolean random = CameraPane.SWITCH;
	4813	+ CameraPane.SWITCH = false; // parse all random nodes
3566	4814	lowres.linkVerticesThis(null);
3567	4815	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	4816	+ CameraPane.SWITCH = random;
3569	4817
3570	4818	System.err.flush();
3571	4819
..	..	@@ -3605,7 +4853,7 @@
3605	4853	return;
3606	4854
3607	4855	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	4856	+ Object3D ref = Grafreed.clipboard.get(0);
3609	4857
3610	4858	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	4859
..	..	@@ -3799,9 +5047,9 @@
3799	5047
3800	5048	void ClipMesh()
3801	5049	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5050	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	5051	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	5052	+ Object3D content = Grafreed.clipboard.get(0);
3805	5053
3806	5054	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	5055	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +5058,7 @@
3810	5058	// {
3811	5059	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	5060	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	5061	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	5062	}
3815	5063	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	5064	System.out.println("DONE.");
..	..	@@ -3857,6 +5105,18 @@
3857	5105	void MarkLeaves(boolean hide)
3858	5106	{
3859	5107	group.selection.MarkLeaves(hide);
	5108	+ refreshContents();
	5109	+ }
	5110	+
	5111	+ void RewindLeaves(boolean hide)
	5112	+ {
	5113	+ group.selection.RewindLeaves(hide);
	5114	+ refreshContents();
	5115	+ }
	5116	+
	5117	+ void RandomLeaves(boolean hide)
	5118	+ {
	5119	+ group.selection.RandomLeaves(hide);
3860	5120	refreshContents();
3861	5121	}
3862	5122
..	..	@@ -3931,28 +5191,25 @@
3931	5191	// }
3932	5192	// }
3933	5193
3934		- static boolean allparams = true;
3935		-
3936		- static Vector<Object3D> listUI = new Vector<Object3D>();
3937		-
3938	5194	void EditSelection(boolean newWindow)
3939	5195	{
	5196	+ if (group.selection == null)
	5197	+ {
	5198	+ EditElement(group, newWindow); // ? new
	5199	+ return;
	5200	+ }
	5201	+
3940	5202	// aConstraints.gridy = 0;
3941	5203	for (int i=0; i<group.selection.size(); i++)
3942	5204	{
3943	5205	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3944	5206	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3945		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5207	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	5208
3947	5209	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	5210	+ if(elem != group \|\| !newWindow)
3949	5211	{
3950		- // if (!(elem instanceof Composite))
3951		- // newWindow = false;
3952		- listUI.add(elem);
3953		- elem.openEditWindow(this, newWindow); //, false);
3954		- System.out.println("edit : " + elem);
3955		- elem.editWindow.refreshContents(true); // ? new
	5212	+ EditElement(elem, newWindow); // ? new
3956	5213	}
3957	5214	}
3958	5215	}
..	..	@@ -4015,9 +5272,7 @@
4015	5272
4016	5273	freezemodel = false;
4017	5274	}
4018		-
4019		- boolean flashIt = true;
4020		-
	5275	+
4021	5276	public void valueChanged(TreeSelectionEvent e)
4022	5277	//public boolean handleEvent(Event event)
4023	5278	{
..	..	@@ -4027,7 +5282,8 @@
4027	5282	//new Exception().printStackTrace();
4028	5283
4029	5284	freezemodel = true;
4030		-
	5285	+ ClearUnpinned();
	5286	+
4031	5287	/**/
4032	5288	//switch (event.id)
4033	5289	{
..	..	@@ -4035,7 +5291,6 @@
4035	5291	//case 702: // Event.LIST_DESELECT
4036	5292	group.deselectAll();
4037	5293	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	5294	if (tps != null)
4040	5295	{
4041	5296	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,33 +5299,39 @@
4044	5299
4045	5300	//if (child.parent != null)
4046	5301	//child.parent.addSelectee(child);
	5302	+ objEditor.SetMaterial(child);
4047	5303	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	5304	}
4052	5305	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	5306	+// else
	5307	+// {
	5308	+// objEditor.SetMaterial(group); // .GetMaterial());
	5309	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5310	+// System.err.println("info : " + group.GetPath());
	5311	+// }
4059	5312
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	5314	CameraPane.flash = true;
4064	5315
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	5317	// a camera
4067	5318	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5320	+ {
	5321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5323	+ }
4070	5324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4071	5325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	5326	}
4073	5327
	5328	+ if (tps != null && tps.length == 1)
	5329	+ {
	5330	+ EditSelection(false);
	5331	+ }
	5332	+
	5333	+ SetPinStates(tps != null && tps.length > 0);
	5334	+
4074	5335	refreshContents();
4075	5336	//return true;
4076	5337	}
..	..	@@ -4079,6 +5340,51 @@
4079	5340
4080	5341	freezemodel = false;
4081	5342	}
	5343	+
	5344	+ void SetPinStates(boolean enabled)
	5345	+ {
	5346	+ editButton.setEnabled(enabled);
	5347	+ uneditButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
	5349	+ flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
	5366	+ }
	5367	+
	5368	+ void refreshContents(boolean cp)
	5369	+ {
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5371	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5372	+ {
	5373	+ objEditor.ClearInfo(); // .GetMaterial());
	5374	+
	5375	+ for (int i=0; i < group.selection.Size(); i++)
	5376	+ {
	5377	+ Object3D child = (Object3D) group.selection.get(i);
	5378	+
	5379	+ objEditor.AddInfo(child, this, true);
	5380	+// System.err.println("info : " + child.GetPath());
	5381	+ }
	5382	+
	5383	+ objEditor.SetText(); // jan 2014
	5384	+ }
	5385	+
	5386	+ super.refreshContents(cp);
	5387	+ }
4082	5388
4083	5389	void linkSomething(Object3D thing)
4084	5390	{
..	..	@@ -4150,16 +5456,19 @@
4150	5456	{
4151	5457	if (group.selection.isEmpty())
4152	5458	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	5459	+
	5460	+ Grafreed.clipboardIsTempGroup = false;
4154	5461	Composite tGroup = null;
4155	5462	if (group.selection.size() > 0) // 1)
4156	5463	{
4157	5464	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	5465	+ Grafreed.clipboardIsTempGroup = true;
4159	5466	}
4160	5467
4161	5468	if (cut)
4162	5469	{
	5470	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5471	+// Save();
4163	5472	//int indices[] = jList.getSelectedIndices();
4164	5473	//for (int i = indices.length - 1; i >= 0; i--)
4165	5474	//jList.remove(indices[i]);
..	..	@@ -4195,16 +5504,16 @@
4195	5504	//System.out.println("cut " + child);
4196	5505	//System.out.println("parent = " + child.parent);
4197	5506	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4199	5508	tGroup.add/Child/(tmp);
4200	5509	else
4201		- GrafreeD.clipboard = tmp;
	5510	+ Grafreed.clipboard = tmp;
4202	5511	}
4203	5512	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	5513	+ if (Grafreed.clipboardIsTempGroup)
4205	5514	tGroup.add/Child/(child);
4206	5515	else
4207		- GrafreeD.clipboard = child;
	5516	+ Grafreed.clipboard = child;
4208	5517	}
4209	5518
4210	5519	//ResetModel();
..	..	@@ -4236,21 +5545,23 @@
4236	5545	//System.out.println("cut " + elem);
4237	5546	//System.out.println("parent = " + elem.parent);
4238	5547	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	5548	+ if (Grafreed.clipboardIsTempGroup)
4240	5549	tGroup.add/Child/(tmp);
4241	5550	else
4242		- GrafreeD.clipboard = tmp;
	5551	+ Grafreed.clipboard = tmp;
4243	5552	}
4244	5553	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	5554	+ if (Grafreed.clipboardIsTempGroup)
4246	5555	tGroup.add/Child/(child);
4247	5556	else
4248		- GrafreeD.clipboard = child;
	5557	+ Grafreed.clipboard = child;
4249	5558	}
4250	5559
4251	5560	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	5561	+
	5562	+ if (Grafreed.clipboardIsTempGroup)
	5563	+ Grafreed.clipboard = tGroup;
	5564	+
4254	5565	if (cut)
4255	5566	{
4256	5567	ResetModel();
..	..	@@ -4260,11 +5571,15 @@
4260	5571
4261	5572	void paste(boolean expand)
4262	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4263	5578	// if (GrafreeD.clipboard == null)
4264	5579	// return;
4265	5580	boolean first = true;
4266	5581
4267		- if (GrafreeD.clipboardIsTempGroup)
	5582	+ if (Grafreed.clipboardIsTempGroup)
4268	5583	{
4269	5584	Composite temp;
4270	5585
..	..	@@ -4275,7 +5590,7 @@
4275	5590	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	5591	*/
4277	5592	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5593	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	5594	{
4280	5595	Object3D child = (Object3D)e.nextElement();
4281	5596
..	..	@@ -4309,21 +5624,22 @@
4309	5624	//Object3D cb = Applet3D.clipboard;
4310	5625	//temp.addChild(cb);
4311	5626	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5627	+ assert(Grafreed.clipboard.parent == null);
	5628	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5629	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5630	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5631	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	5632	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	5633	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5634	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	5635	}
4321	5636
	5637	+ Globals.REPLACEONMAKE = keep;
4322	5638	ResetModel();
4323	5639	refreshContents();
4324	5640	}
4325	5641
4326		- void pasteInto(boolean copyit)
	5642	+ void pasteInto(boolean copyit, boolean clone)
4327	5643	{
4328	5644	// if (GrafreeD.clipboard == null)
4329	5645	// return;
..	..	@@ -4352,15 +5668,22 @@
4352	5668	if (copyit)
4353	5669	{
4354	5670	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	5671	+ if (clone)
	5672	+ {
	5673	+ CloneClipboard(false); // sept 2014
	5674	+ }
	5675	+ else
	5676	+ {
	5677	+ paste(false);
	5678	+ }
4356	5679	}
4357	5680	else
4358	5681	{
4359	5682	boolean first = true;
4360	5683
4361		- if (GrafreeD.clipboardIsTempGroup)
	5684	+ if (Grafreed.clipboardIsTempGroup)
4362	5685	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	5686	+ Composite temp = (Composite)Grafreed.clipboard;
4364	5687	Object3D copy;
4365	5688	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	5689	{
..	..	@@ -4370,7 +5693,7 @@
4370	5693	}
4371	5694	} else
4372	5695	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	5696	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	5697	}
4375	5698	}
4376	5699	}
..	..	@@ -4447,6 +5770,10 @@
4447	5770
4448	5771	void group(Object3D csg, boolean grab)
4449	5772	{
	5773	+ if (Globals.REPLACEONMAKE)
	5774	+ Save();
	5775	+ boolean keep = Globals.REPLACEONMAKE;
	5776	+ Globals.REPLACEONMAKE = false;
4450	5777	if (//false) // why??
4451	5778	!group.selection.isEmpty())
4452	5779	{
..	..	@@ -4560,10 +5887,15 @@
4560	5887	//node.add(csg);
4561	5888	//makeSomething(node);
4562	5889	makeSomething(csg);
	5890	+ Globals.REPLACEONMAKE = keep;
4563	5891	}
4564	5892
4565	5893	void Ungroup(Object3D g)
4566	5894	{
	5895	+ if (Globals.REPLACEONMAKE)
	5896	+ Save();
	5897	+ boolean keep = Globals.REPLACEONMAKE;
	5898	+ Globals.REPLACEONMAKE = false;
4567	5899	if (g instanceof HiddenObject)
4568	5900	{
4569	5901	HiddenObject h = (HiddenObject) g;
..	..	@@ -4580,6 +5912,7 @@
4580	5912	objEditor.makeSomething(g.get(i), false);
4581	5913	}
4582	5914	}
	5915	+ Globals.REPLACEONMAKE = keep;
4583	5916	}
4584	5917
4585	5918	void ungroup()
..	..	@@ -4775,21 +6108,6 @@
4775	6108	}
4776	6109	*/
4777	6110
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	6111	/*
4794	6112	public void Callback(Object obj)
4795	6113	{
..	..	@@ -4813,26 +6131,9 @@
4813	6131	}
4814	6132	*/
4815	6133
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	6134	String GetFile(String dialogName)
4834	6135	{
4835		- if (GrafreeD.standAlone)
	6136	+ if (Grafreed.standAlone)
4836	6137	{
4837	6138	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	6139	browser.show();
..	..	@@ -4896,10 +6197,48 @@
4896	6197	cButton flashSelectionButton;
4897	6198	cButton editButton;
4898	6199	cButton uneditButton;
	6200	+ JCheckBox allParamsButton;
4899	6201	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	6202	cButton unselectButton;
4902	6203
	6204	+ cButton restoreCameraButton;
	6205	+
	6206	+ cButton oneStepButton;
	6207	+
	6208	+ cButton groupButton;
	6209	+ cButton ungroupButton;
	6210	+ cButton compositeButton;
	6211	+ cButton switchButton;
	6212	+ cButton loopButton;
	6213	+ cButton textureButton;
	6214	+
	6215	+ cButton skybox1Button;
	6216	+ cButton skybox2Button;
	6217	+ cButton skybox3Button;
	6218	+ cButton skybox4Button;
	6219	+ cButton skybox5Button;
	6220	+ cButton skybox6Button;
	6221	+ cButton skybox7Button;
	6222	+
	6223	+ cButton skybox11Button;
	6224	+ cButton skybox12Button;
	6225	+ cButton skybox13Button;
	6226	+ cButton skybox14Button;
	6227	+ cButton skybox15Button;
	6228	+ cButton skybox16Button;
	6229	+ cButton skybox17Button;
	6230	+
	6231	+ cButton gridButton;
	6232	+ cButton boxButton;
	6233	+ cButton sphereButton;
	6234	+ cButton coneButton;
	6235	+ cButton torusButton;
	6236	+ cButton superButton;
	6237	+ cButton kleinButton;
	6238	+ cButton particlesButton;
	6239	+ cButton overlayButton;
	6240	+ cButton lightButton;
	6241	+
4903	6242	cButton screenfitButton;
4904	6243	cButton screenfitpointButton;
4905	6244	cButton snapobjectButton;
..	..	@@ -4911,14 +6250,6 @@
4911	6250
4912	6251	cButton setsupportButton;
4913	6252
4914		- cButton twoButton;
4915		- cButton sixButton;
4916		- cButton threeButton;
4917		- cButton sevenButton;
4918		- cButton fourButton; // full panel
4919		- cButton oneButton; // full XYZ
4920		- //cButton currentLayout;
4921		-
4922	6253	//
4923	6254	//Composite
4924	6255	Object3D // to do !!
..	..	@@ -4928,10 +6259,12 @@
4928	6259	//JTree jTree;
4929	6260	private MenuItem lookAtItem;
4930	6261	private MenuItem lookFromItem;
4931		- private MenuItem switchItem;
4932		- private MenuItem cutItem;
4933		- private MenuItem duplicateItem;
4934		- private MenuItem cloneItem;
	6262	+ private MenuItem switchViewItem;
	6263	+ private JMenuItem cutItem;
	6264	+ private MenuItem undoItem;
	6265	+ private MenuItem redoItem;
	6266	+ private JMenuItem duplicateItem;
	6267	+ private JMenuItem cloneItem;
4935	6268	private MenuItem cloneSupportItem;
4936	6269	private MenuItem overwriteGeoItem;
4937	6270	private MenuItem overwriteMatItem;
..	..	@@ -4943,7 +6276,7 @@
4943	6276	private MenuItem linkverticesItem;
4944	6277	private MenuItem relinkverticesItem;
4945	6278	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	6279	+ private MenuItem resetAllItem;
4947	6280	private MenuItem stepAllItem;
4948	6281	private MenuItem revertMeshItem;
4949	6282	private MenuItem poseMeshItem;
..	..	@@ -4952,12 +6285,13 @@
4952	6285	private MenuItem cloneGeometriesItem;
4953	6286	private MenuItem shareGeometriesItem;
4954	6287	private MenuItem mergeGeometriesItem;
4955		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
4956	6289	private MenuItem pasteItem;
4957		- private MenuItem pasteLinkItem;
4958		- private MenuItem pasteCloneItem;
4959		- private MenuItem pasteExpandItem;
4960		- private MenuItem clearItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
4961	6295	private MenuItem clearAllItem;
4962	6296	private MenuItem genUVItem;
4963	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -4992,6 +6326,10 @@
4992	6326	private MenuItem showleavesItem;
4993	6327	private MenuItem markleavesItem;
4994	6328	private MenuItem unmarkleavesItem;
	6329	+ private MenuItem rewindleavesItem;
	6330	+ private MenuItem unrewindleavesItem;
	6331	+ private MenuItem randomleavesItem;
	6332	+ private MenuItem unrandomleavesItem;
4995	6333
4996	6334	private MenuItem flipVItem;
4997	6335	private MenuItem unflipVItem;
..	..	@@ -5003,15 +6341,17 @@
5003	6341	private MenuItem panoTexturesItem;
5004	6342
5005	6343	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	6344	+ private MenuItem resetCentroidXZItem;
5007	6345	private MenuItem resetTransformItem;
	6346	+ private MenuItem transformGeometryItem;
	6347	+ private MenuItem transformChildrenItem;
5008	6348	private MenuItem hideItem;
5009	6349	private MenuItem grabItem;
5010	6350	private MenuItem backItem;
5011	6351	private MenuItem frontItem;
5012	6352	private MenuItem cameraItem;
5013	6353	private MenuItem compositeItem;
5014		- private MenuItem randomItem;
	6354	+ private MenuItem switchItem;
5015	6355	private MenuItem physicsItem;
5016	6356	private MenuItem frameselectorItem;
5017	6357	private MenuItem scriptNodeItem;
..	..	@@ -5019,7 +6359,7 @@
5019	6359	private MenuItem switchTransfoItem;
5020	6360	private MenuItem morphItem;
5021	6361	private MenuItem linkerItem;
5022		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
5023	6363	private MenuItem editItem;
5024	6364	private MenuItem openWindowItem;
5025	6365	private MenuItem editLeafItem;
..	..	@@ -5035,6 +6375,8 @@
5035	6375	private MenuItem attachBumpItem;
5036	6376	private MenuItem detachBumpItem;
5037	6377	private MenuItem pigmentBumpItem;
	6378	+ private MenuItem embedTexturesItem;
	6379	+ private MenuItem deEmbedTexturesItem;
5038	6380
5039	6381	private MenuItem particleItem;
5040	6382	private MenuItem ragdollItem;
..	..	@@ -5051,7 +6393,7 @@
5051	6393	private MenuItem blobItem;
5052	6394	private MenuItem latheItem;
5053	6395	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	6396	+ private MenuItem overlayItem;
5055	6397	private MenuItem meshItem;
5056	6398	// private MenuItem meshGroupItem;
5057	6399	private MenuItem springItem;
..	..	@@ -5073,11 +6415,6 @@
5073	6415	private MenuItem doubleItem;
5074	6416	private MenuItem tripleItem;
5075	6417
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	6418	private MenuItem computeAOItem;
5082	6419	private MenuItem recompileItem;
5083	6420	private MenuItem editScriptItem;
..	..	@@ -5087,4 +6424,8 @@
5087	6424	private MenuItem analyzeItem;
5088	6425	private MenuItem dumpItem;
5089	6426	//boolean freezemodel = false;
	6427	+
	6428	+ Menu cameraMenu;
	6429	+ MenuItem editCameraItem;
	6430	+ MenuItem restoreCameraItem;
5090	6431	}